From 4bc3dd8ab65ebeb1ce084c2214f3112068c4db41 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Fri, 26 Feb 2016 06:51:47 +0000 Subject: [PATCH] Use gssapi related descriptions in bsd.options.desc.mk. --- mail/cyrus-imapd24/Makefile | 3 --- mail/cyrus-imapd25/Makefile | 3 --- security/cyrus-sasl2-gssapi/Makefile | 33 +++++++++++-------------- security/cyrus-sasl2-saslauthd/Makefile | 33 +++++++++++-------------- 4 files changed, 30 insertions(+), 42 deletions(-) diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 4929259d5211..ba937e72ba08 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -87,15 +87,12 @@ OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif -GSSAPI_BASE_DESC= Use Heimdal in base GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal -GSSAPI_HEIMDAL_DESC= Use Heimdal from ports GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal -GSSAPI_MIT_DESC= Use MIT Kerberos V5 GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 455ae861ea23..f7450032b8a2 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -100,15 +100,12 @@ OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif .endif -GSSAPI_BASE_DESC= Use Heimdal in base GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal -GSSAPI_HEIMDAL_DESC= Use Heimdal from ports GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal -GSSAPI_MIT_DESC= Use MIT Kerberos V5 GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile index 76ef15744e3e..3c7cbe31d745 100644 --- a/security/cyrus-sasl2-gssapi/Makefile +++ b/security/cyrus-sasl2-gssapi/Makefile @@ -46,24 +46,21 @@ CONFIGURE_ARGS+=--with-dblib=none \ MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} -OPTIONS_SINGLE= KERBEROS -OPTIONS_SINGLE_KERBEROS=BASE HEIMDAL MIT -OPTIONS_DEFAULT= BASE -BASE_DESC= Use Heimdal in base -BASE_USES= gssapi -BASE_CONFIGURE_ENABLE= gssapi -HEIMDAL_DESC= Use Heimdal from ports -HEIMDAL_USES= gssapi:heimdal,flags -HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal -HEIMDAL_PLIST_FILES= lib/sasl2/libgs2.a \ - lib/sasl2/libgs2.so \ - lib/sasl2/libgs2.so.3 \ - lib/sasl2/libgs2.so.3.0.0 -MIT_DESC= Use MIT Kerberos V5 -MIT_USES= gssapi:mit -MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_DEFAULT= GSSAPI_BASE +GSSAPI_BASE_USES= gssapi +GSSAPI_BASE_CONFIGURE_ENABLE= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=heimdal +GSSAPI_HEIMDAL_PLIST_FILES= lib/sasl2/libgs2.a \ + lib/sasl2/libgs2.so \ + lib/sasl2/libgs2.so.3 \ + lib/sasl2/libgs2.so.3.0.0 +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=mit PLIST_FILES= lib/sasl2/libgssapiv2.a \ lib/sasl2/libgssapiv2.so \ diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 3e3e7ab81a4d..304a8fff4f4f 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -53,24 +53,21 @@ OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} HTTPFORM_DESC= Enable HTTP form authentication HTTPFORM_CONFIGURE_ENABLE=httpform -OPTIONS_RADIO= KERBEROS -OPTIONS_RADIO_KERBEROS= HEIMDAL MIT +OPTIONS_RADIO= GSSAPI +OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT .if exists(/usr/lib/libkrb5.a) -OPTIONS_RADIO_KERBEROS+=BASE -OPTIONS_DEFAULT+= BASE +OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE +OPTIONS_DEFAULT+= GSSAPI_BASE .endif -BASE_DESC= Use Heimdal in base -BASE_USES= gssapi:base -BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal -HEIMDAL_DESC= Use Heimdal from ports -HEIMDAL_USES= gssapi:heimdal,flags -HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal -MIT_DESC= Use MIT Kerberos V5 -MIT_USES= gssapi:mit -MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit +GSSAPI_BASE_USES= gssapi:base +GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=heimdal +GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=heimdal +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=mit .include @@ -84,8 +81,8 @@ WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif .endif -.if !${PORT_OPTIONS:MBASE} && !${PORT_OPTIONS:MHEIMDAL} && \ - !${PORT_OPTIONS:MMIT} +.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ + !${PORT_OPTIONS:MGSSAPI_MIT} CONFIGURE_ARGS+=--disable-gssapi .endif