CVS commit: pkgsrc/pkgtools/pkg

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Oct 27 00:06:54 UTC 2016

Modified Files:
        pkgsrc/pkgtools/pkg: Makefile PLIST

Log Message:
Improve the most trivial parts of a patch from John Marino

This does:
- remove the requirement for C++ (there is no C++ code there)
- properly substitute $PKGSRCDIR for PORTSDIR
- remove sbin/pkg2ng as it is inapplicable for pkgsrc
- bump PKGREVISION accordingly

More changes pending...


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/pkg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/pkg/PLIST

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.6 pkgsrc/pkgtools/pkg/Makefile:1.7
--- pkgsrc/pkgtools/pkg/Makefile:1.6    Tue Oct 25 12:54:37 2016
+++ pkgsrc/pkgtools/pkg/Makefile        Thu Oct 27 00:06:54 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2016/10/25 12:54:37 khorben Exp $
+# $NetBSD: Makefile,v 1.7 2016/10/27 00:06:54 khorben Exp $
 
 DISTNAME=      pkg-1.8.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    pkgtools
 MASTER_SITES=  http://files.etoilebsd.net/pkg/
 EXTRACT_SUFX=  .tar.xz
@@ -12,10 +12,10 @@ COMMENT=    Package management tool for Fre
 LICENSE=       2-clause-bsd
 
 GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c
 
 CPPFLAGS+=     -D_LOCALBASE="\"${PREFIX}\""
-CPPFLAGS+=     -DPORTSDIR="\"/usr/pkgsrc\""
+CPPFLAGS+=     -DPORTSDIR="\"${PKGSRCDIR}\""
 
 AUTO_MKDIRS=   yes
 
@@ -56,6 +56,7 @@ post-patch:
                ${WRKSRC}/src/
 
 post-install:
+       ${RM} ${DESTDIR}${PREFIX}/sbin/pkg2ng
        ${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d/_pkg.bash \
                ${DESTDIR}${EGDIR}/bash_completion.d/_pkg.bash
        ${RMDIR} ${DESTDIR}${PREFIX}/etc/bash_completion.d

Index: pkgsrc/pkgtools/pkg/PLIST
diff -u pkgsrc/pkgtools/pkg/PLIST:1.3 pkgsrc/pkgtools/pkg/PLIST:1.4
--- pkgsrc/pkgtools/pkg/PLIST:1.3       Sat Aug 27 21:57:05 2016
+++ pkgsrc/pkgtools/pkg/PLIST   Thu Oct 27 00:06:54 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/08/27 21:57:05 khorben Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/10/27 00:06:54 khorben Exp $
 include/pkg.h
 lib/libpkg.la
 lib/libpkg_static.la
@@ -44,7 +44,6 @@ man/man8/pkg-which.8
 man/man8/pkg.8
 sbin/pkg
 sbin/pkg-static
-sbin/pkg2ng
 share/examples/pkg/bash_completion.d/_pkg.bash
 share/examples/pkg/periodic/daily/411.pkg-backup
 share/examples/pkg/periodic/daily/490.status-pkg-changes