From owner-svn-ports-head@freebsd.org  Tue Jul 21 23:54:38 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51B439A7101;
 Tue, 21 Jul 2015 23:54:38 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42D4110BF;
 Tue, 21 Jul 2015 23:54:38 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LNsc1l023564;
 Tue, 21 Jul 2015 23:54:38 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LNscpi023563;
 Tue, 21 Jul 2015 23:54:38 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201507212354.t6LNscpi023563@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 21 Jul 2015 23:54:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392649 - head/www/mod_auth_kerb2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2015 23:54:38 -0000

Author: jkim
Date: Tue Jul 21 23:54:37 2015
New Revision: 392649
URL: https://svnweb.freebsd.org/changeset/ports/392649

Log:
  - Let the user select at least one of the available GSSAPI options.
  - Reduce the scope of gssapi_krb5 hack.  See PR156245 for more information.

Modified:
  head/www/mod_auth_kerb2/Makefile

Modified: head/www/mod_auth_kerb2/Makefile
==============================================================================
--- head/www/mod_auth_kerb2/Makefile	Tue Jul 21 22:24:10 2015	(r392648)
+++ head/www/mod_auth_kerb2/Makefile	Tue Jul 21 23:54:37 2015	(r392649)
@@ -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