From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 17 18:44:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94DAB6E6;
 Tue, 17 Jun 2014 18:44:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 686CA2FC9;
 Tue, 17 Jun 2014 18:44:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HIi5wK033252;
 Tue, 17 Jun 2014 18:44:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HIi58k033249;
 Tue, 17 Jun 2014 18:44:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201406171844.s5HIi58k033249@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 17 Jun 2014 18:44:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358159 - in head/www/mod_auth_kerb2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jun 2014 18:44:05 -0000

Author: jkim
Date: Tue Jun 17 18:44:04 2014
New Revision: 358159
URL: http://svnweb.freebsd.org/changeset/ports/358159
QAT: https://qat.redports.org/buildarchive/r358159/

Log:
  Conditionally add "-lgssapi_krb5" to KRB5_LDFLAGS.  This fixes build with
  security/heimdal.
  
  PR:		ports/124375
  Approved by:	apache (maintainer, timeout 6+ years)

Modified:
  head/www/mod_auth_kerb2/Makefile
  head/www/mod_auth_kerb2/files/patch-Makefile.in

Modified: head/www/mod_auth_kerb2/Makefile
==============================================================================
--- head/www/mod_auth_kerb2/Makefile	Tue Jun 17 18:39:34 2014	(r358158)
+++ head/www/mod_auth_kerb2/Makefile	Tue Jun 17 18:44:04 2014	(r358159)
@@ -39,6 +39,10 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE
 post-patch:
 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
 		${WRKSRC}/Makefile.in
+.if !defined(HEIMDAL_HOME)
+	${REINPLACE_CMD} -e 's|@KRB5_LDFLAGS@|@KRB5_LDFLAGS@ -lgssapi_krb5|' \
+		${WRKSRC}/Makefile.in
+.endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}

Modified: head/www/mod_auth_kerb2/files/patch-Makefile.in
==============================================================================
--- head/www/mod_auth_kerb2/files/patch-Makefile.in	Tue Jun 17 18:39:34 2014	(r358158)
+++ head/www/mod_auth_kerb2/files/patch-Makefile.in	Tue Jun 17 18:44:04 2014	(r358159)
@@ -1,14 +1,11 @@
---- ./Makefile.in.orig	2008-12-02 15:07:10.000000000 +0100
-+++ ./Makefile.in	2014-03-09 17:54:19.000000000 +0100
-@@ -1,6 +1,7 @@
+--- Makefile.in.orig	2008-12-02 09:07:10.000000000 -0500
++++ Makefile.in	2014-06-17 14:09:26.000000000 -0400
+@@ -1,4 +1,5 @@
  APXS = @APXS@
-+APXS_STAGE=	@APXS_STAGE@
++APXS_STAGE = @APXS_STAGE@
  KRB5_CPPFLAGS = @KRB5_CPPFLAGS@
--KRB5_LDFLAGS = @KRB5_LDFLAGS@
-+KRB5_LDFLAGS = @KRB5_LDFLAGS@ -lgssapi_krb5
+ KRB5_LDFLAGS = @KRB5_LDFLAGS@
  KRB4_CPPFLAGS = @KRB4_CPPFLAGS@
- KRB4_LDFLAGS = @KRB4_LDFLAGS@
- LIB_resolv = @LIB_resolv@
 @@ -16,7 +17,7 @@
  	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c" "src/mod_auth_kerb.c"