Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Jun  6 15:28:52 UTC 2006

Modified Files:
	pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
	pkgsrc/mk/check: bsd.check-vars.mk
	pkgsrc/mk/depends: bsd.depends-vars.mk
	pkgsrc/mk/extract: bsd.extract-vars.mk
	pkgsrc/mk/fetch: bsd.fetch-vars.mk
	pkgsrc/mk/install: bsd.install-vars.mk
	pkgsrc/mk/patch: bsd.patch-vars.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.1842 -r1.1843 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.225 -r1.226 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/check/bsd.check-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/depends/bsd.depends-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/extract/bsd.extract-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/fetch/bsd.fetch-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/install/bsd.install-vars.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mk/patch/bsd.patch-vars.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.