diff options
27 files changed, 27 insertions, 56 deletions
diff --git a/doc/guide/Makefile b/doc/guide/Makefile index 8d5211433ee..a049b401e5a 100644 --- a/doc/guide/Makefile +++ b/doc/guide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2009/01/09 11:11:40 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2009/04/08 22:43:23 joerg Exp $ # DISTNAME= pkgsrc-guide-${PKGVERSION} @@ -15,7 +15,6 @@ COMMENT= The pkgsrc guide PKGVERSION!= date '+%Y%m%d' DIST_SUBDIR= ${PKGBASE} -NO_MTREE= yes USE_LANGUAGES= # empty MAKE_ENV+= SED=${SED:Q} diff --git a/inputmethod/ja-freewnn-dict/Makefile b/inputmethod/ja-freewnn-dict/Makefile index a1ebaf8bf34..d107f4411c7 100644 --- a/inputmethod/ja-freewnn-dict/Makefile +++ b/inputmethod/ja-freewnn-dict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:23 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2009/04/08 22:43:23 joerg Exp $ # PKGNAME= ja-FreeWnn-dict-1.10 @@ -21,7 +21,6 @@ PATCHDIR= ${.CURDIR}/../ja-freewnn-lib/patches .include "../../mk/bsd.prefs.mk" -NO_MTREE= YES INSTALLATION_PREFIX= ${IMDICTDIR} .include "../../inputmethod/ja-freewnn-lib/Makefile.common" diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index 9c10bd8a231..55edafce24f 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2007/02/22 19:26:38 wiz Exp $ +# $NetBSD: Makefile.common,v 1.17 2009/04/08 22:43:24 joerg Exp $ DISTNAME= kaffe-1.1.7 CATEGORIES= lang java @@ -16,7 +16,6 @@ GNU_CONFIGURE_PREFIX= ${JAVA_HOME} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} JAVA_HOME= ${PREFIX}/java/kaffe JAVA_NAME= kaffe -NO_MTREE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake TEST_TARGET= check diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile index 9564d77bdc9..21cbd7c2053 100644 --- a/lang/nawk/Makefile +++ b/lang/nawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2008/09/08 13:47:55 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2009/04/08 22:43:24 joerg Exp $ DISTNAME= nawk-20050424 PKGREVISION= 3 @@ -19,7 +19,6 @@ CFLAGS+= ${CPPFLAGS} MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} NO_CHECKSUM= yes -NO_MTREE= yes BUILD_TARGET= a.out INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/lang/sablevm-classpath/Makefile.common b/lang/sablevm-classpath/Makefile.common index 4621521ce7e..8bfd5122a9d 100644 --- a/lang/sablevm-classpath/Makefile.common +++ b/lang/sablevm-classpath/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2006/10/04 21:46:14 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2009/04/08 22:43:24 joerg Exp $ # DISTNAME= sablevm-classpath-1.13 @@ -15,7 +15,6 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/sablevm-classpath/distinfo GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/java/sablevm -NO_MTREE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile index 45995342cea..6b956402f4c 100644 --- a/lang/sablevm/Makefile +++ b/lang/sablevm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:23 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2009/04/08 22:43:24 joerg Exp $ # DISTNAME= sablevm-1.13 @@ -18,7 +18,6 @@ DEPENDS+= sablevm-classpath-1.13nb1:../../lang/sablevm-classpath GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${JAVA_HOME} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} -NO_MTREE= yes USE_TOOLS+= gmake gm4 USE_LIBTOOL= yes diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 8c4046a32d4..a02d2dbfac7 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2008/01/19 09:16:25 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2009/04/08 22:43:24 joerg Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -20,7 +20,6 @@ SSH= ${LOCALBASE}/bin/ssh WRKSRC= ${WRKDIR} USE_TOOLS+= gmake perl INTERACTIVE_STAGE= fetch -NO_MTREE= yes NOW_ROOT= ${LOCALBASE}/now MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT} diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile index f09f5590bfd..03f141ea495 100644 --- a/pkgtools/autoswc/Makefile +++ b/pkgtools/autoswc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/10/11 18:03:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2009/04/08 22:43:24 joerg Exp $ DISTNAME= autoswc-1.6 CATEGORIES= pkgtools sysutils @@ -16,7 +16,6 @@ DEPENDS+= libtool-base>=1.5.2:../../devel/libtool-base NO_CHECKSUM= YES NO_CONFIGURE= YES -NO_MTREE= YES WRKSRC= ${WRKDIR} PKG_SYSCONFSUBDIR= autoswc diff --git a/pkgtools/bootstrap-extras/Makefile b/pkgtools/bootstrap-extras/Makefile index d446b18947c..2e9a406683d 100644 --- a/pkgtools/bootstrap-extras/Makefile +++ b/pkgtools/bootstrap-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/06/19 18:36:51 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2009/04/08 22:43:24 joerg Exp $ DISTNAME= bootstrap-extra-files-20070702 CATEGORIES= pkgtools @@ -12,7 +12,6 @@ PKG_DESTDIR_SUPPORT= user-destdir BOOTSTRAP_PKG= yes NO_CHECKSUM= yes -NO_MTREE= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index 4242b9018e7..8e375d4856b 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/02/26 07:05:10 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2009/04/08 22:43:24 joerg Exp $ DISTNAME= bootstrap-mk-files-20090226 CATEGORIES= pkgtools @@ -17,7 +17,6 @@ NO_PKGTOOLS_REQD_CHECK= # defined BOOTSTRAP_PKG= yes NO_CHECKSUM= yes -NO_MTREE= yes NO_BUILD= yes USE_TOOLS+= sed diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index f2a84118f77..09bab424e15 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.160 2009/03/04 19:47:20 joerg Exp $ +# $NetBSD: Makefile,v 1.161 2009/04/08 22:43:24 joerg Exp $ # Notes to package maintainers: # @@ -32,7 +32,6 @@ NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt --enable-db SKIP_AUDIT_PACKAGES= yes NO_PKGTOOLS_REQD_CHECK= yes NO_CHECKSUM= yes -NO_MTREE= yes PKG_PRESERVE= yes CHECK_PERMS= no diff --git a/pkgtools/pkg_tarup/Makefile b/pkgtools/pkg_tarup/Makefile index e9dcadea997..d7cc5f16586 100644 --- a/pkgtools/pkg_tarup/Makefile +++ b/pkgtools/pkg_tarup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/02/12 15:03:28 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2009/04/08 22:43:25 joerg Exp $ DISTNAME= pkg_tarup-1.7.1 CATEGORIES= pkgtools @@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} NO_CHECKSUM= yes NO_BUILD= yes -NO_MTREE= yes USE_LANGUAGES= # none AUTO_MKDIRS= yes diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index b9e235b9613..e797c3d4968 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2009/03/08 00:03:37 snj Exp $ +# $NetBSD: Makefile,v 1.100 2009/04/08 22:43:25 joerg Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, @@ -22,7 +22,6 @@ USE_LANGUAGES= # empty USE_TOOLS+= pax EXTRACT_ONLY= # empty NO_CHECKSUM= yes -NO_MTREE= yes PLIST_SRC.dirs= ${WRKDIR}/.PLIST_SRC.dirs PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files diff --git a/regress/print-plist/Makefile b/regress/print-plist/Makefile index 499224a5698..6d537a52b1f 100644 --- a/regress/print-plist/Makefile +++ b/regress/print-plist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/04/30 13:38:16 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2009/04/08 22:43:25 joerg Exp $ # DISTNAME= print-plist-0.0 @@ -11,7 +11,6 @@ COMMENT= Test print-PLIST and related functionality EXTRACT_ONLY= # empty NO_CONFIGURE= yes -NO_MTREE= yes PRINT_PLIST_AWK+= /^print-plist\/foo$$/ \ { print "@comment Matched test file."; \ diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile index 822076c0f6f..8ee8cf66630 100644 --- a/shells/standalone-tcsh/Makefile +++ b/shells/standalone-tcsh/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2008/08/12 14:51:45 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2009/04/08 22:43:25 joerg Exp $ # # FIXME: This is because of PREFIX=/ below. CHECK_FILES_SUPPORTED= no -NO_MTREE= YES - PKGNAME= standalone-${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile index 2286169ae47..9ba3ac2e000 100644 --- a/sysutils/adjustkernel/Makefile +++ b/sysutils/adjustkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/06/14 08:50:53 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2009/04/08 22:43:25 joerg Exp $ DISTNAME= adjustkernel-1.7 CATEGORIES= sysutils @@ -13,7 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} NO_CHECKSUM= yes NO_BUILD= yes -NO_MTREE= yes USE_TOOLS+= perl:run REPLACE_PERL= adjustkernel diff --git a/sysutils/install-sh/Makefile b/sysutils/install-sh/Makefile index 7ea37def524..86e8eefeaf3 100644 --- a/sysutils/install-sh/Makefile +++ b/sysutils/install-sh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/06/19 18:36:51 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2009/04/08 22:43:25 joerg Exp $ DISTNAME= install-sh-20070712 CATEGORIES= sysutils @@ -12,7 +12,6 @@ PKG_DESTDIR_SUPPORT= user-destdir BOOTSTRAP_PKG= yes USE_TOOLS+= sed NO_CHECKSUM= yes -NO_MTREE= yes NO_BUILD= yes # Use the install script to perform installation to avoid bootstrapping diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index 58c5dac6098..06d49f0920c 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2008/08/08 15:00:53 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2009/04/08 22:43:25 joerg Exp $ DISTNAME= docbook-4.4 PKGREVISION= 2 @@ -25,7 +25,6 @@ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip DEPENDS+= iso8879>=1986:../../textproc/iso8879 WRKSRC= ${WRKDIR} -NO_MTREE= yes USE_LANGUAGES= # none USE_TOOLS+= unzip EXTRACT_ONLY= # nothing diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile index 4097c7c8bd0..c130c2edbae 100644 --- a/textproc/dsssl-docbook-modular/Makefile +++ b/textproc/dsssl-docbook-modular/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2008/01/14 23:18:12 heinz Exp $ +# $NetBSD: Makefile,v 1.32 2009/04/08 22:43:25 joerg Exp $ DISTNAME= docbook-dsssl-1.79 PKGNAME= dsssl-docbook-modular-1.79 @@ -16,8 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= docbook>=4.0:../../textproc/docbook -NO_MTREE= yes - USE_LANGUAGES= # empty INSTDIR= ${PREFIX}/share/sgml/docbook/dsssl/modular diff --git a/textproc/html/Makefile b/textproc/html/Makefile index f009c12bb2e..733b8c32d26 100644 --- a/textproc/html/Makefile +++ b/textproc/html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:14 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2009/04/08 22:43:25 joerg Exp $ # DISTNAME= html-4.01 @@ -15,7 +15,6 @@ DEPENDS+= iso8879>=1986:../../textproc/iso8879 PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes USE_TOOLS+= tar diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile index b21cb3c7d37..68d6c536f1a 100644 --- a/textproc/iso12083/Makefile +++ b/textproc/iso12083/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/12/02 13:04:15 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2009/04/08 22:43:25 joerg Exp $ DISTNAME= iso12083-1993 PKGREVISION= 5 @@ -13,7 +13,6 @@ COMMENT= SGML DTDs from the The Electronic Publishing Special Interest Group DIST_SUBDIR= iso12083 WRKSRC= ${WRKDIR} -NO_MTREE= yes NO_BUILD= yes EXTRACT_ONLY= # empty diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index ac0d1a62a1c..91319cc7288 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/08/08 14:57:39 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2009/04/08 22:43:26 joerg Exp $ DISTNAME= ISOEnts PKGNAME= iso8879-1986 @@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} USE_TOOLS+= unzip -NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes diff --git a/textproc/nbsed/Makefile b/textproc/nbsed/Makefile index db4dde13385..0ca3d3709ba 100644 --- a/textproc/nbsed/Makefile +++ b/textproc/nbsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/06/19 18:36:52 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2009/04/08 22:43:26 joerg Exp $ DISTNAME= nbsed-20040821 PKGREVISION= 1 @@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir BOOTSTRAP_PKG= yes NO_CHECKSUM= yes -NO_MTREE= yes USE_FEATURES= nbcompat GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-transform-name="s,sed,nbsed," diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile index b5cc4966bcf..0cee4b654bb 100644 --- a/textproc/xhtml/Makefile +++ b/textproc/xhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:24 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2009/04/08 22:43:26 joerg Exp $ # DISTNAME= xhtml1 @@ -13,7 +13,6 @@ HOMEPAGE= http://www.w3.org/MarkUp/ COMMENT= DTDs for the Extensible Hypertext Markup Language NO_BUILD= yes -NO_MTREE= yes USE_LANGUAGES= # empty USE_TOOLS+= pax WRKSRC= ${WRKDIR}/xhtml1-20020801 diff --git a/x11/dtx11session/Makefile b/x11/dtx11session/Makefile index 62f27dbfd7a..0f12c6233f7 100644 --- a/x11/dtx11session/Makefile +++ b/x11/dtx11session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/09/19 06:46:52 tron Exp $ +# $NetBSD: Makefile,v 1.7 2009/04/08 22:43:26 joerg Exp $ DISTNAME= dtxsession-1.0 CATEGORIES= x11 @@ -18,7 +18,6 @@ LOCALBASE= /usr/dt .endif NO_BUILD= YES NO_CHECKSUM= YES -NO_MTREE= YES CONFIG_DIR= ${PREFIX}/config diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile index eb8918a0c4d..42a3fd93a7f 100644 --- a/x11/xdaemon/Makefile +++ b/x11/xdaemon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2009/04/08 22:43:26 joerg Exp $ DISTNAME= xdaemon-1.2 CATEGORIES= games x11 @@ -22,7 +22,6 @@ CONFLICTS+= xdaemon-2.* WRKSRC= ${WRKDIR} NO_CONFIGURE= yes NO_BUILD= yes -NO_MTREE= yes DIST_SUBDIR= xdaemon IMAGES= xdaemon xdaemon2 xnetbsd-flag xnetbsd-flag2 diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile index 9dccb361c2d..481a01aadca 100644 --- a/x11/xdaemon2/Makefile +++ b/x11/xdaemon2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2009/04/08 22:43:26 joerg Exp $ DISTNAME= xdaemon-2.1 CATEGORIES= games x11 @@ -17,7 +17,6 @@ CONFLICTS+= xdaemon-1.* NO_CONFIGURE= yes NO_BUILD= yes -NO_MTREE= yes DIST_SUBDIR= xdaemon IMAGES= xdaemon xdaemon2 xnetbsd-flag xnetbsd-flag2 |