Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Aug  2 22:07:32 UTC 2007

Modified Files:
	pkgsrc/mail/courier-imap: Makefile
	pkgsrc/mail/courier-mta: Makefile Makefile.common
	pkgsrc/mail/maildrop: Makefile
	pkgsrc/mail/sqwebmail: Makefile
	pkgsrc/net/couriertcpd: Makefile

Log Message:
Fix botched migration of PKG_OPTIONS from courier-mta/Makefile.common
into the Makefiles of the packages that include it:

(1) PKGNAME and PKG_SUPPORTED_OPTIONS clearly no longer need to be
    defined since the only code that used it in Makefile.common was
    removed.

(2) Package Makefiles need to properly define PKG_OPTIONS_VAR and
    PKG_SUPPORTED_OPTIONS prior to including bsd.options.mk.  Set
    them to the appropriate values to match the orginal names from
    before the botched migration.


To generate a diff of this commit:
cvs rdiff -r1.60 -r1.61 pkgsrc/mail/courier-imap/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/mail/courier-mta/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/mail/courier-mta/Makefile.common
cvs rdiff -r1.41 -r1.42 pkgsrc/mail/maildrop/Makefile
cvs rdiff -r1.53 -r1.54 pkgsrc/mail/sqwebmail/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/couriertcpd/Makefile

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