Module Name:	pkgsrc
Committed By:	jlam
Date:		Sun Aug 22 19:32:52 UTC 2004

Modified Files:
	pkgsrc/databases/openldap: options.mk
	pkgsrc/devel/rt3: Makefile.options
	pkgsrc/emulators/vice: Makefile
	pkgsrc/graphics/freetype2: Makefile
	pkgsrc/mail/clamav: Makefile
	pkgsrc/mail/cyrus-imapd21: Makefile
	pkgsrc/mail/cyrus-imapd22: Makefile
	pkgsrc/mail/dovecot: options.mk
	pkgsrc/mail/dspam: options.mk
	pkgsrc/mail/ezmlm-idx: options.mk
	pkgsrc/mail/fetchmail: options.mk
	pkgsrc/mail/mutt: options.mk
	pkgsrc/mail/mutt-devel: options.mk
	pkgsrc/mail/postfix: options.mk
	pkgsrc/mail/postfix-current: options.mk
	pkgsrc/mail/qmail: options.mk
	pkgsrc/mk: bsd.options.mk
	pkgsrc/net/flow-tools: Makefile
	pkgsrc/net/samba: options.mk
	pkgsrc/print/cups: Makefile
	pkgsrc/security/PAM: Makefile
	pkgsrc/security/amavisd-new: Makefile
	pkgsrc/security/cy2-sql: Makefile
	pkgsrc/security/cyrus-sasl: Makefile
	pkgsrc/security/cyrus-saslauthd: options.mk
	pkgsrc/security/heimdal: Makefile
	pkgsrc/security/mit-krb5: Makefile
	pkgsrc/security/openssl: Makefile
	pkgsrc/security/sudo: Makefile
	pkgsrc/shells/bash2: Makefile
	pkgsrc/www/apache: Makefile
	pkgsrc/www/lynx: options.mk
	pkgsrc/www/php4: Makefile.php

Log Message:
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework.  Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.

This fixes PR pkg/26590.


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 pkgsrc/databases/openldap/options.mk
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/rt3/Makefile.options
cvs rdiff -r1.48 -r1.49 pkgsrc/emulators/vice/Makefile
cvs rdiff -r1.36 -r1.37 pkgsrc/graphics/freetype2/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/mail/clamav/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/mail/cyrus-imapd21/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/mail/cyrus-imapd22/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/dovecot/options.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/dspam/options.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mail/ezmlm-idx/options.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/fetchmail/options.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mail/mutt/options.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/mutt-devel/options.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mail/postfix/options.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/postfix-current/options.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/mail/qmail/options.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/bsd.options.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/net/flow-tools/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/net/samba/options.mk
cvs rdiff -r1.78 -r1.79 pkgsrc/print/cups/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/security/PAM/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/security/amavisd-new/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/security/cy2-sql/Makefile
cvs rdiff -r1.44 -r1.45 pkgsrc/security/cyrus-sasl/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/security/cyrus-saslauthd/options.mk
cvs rdiff -r1.19 -r1.20 pkgsrc/security/heimdal/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/security/mit-krb5/Makefile
cvs rdiff -r1.94 -r1.95 pkgsrc/security/openssl/Makefile
cvs rdiff -r1.64 -r1.65 pkgsrc/security/sudo/Makefile
cvs rdiff -r1.55 -r1.56 pkgsrc/shells/bash2/Makefile
cvs rdiff -r1.149 -r1.150 pkgsrc/www/apache/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/www/lynx/options.mk
cvs rdiff -r1.16 -r1.17 pkgsrc/www/php4/Makefile.php

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