diff options
-rw-r--r-- | pkgtools/mtree/Makefile | 22 | ||||
-rw-r--r-- | pkgtools/mtree/Makefile.common | 27 | ||||
-rw-r--r-- | pkgtools/mtree/PLIST | 3 | ||||
-rw-r--r-- | pkgtools/mtree/files/Makefile.in | 5 | ||||
-rw-r--r-- | sysutils/Makefile | 3 | ||||
-rw-r--r-- | sysutils/mtree/Makefile | 10 |
6 files changed, 19 insertions, 51 deletions
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile index 0cccf90b047..8d71cf0df56 100644 --- a/pkgtools/mtree/Makefile +++ b/pkgtools/mtree/Makefile @@ -1,14 +1,24 @@ -# $NetBSD: Makefile,v 1.24 2009/02/10 00:11:53 joerg Exp $ -# -# This version of mtree installs into ${PKG_TOOLS_BIN}. +# $NetBSD: Makefile,v 1.25 2012/03/08 01:11:21 joerg Exp $ # +DISTNAME= mtree-20120308 +CATEGORIES= pkgtools sysutils +MASTER_SITES= # empty +DISTFILES= # empty + +MAINTAINER= sbd@NetBSD.org +HOMEPAGE= http://www.NetBSD.org/ +COMMENT= Utility for mapping and checking directory hierarchies + PKG_DESTDIR_SUPPORT= user-destdir -.include "Makefile.common" +GNU_CONFIGURE= yes + +USE_FEATURES= nbcompat -CATEGORIES= pkgtools +.include "../../mk/bsd.prefs.mk" -NO_PKGTOOLS_REQD_CHECK= # defined +do-extract: + @${CP} -R ${FILESDIR} ${WRKSRC} .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/mtree/Makefile.common b/pkgtools/mtree/Makefile.common deleted file mode 100644 index db9596621d4..00000000000 --- a/pkgtools/mtree/Makefile.common +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile.common,v 1.8 2010/03/24 20:18:01 sbd Exp $ -# -# This Makefile fragment is included by: -# -# pkgsrc/pkgtools/mtree/Makefile -# pkgsrc/sysutils/mtree/Makefile -# - -DISTNAME= mtree-20081105 -MASTER_SITES= # empty -DISTFILES= # empty - -MAINTAINER= sbd@NetBSD.org -HOMEPAGE= http://www.NetBSD.org/ -COMMENT= Utility for mapping and checking directory hierarchies - -GNU_CONFIGURE= yes - -USE_FEATURES= nbcompat - -FILESDIR= ${.CURDIR}/../../pkgtools/mtree/files -PKGDIR= ${.CURDIR}/../../pkgtools/mtree - -.include "../../mk/bsd.prefs.mk" - -do-extract: - @${CP} -R ${FILESDIR} ${WRKSRC} diff --git a/pkgtools/mtree/PLIST b/pkgtools/mtree/PLIST index 3cbb06f715f..dd275acc7c4 100644 --- a/pkgtools/mtree/PLIST +++ b/pkgtools/mtree/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2006/07/14 19:23:09 jlam Exp $ -man/cat8/mtree.0 +@comment $NetBSD: PLIST,v 1.3 2012/03/08 01:11:21 joerg Exp $ man/man8/mtree.8 sbin/mtree diff --git a/pkgtools/mtree/files/Makefile.in b/pkgtools/mtree/files/Makefile.in index 41923e61683..ebcaad9f33f 100644 --- a/pkgtools/mtree/files/Makefile.in +++ b/pkgtools/mtree/files/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.8 2009/02/10 00:11:53 joerg Exp $ +# $NetBSD: Makefile.in,v 1.9 2012/03/08 01:11:21 joerg Exp $ srcdir= @srcdir@ @@ -8,7 +8,6 @@ sbindir= @sbindir@ mandir= @mandir@ man8dir= $(mandir)/man8 -cat8dir= $(mandir)/cat8 CC= @CC@ CCLD= $(CC) @@ -43,7 +42,5 @@ distclean: clean install: $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) $(INSTALL) -m 755 -d ${DESTDIR}$(man8dir) - $(INSTALL) -m 755 -d ${DESTDIR}$(cat8dir) $(INSTALL) $(PROG) ${DESTDIR}$(sbindir) $(INSTALL) -m 444 $(PROG).8 ${DESTDIR}$(man8dir)/$(PROG).8 - $(INSTALL) -m 444 $(PROG).cat8 ${DESTDIR}$(cat8dir)/$(PROG).0 diff --git a/sysutils/Makefile b/sysutils/Makefile index 7973327ecb0..2f25d5b3df9 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.534 2012/03/06 04:54:54 sbd Exp $ +# $NetBSD: Makefile,v 1.535 2012/03/08 01:11:21 joerg Exp $ # COMMENT= System utilities @@ -265,7 +265,6 @@ SUBDIR+= monit SUBDIR+= mrsync SUBDIR+= mtools SUBDIR+= mtoolsfm -SUBDIR+= mtree SUBDIR+= mtscan SUBDIR+= munin-doc SUBDIR+= munin-node diff --git a/sysutils/mtree/Makefile b/sysutils/mtree/Makefile deleted file mode 100644 index 4a6d0ee6f23..00000000000 --- a/sysutils/mtree/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2009/02/10 00:12:45 joerg Exp $ - -USE_FEATURES= nbcompat -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../pkgtools/mtree/Makefile.common" - -CATEGORIES= sysutils - -.include "../../mk/bsd.pkg.mk" |