CVS commit: pkgsrc/pkgtools/pkg

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Sun Nov 20 01:18:47 UTC 2016

Modified Files:
        pkgsrc/pkgtools/pkg: Makefile distinfo
Removed Files:
        pkgsrc/pkgtools/pkg/files: readpassphrase_compat.h
        pkgsrc/pkgtools/pkg/patches: patch-external_libfetch_ftp.c
            patch-external_libfetch_http.c patch-libpkg_pkg.h.in
            patch-libpkg_pkg__elf.c

Log Message:
pkgtools/pkg: Upgrade version 1.8.7 => 1.9.99.3

This is a development version, but it contains many fixes for NetBSD and
Linux.  It's better than the release version here.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/pkgtools/pkg/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/pkg/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg/files/readpassphrase_compat.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/pkgtools/pkg/patches/patch-external_libfetch_ftp.c \
    pkgsrc/pkgtools/pkg/patches/patch-external_libfetch_http.c \
    pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg.h.in \
    pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg/Makefile
diff -u pkgsrc/pkgtools/pkg/Makefile:1.17 pkgsrc/pkgtools/pkg/Makefile:1.18
--- pkgsrc/pkgtools/pkg/Makefile:1.17   Fri Nov 18 14:10:18 2016
+++ pkgsrc/pkgtools/pkg/Makefile        Sun Nov 20 01:18:46 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2016/11/18 14:10:18 marino Exp $
+# $NetBSD: Makefile,v 1.18 2016/11/20 01:18:46 marino Exp $
 
-DISTNAME=      pkg-1.8.7
-PKGREVISION=   8
+DISTNAME=      pkg-1.9.99.3
 CATEGORIES=    pkgtools
 MASTER_SITES=  http://files.etoilebsd.net/pkg/
 EXTRACT_SUFX=  .tar.xz
@@ -19,6 +18,7 @@ USE_LANGUAGES=        c
 CPPFLAGS+=     -D_LOCALBASE="\"${PREFIX}\""
 CPPFLAGS+=     -DPORTSDIR="\"${PKG.portsdir}\""
 CPPFLAGS+=     -DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\"";
+CFLAGS+=       -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
 
 .if defined(DEBUG_PKGNG)
 CFLAGS:=       ${CFLAGS:N-O2} -ggdb -O0
@@ -92,13 +92,6 @@ SUBST_FILES.vuxml=   libpkg/pkg_audit.c
 SUBST_SED.vuxml=       -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
 SUBST_MESSAGE.vuxml=   Direct audit reports to Pkgsrc vuxml
 
-SUBST_CLASSES+=                ldhints
-SUBST_STAGE.ldhints=   post-patch
-SUBST_FILES.ldhints=   libpkg/private/ldconfig.h libpkg/elfhints.c
-SUBST_SED.ldhints=     -e "s|/var/run/ld-elf.so.hints|/var/run/ld.so.hints|" \
-                       -e 's,ifndef __linux__,if defined __FreeBSD__ || defined __DragonFly__,'
-SUBST_MESSAGE.ldhints= Disable ldconfig hints for NetBSD
-
 .if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path
 PKG.portsdir?= /usr/pkgsrc
 .else
@@ -112,9 +105,6 @@ BUILDLINK_PASSTHRU_RPATHDIRS=       /lib/priv
 .endif
 
 post-patch:
-       ${CP} ${FILESDIR}/readpassphrase_compat.h \
-               ${WRKSRC}/src/
-
 # DragonFly SSL libraries are private.
 .if exists(/usr/lib/priv/libprivate_ssl.so)
        ${SED} -i.bak \

Index: pkgsrc/pkgtools/pkg/distinfo
diff -u pkgsrc/pkgtools/pkg/distinfo:1.8 pkgsrc/pkgtools/pkg/distinfo:1.9
--- pkgsrc/pkgtools/pkg/distinfo:1.8    Tue Nov 15 17:48:56 2016
+++ pkgsrc/pkgtools/pkg/distinfo        Sun Nov 20 01:18:46 2016
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.8 2016/11/15 17:48:56 marino Exp $
+$NetBSD: distinfo,v 1.9 2016/11/20 01:18:46 marino Exp $
 
-SHA1 (pkg-1.8.7.tar.xz) = 4727c25b0e4c34df1bf7a00df0e9c6370e855416
-RMD160 (pkg-1.8.7.tar.xz) = f0087c0e88ef890300a46a28d0644926fa7a7acb
-SHA512 (pkg-1.8.7.tar.xz) = 61b1553cb444ba30bcf1c9a5da204ff29b08ad87641c3f49fb7e7efd9f5396742e6812bf96a0228d3e76916648511faa086d197cc41c2ced9979615e23a3bc43
-Size (pkg-1.8.7.tar.xz) = 1950148 bytes
+SHA1 (pkg-1.9.99.3.tar.xz) = 89a75e19cccda903ca74e1f44c5bbd03ae32fee3
+RMD160 (pkg-1.9.99.3.tar.xz) = 9bab612c3def26b4b9e1124f5c04fbd3762a584c
+SHA512 (pkg-1.9.99.3.tar.xz) = 602b5d8cbe1e55a1539cfb68045c061c17c20f8cf1705ba14dfac9b889840be48b21d5e452ab69c51636f1708df89b16636c5f807812f28e739f76caa2fc93d7
+Size (pkg-1.9.99.3.tar.xz) = 1918096 bytes
 SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2
-SHA1 (patch-external_libfetch_ftp.c) = f0080c4bd59386ab2a4ee015f6b22d4d228d7869
-SHA1 (patch-external_libfetch_http.c) = 9e618f80d6d72af7011351a8903b83f73130cdba
-SHA1 (patch-libpkg_pkg.h.in) = e74a96513c1e74ddea8a5b05b080cef57976d68b
-SHA1 (patch-libpkg_pkg__elf.c) = 07174f421e162fc74f1c2b306f60da1273b8b6ec