From owner-svn-ports-head@FreeBSD.ORG  Fri Aug  8 13:29:34 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C316C289
 for <svn-ports-head@freebsd.org>; Fri,  8 Aug 2014 13:29:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 98F03229D
 for <svn-ports-head@freebsd.org>; Fri,  8 Aug 2014 13:29:34 +0000 (UTC)
Received: from gahr (uid 1155) (envelope-from gahr@FreeBSD.org) id 2e75
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Fri, 08 Aug 2014 13:29:34 +0000
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 8 Aug 2014 13:29:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364359 - in head/textproc/zorba: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e4d0be.2e75.50c0ebc6@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
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: Fri, 08 Aug 2014 13:29:34 -0000

Author: gahr
Date: Fri Aug  8 13:29:33 2014
New Revision: 364359
URL: http://svnweb.freebsd.org/changeset/ports/364359
QAT: https://qat.redports.org/buildarchive/r364359/

Log:
  - USES=execinfo

Modified:
  head/textproc/zorba/Makefile
  head/textproc/zorba/files/patch-CMakeLists.txt

Modified: head/textproc/zorba/Makefile
==============================================================================
--- head/textproc/zorba/Makefile	Fri Aug  8 13:27:33 2014	(r364358)
+++ head/textproc/zorba/Makefile	Fri Aug  8 13:29:33 2014	(r364359)
@@ -13,8 +13,7 @@ COMMENT=	General purpose C++ XQuery proc
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-   		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
+LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
 		libicudata.so:${PORTSDIR}/devel/icu \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libtidy.so:${PORTSDIR}/www/tidy-lib \
@@ -31,7 +30,7 @@ CONFLICTS=	xqilla-[0-9]*
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
-USES=		cmake:outsource iconv compiler:c++11-lib
+USES=		cmake:outsource compiler:c++11-lib execinfo iconv
 CXXFLAGS+=	-I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
@@ -104,8 +103,15 @@ BUILD_DEPENDS+=	doxygen:${PORTSDIR}/deve
 .endif
 
 post-patch:
+.if exists(/usr/lib/libexecinfo.so)
+	${REINPLACE_CMD} -e 's|%%LIBEXECINFO%%|/usr/lib/libexecinfo.so|' \
+	    ${WRKSRC}/CMakeLists.txt
+.else
+	${REINPLACE_CMD} -e 's|%%LIBEXECINFO%%|${LOCALBASE}/lib/libexecinfo.so|' \
+	    ${WRKSRC}/CMakeLists.txt
+.endif
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	   ${WRKSRC}/CMakeLists.txt ${WRKSRC}/cmake_modules/FindPHP5.cmake
+	   ${WRKSRC}/cmake_modules/FindPHP5.cmake
 .if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '531s|^|#|' ${WRKSRC}/CMakeLists.txt
 .endif

Modified: head/textproc/zorba/files/patch-CMakeLists.txt
==============================================================================
--- head/textproc/zorba/files/patch-CMakeLists.txt	Fri Aug  8 13:27:33 2014	(r364358)
+++ head/textproc/zorba/files/patch-CMakeLists.txt	Fri Aug  8 13:29:33 2014	(r364359)
@@ -18,7 +18,7 @@
 +# execinfo
 +#
 +IF(FREEBSD)
-+   SET(requiredlibs ${requiredlibs} "${LOCALBASE}/lib/libexecinfo.so")
++   SET(requiredlibs ${requiredlibs} "%%LIBEXECINFO%%")
 +ENDIF(FREEBSD)
 +
 +#