summaryrefslogtreecommitdiff
path: root/pkgtools/pkg
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2016-10-27 00:06:54 +0000
committerkhorben <khorben@pkgsrc.org>2016-10-27 00:06:54 +0000
commitf789e925fd74bb61547375cd8e8d9978c20f1caa (patch)
treec4539192ce5b7323ea8bb9554f0e41616581b332 /pkgtools/pkg
parent8d1d3946fbd96af1a73c9c0ad4ece9513b5c356e (diff)
downloadpkgsrc-f789e925fd74bb61547375cd8e8d9978c20f1caa.tar.gz
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...
Diffstat (limited to 'pkgtools/pkg')
-rw-r--r--pkgtools/pkg/Makefile9
-rw-r--r--pkgtools/pkg/PLIST3
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg/Makefile b/pkgtools/pkg/Makefile
index 6c356922f85..a4b9c79b4ba 100644
--- a/pkgtools/pkg/Makefile
+++ b/pkgtools/pkg/Makefile
@@ -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 FreeBSD
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
diff --git a/pkgtools/pkg/PLIST b/pkgtools/pkg/PLIST
index 046dd0905bd..0e500cc26db 100644
--- a/pkgtools/pkg/PLIST
+++ b/pkgtools/pkg/PLIST
@@ -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