From owner-svn-ports-all@FreeBSD.ORG Mon May 11 11:55:26 2015 Return-Path: Delivered-To: svn-ports-all@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 BA7D99C8; Mon, 11 May 2015 11:55:26 +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 8F6AB16FA; Mon, 11 May 2015 11:55:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BBtQe1007570; Mon, 11 May 2015 11:55:26 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BBtQ7G007569; Mon, 11 May 2015 11:55:26 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201505111155.t4BBtQ7G007569@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Mon, 11 May 2015 11:55:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386071 - head/mail/cyrus-imapd24 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 11:55:26 -0000 Author: ume Date: Mon May 11 11:55:25 2015 New Revision: 386071 URL: https://svnweb.freebsd.org/changeset/ports/386071 Log: Use USES=gssapi to support MIT Kerberos and Heimdal from ports. Requested by: Phil Pennock Modified: head/mail/cyrus-imapd24/Makefile Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Mon May 11 11:47:38 2015 (r386070) +++ head/mail/cyrus-imapd24/Makefile Mon May 11 11:55:25 2015 (r386071) @@ -82,6 +82,25 @@ SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_USE= SQLITE=yes 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="${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 + .include # Autocreate Inbox and Autosieve patches from UoA @@ -116,16 +135,17 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- USE_AUTOTOOLS= autoconf autoheader .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