From owner-svn-ports-all@FreeBSD.ORG  Sat Nov  2 10:11:32 2013
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 ESMTP id F26B6B61;
 Sat,  2 Nov 2013 10:11:31 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E00A32C6B;
 Sat,  2 Nov 2013 10:11:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2ABVoO021643;
 Sat, 2 Nov 2013 10:11:31 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2ABV7A021642;
 Sat, 2 Nov 2013 10:11:31 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311021011.rA2ABV7A021642@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 2 Nov 2013 10:11:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332465 - head/ftp/curl
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.14
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: Sat, 02 Nov 2013 10:11:32 -0000

Author: sunpoet
Date: Sat Nov  2 10:11:31 2013
New Revision: 332465
URL: http://svnweb.freebsd.org/changeset/ports/332465

Log:
  - Fix build when both GSSAPI and SPNEGO options are on
  
  When SPNEGO option is on, LOCALBASE/include/fbopenssl was added to the search
  path of include files. It causes build failure when "#include <gssapi.h>" wants
  /usr/include/gssapi/gssapi.h.

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Sat Nov  2 09:50:04 2013	(r332464)
+++ head/ftp/curl/Makefile	Sat Nov  2 10:11:31 2013	(r332465)
@@ -68,9 +68,8 @@ GNUTLS_CONFIGURE_OFF=	--without-gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GSSAPI_CONFIGURE_OFF=	--without-gssapi
-GSSAPI_CONFIGURE_ON=	--with-gssapi \
-			--with-gssapi-includes=${INCLUDEDIR} \
-			--with-gssapi-libs=${LIBDIR}
+GSSAPI_CONFIGURE_ON=	--with-gssapi=/usr
+GSSAPI_CPPFLAGS=	-I${INCLUDEDIR}/gssapi
 IDN_CONFIGURE_OFF=	--without-libidn
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn