diff options
| author | jlam <jlam> | 2006-06-06 15:28:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-06 15:28:51 +0000 |
| commit | 6df12d32ec3af16f667c52e517a1bdd27829da80 (patch) | |
| tree | be674509e8d58469464756dfb6ad0bf39e42afa9 /mk/bsd.pkg.mk | |
| parent | eb0827183e23873bd6f1f439fec440e17178d583 (diff) | |
| download | pkgsrc-6df12d32ec3af16f667c52e517a1bdd27829da80.tar.gz | |
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 (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c7b27dff35d..47919df2c04 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 |