From owner-svn-ports-head@freebsd.org Fri Feb 26 06:51:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49F63AB3BBF; Fri, 26 Feb 2016 06:51:49 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C648A31; Fri, 26 Feb 2016 06:51:48 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1Q6pmpE058208; Fri, 26 Feb 2016 06:51:48 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1Q6pl0O058204; Fri, 26 Feb 2016 06:51:47 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201602260651.u1Q6pl0O058204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Fri, 26 Feb 2016 06:51:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409581 - in head: mail/cyrus-imapd24 mail/cyrus-imapd25 security/cyrus-sasl2-gssapi security/cyrus-sasl2-saslauthd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2016 06:51:49 -0000 Author: ume Date: Fri Feb 26 06:51:47 2016 New Revision: 409581 URL: https://svnweb.freebsd.org/changeset/ports/409581 Log: Use gssapi related descriptions in bsd.options.desc.mk. Modified: head/mail/cyrus-imapd24/Makefile head/mail/cyrus-imapd25/Makefile head/security/cyrus-sasl2-gssapi/Makefile head/security/cyrus-sasl2-saslauthd/Makefile Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Fri Feb 26 06:38:56 2016 (r409580) +++ head/mail/cyrus-imapd24/Makefile Fri Feb 26 06:51:47 2016 (r409581) @@ -87,15 +87,12 @@ OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GS 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 Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Fri Feb 26 06:38:56 2016 (r409580) +++ head/mail/cyrus-imapd25/Makefile Fri Feb 26 06:51:47 2016 (r409581) @@ -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 Modified: head/security/cyrus-sasl2-gssapi/Makefile ============================================================================== --- head/security/cyrus-sasl2-gssapi/Makefile Fri Feb 26 06:38:56 2016 (r409580) +++ head/security/cyrus-sasl2-gssapi/Makefile Fri Feb 26 06:51:47 2016 (r409581) @@ -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 \ Modified: head/security/cyrus-sasl2-saslauthd/Makefile ============================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile Fri Feb 26 06:38:56 2016 (r409580) +++ head/security/cyrus-sasl2-saslauthd/Makefile Fri Feb 26 06:51:47 2016 (r409581) @@ -53,24 +53,21 @@ OPENLDAP_CONFIGURE_ON= --with-ldap=${LOC 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