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, 72 insertions, 49 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 459d29b515f..d1bd3693dc4 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/07/08 21:11:25 recht Exp $
+# $NetBSD: Makefile,v 1.33 2004/07/30 21:05:41 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,8 +6,6 @@ PKGREVISION=	3
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
-PLIST_SRC+=		${PKGDIR}/PLIST.common
-
 .if exists(/usr/include/ndbm.h)
 SASL_DBTYPE?=		ndbm
 .else
@@ -42,6 +40,8 @@ AUTHDAEMONVAR?=		${VARBASE}/authdaemon
 CONFIGURE_ARGS+=        --with-authdaemond=${AUTHDAEMONVAR}
 BUILD_DEFS+=		AUTHDAEMONVAR
 
+.include "Makefile.options"
+
 .if exists(/dev/urandom)
 SASL_ENTROPY_SOURCE?=	/dev/urandom
 .endif
@@ -50,21 +50,6 @@ CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE}
 .endif
 BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 
-.if defined(KERBEROS)
-SASL_USE_GSSAPI=	yes
-.endif
-.if (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
-.  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}	# GSSAPI
-CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-GSSIMPL.heimdal=	heimdal
-GSSIMPL.mit-krb5=	mit
-PLIST_SRC+=		${PKGDIR}/PLIST.krb5
-.endif
-BUILD_DEFS+=		SASL_USE_GSSAPI
-
-PLIST_SRC+=		${PKGDIR}/PLIST.plugins
-
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
diff --git a/security/cyrus-sasl2/Makefile.options b/security/cyrus-sasl2/Makefile.options
new file mode 100644
index 00000000000..a33fbc55c1f
--- /dev/null
+++ b/security/cyrus-sasl2/Makefile.options
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $
+
+# Global and legacy options
+.if defined(KERBEROS) || defined(SASL_USE_GSSAPI)
+.  if !defined(PKG_OPTIONS.cyrus-sasl)
+.    if defined(KERBEROS) 
+PKG_OPTIONS.cyrus-sasl+=	kerberos
+.    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=	gssapi kerberos
+.include "../../mk/bsd.options.mk"
+
+###
+### Kerberos authentication is via GSSAPI.
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Mgssapi)
+PKG_OPTIONS+=	gssapi
+.  endif
+.endif
+
+###
+### Authentication via GSSAPI (which supports primarily Kerberos 5)
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=	heimdal
+GSSIMPL.mit-krb5=	mit
+PLIST_SUBST+=		GSSAPI=
+.else
+PLIST_SUBST+=		GSSAPI="@comment "
+.endif
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST
index 3a4421e68cb..9fef67e86b1 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.13 2004/03/29 05:47:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/07/30 21:05:41 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -11,6 +11,34 @@ lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
 lib/libsasl2.so.2.18
+lib/sasl2/libanonymous.la
+lib/sasl2/libanonymous.so
+lib/sasl2/libanonymous.so.2
+lib/sasl2/libanonymous.so.2.18
+lib/sasl2/libcrammd5.la
+lib/sasl2/libcrammd5.so
+lib/sasl2/libcrammd5.so.2
+lib/sasl2/libcrammd5.so.2.18
+lib/sasl2/libdigestmd5.la
+lib/sasl2/libdigestmd5.so
+lib/sasl2/libdigestmd5.so.2
+lib/sasl2/libdigestmd5.so.2.18
+${GSSAPI}lib/sasl2/libgssapiv2.la
+${GSSAPI}lib/sasl2/libgssapiv2.so
+${GSSAPI}lib/sasl2/libgssapiv2.so.2
+${GSSAPI}lib/sasl2/libgssapiv2.so.2.18
+lib/sasl2/libotp.la
+lib/sasl2/libotp.so
+lib/sasl2/libotp.so.2
+lib/sasl2/libotp.so.2.18
+lib/sasl2/libplain.la
+lib/sasl2/libplain.so
+lib/sasl2/libplain.so.2
+lib/sasl2/libplain.so.2.18
+lib/sasl2/libsasldb.la
+lib/sasl2/libsasldb.so
+lib/sasl2/libsasldb.so.2
+lib/sasl2/libsasldb.so.2.18
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
deleted file mode 100644
index d6e66038610..00000000000
--- a/security/cyrus-sasl2/PLIST.krb5
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.krb5,v 1.9 2004/03/29 05:47:31 jlam Exp $
-lib/sasl2/libgssapiv2.la
-lib/sasl2/libgssapiv2.so
-lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.18
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
deleted file mode 100644
index 12b69f45061..00000000000
--- a/security/cyrus-sasl2/PLIST.plugins
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST.plugins,v 1.8 2004/03/29 05:47:31 jlam Exp $
-lib/sasl2/libanonymous.la
-lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.18
-lib/sasl2/libcrammd5.la
-lib/sasl2/libcrammd5.so
-lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.18
-lib/sasl2/libdigestmd5.la
-lib/sasl2/libdigestmd5.so
-lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.18
-lib/sasl2/libotp.la
-lib/sasl2/libotp.so
-lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.18
-lib/sasl2/libplain.la
-lib/sasl2/libplain.so
-lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.18
-lib/sasl2/libsasldb.la
-lib/sasl2/libsasldb.so
-lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.18