summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-14 19:38:47 +0000
committerjlam <jlam>2006-07-14 19:38:47 +0000
commit9d1f7743e926afaae17d98201e71d21517f1cd84 (patch)
tree611a7d959ddbe46e32fc14c1ddd6757c03484166 /pkgtools
parent11303fc8a1c9101af26d807966d1b7b6b7f966a6 (diff)
downloadpkgsrc-9d1f7743e926afaae17d98201e71d21517f1cd84.tar.gz
Create a separate "pax" package in the pkgtools category that installs
into ${PKG_TOOLS_BIN}. This package is used in the case where pax is a requirement for the pkg_install tools. The archivers/pax package is now a normal package with no special PKG_PRESERVE flags set.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/Makefile3
-rw-r--r--pkgtools/pax/Makefile22
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgtools/Makefile b/pkgtools/Makefile
index fe68ad80384..219326f89d6 100644
--- a/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2006/05/28 09:48:48 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2006/07/14 19:38:47 jlam Exp $
#
COMMENT= Tools for use in the packages collection
@@ -15,6 +15,7 @@ SUBDIR+= gensolpkg
SUBDIR+= libnbcompat
SUBDIR+= mtree
SUBDIR+= p5-pkgsrc-Dewey
+#SUBDIR+= pax
SUBDIR+= pkg_alternatives
SUBDIR+= pkg_chk
SUBDIR+= pkg_comp
diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile
new file mode 100644
index 00000000000..5351a76ff8b
--- /dev/null
+++ b/pkgtools/pax/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.11 2006/07/14 19:38:47 jlam Exp $
+#
+# This version of pax installs into ${PKG_TOOLS_BIN}.
+#
+
+.include "../../archivers/pax/Makefile.common"
+
+NO_PKGTOOLS_REQD_CHECK= yes
+PKG_PRESERVE= yes
+
+PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
+
+# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
+# XXX set PKGMANDIR to be other than "share/man".
+# XXX
+.if !empty(PKG_TOOLS_PREFIX:M/usr)
+PKGMANDIR= share/man
+.endif
+
+.include "../../mk/bsd.pkg.mk"
+
+PREFIX:= ${PKG_TOOLS_PREFIX}