- Let the user select at least one of the available GSSAPI options.

- Reduce the scope of gssapi_krb5 hack.  See PR156245 for more information.

www/mod_auth_kerb2/Makefile

@@ -24,9 +24,9 @@ USE_APACHE=	22+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
 
-OPTIONS_RADIO=		GSSAPI
+OPTIONS_SINGLE=		GSSAPI
 OPTIONS_DEFAULT=	GSSAPI_BASE
-OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_BASE_DESC=	Use Base version of GSS API
 GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
 GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
@@ -35,8 +35,10 @@ GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${OSVERSION} < 903504
 post-patch:
-.if !defined(HEIMDAL_HOME)
 	${REINPLACE_CMD} -e 's|@KRB5_LDFLAGS@|@KRB5_LDFLAGS@ -lgssapi_krb5|' \
 		${WRKSRC}/Makefile.in
 .endif