summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES-20063
-rw-r--r--pkgtools/Makefile4
-rw-r--r--pkgtools/mtree/Makefile28
-rw-r--r--pkgtools/mtree/Makefile.common34
-rw-r--r--sysutils/Makefile3
-rw-r--r--sysutils/mtree/Makefile7
6 files changed, 52 insertions, 27 deletions
diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006
index 005d5a2a921..19a5d0b5f89 100644
--- a/doc/CHANGES-2006
+++ b/doc/CHANGES-2006
@@ -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 @@ Changes to the packages collection and infrastructure in 2006:
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 --git a/pkgtools/Makefile b/pkgtools/Makefile
index 219326f89d6..be5735dec59 100644
--- a/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -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+= genrpm
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 --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile
index 6eff2b777a5..bd5df09d2a7 100644
--- a/pkgtools/mtree/Makefile
+++ b/pkgtools/mtree/Makefile
@@ -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
-
-MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.NetBSD.org/
-COMMENT= Utility for mapping and checking directory hierarchies
+.include "Makefile.common"
-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 @@ PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
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 --git a/pkgtools/mtree/Makefile.common b/pkgtools/mtree/Makefile.common
new file mode 100644
index 00000000000..88c5f693abb
--- /dev/null
+++ b/pkgtools/mtree/Makefile.common
@@ -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
+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 --git a/sysutils/Makefile b/sysutils/Makefile
index 910472e74c6..d90796f5e74 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -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+= mksunbootcd
SUBDIR+= mktemp
SUBDIR+= mtools
SUBDIR+= mtoolsfm
+SUBDIR+= mtree
SUBDIR+= mtscan
SUBDIR+= munin-doc
SUBDIR+= munin-node
diff --git a/sysutils/mtree/Makefile b/sysutils/mtree/Makefile
new file mode 100644
index 00000000000..c6f48ef9ce1
--- /dev/null
+++ b/sysutils/mtree/Makefile
@@ -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"