pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Move META_PACKAGE logic from bsd.pkg.mk to bds.pref...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/91e23a3754f0
branches:  trunk
changeset: 543269:91e23a3754f0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jun 12 01:09:01 2008 +0000

description:
Move META_PACKAGE logic from bsd.pkg.mk to bds.prefs.mk, otherwise it
can't define destdir support.

diffstat:

 mk/bsd.pkg.mk   |  20 +-------------------
 mk/bsd.prefs.mk |  20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs (68 lines):

diff -r 01a97bdf5ad8 -r 91e23a3754f0 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jun 12 01:01:47 2008 +0000
+++ b/mk/bsd.pkg.mk     Thu Jun 12 01:09:01 2008 +0000
@@ -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 @@
 .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 -r 01a97bdf5ad8 -r 91e23a3754f0 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Jun 12 01:01:47 2008 +0000
+++ b/mk/bsd.prefs.mk   Thu Jun 12 01:09:01 2008 +0000
@@ -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 @@
 
 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



Home | Main Index | Thread Index | Old Index