From owner-svn-ports-head@FreeBSD.ORG  Sun Jan  6 16:56:56 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7B535394;
 Sun,  6 Jan 2013 16:56:56 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6C0E294C;
 Sun,  6 Jan 2013 16:56:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06GuuLO080260;
 Sun, 6 Jan 2013 16:56:56 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06GuuHj080258;
 Sun, 6 Jan 2013 16:56:56 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201301061656.r06GuuHj080258@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sun, 6 Jan 2013 16:56:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310002 - head/security/cyrus-sasl2-saslauthd
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.14
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: Sun, 06 Jan 2013 16:56:56 -0000

Author: ume
Date: Sun Jan  6 16:56:55 2013
New Revision: 310002
URL: http://svnweb.freebsd.org/changeset/ports/310002

Log:
  If security/krb5 is installed and OPENLDAP option is enabled, it
  failed to build unless KRB5_HOME is set properly.  Now, only when
  KRB5_HOME is set properly, it build with security/krb5.
  
  Spotted by:	David Gessel <gessel__at__blackrosetech.com>

Modified:
  head/security/cyrus-sasl2-saslauthd/Makefile

Modified: head/security/cyrus-sasl2-saslauthd/Makefile
==============================================================================
--- head/security/cyrus-sasl2-saslauthd/Makefile	Sun Jan  6 16:50:14 2013	(r310001)
+++ head/security/cyrus-sasl2-saslauthd/Makefile	Sun Jan  6 16:56:55 2013	(r310002)
@@ -27,6 +27,10 @@ DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
 MAKE_JOBS_SAFE=	yes
 
+# This doesn't work due to absence of .al support in our libtool
+#USE_AUTOTOOLS=	libtool
+#LIBTOOLFILES=	${CONFIGURE_SCRIPT} saslauthd/configure
+
 MAN8=		saslauthd.8
 
 USE_RC_SUBR=	saslauthd
@@ -44,6 +48,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
 		--with-rc4=openssl \
 		--with-saslauthd=${SASLAUTHD_RUNPATH} \
 		--disable-krb4
+CONFIGURE_ENV+=	andrew_cv_runpath_switch=none
 
 OPTIONS_DEFINE=		BDB OPENLDAP HTTPFORM
 OPENLDAP_DESC=		Use OpenLDAP
@@ -76,11 +81,12 @@ CONFIGURE_ARGS+=--enable-httpform
 
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
-LDFLAGS+=	"-R${KRB5_HOME}/lib"
+LDFLAGS+=	-R${KRB5_HOME}/lib
 .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal
 .elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=--enable-gssapi
+CONFIGURE_ARGS+=--enable-gssapi=/usr
+CFLAGS+=	-nostdinc -I/usr/include
 .else
 CONFIGURE_ARGS+=--disable-gssapi
 .endif