Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Aug 2014 13:29:34 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364359 - in head/textproc/zorba: . files
Message-ID:  <53e4d0be.2e75.50c0ebc6@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)
 +
 +#



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e4d0be.2e75.50c0ebc6>