From b460ce1ab51a88c8a15737b9aaf78a949fe6f32e Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 30 Jul 2004 21:05:41 +0000 Subject: 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). --- security/cyrus-sasl2/Makefile | 21 +----- security/cyrus-sasl2/Makefile.options | 40 +++++++++++ security/cyrus-sasl2/PLIST | 129 ++++++++++++++++++++++++++++++++++ security/cyrus-sasl2/PLIST.common | 101 -------------------------- security/cyrus-sasl2/PLIST.krb5 | 5 -- security/cyrus-sasl2/PLIST.plugins | 25 ------- 6 files changed, 172 insertions(+), 149 deletions(-) create mode 100644 security/cyrus-sasl2/Makefile.options create mode 100644 security/cyrus-sasl2/PLIST delete mode 100644 security/cyrus-sasl2/PLIST.common delete mode 100644 security/cyrus-sasl2/PLIST.krb5 delete mode 100644 security/cyrus-sasl2/PLIST.plugins (limited to 'security/cyrus-sasl2') 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 b/security/cyrus-sasl2/PLIST new file mode 100644 index 00000000000..9fef67e86b1 --- /dev/null +++ b/security/cyrus-sasl2/PLIST @@ -0,0 +1,129 @@ +@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 +include/sasl/prop.h +include/sasl/sasl.h +include/sasl/saslplug.h +include/sasl/saslutil.h +lib/libsasl2.a +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 +man/man3/sasl_auxprop_getctx.3 +man/man3/sasl_auxprop_request.3 +man/man3/sasl_callbacks.3 +man/man3/sasl_canon_user_t.3 +man/man3/sasl_chalprompt_t.3 +man/man3/sasl_checkapop.3 +man/man3/sasl_checkpass.3 +man/man3/sasl_client_init.3 +man/man3/sasl_client_new.3 +man/man3/sasl_client_start.3 +man/man3/sasl_client_step.3 +man/man3/sasl_decode.3 +man/man3/sasl_dispose.3 +man/man3/sasl_done.3 +man/man3/sasl_encode.3 +man/man3/sasl_encodev.3 +man/man3/sasl_errdetail.3 +man/man3/sasl_errors.3 +man/man3/sasl_errstring.3 +man/man3/sasl_getopt_t.3 +man/man3/sasl_getpath_t.3 +man/man3/sasl_getprop.3 +man/man3/sasl_getrealm_t.3 +man/man3/sasl_getsecret_t.3 +man/man3/sasl_getsimple_t.3 +man/man3/sasl_global_listmech.3 +man/man3/sasl_idle.3 +man/man3/sasl_listmech.3 +man/man3/sasl_log_t.3 +man/man3/sasl_server_init.3 +man/man3/sasl_server_new.3 +man/man3/sasl_server_start.3 +man/man3/sasl_server_step.3 +man/man3/sasl_server_userdb_checkpass_t.3 +man/man3/sasl_server_userdb_setpass_t.3 +man/man3/sasl_setpass.3 +man/man3/sasl_setprop.3 +man/man3/sasl_user_exists.3 +man/man3/sasl_verifyfile_t.3 +man/man8/sasldblistusers2.8 +man/man8/saslpasswd2.8 +sbin/sasldblistusers2 +sbin/saslpasswd2 +share/doc/html/cyrus-sasl/advanced.html +share/doc/html/cyrus-sasl/appconvert.html +share/doc/html/cyrus-sasl/components.html +share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-03.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt +share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt +share/doc/html/cyrus-sasl/draft-murchison-sasl-login-00.txt +share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt +share/doc/html/cyrus-sasl/gssapi.html +share/doc/html/cyrus-sasl/index.html +share/doc/html/cyrus-sasl/install.html +share/doc/html/cyrus-sasl/macosx.html +share/doc/html/cyrus-sasl/mechanisms.html +share/doc/html/cyrus-sasl/options.html +share/doc/html/cyrus-sasl/plugprog.html +share/doc/html/cyrus-sasl/programming.html +share/doc/html/cyrus-sasl/readme.html +share/doc/html/cyrus-sasl/rfc1321.txt +share/doc/html/cyrus-sasl/rfc1939.txt +share/doc/html/cyrus-sasl/rfc2104.txt +share/doc/html/cyrus-sasl/rfc2195.txt +share/doc/html/cyrus-sasl/rfc2222.txt +share/doc/html/cyrus-sasl/rfc2243.txt +share/doc/html/cyrus-sasl/rfc2245.txt +share/doc/html/cyrus-sasl/rfc2289.txt +share/doc/html/cyrus-sasl/rfc2444.txt +share/doc/html/cyrus-sasl/rfc2595.txt +share/doc/html/cyrus-sasl/rfc2831.txt +share/doc/html/cyrus-sasl/rfc2945.txt +share/doc/html/cyrus-sasl/rfc3174.txt +share/doc/html/cyrus-sasl/server-plugin-flow.fig +share/doc/html/cyrus-sasl/sysadmin.html +share/doc/html/cyrus-sasl/testing.txt +share/doc/html/cyrus-sasl/upgrading.html +share/doc/html/cyrus-sasl/windows.html +@dirrm share/doc/html/cyrus-sasl +@dirrm include/sasl diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common deleted file mode 100644 index 3a4421e68cb..00000000000 --- a/security/cyrus-sasl2/PLIST.common +++ /dev/null @@ -1,101 +0,0 @@ -@comment $NetBSD: PLIST.common,v 1.13 2004/03/29 05:47:31 jlam Exp $ -include/sasl/hmac-md5.h -include/sasl/md5.h -include/sasl/md5global.h -include/sasl/prop.h -include/sasl/sasl.h -include/sasl/saslplug.h -include/sasl/saslutil.h -lib/libsasl2.a -lib/libsasl2.la -lib/libsasl2.so -lib/libsasl2.so.2 -lib/libsasl2.so.2.18 -man/man3/sasl.3 -man/man3/sasl_authorize_t.3 -man/man3/sasl_auxprop.3 -man/man3/sasl_auxprop_getctx.3 -man/man3/sasl_auxprop_request.3 -man/man3/sasl_callbacks.3 -man/man3/sasl_canon_user_t.3 -man/man3/sasl_chalprompt_t.3 -man/man3/sasl_checkapop.3 -man/man3/sasl_checkpass.3 -man/man3/sasl_client_init.3 -man/man3/sasl_client_new.3 -man/man3/sasl_client_start.3 -man/man3/sasl_client_step.3 -man/man3/sasl_decode.3 -man/man3/sasl_dispose.3 -man/man3/sasl_done.3 -man/man3/sasl_encode.3 -man/man3/sasl_encodev.3 -man/man3/sasl_errdetail.3 -man/man3/sasl_errors.3 -man/man3/sasl_errstring.3 -man/man3/sasl_getopt_t.3 -man/man3/sasl_getpath_t.3 -man/man3/sasl_getprop.3 -man/man3/sasl_getrealm_t.3 -man/man3/sasl_getsecret_t.3 -man/man3/sasl_getsimple_t.3 -man/man3/sasl_global_listmech.3 -man/man3/sasl_idle.3 -man/man3/sasl_listmech.3 -man/man3/sasl_log_t.3 -man/man3/sasl_server_init.3 -man/man3/sasl_server_new.3 -man/man3/sasl_server_start.3 -man/man3/sasl_server_step.3 -man/man3/sasl_server_userdb_checkpass_t.3 -man/man3/sasl_server_userdb_setpass_t.3 -man/man3/sasl_setpass.3 -man/man3/sasl_setprop.3 -man/man3/sasl_user_exists.3 -man/man3/sasl_verifyfile_t.3 -man/man8/sasldblistusers2.8 -man/man8/saslpasswd2.8 -sbin/sasldblistusers2 -sbin/saslpasswd2 -share/doc/html/cyrus-sasl/advanced.html -share/doc/html/cyrus-sasl/appconvert.html -share/doc/html/cyrus-sasl/components.html -share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-03.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt -share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt -share/doc/html/cyrus-sasl/draft-murchison-sasl-login-00.txt -share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt -share/doc/html/cyrus-sasl/gssapi.html -share/doc/html/cyrus-sasl/index.html -share/doc/html/cyrus-sasl/install.html -share/doc/html/cyrus-sasl/macosx.html -share/doc/html/cyrus-sasl/mechanisms.html -share/doc/html/cyrus-sasl/options.html -share/doc/html/cyrus-sasl/plugprog.html -share/doc/html/cyrus-sasl/programming.html -share/doc/html/cyrus-sasl/readme.html -share/doc/html/cyrus-sasl/rfc1321.txt -share/doc/html/cyrus-sasl/rfc1939.txt -share/doc/html/cyrus-sasl/rfc2104.txt -share/doc/html/cyrus-sasl/rfc2195.txt -share/doc/html/cyrus-sasl/rfc2222.txt -share/doc/html/cyrus-sasl/rfc2243.txt -share/doc/html/cyrus-sasl/rfc2245.txt -share/doc/html/cyrus-sasl/rfc2289.txt -share/doc/html/cyrus-sasl/rfc2444.txt -share/doc/html/cyrus-sasl/rfc2595.txt -share/doc/html/cyrus-sasl/rfc2831.txt -share/doc/html/cyrus-sasl/rfc2945.txt -share/doc/html/cyrus-sasl/rfc3174.txt -share/doc/html/cyrus-sasl/server-plugin-flow.fig -share/doc/html/cyrus-sasl/sysadmin.html -share/doc/html/cyrus-sasl/testing.txt -share/doc/html/cyrus-sasl/upgrading.html -share/doc/html/cyrus-sasl/windows.html -@dirrm share/doc/html/cyrus-sasl -@dirrm include/sasl 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 -- cgit v1.2.3