[pkgsrc/trunk]: pkgsrc Create a separate sysutils/mtree package that is a "no...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b2e653fb785
branches:  trunk
changeset: 516129:3b2e653fb785
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 14 19:54:47 2006 +0000

description:
Create a separate sysutils/mtree package that is a "normal" package,
distinct from the pkgtools/mtree package which is installed as part of
the bootstrap process and which may be needed by pkg_install.

diffstat:

 doc/CHANGES-2006               |   3 ++-
 pkgtools/Makefile              |   4 ++--
 pkgtools/mtree/Makefile        |  28 +++++-----------------------
 pkgtools/mtree/Makefile.common |  34 ++++++++++++++++++++++++++++++++++
 sysutils/Makefile              |   3 ++-
 sysutils/mtree/Makefile        |   7 +++++++
 6 files changed, 52 insertions(+), 27 deletions(-)

diffs (147 lines):

diff -r 83c0536d2662 -r 3b2e653fb785 doc/CHANGES-2006
--- a/doc/CHANGES-2006  Fri Jul 14 19:45:12 2006 +0000
+++ b/doc/CHANGES-2006  Fri Jul 14 19:54:47 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.724 2006/07/14 19:38:47 jlam Exp $
+$NetBSD: CHANGES-2006,v 1.725 2006/07/14 19:54:47 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -3377,3 +3377,4 @@
        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]
+       Added sysutils/mtree version 20040722 [jlam 2006-07-14]
diff -r 83c0536d2662 -r 3b2e653fb785 pkgtools/Makefile
--- a/pkgtools/Makefile Fri Jul 14 19:45:12 2006 +0000
+++ b/pkgtools/Makefile Fri Jul 14 19:54:47 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2006/07/14 19:38:47 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2006/07/14 19:54:47 jlam Exp $
 #
 
 COMMENT=       Tools for use in the packages collection
@@ -13,7 +13,7 @@
 SUBDIR+=       gensolpkg
 #SUBDIR+=      libkver         # Only under instruction of user
 SUBDIR+=       libnbcompat
-SUBDIR+=       mtree
+#SUBDIR+=      mtree
 SUBDIR+=       p5-pkgsrc-Dewey
 #SUBDIR+=      pax
 SUBDIR+=       pkg_alternatives
diff -r 83c0536d2662 -r 3b2e653fb785 pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile   Fri Jul 14 19:45:12 2006 +0000
+++ b/pkgtools/mtree/Makefile   Fri Jul 14 19:54:47 2006 +0000
@@ -1,24 +1,15 @@
-# $NetBSD: Makefile,v 1.18 2006/07/14 19:23:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/14 19:54:47 jlam Exp $
+#
+# This version of mtree installs into ${PKG_TOOLS_BIN}.
 #
 
-DISTNAME=              mtree-20040722
-CATEGORIES=            pkgtools
-MASTER_SITES=          # empty
-DISTFILES=             # empty
+.include "Makefile.common"
 
-MAINTAINER=            grant%NetBSD.org@localhost
-HOMEPAGE=              http://www.NetBSD.org/
-COMMENT=               Utility for mapping and checking directory hierarchies
-
-GNU_CONFIGURE=         yes
+CATEGORIES=    pkgtools
 
 NO_PKGTOOLS_REQD_CHECK=        # defined
-NO_CHECKSUM=           yes
-NO_MTREE=              yes
 PKG_PRESERVE=          # defined
 
-.include "../../mk/bsd.prefs.mk"
-
 PKG_TOOLS_PREFIX=      ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 
 # XXX This breaks for those who set their own LOCALBASE to "/usr" and also
@@ -28,15 +19,6 @@
 PKGMANDIR=             share/man
 .endif
 
-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 "../../mk/bsd.pkg.mk"
 
 PREFIX:=       ${PKG_TOOLS_PREFIX}
diff -r 83c0536d2662 -r 3b2e653fb785 pkgtools/mtree/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/mtree/Makefile.common    Fri Jul 14 19:54:47 2006 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile.common,v 1.1 2006/07/14 19:54:47 jlam Exp $#
+#
+# This Makefile fragment is included by:
+#
+#      pkgsrc/pkgtools/mtree/Makefile
+#      pkgsrc/sysutils/mtree/Makefile
+#
+
+DISTNAME=              mtree-20040722
+MASTER_SITES=          # empty
+DISTFILES=             # empty
+
+MAINTAINER=            grant%NetBSD.org@localhost
+HOMEPAGE=              http://www.NetBSD.org/
+COMMENT=               Utility for mapping and checking directory hierarchies
+
+GNU_CONFIGURE=         yes
+
+NO_CHECKSUM=           yes
+NO_MTREE=              yes
+
+FILESDIR=              ${.CURDIR}/../../pkgtools/mtree/files
+PKGDIR=                        ${.CURDIR}/../../pkgtools/mtree
+
+.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 83c0536d2662 -r 3b2e653fb785 sysutils/Makefile
--- a/sysutils/Makefile Fri Jul 14 19:45:12 2006 +0000
+++ b/sysutils/Makefile Fri Jul 14 19:54:47 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.363 2006/07/09 15:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.364 2006/07/14 19:54:47 jlam Exp $
 #
 
 COMMENT=       System utilities
@@ -146,6 +146,7 @@
 SUBDIR+=       mktemp
 SUBDIR+=       mtools
 SUBDIR+=       mtoolsfm
+SUBDIR+=       mtree
 SUBDIR+=       mtscan
 SUBDIR+=       munin-doc
 SUBDIR+=       munin-node
diff -r 83c0536d2662 -r 3b2e653fb785 sysutils/mtree/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/mtree/Makefile   Fri Jul 14 19:54:47 2006 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2006/07/14 19:54:47 jlam Exp $
+
+.include "../../pkgtools/mtree/Makefile.common"
+
+CATEGORIES=    sysutils
+
+.include "../../mk/bsd.pkg.mk"