summaryrefslogtreecommitdiff
path: root/pkgtools/mtree
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-07-14 19:54:47 +0000
committerjlam <jlam@pkgsrc.org>2006-07-14 19:54:47 +0000
commit06eb7023cb1b05732182864f41b9093fa9b6ac74 (patch)
tree1162554eb4db599be110f32e289f8532a1f144a3 /pkgtools/mtree
parent3b3d6f17ec9326776659a8a5f0468ce0b234a69b (diff)
downloadpkgsrc-06eb7023cb1b05732182864f41b9093fa9b6ac74.tar.gz
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 (limited to 'pkgtools/mtree')
-rw-r--r--pkgtools/mtree/Makefile28
-rw-r--r--pkgtools/mtree/Makefile.common34
2 files changed, 39 insertions, 23 deletions
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}