Attachment 194829 Details for Bug 222745 – Ports patch

[patch] Ports patch

ports.diff (text/plain), 33.77 KB, created by Cy Schubert on 2018-07-02 07:13:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2018-07-02 07:13:55 UTC

Size: 33.77 KB

patch

obsolete

>diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
>index f1e76ffc40b3..bc5d84b6134d 100644
>--- a/Mk/Uses/gssapi.mk
>+++ b/Mk/Uses/gssapi.mk
>@@ -4,11 +4,11 @@
> #
> # Feature:	gssapi
> # Usage:	USES=gssapi or USES=gssapi:ARGS
>-# Valid ARGS:	base (default, implicit), heimdal, mit.
>+# Valid ARGS:	mit (default, implicit), heimdal
> #		"bootstrap" is a special prefix only for krb5 or heimdal ports.
> #		("bootstrap,mit")
> #		flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
>-#		("base,flags")
>+#		("heimdal,flags")
> #
> # MAINTAINER:	hrs@FreeBSD.org
> #
>@@ -81,26 +81,11 @@ _HEADERS=	sys/types.h sys/stat.h stdint.h
> 
> .undef _FIXUP_KRB5CONFIG
> .if empty(gssapi_ARGS)
>-gssapi_ARGS=	base
>+gssapi_ARGS=	mit
> .endif
> .for _A in ${gssapi_ARGS}
> _local:=	${_A}
>-.if ${_local} == "base"
>-.  if ${SSL_DEFAULT} != base
>-IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
>-.  endif
>-HEIMDAL_HOME=	/usr
>-GSSAPIBASEDIR=	${HEIMDAL_HOME}
>-GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
>-GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
>-_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
>-GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
>-GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
>-GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
>-.if empty(OSREL:N9.3)
>-_FIXUP_KRB5CONFIG=	yes
>-.endif
>-.elif ${_local} == "heimdal"
>+.if ${_local} == "heimdal"
> HEIMDAL_HOME?=	${LOCALBASE}
> GSSAPIBASEDIR=	${HEIMDAL_HOME}
> GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
>diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
>index dec9fbb2fcd1..15c1dfefa810 100644
>--- a/devel/cvs/Makefile
>+++ b/devel/cvs/Makefile
>@@ -13,8 +13,10 @@ LICENSE=	GPLv2+
> 
> CONFLICTS_INSTALL?=	cvs+ipv6-[12]* cvs-devel-[12]*
> 
>-OPTIONS_DEFINE=	IPV6 KERBEROS EXAMPLES
>-OPTIONS_DEFAULT=KERBEROS
>+OPTIONS_DEFINE=	IPV6 EXAMPLES
>+OPTIONS_SINGLE=	KERBEROS
>+OPTIONS_SINGLE_KERBEROS=	HEIMDAL MIT NONE
>+OPTIONS_DEFAULT=HEIMDAL
> .if !make(makesum)
> OPTIONS_EXCLUDE?=IPV6
> .endif
>@@ -22,7 +24,12 @@ OPTIONS_EXCLUDE?=IPV6
> IPV6_CATEGORIES=	ipv6
> IPV6_PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
> IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
>-KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
>+HEIMDAL_USES=		gssapi:heimdal
>+HEIMDAL_CFLAGS=		-I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
>+HEIMDAL_MAKE_ARGS=	KERBEROS_SUPPORT=yes
>+MIT_USES=		gssapi:mit
>+MIT_CFLAGS=		-I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
>+MIT_MAKE_ARGS=		KERBEROS_SUPPORT=yes
> 
> USES=		cpe makeinfo shebangfix tar:xz uidfix
> CPE_VENDOR=	gnu
>diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
>index d2b0c67fbfe3..743f4afa905d 100644
>--- a/devel/cvs/files/patch-cvs__Makefile
>+++ b/devel/cvs/files/patch-cvs__Makefile
>@@ -1,11 +1,18 @@
>---- ../cvs-build/cvs/Makefile.orig	2012-09-06 06:25:43.000000000 +0400
>-+++ ../cvs-build/cvs/Makefile	2014-07-15 12:37:28.000000000 +0400
>-@@ -32,7 +32,7 @@
>+--- ../cvs-build/cvs/Makefile.orig	2012-09-05 19:25:43.000000000 -0700
>++++ ../cvs-build/cvs/Makefile	2018-04-19 22:42:32.057681000 -0700
>+@@ -32,11 +32,12 @@
>  DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
>  LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
>  
> -.if ${MK_KERBEROS_SUPPORT} != "no"
>-+.if defined(KERBEROS_SUPPORT)
>++.if defined(KERBEROS_SUPPORT) && KERBEROS_SUPPORT=heimdal
>  CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
>  LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
>- DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
>+-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
>+-DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
>++.elif defined(KERBEROS_SUPPORT) && KERBEROS_SUPPORT=mit
>++CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
>++LDADD+= -lgssapi_krb5 -lkrb5 -lk5crypto -lcrypt -lcom_err
>+ .endif
>+ 
>+ #
>diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile
>index db27fe926466..023e44787730 100644
>--- a/devel/e2fsprogs-libss/Makefile
>+++ b/devel/e2fsprogs-libss/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Ben Kaduk <kaduk@mit.edu>
> # $FreeBSD$
> 
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMESUFFIX=	-libss
> 
>@@ -11,9 +11,6 @@ COMMENT=	Command-line interface parsing library from e2fsprogs
> LICENSE=	MIT
> LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h
> 
>-CONFLICTS=	heimdal-[0-9]*
>-CONFLICTS+=	krb4-[0-9]*
>-
> OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
> CONFIGURE_ARGS=	--enable-elf-shlibs
> MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs
>diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
>index 0f1bb4ab195e..c1edd42aa66f 100644
>--- a/dns/samba-nsupdate/Makefile
>+++ b/dns/samba-nsupdate/Makefile
>@@ -35,6 +35,8 @@ CONFIGURE_ARGS+=	\
> 			--without-idn \
> 			--with-randomdev=/dev/random
> 
>+CFLAGS+=		-Wno-implicit-function-declaration
>+
> OPTIONS_DEFINE=	IPV6
> 
> SIGCHASE_CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
>@@ -52,15 +54,18 @@ ARCH=		x86_64
> # Enable OpenSSL API
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
> # Try to find appropriate GSSAPI libs
>-.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
>-CONFIGURE_ARGS+=	--with-gssapi="${KRB5_HOME}"
>-.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
>-CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
>-.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
>-CONFIGURE_ARGS+=	--with-gssapi="/usr"
>-.else
>-LIB_DEPENDS+=		libkrb5.so:security/heimdal
>+.if exists(${LOCALBASE}/lib/libgssapi_krb5.so)
> CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
>+USES+=			gssapi:mit:flags
>+.elif exists(${LOCALBASE}/lib/heimdal/libgssapi.so)
>+CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/lib/heimdal \
>+			--includedir=${LOCALBASE}/include/heimdal
>+CFLAGS+=		-L${LOCALBASE}/lib/heimdal \
>+			-I${LOCALBASE}/include/heimdal
>+USES+=			gssapi:heimdal:flags
>+.else
>+USES+=			gssapi:heimdal:flags
>+CONFIGURE_ARGS+=	--with-gssapi="${GSSAPIBASEDIR}"
> .endif
> 
> post-patch:
>diff --git a/dns/samba-nsupdate/files/patch-configure.in b/dns/samba-nsupdate/files/patch-configure.in
>index b0a9e2c84f9a..1645937a4275 100644
>--- a/dns/samba-nsupdate/files/patch-configure.in
>+++ b/dns/samba-nsupdate/files/patch-configure.in
>@@ -1,5 +1,5 @@
>---- configure.in.orig	2013-09-05 05:19:53.000000000 +0000
>-+++ configure.in	2013-10-18 14:30:21.711727438 +0000
>+--- configure.in.orig	2013-09-04 22:19:53.000000000 -0700
>++++ configure.in	2018-06-17 22:35:03.447461000 -0700
> @@ -1013,7 +1013,8 @@
>  		    "-lgssapi" \
>  		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
>@@ -10,12 +10,14 @@
>  		do
>  		    # Note that this does not include $saved_libs, because
>  		    # on FreeBSD machines this configure script has added
>-@@ -1027,7 +1028,7 @@
>+@@ -1027,7 +1028,9 @@
>  			    LIBS="-L$use_gssapi/lib $TRY_LIBS"
>  		    fi
>  		    AC_MSG_CHECKING(linking as $TRY_LIBS)
> -		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
> +		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],
>++				gssapi_linked=yes, gssapi_linked=no)
>++		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();krb5_gss_register_acceptor_identity("krb5");],
>  				gssapi_linked=yes, gssapi_linked=no)
>  		    case $gssapi_linked in
>  		    yes) AC_MSG_RESULT(yes); break ;;
>diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
>index 9c890a113897..c82717e557ce 100644
>--- a/ftp/curl/Makefile
>+++ b/ftp/curl/Makefile
>@@ -19,7 +19,7 @@ OPTIONS_RADIO=	SSL
> OPTIONS_SINGLE=	GSSAPI RESOLV
> OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP
> OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL WOLFSSL
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
> OPTIONS_DEFAULT=	CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP
> CA_BUNDLE_DESC=		Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
>@@ -83,11 +83,6 @@ GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
> 			libnettle.so:security/nettle
> GOPHER_CONFIGURE_ENABLE=gopher
>-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
>-GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
>-GSSAPI_BASE_LIBS=	${GSSAPILIBS}
>-GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
> GSSAPI_HEIMDAL_LDFLAGS=	${GSSAPILDFLAGS}
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 1211f8eebf93..7d93b56f3e5b 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -46,7 +46,7 @@ OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> LZ4_DESC=	LZ4 compression support
> VPOPMAIL_DESC=	vpopmail support
>@@ -61,7 +61,6 @@ SOLR_DESC=	Solr FTS support
> TEXTCAT_DESC=	Libtextcat FTS support
> 
> 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
> 
>@@ -111,7 +110,6 @@ TEXTCAT_LIB_DEPENDS=	libtextcat.so:textproc/libtextcat
> # GSSAPI
> GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
> GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_USES=		gssapi
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_MIT_USES=		gssapi:mit
> 
>diff --git a/mail/dovecot22/Makefile b/mail/dovecot22/Makefile
>index 9fa838c91401..e7f9be9e1591 100644
>--- a/mail/dovecot22/Makefile
>+++ b/mail/dovecot22/Makefile
>@@ -53,7 +53,7 @@ OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> LZ4_DESC=	LZ4 compression support
> VPOPMAIL_DESC=	vpopmail support
>@@ -68,7 +68,6 @@ SOLR_DESC=	Solr FTS support
> TEXTCAT_DESC=	Libtextcat FTS support
> 
> 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
> 
>@@ -115,7 +114,6 @@ TEXTCAT_LIB_DEPENDS=	libtextcat.so:textproc/libtextcat
> # GSSAPI
> GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
> GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_USES=		gssapi
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_MIT_USES=		gssapi:mit
> 
>diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
>index 87fe6d8e8d77..0cc316b399fd 100644
>--- a/mail/fetchmail/Makefile
>+++ b/mail/fetchmail/Makefile
>@@ -35,12 +35,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	X11 NLS NTLM POP2 DOCS
> OPTIONS_SINGLE=	GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+OPTIONS_DEFAULT=	GSSAPI_NONE
> OPTIONS_SUB=	yes
> 
>-GSSAPI_BASE_USES=	gssapi
>-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_MIT_USES=	gssapi:mit
>@@ -67,12 +65,15 @@ PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
> 		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
> 		esrs-design-notes.html
> 
>-#.include <bsd.port.options.mk>
>+.include <bsd.port.options.mk>
> 
> post-patch:
> .if !exists(/usr/lib/libcom_err.so)
> 	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
> .endif
>+.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
>+	@${GREP} -lr gssapi_krb5 ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's/gssapi_krb5/gssapi/g'
>+.endif
> 
> post-build:
> 	@${MAKE_CMD} -C ${WRKSRC} check
>diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile
>index f9a40bbd01dd..641804f3e430 100644
>--- a/net-im/zephyr/Makefile
>+++ b/net-im/zephyr/Makefile
>@@ -26,6 +26,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> CPPFLAGS+=	-I${LOCALBASE}/include
> 
> OPTIONS_DEFINE=		HEIMDAL
>+OPTIONS_DEFAULT=	HEIMDAL
> HEIMDAL_DESC=		Link against libss.so from security/heimdal
> 
> .include <bsd.port.pre.mk>
>@@ -35,18 +36,18 @@ CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no
> .endif
> 
> .if ${PORT_OPTIONS:MHEIMDAL}
>-BROKEN=		bad depobj
>-LIB_DEPENDS+=	libss.so.1:security/heimdal
>+USES+=		gssapi:heimdal
> .if defined(HEIMDAL_HOME)
> KRB5_DIR?=	${HEIMDAL_HOME}
> .else
> KRB5_DIR?=	${LOCALBASE}
> .endif
> .else
>-LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss
>-KRB5_DIR?=	${DESTDIR}/usr
>+BROKEN=		Does not build without Heimdal in base
> .endif
> 
>+LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss
>+
> # try to fix parallel (-jX) builds: add missing inter-source dependencies
> post-patch:
> 	@${REINPLACE_CMD} -e \
>diff --git a/net-mgmt/adcli/Makefile b/net-mgmt/adcli/Makefile
>index a04e13cac701..cf40f3d7f99b 100644
>--- a/net-mgmt/adcli/Makefile
>+++ b/net-mgmt/adcli/Makefile
>@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
> TEST_TARGET=	check
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFAULT=	GSSAPI_MIT
> 
> CONFIGURE_ENV+=	ac_cv_path_KRB5_CONFIG=${KRB5CONFIG}	\
> 		ac_cv_path_XMLTO=${TRUE}
>@@ -32,13 +32,9 @@ CONFIGURE_ARGS=	--sysconfdir=/etc
> CFLAGS+=	-I${LOCALBASE}/include -DLDAP_DEPRECATED=0
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-GSSAPI_BASE_USES=	gssapi
> GSSAPI_MIT_USES=	gssapi:mit,flags
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
> 
>-GSSAPI_BASE_CONFIGURE_ARGS=	--sysconfdir=/etc
>-GSSAPI_BASE_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}"	\
>-				KRB5_LIBS="${GSSAPILIBS}"
> GSSAPI_HEIMDAL_CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc
> GSSAPI_HEIMDAL_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}/heimdal" \
> 				KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS}"
>@@ -46,7 +42,6 @@ GSSAPI_MIT_CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc
> GSSAPI_MIT_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}/gssapi" \
> 				KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS} -lk5crypto"
> # Quiets down warnings inside MIT's headers:
>-GSSAPI_BASE_CFLAGS+=	-DHEIMDAL
> GSSAPI_HEIMDAL_CFLAGS+=	-DHEIMDAL
> GSSAPI_MIT_CFLAGS+=	-DTARGET_OS_MAC=0
> 
>diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
>index 26de0d847500..b8ab769f1c12 100644
>--- a/net/freeradius3/Makefile
>+++ b/net/freeradius3/Makefile
>@@ -51,14 +51,13 @@ OPTIONS_DEFINE=	USER LDAP MYSQL PGSQL UNIXODBC FIREBIRD REDIS \
> 		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
> 		FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
> 		WINBIND
>-OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO
>+OPTIONS_DEFAULT=USER PERL MITKRB_PORT UDPFROMTO
> OPTIONS_SINGLE=	KRB
>-OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT
>+OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL_PORT MITKRB_PORT
> 
> USER_DESC=		Run as user freeradius, group freeradius
> KRB_DESC=		${KERBEROS_DESC}
> NOKRB_DESC=		Without Kerberos support
>-HEIMDAL_DESC=		With Heimdal Kerberos support
> HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
> MITKRB_PORT_DESC=	With MIT Kerberos from ports
> UNIXODBC_DESC=		With unixODBC database support
>@@ -76,10 +75,8 @@ EDIR_IMPLIES=			LDAP
> FREETDS_CONFIGURE_WITH=		rlm_freetds
> FREETDS_CONFIGURE_OFF=		--without-freetds
> FREETDS_LIB_DEPENDS=		libct.so:databases/freetds
>-HEIMDAL_CONFIGURE_ON=		--with-rlm-krb5-dir=/
> HEIMDAL_PORT_LIB_DEPENDS=	libkrb5.so:security/heimdal
> HEIMDAL_PORT_CONFIGURE_ON=	--with-rlm-krb5-dir=${LOCALBASE}
>-HEIMDAL_CONFLICTS_BUILD=	krb5-[0-9].*
> IDN_CONFIGURE_WITH=		rlm_idn
> IDN_LIB_DEPENDS=		libidn.so:dns/libidn
> FIREBIRD_CONFIGURE_WITH=	rlm_sql_firebird
>@@ -262,12 +259,6 @@ post-patch:
> 	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
> 		${WRKSRC}/scripts/all.mk
> 
>-# If we're using Heimdal from base, alter the LIBS variable
>-.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
>-	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
>-	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
>-		${WRKSRC}/src/modules/rlm_krb5/configure
>-.endif
> .if empty(PORT_OPTIONS:MRUBY)
> 	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/
> .endif
>diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
>index 09ca5f2ddc92..63536ee03e40 100644
>--- a/net/nss_ldap/Makefile
>+++ b/net/nss_ldap/Makefile
>@@ -22,8 +22,14 @@ GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_OPENLDAP=	yes
> 
>-OPTIONS_DEFINE=	LCLASS KERBEROS SASL
>-OPTIONS_DEFAULT=LCLASS KERBEROS
>+OPTIONS_DEFINE=	LCLASS SASL
>+OPTIONS_DEFAULT=LCLASS
>+OPTIONS_SINGLE=	KERBEROS
>+OPTIONS_SINGLE_KERBEROS=	MIT HEIMDAL
>+MIT_DESC=	Link against MIT Kerberos
>+MIT_USES=	gssapi:mit
>+HEIMDAL_DESC=	Link against Heimdal in ports Kerberos
>+HEIMDAL_USES=	gssapi:heimdal
> 
> LCLASS_DESC=	Enable login classes via the loginClass attribute
> 
>diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
>index 48bd9795a85b..4f97d0341e41 100644
>--- a/security/cyrus-sasl2-gssapi/Makefile
>+++ b/security/cyrus-sasl2-gssapi/Makefile
>@@ -6,11 +6,8 @@ PORTREVISION=	7
> COMMENT=	SASL GSSAPI authentication plugin
> 
> OPTIONS_SINGLE=			GSSAPI
>-OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-OPTIONS_DEFAULT=		GSSAPI_BASE
>-GSSAPI_BASE_USES=		gssapi:base
>-GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
>-				--with-gss_impl=heimdal
>+OPTIONS_SINGLE_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFAULT=		GSSAPI_MIT
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
> 				--with-gss_impl=heimdal
>diff --git a/security/kstart/Makefile b/security/kstart/Makefile
>index 9042ecc6cec3..d10d65c82f75 100644
>--- a/security/kstart/Makefile
>+++ b/security/kstart/Makefile
>@@ -13,6 +13,16 @@ COMMENT=	Automated Kerberos ticket cache and keytab management utilities
> 
> USE_RC_SUBR=	${PORTNAME}
> HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
>+			--with-krb5-includes="${GSSAPIINCDIR}" \
>+			${GSSAPI_CONFIGURE_ARGS}
>+
>+OPTIONS_RADIO=	KERBEROS
>+KERBEROS_DESC=	Kerberos 5 authentication
>+OPTIONS_RADIO_KERBEROS=	GSSAPI_HEIMDAL GSSAPI_MIT
>+USES_GSSAPI_MIT=	gssapi:mit
>+USES_GSSAPI_HEIMDAL=	gssapi:heimdal
>+
> PLIST_FILES=	bin/k5start bin/krenew \
> 		man/man1/k5start.1.gz man/man1/krenew.1.gz
> 
>diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
>index 0e2d163caab7..38ec14c53bbe 100644
>--- a/security/openconnect/Makefile
>+++ b/security/openconnect/Makefile
>@@ -27,8 +27,14 @@ INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=	PROXY GNUTLS GSSAPI LZ4 P11 STOKEN
>-OPTIONS_DEFAULT=GSSAPI
>+OPTIONS_SINGLE=	GSSAPI
>+OPTIONS_DEFINE=	PROXY GNUTLS LZ4 P11 STOKEN
>+OPTIONS_DEFAULT=GSSAPI_HEIMDAL
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+
>+GSSAPI_NONE_DESC=	Build without GSSAPI support
>+GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
>+GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
> 
> LZ4_DESC=		LZ4-based compression
> LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
>@@ -42,7 +48,12 @@ GNUTLS_DESC=		Use GnuTLS instead of OpenSSL (experimental)
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> GNUTLS_CONFIGURE_WITH=	gnutls
> 
>-GSSAPI_CONFIGURE_WITH=	gssapi
>+GSSAPI_HEIMDAL_USES=            gssapi:heimdal
>+GSSAPI_MIT_USES=                gssapi:mit
>+GSSAPI_NONE_CONFIGURE_ON=       --without-gssapi
>+GSSAPI_HEIMDAL_CONFIGURE_WITH=	gssapi
>+GSSAPI_MIT_CONFIGURE_WITH=	gssapi
>+
> 
> P11_DESC=		PKCS#11 support via libp11
> P11_LIB_DEPENDS=	libp11.so:security/libp11
>diff --git a/security/p5-Authen-Krb5-Simple/Makefile b/security/p5-Authen-Krb5-Simple/Makefile
>index f7071ffb17ed..85bd780f1ae2 100644
>--- a/security/p5-Authen-Krb5-Simple/Makefile
>+++ b/security/p5-Authen-Krb5-Simple/Makefile
>@@ -14,11 +14,9 @@ USE_PERL5=	configure
> CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFAULT=	GSSAPI_MIT
> 
>-GSSAPI_BASE_USES=	gssapi
>-GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
> GSSAPI_MIT_USES=	gssapi:mit
>diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile
>index 2efed6259bac..772c2d57a97e 100644
>--- a/security/p5-Authen-Krb5/Makefile
>+++ b/security/p5-Authen-Krb5/Makefile
>@@ -17,11 +17,9 @@ USE_PERL5=	configure
> CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFAULT=	GSSAPI_MIT
> 
>-GSSAPI_BASE_USES=	gssapi
>-GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ENV=	HAVE_HEIMDAL=1
> GSSAPI_MIT_USES=	gssapi:mit
>diff --git a/security/p5-Heimdal-Kadm5/Makefile b/security/p5-Heimdal-Kadm5/Makefile
>index efa1a552f71a..6d0587772c1d 100644
>--- a/security/p5-Heimdal-Kadm5/Makefile
>+++ b/security/p5-Heimdal-Kadm5/Makefile
>@@ -10,17 +10,10 @@ PKGNAMEPREFIX=	p5-
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Perl extension for Heimdal administrative client library
> 
>-USES=		perl5
>+USES=		gssapi:heimdal perl5
> USE_PERL5=	configure
> CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
> 
>-OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>-
>-GSSAPI_BASE_USES=	gssapi
>-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
>-
> post-build:
> 	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so
> 
>diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
>index 03309b05efb1..662f720280b2 100644
>--- a/security/pam_krb5-rh/Makefile
>+++ b/security/pam_krb5-rh/Makefile
>@@ -16,6 +16,14 @@ LICENSE_COMB=	dual
> 
> CONFLICTS=	pam_krb5-4.*
> 
>+OPTIONS_SINGLE=	LINK
>+OPTIONS_SINGLE_LINK=	MIT HEIMDAL
>+OPTIONS_DEFAULT=	MIT
>+MIT_DESC=	Link against MIT Kerberos
>+MIT_USES=	gssapi:mit
>+HEIMDAL_DESC=	Link against Heimdal in ports Kerberos
>+HEIMDAL_USES=	gssapi:heimdal
>+
> USES=		iconv libtool ssl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--without-afs --without-keyutils --without-krb4
>diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
>index a708be305eec..da3ff53ac440 100644
>--- a/security/pam_krb5/Makefile
>+++ b/security/pam_krb5/Makefile
>@@ -20,14 +20,12 @@ USES=			gmake libtool perl5
> USE_PERL5=		build
> 
> OPTIONS_SINGLE=		LINK
>-OPTIONS_SINGLE_LINK=	MIT HEIMDAL_BASE HEIMDAL_PORT
>+OPTIONS_SINGLE_LINK=	MIT HEIMDAL_PORT
> OPTIONS_DEFAULT=	MIT
> MIT_DESC=		Link against MIT Kerberos
> MIT_USES=		gssapi:mit
> HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
> HEIMDAL_PORT_USES=	gssapi:heimdal
>-HEIMDAL_BASE_DESC=	Link against Heimdal in base Kerberos
>-HEIMDAL_BASE_USES=	gssapi:base
> 
> CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
> 			--with-krb5-include="${GSSAPIINCDIR}" \
>diff --git a/security/putty/Makefile b/security/putty/Makefile
>index 0fedc2788c81..b992613714d5 100644
>--- a/security/putty/Makefile
>+++ b/security/putty/Makefile
>@@ -25,9 +25,9 @@ PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man
> 
> OPTIONS_RADIO=		TOOLKIT
> OPTIONS_RADIO_TOOLKIT=	GTK2 GTK3
>-OPTIONS_DEFAULT=GSSAPI_BASE GTK3
>+OPTIONS_DEFAULT=GSSAPI_MIT GTK3
> OPTIONS_SINGLE=	GSSAPI_SELECT
>-OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
>+OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_HEIMDAL \
> 				GSSAPI_MIT
> 
> CONFLICTS_INSTALL?=	pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*
>@@ -61,11 +61,7 @@ DESKTOP_ENTRIES="PuTTY" \
> MAKE_ARGS+=	GTK_CONFIG=:
> .endif
> 
>-.if ${PORT_OPTIONS:MGSSAPI_BASE}
>-_COMPAT=		-DSTATIC_GSSAPI
>-USES+=		gssapi:base,flags
>-MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
>-.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
>+.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
> _COMPAT=		-DSTATIC_GSSAPI
> USES+=		gssapi:heimdal,flags
> MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
>diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile
>index eab2e42c1873..8742d92d8191 100644
>--- a/security/py-kerberos/Makefile
>+++ b/security/py-kerberos/Makefile
>@@ -13,24 +13,21 @@ COMMENT=	Kerberos bindings for python
> 
> LICENSE=	APACHE20
> 
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>+OPTIONS_DEFAULT=	GSSAPI_HEIMDAL
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
> 
>-GSSAPI_BASE_USES=		gssapi
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_MIT_USES=		gssapi:mit
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
> 
>-GSSAPI_BASE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
>+GSSAPI_HEIMDAL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
> 				${PATCHDIR}/extra-patch-src_kerberosgss.c \
> 				${PATCHDIR}/extra-patch-src_kerberosgss.h \
> 				${PATCHDIR}/extra-patch-src_kerberospw.h
> 
>-GSSAPI_HEIMDAL_EXTRA_PATCHES=	${GSSAPI_BASE_EXTRA_PATCHES}
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|getoutput("krb5-config|getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
> 
>diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
>index d4a8916edf98..a8dd6eff448a 100644
>--- a/sysutils/msktutil/Makefile
>+++ b/sysutils/msktutil/Makefile
>@@ -22,15 +22,13 @@ WANT_OPENLDAP_SASL=	yes
> CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
> 
> OPTIONS_SINGLE=	GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
> 
>-OPTIONS_DEFAULT=GSSAPI_BASE
>+OPTIONS_DEFAULT=GSSAPI_MIT
> 
>-GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
> GSSAPI_MIT_USES=	gssapi:mit
> 
>-GSSAPI_BASE_CONFIGURE_ON=	--with-krb5=heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-krb5=heimdal
> GSSAPI_MIT_CONFIGURE_ON=	--with-krb5=mit
> CONFIGURE_ARGS+=		--with-krb5-config=${KRB5CONFIG}
>diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
>index 41c21989cfe4..92ba68606e8c 100644
>--- a/sysutils/slurm-wlm/Makefile
>+++ b/sysutils/slurm-wlm/Makefile
>@@ -22,7 +22,8 @@ LIB_DEPENDS=	libjson-c.so:devel/json-c \
> USERS=		slurm
> GROUPS=		${USERS}
> 
>-USES=		gmake libtool pkgconfig python:build readline:port shebangfix \
>+USES=		gmake gssapi:heimdal,flags \
>+		libtool pkgconfig python:build readline:port shebangfix \
> 		ssl tar:bz2
> USE_LDCONFIG=	yes
> USE_PERL5=	configure
>@@ -78,8 +79,10 @@ RRD_CONFIGURE_WITH=	rrdtool
> 
> LINUX_USES=		linux
> 
>-CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
>+CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include \
>+		-I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
>+LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm \
>+		-L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
> 
> # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
> # #include <pty.h> with appropriate headers will therefore not work, so instead
>diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
>index 34d208c8ee70..ff057ac9b0f6 100644
>--- a/www/mod_auth_kerb2/Makefile
>+++ b/www/mod_auth_kerb2/Makefile
>@@ -24,13 +24,11 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_DEFAULT=	GSSAPI_BASE
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-GSSAPI_BASE_DESC=	Use Base version of GSS API
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
> GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
> GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
> GSSAPI_DESC=		Use Base version of GSS API
>-GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
> GSSAPI_MIT_USES=	gssapi:mit
> 
>diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
>index 6a4b3180bfb6..2a002738d7b3 100644
>--- a/www/nginx-devel/Makefile
>+++ b/www/nginx-devel/Makefile
>@@ -94,8 +94,7 @@ OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
> 		THREADS WWW
> 
> OPTIONS_RADIO+=		GSSAPI
>-OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-GSSAPI_BASE_USES=	gssapi
>+OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
> GSSAPI_MIT_USES=	gssapi:mit
> 
>@@ -111,7 +110,6 @@ ${opt}_IMPLIES=	MAIL
> ${opt}_IMPLIES=	HTTP
> .endfor
> 
>-GSSAPI_BASE_IMPLIES=	HTTP_AUTH_KRB5
> GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
> GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
> 
>@@ -262,6 +260,9 @@ post-patch-GRIDFS-on:
> post-patch-HTTP_AUTH_KRB5-on:
> 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
> 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
>+
> 
> post-patch-HTTP_TARANTOOL-on:
> 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
>diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>index 9c55d455ebed..18d760b81a5d 100644
>--- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>+++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>@@ -7,14 +7,15 @@
> -if uname -o | grep -q FreeBSD; then
> -    ngx_feature_libs="$ngx_feature_libs -lgssapi"
> -fi
>-+ngx_feature_libs="%%GSSAPILIBS%%"
>++ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
> +ngx_module_incs="%%GSSAPIINCDIR%%"
>  
>  if test -n "$ngx_module_link"; then
>      ngx_module_type=HTTP
>-@@ -16,3 +13,5 @@ else
>+@@ -16,3 +13,6 @@ else
>      NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
>      CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
>  fi
> +
>-+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS"
>++LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
>++CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"
>diff --git a/www/nginx/Makefile b/www/nginx/Makefile
>index 0e0d5238883e..8593316416b1 100644
>--- a/www/nginx/Makefile
>+++ b/www/nginx/Makefile
>@@ -93,8 +93,7 @@ OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
> 		THREADS WWW
> 
> OPTIONS_RADIO+=		GSSAPI
>-OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-GSSAPI_BASE_USES=	gssapi
>+OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
> GSSAPI_MIT_USES=	gssapi:mit
> 
>@@ -110,7 +109,6 @@ ${opt}_IMPLIES=	MAIL
> ${opt}_IMPLIES=	HTTP
> .endfor
> 
>-GSSAPI_BASE_IMPLIES=	HTTP_AUTH_KRB5
> GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
> GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
> 
>@@ -260,6 +258,9 @@ post-patch-GRIDFS-on:
> 
> post-patch-HTTP_AUTH_KRB5-on:
> 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
> 
> post-patch-HTTP_TARANTOOL-on:
> 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
>diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>index 37543286589a..18d760b81a5d 100644
>--- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>+++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>@@ -7,14 +7,15 @@
> -if uname -o | grep -q FreeBSD; then
> -    ngx_feature_libs="$ngx_feature_libs -lgssapi"
> -fi
>-+ngx_feature_libs="%%GSSAPILIBS%%"
>-+ngx_module_incs="%%GSSAPINCDIR%%"
>++ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
>++ngx_module_incs="%%GSSAPIINCDIR%%"
>  
>  if test -n "$ngx_module_link"; then
>      ngx_module_type=HTTP
>-@@ -16,3 +13,5 @@ else
>+@@ -16,3 +13,6 @@ else
>      NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
>      CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
>  fi
> +
>-+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS"
>++LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
>++CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"
>diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
>index 209cf258f232..f84759e8a81d 100644
>--- a/www/squid-devel/Makefile
>+++ b/www/squid-devel/Makefile
>@@ -54,10 +54,10 @@ OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
>-		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
>+		FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
> 		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
> 
>@@ -137,10 +137,6 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-heimdal-krb5 \
> 				--without-mit-krb5 \
> 				--without-gss
> 
>-GSSAPI_BASE_USES=		gssapi
>-GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
>-
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""
>diff --git a/www/squid/Makefile b/www/squid/Makefile
>index aa2ef76336a1..b17019669289 100644
>--- a/www/squid/Makefile
>+++ b/www/squid/Makefile
>@@ -55,10 +55,10 @@ OPTIONS_DEFINE=	ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
> 
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
>-		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
>+		FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
> 		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
> 
>@@ -135,10 +135,6 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-heimdal-krb5 \
> 				--without-mit-krb5 \
> 				--without-gss
> 
>-GSSAPI_BASE_USES=		gssapi
>-GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
>-
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""

Actions: View | Diff

Attachments on bug 222745: 186891 | 192316 | 194828 | 194829 | 197116 | 197117 | 197256