[pkgsrc/trunk]: pkgsrc/mk Moved the PKG_INSTALLATION_TYPES variable from defa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/924754427b7a
branches:  trunk
changeset: 502880:924754427b7a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 10 09:48:04 2005 +0000

description:
Moved the PKG_INSTALLATION_TYPES variable from defaults/mk.conf to
bsd.prefs.mk as it is not intended to be set in mk.conf.

diffstat:

 mk/bsd.prefs.mk     |  12 +++++++++++-
 mk/defaults/mk.conf |  12 +-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (52 lines):

diff -r afbee2cf735f -r 924754427b7a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Nov 10 09:09:26 2005 +0000
+++ b/mk/bsd.prefs.mk   Thu Nov 10 09:48:04 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.205 2005/11/10 09:09:26 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.206 2005/11/10 09:48:04 rillig Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -347,6 +347,16 @@
 PHASES_AFTER_INSTALL=  install ${PHASES_AFTER_PACKAGE}
 PHASES_AFTER_PACKAGE=  package
 
+PKG_INSTALLATION_TYPES?= overwrite
+# This is a whitespace-separated list of installation types supported
+# by the package.
+#
+# *NOTE*: This variable *must* be set in the package Makefile *before*
+#         the inclusion of bsd.prefs.mk.
+#
+# Possible: any of: overwrite, pkgviews
+# Default: overwrite
+
 # Set the style of installation to be performed for the package.  The
 # funky make variable modifiers just select the first word of the value
 # stored in the referenced variable.
diff -r afbee2cf735f -r 924754427b7a mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Nov 10 09:09:26 2005 +0000
+++ b/mk/defaults/mk.conf       Thu Nov 10 09:48:04 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.85 2005/11/09 01:06:48 reed Exp $
+# $NetBSD: mk.conf,v 1.86 2005/11/10 09:48:04 rillig Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1491,16 +1491,6 @@
 # Possible: YES, NO
 # Default: YES
 
-PKG_INSTALLATION_TYPES?= overwrite
-# This is a whitespace-separated list of installation types supported
-# by the package.
-#
-# *NOTE*: This variable *must* be set in the package Makefile *before*
-#         the inclusion of bsd.prefs.mk.
-#
-# Possible: any of: overwrite, pkgviews
-# Default: overwrite
-
 #PKG_JVM=
 # Used to choose a java virtual machine for packages which use Java.
 # ${JAVA_HOME} will be set based on this choice, if unset