[pkgsrc/trunk]: pkgsrc/mk Move the default settings for USE_BUILDLINK[23] fro...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/226d4698510d
branches:  trunk
changeset: 461177:226d4698510d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Sep 12 10:49:28 2003 +0000

description:
Move the default settings for USE_BUILDLINK[23] from bsd.pkg.mk into
bsd.prefs.mk so that they may be tested/used in buildlink[23].mk files.

diffstat:

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

diffs (43 lines):

diff -r b6ba58534188 -r 226d4698510d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Sep 12 10:02:47 2003 +0000
+++ b/mk/bsd.pkg.mk     Fri Sep 12 10:49:28 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1270 2003/09/12 05:15:04 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1271 2003/09/12 10:49:28 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -121,11 +121,6 @@
 PKG_FAIL_REASON+=      "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages."
 .endif
 
-USE_BUILDLINK2?=       no      # default to not using buildlink2
-USE_BUILDLINK3?=       no      # default to not using buildlink3
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-USE_BUILDLINK3=                yes     # pkgviews requires buildlink3
-.endif
 .if empty(USE_BUILDLINK2:M[nN][oO]) && empty(USE_BUILDLINK3:M[nN][oO])
 PKG_FAIL_REASON+=      "Please undefine USE_BUILDLINK2 or USE_BUILDLINK3."
 .endif
diff -r b6ba58534188 -r 226d4698510d mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Sep 12 10:02:47 2003 +0000
+++ b/mk/bsd.prefs.mk   Fri Sep 12 10:49:28 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.122 2003/09/02 06:59:44 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.123 2003/09/12 10:49:31 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -290,6 +290,12 @@
 .endfor
 PKG_INSTALLATION_TYPE?=        none
 
+USE_BUILDLINK2?=       no      # default to not using buildlink2
+USE_BUILDLINK3?=       no      # default to not using buildlink3
+.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
+USE_BUILDLINK3=                yes     # pkgviews requires buildlink3
+.endif
+
 # This is the package database directory for the default view.
 PKG_DBDIR?=            ${DESTDIR}/var/db/pkg