Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Jul 2016 14:31:18 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418580 - head/mail/dovecot2-pigeonhole
Message-ID:  <201607151431.u6FEVILU075354@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Fri Jul 15 14:31:18 2016
New Revision: 418580
URL: https://svnweb.freebsd.org/changeset/ports/418580

Log:
  If base was built WITHOUT_KERBEROS and dovecot2 was built with kerberos
  from ports, pigeonhole's build will fail because it can't find libkrb5.so.
  
  To fix this, introduce the usual GSSAPI option block. Also, add a
  BUILD_FAIL_MESSAGE asking you to make sure that the GSSAPI option here
  matches the GSSAPI option from dovecot2.
  
  PR:		211025
  Submitted by:	dewayne heuristicsystems com au
  Patch by:	maintainer (Larry Rosenman)

Modified:
  head/mail/dovecot2-pigeonhole/Makefile

Modified: head/mail/dovecot2-pigeonhole/Makefile
==============================================================================
--- head/mail/dovecot2-pigeonhole/Makefile	Fri Jul 15 13:45:50 2016	(r418579)
+++ head/mail/dovecot2-pigeonhole/Makefile	Fri Jul 15 14:31:18 2016	(r418580)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.15
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -28,9 +29,24 @@ USES=		compiler:c11 libtool ssl
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
 
 OPTIONS_DEFINE=	DOCS LDAP MANAGESIEVE
-OPTIONS_DEFAULT=MANAGESIEVE
+OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE
+
+OPTIONS_SINGLE=	GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_SUB=	yes
 
+GSSAPI_DESC=		GSSAPI Support (*MUST MATCH* mail/dovecot2)
+GSSAPI_NONE_DESC=	Build without GSSAPI support
+GSSAPI_BASE_DESC=	Use GSSAPI from base
+GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
+GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
+
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_NONE_CONFIGURE_OFF=	${GSSAPI_CONFIGURE_ARGS}
+BUILD_FAIL_MESSAGE=	Ensure that ${PORTNAME}'s GSSAPI backend is the same as dovecot2 (make config).
+
 MANAGESIEVE_DESC=		ManageSieve support
 MANAGESIEVE_CONFIGURE_WITH=	managesieve
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607151431.u6FEVILU075354>