diff options
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 12 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 580d876d9193..2beaad8d5d37 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkg DISTVERSION= 1.17.99.9 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -43,13 +44,6 @@ CONFIGURE_ARGS+= --with-asan --with-ubsan #CONFIGURE_ARGS+= --default-format=tzst #.endif -.if !exists(/usr/libdata/pkgconfig/liblzma.pc) -LIBLZMA_LIBS= -llzma -.else -LIBLZMA_PC!= ${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc -LIBLZMA_LIBS= ${LIBLZMA_PC:M-l*} -.endif - .if defined(WITH_PKG) .if ${WITH_PKG} != devel . if !defined(PACKAGE_BUILDING) @@ -67,10 +61,6 @@ PKG_DEPENDS= PKG_BIN= ${WRKSRC}/src/pkg-static .endif -post-patch: - ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \ - ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup - .if ${PORT_OPTIONS:MSAN} post-build: @(cd ${WRKSRC}/src && \ diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 79d7c4427191..b031f2ebbe35 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkg DISTVERSION= 1.17.5 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ @@ -70,13 +71,6 @@ pre-everything:: .endif .endif -.if !exists(/usr/libdata/pkgconfig/liblzma.pc) -LIBLZMA_LIBS= -llzma -.else -LIBLZMA_PC!= ${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc -LIBLZMA_LIBS= ${LIBLZMA_PC:M-l*} -.endif - #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS @@ -87,10 +81,6 @@ PKG_DEPENDS= PKG_BIN= ${WRKSRC}/src/pkg-static .endif -post-patch: - ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \ - ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg |