1 files changed, 29 insertions, 44 deletions

diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 4dd6ef69e7ec..06a6dd55aac1 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zorba
 PORTVERSION=	2.7.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT=	General purpose C++ XQuery processor
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
+LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 		libicudata.so:${PORTSDIR}/devel/icu \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libtidy.so:${PORTSDIR}/www/tidy-lib \
@@ -23,6 +23,17 @@ RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS
+OPTIONS_SUB=	yes
+
+DOCS_BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PHP_CMAKE_ON=		-DWITH_PHP5:BOOL=true
+PHP_CMAKE_OFF=		-DWITH_PHP5:BOOL=false
+PYTHON_CMAKE_ON=	-DWITH_PYTHON:BOOL=true
+PYTHON_CMAKE_OFF=	-DWITH_PYTHON:BOOL=false
+RUBY_CMAKE_ON=		-DWITH_RUBY:BOOL=true
+RUBY_CMAKE_OFF=		-DWITH_RUBY:BOOL=false
+JAVA_CMAKE_ON=		-DWITH_JAVA:BOOL=true
+JAVA_CMAKE_OFF=		-DWITH_JAVA:BOOL=false
 
 # Both install include/xqc.h
 CONFLICTS=	xqilla-[0-9]*
@@ -43,42 +54,32 @@ PLIST_SUB+=	FULLVERSION=${PORTVERSION} \
 		MIDVERSION=${PORTVERSION:R} \
 		MINVERSION=${PORTVERSION:R:R}
 
+.if exists(/usr/lib/libexecinfo.so)
+LOC_EXECINFO=	/usr/lib/libexecinfo.so
+.else
+LOC_EXECINFO=	${LOCALBASE}/lib/libexecinfo.so
+.endif
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP=	tokenizer
 USE_PHP_BUILD=	yes
 WITH_SWIG=	yes
-CMAKE_ARGS+=	-DWITH_PHP5:BOOL=true \
-   		-DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
-PLIST_SUB+=	WITH_PHP="" \
-		PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}"
-.else
-CMAKE_ARGS+=	-DWITH_PHP5:BOOL=false
-PLIST_SUB+=	WITH_PHP="@comment "
+CMAKE_ARGS+=	-DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
+PLIST_SUB+=	PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}"
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 WITH_SWIG=	yes
-CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=true \
-		-DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
-PLIST_SUB+=	WITH_PYTHON="" \
-		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
-
-.else
-CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=false
-PLIST_SUB+=	WITH_PYTHON="@comment "
+CMAKE_ARGS+=	-DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
+PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
 .endif
 
 .if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
 WITH_SWIG=	yes
-CMAKE_ARGS+=	-DWITH_RUBY:BOOL=true
-PLIST_SUB+=	WITH_RUBY=""
-.else
-CMAKE_ARGS+=	-DWITH_RUBY:BOOL=false
-PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
@@ -86,39 +87,23 @@ USE_JAVA=	yes
 CONFIGURE_ENV+=	JAVA_HOME=${JAVA_HOME}
 CATEGORIES+=	java
 WITH_SWIG=	yes
-CMAKE_ARGS+=	-DWITH_JAVA:BOOL=true \
-   		-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
-PLIST_SUB+=	WITH_JAVA=""
-.else
-CMAKE_ARGS+=	-DWITH_JAVA:BOOL=false
-PLIST_SUB+=	WITH_JAVA="@comment "
+CMAKE_ARGS+=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
 .endif
 
 .if defined(WITH_SWIG)
 BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.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|%%LIBEXECINFO%%|${LOC_EXECINFO}|' \
+		-e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	   ${WRKSRC}/cmake_modules/FindPHP5.cmake
+		${WRKSRC}/cmake_modules/FindPHP5.cmake
 .if !${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e '531s|^|#|' ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
-#pre-build:
-#	${FIND} ${WRKSRC} -name "*.orig" -delete
-
 post-install:
 	${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}