From owner-svn-ports-branches@FreeBSD.ORG  Thu Apr  3 15:49:44 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61D27B10;
 Thu,  3 Apr 2014 15:49:44 +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 4E6BACD6;
 Thu,  3 Apr 2014 15:49:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33FniSx052765;
 Thu, 3 Apr 2014 15:49:44 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33Fnitt052764;
 Thu, 3 Apr 2014 15:49:44 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201404031549.s33Fnitt052764@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 3 Apr 2014 15:49:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r350025 - branches/2014Q2/ftp/curl
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 15:49:44 -0000

Author: sunpoet
Date: Thu Apr  3 15:49:43 2014
New Revision: 350025
URL: http://svnweb.freebsd.org/changeset/ports/350025
QAT: https://qat.redports.org/buildarchive/r350025/

Log:
  MFH: r349946
  
  - Fix build failure when SPNEGO option is on
  
  Approved by:	portmgr (antoine)

Modified:
  branches/2014Q2/ftp/curl/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/ftp/curl/Makefile
==============================================================================
--- branches/2014Q2/ftp/curl/Makefile	Thu Apr  3 15:28:56 2014	(r350024)
+++ branches/2014Q2/ftp/curl/Makefile	Thu Apr  3 15:49:43 2014	(r350025)
@@ -76,7 +76,7 @@ GNUTLS_CONFIGURE_OFF=	--without-gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=/usr
-GSSAPI_BASE_CPPFLAGS=	-I${INCLUDEDIR}/gssapi
+GSSAPI_BASE_CPPFLAGS=	-I${INCLUDEDIR}
 HEIMDAL_PORT_CONFIGURE_ON=	--with-gssapi=${HEIMDAL_HOME}
 HEIMDAL_PORT_CPPFLAGS=	-I${HEIMDAL_HOME}/include
 HEIMDAL_PORT_LDFLAGS=	-L${HEIMDAL_HOME}/lib
@@ -159,6 +159,7 @@ CONFIGURE_ARGS+=--without-gssapi
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
 
 post-install:
 .if !defined(BUILDING_HIPHOP)