From owner-svn-ports-head@FreeBSD.ORG Sat Mar 21 16:23:29 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9A10C9F; Sat, 21 Mar 2015 16:23:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8B3139B3; Sat, 21 Mar 2015 16:23:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2LGNTCd092066; Sat, 21 Mar 2015 16:23:29 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2LGNT4n092065; Sat, 21 Mar 2015 16:23:29 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201503211623.t2LGNT4n092065@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sat, 21 Mar 2015 16:23:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381797 - head/mail/cyrus-imapd25 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.18-1 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: Sat, 21 Mar 2015 16:23:29 -0000 Author: ume Date: Sat Mar 21 16:23:28 2015 New Revision: 381797 URL: https://svnweb.freebsd.org/changeset/ports/381797 QAT: https://qat.redports.org/buildarchive/r381797/ Log: Use USES=gssapi. Modified: head/mail/cyrus-imapd25/Makefile Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Sat Mar 21 14:38:00 2015 (r381796) +++ head/mail/cyrus-imapd25/Makefile Sat Mar 21 16:23:28 2015 (r381797) @@ -89,6 +89,24 @@ SNMP_CONFIGURE_ON= --with-snmp=${LOCALBA SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} +OPTIONS_RADIO= GSSAPI +OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT +.if exists(/usr/lib/libkrb5.a) +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 --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 + .include .if ${PORT_OPTIONS:MBDB} @@ -114,16 +132,17 @@ IGNORE= DRAC is not available USE_SQLITE=yes .endif +.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ + !${PORT_OPTIONS:MGSSAPI_MIT} +CONFIGURE_ARGS+=--disable-gssapi +.endif + .if ${OSVERSION} >= 900022 PLIST_SUB+= MANCONF="" .else PLIST_SUB+= MANCONF="@comment " .endif -.if !exists(/usr/lib/libkrb5.a) -CONFIGURE_ARGS+=--disable-gssapi -.endif - CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus @@ -185,7 +204,7 @@ post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \ -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \ ${WRKSRC}/Makefile.in