Module Name:	pkgsrc
Committed By:	jlam
Date:		Fri Jul 30 21:05:43 UTC 2004

Modified Files:
	pkgsrc/databases/openldap: Makefile Makefile.options buildlink3.mk
	pkgsrc/mail/cyrus-imapd22: Makefile
	pkgsrc/mail/fetchmail: Makefile
	pkgsrc/mail/mutt-devel: Makefile.options
	pkgsrc/mail/postfix: Makefile Makefile.options
	pkgsrc/mk: bsd.pkg.obsolete.mk
	pkgsrc/net/samba: Makefile PLIST
	pkgsrc/print/cups: Makefile PLIST
	pkgsrc/security/PAM: Makefile
	pkgsrc/security/cyrus-sasl: Makefile buildlink3.mk
	pkgsrc/security/cyrus-sasl2: Makefile
	pkgsrc/security/cyrus-saslauthd: Makefile PLIST
	pkgsrc/security/heimdal: Makefile
	pkgsrc/security/mit-krb5: Makefile
	pkgsrc/security/openssl: Makefile
	pkgsrc/security/sudo: Makefile
	pkgsrc/www/apache: Makefile
	pkgsrc/www/lynx: Makefile
	pkgsrc/www/php4: Makefile.php
Added Files:
	pkgsrc/net/samba: Makefile.options
	pkgsrc/security/cyrus-sasl: PLIST
	pkgsrc/security/cyrus-sasl2: Makefile.options PLIST
	pkgsrc/security/cyrus-saslauthd: Makefile.options
	pkgsrc/www/lynx: Makefile.options
Removed Files:
	pkgsrc/net/samba: PLIST.pam
	pkgsrc/print/cups: PLIST.pam
	pkgsrc/security/cyrus-sasl: PLIST.common PLIST.krb5 PLIST.plugins
	pkgsrc/security/cyrus-sasl2: PLIST.common PLIST.krb5 PLIST.plugins
	pkgsrc/security/cyrus-saslauthd: PLIST.ldap

Log Message:
Convert to use bsd.options.mk.  The relevant options variable to set
for each package can be determined by invoking:

	make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).


To generate a diff of this commit:
cvs rdiff -r1.79 -r1.80 pkgsrc/databases/openldap/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/databases/openldap/Makefile.options
cvs rdiff -r1.10 -r1.11 pkgsrc/databases/openldap/buildlink3.mk
cvs rdiff -r1.17 -r1.18 pkgsrc/mail/cyrus-imapd22/Makefile
cvs rdiff -r1.144 -r1.145 pkgsrc/mail/fetchmail/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/mutt-devel/Makefile.options
cvs rdiff -r1.144 -r1.145 pkgsrc/mail/postfix/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/mail/postfix/Makefile.options
cvs rdiff -r1.14 -r1.15 pkgsrc/mk/bsd.pkg.obsolete.mk
cvs rdiff -r1.123 -r1.124 pkgsrc/net/samba/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/net/samba/Makefile.options
cvs rdiff -r1.21 -r1.22 pkgsrc/net/samba/PLIST
cvs rdiff -r1.1 -r0 pkgsrc/net/samba/PLIST.pam
cvs rdiff -r1.77 -r1.78 pkgsrc/print/cups/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/print/cups/PLIST
cvs rdiff -r1.1 -r0 pkgsrc/print/cups/PLIST.pam
cvs rdiff -r1.24 -r1.25 pkgsrc/security/PAM/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/security/cyrus-sasl/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/security/cyrus-sasl/PLIST
cvs rdiff -r1.5 -r0 pkgsrc/security/cyrus-sasl/PLIST.common
cvs rdiff -r1.2 -r0 pkgsrc/security/cyrus-sasl/PLIST.krb5
cvs rdiff -r1.4 -r0 pkgsrc/security/cyrus-sasl/PLIST.plugins
cvs rdiff -r1.2 -r1.3 pkgsrc/security/cyrus-sasl/buildlink3.mk
cvs rdiff -r1.32 -r1.33 pkgsrc/security/cyrus-sasl2/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/security/cyrus-sasl2/Makefile.options \
    pkgsrc/security/cyrus-sasl2/PLIST
cvs rdiff -r1.13 -r0 pkgsrc/security/cyrus-sasl2/PLIST.common
cvs rdiff -r1.9 -r0 pkgsrc/security/cyrus-sasl2/PLIST.krb5
cvs rdiff -r1.8 -r0 pkgsrc/security/cyrus-sasl2/PLIST.plugins
cvs rdiff -r1.15 -r1.16 pkgsrc/security/cyrus-saslauthd/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/security/cyrus-saslauthd/Makefile.options
cvs rdiff -r1.4 -r1.5 pkgsrc/security/cyrus-saslauthd/PLIST
cvs rdiff -r1.2 -r0 pkgsrc/security/cyrus-saslauthd/PLIST.ldap
cvs rdiff -r1.17 -r1.18 pkgsrc/security/heimdal/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/security/mit-krb5/Makefile
cvs rdiff -r1.92 -r1.93 pkgsrc/security/openssl/Makefile
cvs rdiff -r1.63 -r1.64 pkgsrc/security/sudo/Makefile
cvs rdiff -r1.147 -r1.148 pkgsrc/www/apache/Makefile
cvs rdiff -r1.73 -r1.74 pkgsrc/www/lynx/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/www/lynx/Makefile.options
cvs rdiff -r1.15 -r1.16 pkgsrc/www/php4/Makefile.php

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