[pkgsrc/trunk]: pkgsrc Create a separate "pax" package in the pkgtools catego...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34e83afa1e65
branches:  trunk
changeset: 516126:34e83afa1e65
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 14 19:38:47 2006 +0000

description:
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:

 archivers/pax/Makefile        |  30 ++----------------------------
 archivers/pax/Makefile.common |  35 +++++++++++++++++++++++++++++++++++
 doc/CHANGES-2006              |   3 ++-
 pkgtools/Makefile             |   3 ++-
 pkgtools/pax/Makefile         |  22 ++++++++++++++++++++++
 5 files changed, 63 insertions(+), 30 deletions(-)

diffs (133 lines):

diff -r 29c5775eff7c -r 34e83afa1e65 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Fri Jul 14 19:23:09 2006 +0000
+++ b/archivers/pax/Makefile    Fri Jul 14 19:38:47 2006 +0000
@@ -1,31 +1,5 @@
-# $NetBSD: Makefile,v 1.25 2006/07/14 18:48:43 jlam Exp $
-#
-
-DISTNAME=              pax-20060202
-CATEGORIES=            archivers pkgtools
-MASTER_SITES=          # empty
-DISTFILES=             # empty
-
-MAINTAINER=            grant%NetBSD.org@localhost
-HOMEPAGE=              http://www.NetBSD.org/
-COMMENT=               POSIX standard archiver with many extensions
-
-GNU_CONFIGURE=         yes
+# $NetBSD: Makefile,v 1.26 2006/07/14 19:38:47 jlam Exp $
 
-NO_PKGTOOLS_REQD_CHECK=        yes
-NO_CHECKSUM=           yes
-NO_MTREE=              yes
-PKG_PRESERVE=          yes
-
-.include "../../mk/bsd.prefs.mk"
-
-do-extract:
-       ${CP} -R ${FILESDIR} ${WRKSRC}
-
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
+.include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 29c5775eff7c -r 34e83afa1e65 archivers/pax/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/pax/Makefile.common     Fri Jul 14 19:38:47 2006 +0000
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2006/07/14 19:38:47 jlam Exp $
+#
+# This Makefile fragment is included by:
+#
+#      pkgsrc/archivers/pax/Makefile
+#      pkgsrc/pkgtools/pax/Makefile
+#
+
+DISTNAME=              pax-20060202
+CATEGORIES=            archivers pkgtools
+MASTER_SITES=          # empty
+DISTFILES=             # empty
+
+MAINTAINER=            grant%NetBSD.org@localhost
+HOMEPAGE=              http://www.NetBSD.org/
+COMMENT=               POSIX standard archiver with many extensions
+
+GNU_CONFIGURE=         yes
+
+NO_CHECKSUM=           yes
+NO_MTREE=              yes
+
+FILESDIR=              ${.CURDIR}/../../archivers/pax/files
+PKGDIR=                        ${.CURDIR}/../../archivers/pax
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
+
+do-extract:
+       ${CP} -R ${FILESDIR} ${WRKSRC}
diff -r 29c5775eff7c -r 34e83afa1e65 doc/CHANGES-2006
--- a/doc/CHANGES-2006  Fri Jul 14 19:23:09 2006 +0000
+++ b/doc/CHANGES-2006  Fri Jul 14 19:38:47 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.723 2006/07/14 15:21:14 wiz Exp $
+$NetBSD: CHANGES-2006,v 1.724 2006/07/14 19:38:47 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -3376,3 +3376,4 @@
        Updated time/kronolith to 2.1.2 [adrianp 2006-07-13]
        Updated graphics/gimp24 to 2.3.10nb2 [wiz 2006-07-14]
        Updated finance/gnucash-docs to 2.0.0 [wiz 2006-07-14]
+       Added pkgtools/pax version 20060202 [jlam 2006-07-14]
diff -r 29c5775eff7c -r 34e83afa1e65 pkgtools/Makefile
--- a/pkgtools/Makefile Fri Jul 14 19:23:09 2006 +0000
+++ b/pkgtools/Makefile Fri Jul 14 19:38:47 2006 +0000
@@ -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+=       libnbcompat
 SUBDIR+=       mtree
 SUBDIR+=       p5-pkgsrc-Dewey
+#SUBDIR+=      pax
 SUBDIR+=       pkg_alternatives
 SUBDIR+=       pkg_chk
 SUBDIR+=       pkg_comp
diff -r 29c5775eff7c -r 34e83afa1e65 pkgtools/pax/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pax/Makefile     Fri Jul 14 19:38:47 2006 +0000
@@ -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}