diff options
| author | jlam <jlam> | 2006-06-06 15:28:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-06 15:28:51 +0000 |
| commit | 0f66442049740107d1e59a28f2821e2c4f329aa5 (patch) | |
| tree | be674509e8d58469464756dfb6ad0bf39e42afa9 /mk/patch | |
| parent | 8596802400c7779c508b688300914fdbe19edd03 (diff) | |
| download | pkgsrc-0f66442049740107d1e59a28f2821e2c4f329aa5.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/patch')
| -rw-r--r-- | mk/patch/bsd.patch-vars.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/patch/bsd.patch-vars.mk b/mk/patch/bsd.patch-vars.mk index 6ebb08d1729..418b51965da 100644 --- a/mk/patch/bsd.patch-vars.mk +++ b/mk/patch/bsd.patch-vars.mk @@ -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})) || \ |