Hide the building and installation of libgssapi behind the

WITHOUT_KERBEROS knob. While GSS can be used for other things
some third party software (most notably ports/x11/kdelibs3)
takes the presence of libgssapi as an indication that kerberos
is available, and attempts to link with the kerberos libs. If
they are not available, the build will fail.

Because you might want to use GSS but not kerberos, add a knob
to re-enable it if WITHOUT_KERBEROS is present.

Document the new knob, and the new behavior of WITHOUT_KERBEROS.

Not objected and/or generally agreed to by:	freebsd-arch

Problem discussed/analyzed in:
PR:	ports/116484

lib/Makefile

@@ -31,7 +31,7 @@ SUBDIR=	${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \
 	libbegemot ${_libbluetooth} libbsnmp libbz2 \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libftpio libgeom ${_libgpib} \
-	libgssapi libipsec \
+	${_libgssapi} libipsec \
 	${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpcap \
 	libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -62,6 +62,14 @@ _libbluetooth=	libbluetooth
 _libsdp=	libsdp
 .endif
 
+.if ${MK_KERBEROS} != "no"
+_libgssapi=	libgssapi
+.else
+.if ${MK_GSSAPI} == "yes"
+_libgssapi=	libgssapi
+.endif
+.endif
+
 .if ${MK_IPX} != "no"
 _libipx=	libipx
 .endif

share/mk/bsd.own.mk

@@ -381,6 +381,7 @@ MK_${var}:=	yes
 #
 .for var in \
     BIND_LIBS \
+    GSSAPI \
     HESIOD \
     IDEA
 .if defined(WITH_${var}) && defined(WITHOUT_${var})

tools/build/options/WITHOUT_KERBEROS

@@ -1,2 +1,7 @@
 .\" $FreeBSD$
 Set this if you do not want to build Kerberos 5 (KTH Heimdal).
+This option implies
+.Va WITHOUT_GSSAPI .
+Set
+.Va WITH_GSSAPI
+to override.

tools/build/options/WITH_GSSAPI

@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build libgssapi when
+.Va WITHOUT_KERBEROS
+is set.