summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2008-06-12 01:09:01 +0000
committerjoerg <joerg@pkgsrc.org>2008-06-12 01:09:01 +0000
commit3ba79d294eb62e9c75cc32d37b4af7759af8c9d6 (patch)
tree944256bed35067fd70e782c87a4dbfd9be3e433b
parenta61babd3867d23aae68f081575c82ce87db2ab87 (diff)
downloadpkgsrc-3ba79d294eb62e9c75cc32d37b4af7759af8c9d6.tar.gz
Move META_PACKAGE logic from bsd.pkg.mk to bds.prefs.mk, otherwise it
can't define destdir support.
-rw-r--r--mk/bsd.pkg.mk20
-rw-r--r--mk/bsd.prefs.mk20
2 files changed, 20 insertions, 20 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 677d72129a8..7c504cecca6 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1947 2008/06/12 00:06:27 joerg Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1948 2008/06/12 01:09:01 joerg Exp $
#
# This file is in the public domain.
#
@@ -46,24 +46,6 @@ PKGNAME_NOREV= ${PKGNAME}
.endif
PKGVERSION_NOREV= ${PKGNAME_NOREV:C/^.*-//}
-# A meta-package is a package that does not have any files and whose
-# only purpose is to depend on other packages, giving that collection
-# a simple name.
-#
-# Keywords: meta meta-package META_PACKAGE
-#
-.if defined(META_PACKAGE)
-PKG_DESTDIR_SUPPORT= user-destdir
-NO_CONFIGURE= yes
-NO_BUILD= yes
-DISTFILES= # none
-PLIST_SRC= # none
-do-patch:
- @${DO_NADA}
-do-install:
- @${DO_NADA}
-.endif
-
####
############################################################################
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index c16e55a3fb9..dfe22f0ad58 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.283 2008/05/24 03:40:35 tnn Exp $
+# $NetBSD: bsd.prefs.mk,v 1.284 2008/06/12 01:09:02 joerg Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -354,6 +354,24 @@ PKG_FAIL_REASON+= "missing mk/platform/${OPSYS}.mk"
PKGDIRMODE?= 755
+# A meta-package is a package that does not have any files and whose
+# only purpose is to depend on other packages, giving that collection
+# a simple name.
+#
+# Keywords: meta meta-package META_PACKAGE
+#
+.if defined(META_PACKAGE)
+PKG_DESTDIR_SUPPORT= user-destdir
+NO_CONFIGURE= yes
+NO_BUILD= yes
+DISTFILES= # none
+PLIST_SRC= # none
+do-patch:
+ @${DO_NADA}
+do-install:
+ @${DO_NADA}
+.endif
+
# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir".
USE_DESTDIR?= no
PKG_DESTDIR_SUPPORT?= # empty