add a gssapi flavour to openldap, based on a diff from William Leuschner

databases/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.319 2016/10/15 07:37:56 feinerer Exp $
+# $OpenBSD: Makefile,v 1.320 2016/10/25 17:25:55 sthen Exp $
 
      SUBDIR =
      SUBDIR += apache-couchdb
@@ -50,6 +50,7 @@
      SUBDIR += ocaml-sqlite3
      SUBDIR += openldap
      SUBDIR += openldap,aci
+     SUBDIR += openldap,gssapi
      SUBDIR += openldap23
      SUBDIR += p5-AnyEvent-CouchDB
      SUBDIR += p5-AsciiDB-TagFile

databases/openldap/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.146 2016/09/01 16:50:35 landry Exp $
+# $OpenBSD: Makefile,v 1.147 2016/10/25 17:25:55 sthen Exp $
 
 DPB_PROPERTIES =	parallel
 
@@ -8,7 +8,8 @@ COMMENT-server =	open-source LDAP software (server)
 DISTNAME =		openldap-2.4.44
 PKGNAME-main =		${DISTNAME:S/-/-client-/}
 PKGNAME-server =	${DISTNAME:S/-/-server-/}
-REVISION-server =	1
+REVISION-main =		0
+REVISION-server =	2
 
 # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
 FULLPKGNAME-main =	${DISTNAME:S/-/-client-/}
@@ -31,7 +32,8 @@ MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
 # OpenLDAP Public License
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c crypto ssl
+cWANTLIB =	c crypto pthread sasl2 ssl
+WANTLIB-main =	${cWANTLIB}
 
 MASTER_SITES =	http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/ \
 		http://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
@@ -49,7 +51,7 @@ CONFIGURE_STYLE =	autoconf
 USE_GROFF =		Yes
 
 FLAVOR ?=
-FLAVORS =		aci
+FLAVORS =		aci gssapi
 
 CONFIGURE_ARGS +=	--enable-ipv6 \
 			--with-tls=openssl
@@ -94,17 +96,23 @@ CONFIGURE_ARGS +=	--disable-mdb
 CONFIGURE_ARGS +=	--enable-aci
 .endif
 
+.if ${FLAVOR:Mgssapi}
+CONFIGURE_ARGS +=	--with-kerberos
+WANTLIB-server +=	${MODHEIMDAL_WANTLIB}
+MODULES +=		security/heimdal
+.endif
+
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
 
 TEST_TARGET =	test
 
 MULTI_PACKAGES =	-main -server
 
-LIB_DEPENDS +=		security/cyrus-sasl2 
-WANTLIB +=		pthread sasl2
+LIB_DEPENDS-main +=	security/cyrus-sasl2 
 CPPFLAGS +=		-I${LOCALBASE}/include/sasl
 
 LIB_DEPENDS-server =	${LIB_DEPENDS-main} \
+			${MODHEIMDAL_LIB_DEPENDS} \
 			sysutils/e2fsprogs \
 			textproc/icu4c \
 			databases/db/v4,no_java,no_tcl
@@ -113,7 +121,7 @@ CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include/sasl -I${LOCALBASE}/include/db
 			LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
 
 RUN_DEPENDS-server =	databases/openldap,-main
-WANTLIB-server +=	${WANTLIB} perl util m icudata icuuc uuid
+WANTLIB-server +=	${cWANTLIB} perl m icudata icuuc uuid
 WANTLIB-server +=	stdc++ lib/db4/db>=4
 
 pre-build:

databases/openldap/pkg/DESCR-server

@@ -12,3 +12,4 @@ various administrative binaries.
 
 Flavors:
 	aci	enable the *experimental* ACI dynamic access control
+	gssapi	compile with GSSAPI support (and Heimdal)