diff options
Diffstat (limited to 'pkgtools/pkg_install/Makefile')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 02aab8921f8..5e557da239b 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.219 2017/01/03 17:53:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.220 2017/04/19 21:42:50 joerg Exp $ # Notes to package maintainers: # @@ -104,8 +104,8 @@ MAKE_FLAGS+= ACTIVE_CC=clang VERSION!= ${AWK} '/PKGTOOLS_VERSION/ {print $$3}' \ ${FILESDIR}/lib/version.h -# raw format appeared in libarchive 2.8. -BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.0 +# Requires 3.x filter API and bugfixes. +BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.1 .include "../../archivers/bzip2/builtin.mk" .include "../../archivers/xz/builtin.mk" @@ -181,9 +181,9 @@ pre-configure: config-guess-override config-sub-override CPPFLAGS+= -I${WRKDIR}/libfetch LDFLAGS+= -L${WRKDIR}/libfetch # Avoid duplicate and conflicting headers, pull in any we need -# directly with <netpgpgverify/*.h> +# directly with <netpgpg/*.h> CPPFLAGS+= -I${WRKDIR} -LDFLAGS+= -L${WRKDIR}/netpgpverify +LDFLAGS+= -L${WRKDIR}/netpgp CONFIGURE_ENV+= LIBS=${LIBS:Q} @@ -199,7 +199,7 @@ do-extract: @${CP} -R ${FILESDIR.libarchive} ${WRKDIR}/libarchive .endif @${CP} -R ${FILESDIR.libfetch} ${WRKDIR}/libfetch - @${CP} -R ${FILESDIR.netpgpverify} ${WRKDIR}/netpgpverify + @${CP} -R ${FILESDIR.netpgpverify} ${WRKDIR}/netpgp pre-configure: .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) @@ -223,7 +223,7 @@ pre-configure: ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ -f ${MAKE_FILE} depend all - cd ${WRKDIR}/netpgpverify && \ + cd ${WRKDIR}/netpgp && \ ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \ ${RM} -f bzlib.h zlib.h && \ ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \ |