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.

6 files changed, 11 insertions, 24 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 86903933aab..0d4c1304981 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/06/07 07:50:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.61 2007/08/02 22:07:32 jlam Exp $
 
 DISTNAME=	courier-imap-4.1.1
 PKGREVISION=	3
@@ -17,7 +17,8 @@ USE_TOOLS+=		env gmake openssl:run perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-PKG_SUPPORTED_OPTIONS+=	fam
+PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-imap
+PKG_SUPPORTED_OPTIONS=	fam
 
 .include "../../mk/bsd.options.mk"
 
@@ -25,8 +26,6 @@ PKG_SUPPORTED_OPTIONS+=	fam
 .  include "../../mk/fam.buildlink3.mk"
 .endif
 
-# PKGNAME is a parameter to the following file
-PKGNAME=		${DISTNAME}
 .include "../../mail/courier-mta/Makefile.common"
 
 CONFIGURE_ARGS+=	--datadir=${DATADIR:Q}
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index ed0009a131b..c533307f158 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/07/28 01:37:23 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/08/02 22:07:32 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGREVISION=	4
@@ -19,8 +19,6 @@ DEPENDS+=	maildrop>=2.0.2:../../mail/maildrop
 USE_TOOLS+=		gmake openssl:run perl:run
 USE_LANGUAGES=		c c++
 
-PKGNAME=		${DISTNAME:S/-/-mta-/}
-# PKGNAME is a parameter to the following file.
 .include "Makefile.common"
 
 PLIST_SRC+=		${PKGDIR}/PLIST
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
index 0ed0675b47d..47fe4dd2992 100644
--- a/mail/courier-mta/Makefile.common
+++ b/mail/courier-mta/Makefile.common
@@ -1,14 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2007/07/04 20:54:41 jlam Exp $
-#
-# Package Makefiles should include this file after setting PKGNAME and
-# PKG_SUPPORTED_OPTIONS.
+# $NetBSD: Makefile.common,v 1.5 2007/08/02 22:07:32 jlam Exp $
 
 COURIER_VERSION=	0.53.2
 
-.if !defined(PKGNAME)
-PKG_FAIL_REASON+=	"[courier/Makefile.common] PKGNAME must be set."
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 DATADIR=		${PREFIX}/share/courier
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index c51f2c6e8cf..1171679856a 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/06/15 18:20:06 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2007/08/02 22:07:32 jlam Exp $
 
 DISTNAME=	maildrop-2.0.2
 CATEGORIES=	security
@@ -16,11 +16,10 @@ DEPENDS+=	courier-maildir>=0.53.1:../../mail/courier-maildir
 USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.maildrop
 PKG_SUPPORTED_OPTIONS=	authlib
 PKG_SUGGESTED_OPTIONS=	authlib
 
-# PKGNAME is a parameter to the following file.
-PKGNAME=	${DISTNAME}
 .include "../../mail/courier-mta/Makefile.common"
 
 # These are the users that may invoke maildrop with the "-d user"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 2526ee927c8..b16d6998aaa 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2007/06/15 18:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2007/08/02 22:07:32 jlam Exp $
 
 DISTNAME=	sqwebmail-5.1.2
 PKGREVISION=	1
@@ -17,7 +17,8 @@ USE_TOOLS+=		env gmake gzip:run perl:run
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-PKG_SUPPORTED_OPTIONS+=	fam
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sqwebmail
+PKG_SUPPORTED_OPTIONS=	fam
 
 .include "../../mk/bsd.options.mk"
 
@@ -25,8 +26,6 @@ PKG_SUPPORTED_OPTIONS+=	fam
 .  include "../../mk/fam.buildlink3.mk"
 .endif
 
-# PKGNAME is a parameter to the following file.
-PKGNAME=		${DISTNAME}
 .include "../../mail/courier-mta/Makefile.common"
 
 INSTALL_AM_MAKEFLAGS=	sysconfdir=${EGDIR}
diff --git a/net/couriertcpd/Makefile b/net/couriertcpd/Makefile
index 258ef1733d3..6a98bb5f73a 100644
--- a/net/couriertcpd/Makefile
+++ b/net/couriertcpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/06/08 15:18:42 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/08/02 22:07:32 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/tcpd-/}
@@ -16,7 +16,6 @@ CONFLICTS=	courier-imap<4.11
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-PKG_SUPPORTED_OPTIONS=	# none
 .include "../../mail/courier-mta/Makefile.common"
 
 # This package doesn't need to depend on courier-authlib -- just fake