[pkgsrc/trunk]: pkgsrc/mk Move some variable definitions out of bsd.prefs.mk ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1fa0541265a
branches:  trunk
changeset: 513971:d1fa0541265a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 06 15:28:51 2006 +0000

description:
Move some variable definitions out of bsd.prefs.mk and back into
bsd.pkg.mk.  They didn't actually need to be defined in bsd.prefs.mk,
just somewhere before the "main" bsd.<phase>.mk files were included.
This moves some conditional (?=) definitions back into bsd.pkg.mk so
they won't conflict with any conditional definitions in package
Makefiles.

This should fix the "checksum" problems in lang/php-gd as noted here:

    http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html

where EXTRACT_SUFX had the wrong value due to the order in while *.mk
files were included.

diffstat:

 mk/bsd.pkg.mk                  |  11 ++++++++++-
 mk/bsd.prefs.mk                |  15 ++++++---------
 mk/check/bsd.check-vars.mk     |   8 ++++----
 mk/depends/bsd.depends-vars.mk |   8 ++++----
 mk/extract/bsd.extract-vars.mk |   8 ++++----
 mk/fetch/bsd.fetch-vars.mk     |  12 +++++++-----
 mk/install/bsd.install-vars.mk |   8 ++++----
 mk/patch/bsd.patch-vars.mk     |  11 ++++++-----
 8 files changed, 45 insertions(+), 36 deletions(-)

diffs (183 lines):

diff -r 8b5a784d087c -r d1fa0541265a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/bsd.pkg.mk     Tue Jun 06 15:28:51 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1842 2006/06/06 06:30:29 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1843 2006/06/06 15:28:51 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -19,6 +19,15 @@
 ############################################################################
 
 .include "../../mk/bsd.prefs.mk"
+
+.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
+.include "${PKGSRCDIR}/mk/check/bsd.check-vars.mk"
+.include "${PKGSRCDIR}/mk/depends/bsd.depends-vars.mk"
+.include "${PKGSRCDIR}/mk/fetch/bsd.fetch-vars.mk"
+.include "${PKGSRCDIR}/mk/extract/bsd.extract-vars.mk"
+.include "${PKGSRCDIR}/mk/patch/bsd.patch-vars.mk"
+.include "${PKGSRCDIR}/mk/install/bsd.install-vars.mk"
+
 .include "../../mk/bsd.hacks.mk"
 
 # This has to come first to avoid showing all BUILD_DEFS added by this
diff -r 8b5a784d087c -r d1fa0541265a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/bsd.prefs.mk   Tue Jun 06 15:28:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.225 2006/06/06 06:30:29 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.226 2006/06/06 15:28:52 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -502,9 +502,11 @@
 .endif
 PKGSRCDIR=             ${_PKGSRCDIR}
 
+DISTDIR?=              ${PKGSRCDIR}/distfiles
 PACKAGES?=             ${PKGSRCDIR}/packages
 TEMPLATES?=            ${PKGSRCDIR}/templates
 
+PATCHDIR?=             ${.CURDIR}/patches
 SCRIPTDIR?=            ${.CURDIR}/scripts
 FILESDIR?=             ${.CURDIR}/files
 PKGDIR?=               ${.CURDIR}
@@ -551,17 +553,12 @@
 # Wrapper framework definitions
 .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
 
+# Package system flavor definitions
+.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
+
 # Make variable definitions cache
 .include "${PKGSRCDIR}/mk/bsd.makevars.mk"
 
-.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
-.include "${PKGSRCDIR}/mk/check/bsd.check-vars.mk"
-.include "${PKGSRCDIR}/mk/depends/bsd.depends-vars.mk"
-.include "${PKGSRCDIR}/mk/fetch/bsd.fetch-vars.mk"
-.include "${PKGSRCDIR}/mk/extract/bsd.extract-vars.mk"
-.include "${PKGSRCDIR}/mk/patch/bsd.patch-vars.mk"
-.include "${PKGSRCDIR}/mk/install/bsd.install-vars.mk"
-
 USE_TOOLS+=            awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc    \
                        sed:pkgsrc tr:pkgsrc uname:pkgsrc
 
diff -r 8b5a784d087c -r d1fa0541265a mk/check/bsd.check-vars.mk
--- a/mk/check/bsd.check-vars.mk        Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/check/bsd.check-vars.mk        Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.check-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.check-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included by bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.check.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.check.mk is included.
 #
 
 CHECK_SHLIBS_SUPPORTED?=       yes
diff -r 8b5a784d087c -r d1fa0541265a mk/depends/bsd.depends-vars.mk
--- a/mk/depends/bsd.depends-vars.mk    Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/depends/bsd.depends-vars.mk    Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.depends-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.depends-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included by bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.depends.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.depends.mk is included.
 #
 
 _DEPENDS_COOKIE=       ${WRKDIR}/.depends_done
diff -r 8b5a784d087c -r d1fa0541265a mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.1 2006/06/06 03:05:48 jlam Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included to bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.extract.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.extract.mk is included.
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
diff -r 8b5a784d087c -r d1fa0541265a mk/fetch/bsd.fetch-vars.mk
--- a/mk/fetch/bsd.fetch-vars.mk        Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/fetch/bsd.fetch-vars.mk        Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.1 2006/06/06 03:05:48 jlam Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included to bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.fetch.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.fetch.mk is included.
 #
 # The following variables may be set by the user:
 #
@@ -17,6 +17,8 @@
 #    DISTFILES is the list of distribution files that are fetched.
 #
 
-DISTDIR?=               ${PKGSRCDIR}/distfiles
+# The default DISTDIR is currently set in bsd.prefs.mk.
+#DISTDIR?=               ${PKGSRCDIR}/distfiles
+
 _DISTDIR=              ${DISTDIR}/${DIST_SUBDIR}
 DISTFILES?=            ${DISTNAME}${EXTRACT_SUFX}
diff -r 8b5a784d087c -r d1fa0541265a mk/install/bsd.install-vars.mk
--- a/mk/install/bsd.install-vars.mk    Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/install/bsd.install-vars.mk    Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.install-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included by bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.install.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.install.mk is included.
 #
 
 # If a package sets INSTALLATION_DIRS, then it's known to pre-create
diff -r 8b5a784d087c -r d1fa0541265a mk/patch/bsd.patch-vars.mk
--- a/mk/patch/bsd.patch-vars.mk        Tue Jun 06 14:56:20 2006 +0000
+++ b/mk/patch/bsd.patch-vars.mk        Tue Jun 06 15:28:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.patch-vars.mk,v 1.1 2006/06/06 04:48:19 jlam Exp $
+# $NetBSD: bsd.patch-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included to bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.patch.mk is
-# included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.patch.mk is included.
 #
 # The following variables may be set in a package Makefile:
 #
@@ -22,7 +22,8 @@
 #      the patches in ${PATCHDIR}.
 #
 
-PATCHDIR?=     ${.CURDIR}/patches
+# The default PATCHDIR is currently set in bsd.prefs.mk
+#PATCHDIR?=    ${.CURDIR}/patches
 
 .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \
     (defined(PATCHDIR) && exists(${PATCHDIR})) || \