Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Feb  5 06:58:03 UTC 2004

Modified Files:
	pkgsrc/archivers/bzip2: buildlink2.mk buildlink3.mk
	pkgsrc/converters/libiconv: buildlink2.mk buildlink3.mk
	pkgsrc/databases/db: buildlink2.mk buildlink3.mk
	pkgsrc/devel/binutils: buildlink2.mk buildlink3.mk
	pkgsrc/devel/cdk: buildlink2.mk
	pkgsrc/devel/gettext-lib: buildlink2.mk buildlink3.mk
	pkgsrc/devel/libevent: buildlink2.mk
	pkgsrc/devel/ncurses: buildlink2.mk buildlink3.mk
	pkgsrc/devel/readline: buildlink2.mk buildlink3.mk
	pkgsrc/devel/zlib: buildlink2.mk buildlink3.mk
	pkgsrc/graphics/MesaLib: buildlink3.mk
	pkgsrc/graphics/freetype2: buildlink2.mk buildlink3.mk
	pkgsrc/graphics/glu: buildlink3.mk
	pkgsrc/mail/libmilter: buildlink2.mk
	pkgsrc/mk/buildlink3: bsd.buildlink3.mk
	pkgsrc/net/hesiod: buildlink2.mk
	pkgsrc/net/libpcap: buildlink2.mk buildlink3.mk
	pkgsrc/security/PAM: buildlink2.mk buildlink3.mk
	pkgsrc/security/heimdal: buildlink3.mk
	pkgsrc/security/openssl: buildlink2.mk buildlink3.mk
	pkgsrc/x11/Xrender: buildlink2.mk buildlink3.mk

Log Message:
Support a new global variable:

BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/archivers/bzip2/buildlink2.mk \
    pkgsrc/archivers/bzip2/buildlink3.mk
cvs rdiff -r1.12 -r1.13 pkgsrc/converters/libiconv/buildlink2.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/converters/libiconv/buildlink3.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/databases/db/buildlink2.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/db/buildlink3.mk
cvs rdiff -r1.10 -r1.11 pkgsrc/devel/binutils/buildlink2.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/binutils/buildlink3.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/cdk/buildlink2.mk
cvs rdiff -r1.25 -r1.26 pkgsrc/devel/gettext-lib/buildlink2.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/devel/gettext-lib/buildlink3.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/devel/libevent/buildlink2.mk
cvs rdiff -r1.15 -r1.16 pkgsrc/devel/ncurses/buildlink2.mk
cvs rdiff -r1.10 -r1.11 pkgsrc/devel/ncurses/buildlink3.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/devel/readline/buildlink2.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/readline/buildlink3.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/devel/zlib/buildlink2.mk \
    pkgsrc/devel/zlib/buildlink3.mk
cvs rdiff -r1.13 -r1.14 pkgsrc/graphics/MesaLib/buildlink3.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/graphics/freetype2/buildlink2.mk \
    pkgsrc/graphics/freetype2/buildlink3.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/graphics/glu/buildlink3.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/libmilter/buildlink2.mk
cvs rdiff -r1.72 -r1.73 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/net/hesiod/buildlink2.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/net/libpcap/buildlink2.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/net/libpcap/buildlink3.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/security/PAM/buildlink2.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/security/PAM/buildlink3.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/security/heimdal/buildlink3.mk
cvs rdiff -r1.15 -r1.16 pkgsrc/security/openssl/buildlink2.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/security/openssl/buildlink3.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/x11/Xrender/buildlink2.mk
cvs rdiff -r1.13 -r1.14 pkgsrc/x11/Xrender/buildlink3.mk

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