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).

5 files changed, 64 insertions, 45 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 7e2c80a0849..05df812292b 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2004/07/30 21:05:41 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,32 +6,52 @@ PKGREVISION=	6
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
-PLIST_SRC+=		${.CURDIR}/PLIST.common
-
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
 CONFIGURE_ARGS+=	--enable-cram		# CRAM-MD5
-
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
-.if defined(USE_PAM)
+CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
+CONFIGURE_ARGS+=	--with-rc4=${SSLBASE}
+.include "../../security/openssl/buildlink3.mk"
+
+# Global and legacy options
+.if defined(KERBEROS) || defined(USE_PAM) || defined(SASL_USE_GSSAPI)
+.  if !defined(PKG_OPTIONS.cyrus-sasl)
+.    if defined(KERBEROS)
+PKG_OPTIONS.cyrus-sasl+=	kerberos
+.    endif
+.    if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS])     
+PKG_OPTIONS.cyrus-sasl+=	PAM
+.    endif
+.    if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])     
+PKG_OPTIONS.cyrus-sasl+=	gssapi
+.    endif
+.  endif
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-sasl
+PKG_SUPPORTED_OPTIONS=	PAM gssapi kerberos
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../security/PAM/buildlink3.mk"
-BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .endif
 
-CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
-CONFIGURE_ARGS+=	--with-rc4=${SSLBASE}
-.include "../../security/openssl/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Mgssapi)
+PKG_OPTIONS+=		gssapi
+.  endif
+.endif
 
-.if defined(KERBEROS) || \
-    (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
+.if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}	# GSSAPI
-PLIST_SRC+=		${.CURDIR}/PLIST.krb5
+PLIST_SUBST+=		GSSAPI=
+.else
+PLIST_SUBST+=		GSSAPI="@comment "
 .endif
 
-PLIST_SRC+=		${.CURDIR}/PLIST.plugins
-
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST
index 761fa92d0e2..e02e521e7b4 100644
--- a/security/cyrus-sasl/PLIST.common
+++ b/security/cyrus-sasl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/04/23 22:07:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/07/30 21:05:41 jlam Exp $
 bin/sasl-config
 include/hmac-md5.h
 include/sasl.h
@@ -9,6 +9,31 @@ lib/libsasl.la
 lib/libsasl.so
 lib/libsasl.so.8
 lib/libsasl.so.8.10
+lib/sasl/libanonymous.a
+lib/sasl/libanonymous.la
+lib/sasl/libanonymous.so
+lib/sasl/libanonymous.so.1
+lib/sasl/libanonymous.so.1.16
+lib/sasl/libcrammd5.a
+lib/sasl/libcrammd5.la
+lib/sasl/libcrammd5.so
+lib/sasl/libcrammd5.so.1
+lib/sasl/libcrammd5.so.1.17
+lib/sasl/libdigestmd5.a
+lib/sasl/libdigestmd5.la
+lib/sasl/libdigestmd5.so
+lib/sasl/libdigestmd5.so.0
+lib/sasl/libdigestmd5.so.0.19
+${GSSAPI}lib/sasl/libgssapiv2.a
+${GSSAPI}lib/sasl/libgssapiv2.la
+${GSSAPI}lib/sasl/libgssapiv2.so
+${GSSAPI}lib/sasl/libgssapiv2.so.1
+${GSSAPI}lib/sasl/libgssapiv2.so.1.18
+lib/sasl/libplain.a
+lib/sasl/libplain.la
+lib/sasl/libplain.so
+lib/sasl/libplain.so.1
+lib/sasl/libplain.so.1.15
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_done.3
@@ -53,4 +78,3 @@ share/doc/html/cyrus-sasl/rfc2245.txt
 share/doc/html/cyrus-sasl/rfc2831.txt
 share/doc/html/cyrus-sasl/sysadmin.html
 @dirrm share/doc/html/cyrus-sasl
-@unexec ${RM} -rf ${SASLSOCKETDIR}
diff --git a/security/cyrus-sasl/PLIST.krb5 b/security/cyrus-sasl/PLIST.krb5
deleted file mode 100644
index 6414431fe12..00000000000
--- a/security/cyrus-sasl/PLIST.krb5
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.krb5,v 1.2 2002/03/24 23:30:18 wiz Exp $
-lib/sasl/libgssapiv2.a
-lib/sasl/libgssapiv2.la
-lib/sasl/libgssapiv2.so
-lib/sasl/libgssapiv2.so.1
-lib/sasl/libgssapiv2.so.1.18
diff --git a/security/cyrus-sasl/PLIST.plugins b/security/cyrus-sasl/PLIST.plugins
deleted file mode 100644
index 44faf5cf8dc..00000000000
--- a/security/cyrus-sasl/PLIST.plugins
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST.plugins,v 1.4 2002/01/31 20:42:09 jlam Exp $
-lib/sasl/libanonymous.a
-lib/sasl/libanonymous.la
-lib/sasl/libanonymous.so
-lib/sasl/libanonymous.so.1
-lib/sasl/libanonymous.so.1.16
-lib/sasl/libcrammd5.a
-lib/sasl/libcrammd5.la
-lib/sasl/libcrammd5.so
-lib/sasl/libcrammd5.so.1
-lib/sasl/libcrammd5.so.1.17
-lib/sasl/libdigestmd5.a
-lib/sasl/libdigestmd5.la
-lib/sasl/libdigestmd5.so
-lib/sasl/libdigestmd5.so.0
-lib/sasl/libdigestmd5.so.0.19
-lib/sasl/libplain.a
-lib/sasl/libplain.la
-lib/sasl/libplain.so
-lib/sasl/libplain.so.1
-lib/sasl/libplain.so.1.15
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
index 67283f730d8..95355ef7331 100644
--- a/security/cyrus-sasl/buildlink3.mk
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/07/30 21:05:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -18,7 +18,9 @@ BUILDLINK_RECOMMENDED.cyrus-sasl?=	cyrus-sasl>=1.5.27nb6
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
-.if defined(USE_PAM)
+PKG_OPTIONS.cyrus-sasl?=	${PKG_DEFAULT_OPTIONS}
+
+.if !empty(PKG_OPTIONS.cyrus-sasl:MPAM)
 .  include "../../security/PAM/buildlink3.mk"
 .endif