Index: head/textproc/zorba/Makefile
===================================================================
--- head/textproc/zorba/Makefile	(revision 362794)
+++ head/textproc/zorba/Makefile	(revision 362795)
@@ -1,121 +1,122 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	zorba
 PORTVERSION=	2.7.0
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A general purpose C++ XQuery processor
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
    		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
 		libicudata.so:${PORTSDIR}/devel/icu \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libtidy.so:${PORTSDIR}/www/tidy-lib \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS
 
 # Both install include/xqc.h
 CONFLICTS=	xqilla-[0-9]*
 
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 USES=		cmake:outsource iconv compiler:c++11-lib
 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" \
+    		-DLOCALBASE:STRING=${LOCALBASE} \
     		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB+=	FULLVERSION=${PORTVERSION} \
 		MIDVERSION=${PORTVERSION:R} \
 		MINVERSION=${PORTVERSION:R:R}
 
 .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 "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 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 "
 .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}
 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 "
 .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:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	   ${WRKSRC}/CMakeLists.txt ${WRKSRC}/cmake_modules/FindPHP5.cmake
 .if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '531s|^|#|' ${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}
 
 test:	build
 	cd ${BUILD_WRKSRC} && ${MAKE} test
 
 .include <bsd.port.mk>
Index: head/textproc/zorba/files/patch-CMakeLists.txt
===================================================================
--- head/textproc/zorba/files/patch-CMakeLists.txt	(revision 362794)
+++ head/textproc/zorba/files/patch-CMakeLists.txt	(revision 362795)
@@ -1,46 +1,46 @@
 --- CMakeLists.txt.orig	2012-06-13 06:56:48.000000000 +0200
 +++ CMakeLists.txt	2012-06-22 10:45:57.000000000 +0200
 @@ -39,6 +39,10 @@
    SET(LINUX "${CMAKE_SYSTEM}")
  ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
  
 +IF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
 +    SET(FREEBSD "${CMAKE_SYSTEM}")
 +ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
 +
  # custom ctest options
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake)
  
 @@ -317,14 +321,21 @@
  ENDIF(WIN32)
  
  #
 +# execinfo
 +#
 +IF(FREEBSD)
-+   SET(requiredlibs ${requiredlibs} "/usr/local/lib/libexecinfo.so")
++   SET(requiredlibs ${requiredlibs} "${LOCALBASE}/lib/libexecinfo.so")
 +ENDIF(FREEBSD)
 +
 +#
  # SWIG
  #
  IF (NOT ZORBA_SUPPRESS_SWIG)
    FIND_PACKAGE (SWIG)
  
 -  COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "1.3.40" result)
 +  COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "2.0.7" result)
    IF(result LESS 0)
 -    MESSAGE(WARNING "You need at least SWIG version 1.3.40")
 +    MESSAGE(WARNING "You need at least SWIG version 2.0.7")
    ENDIF(result LESS 0)
  
  
 @@ -504,7 +515,7 @@
    SET(ZORBA_CMAKE_DIR "cmake" CACHE STRING
      "Relative path to CMake files in Zorba installation")
  ELSE (WIN32)
 -  SET(ZORBA_CMAKE_DIR "share/cmake/zorba-${ZORBA_VERSION}" CACHE STRING
 +  SET(ZORBA_CMAKE_DIR "share/cmake/Modules/zorba-${ZORBA_VERSION}" CACHE STRING
      "Relative path to CMake files in Zorba installation")
  ENDIF (WIN32)