svn commit: r359465 - in head/textproc/zorba: . files
Pietro Cerutti
gahr at FreeBSD.org
Fri Jun 27 08:08:01 UTC 2014
Author: gahr
Date: Fri Jun 27 08:07:59 2014
New Revision: 359465
URL: http://svnweb.freebsd.org/changeset/ports/359465
QAT: https://qat.redports.org/buildarchive/r359465/
Log:
- STAGE-clean
- Fix build
Added:
head/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp (contents, props changed)
head/textproc/zorba/files/patch-include-zorba-config.h.cmake (contents, props changed)
head/textproc/zorba/files/patch-src-store-api_item_handle.h (contents, props changed)
head/textproc/zorba/files/patch-src-util_tracer.h (contents, props changed)
Modified:
head/textproc/zorba/Makefile
head/textproc/zorba/pkg-plist
Modified: head/textproc/zorba/Makefile
==============================================================================
--- head/textproc/zorba/Makefile Fri Jun 27 07:52:34 2014 (r359464)
+++ head/textproc/zorba/Makefile Fri Jun 27 08:07:59 2014 (r359465)
@@ -30,10 +30,12 @@ CONFLICTS= xqilla-[0-9]*
USE_GNOME= libxml2 libxslt
USE_LDCONFIG= yes
-USES= cmake:outsource iconv
-CXXFLAGS+= -I${LOCALBASE}/include
+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"
+CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
@@ -41,7 +43,6 @@ PLIST_SUB+= FULLVERSION=${PORTVERSION} \
MIDVERSION=${PORTVERSION:R} \
MINVERSION=${PORTVERSION:R:R}
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPHP}
@@ -112,7 +113,7 @@ post-patch:
# ${FIND} ${WRKSRC} -name "*.orig" -delete
post-install:
- ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
+ ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
test: build
cd ${BUILD_WRKSRC} && ${MAKE} test
Added: head/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp Fri Jun 27 08:07:59 2014 (r359465)
@@ -0,0 +1,11 @@
+--- bin/debugger/command_line_handler.cpp.orig 2014-06-26 18:42:05.000000000 +0200
++++ bin/debugger/command_line_handler.cpp 2014-06-26 18:40:21.000000000 +0200
+@@ -138,7 +138,7 @@
+
+ template<>
+ void
+-CommandLineHandler::handle<BreakpointSet>(std::tr1::tuple<bstring, bstring, bint> &aTuple)
++CommandLineHandler::handle<BreakpointSet>(ZORBA_TR1_NS::tuple<bstring, bstring, bint> &aTuple)
+ {
+ DebuggerClient::BreakpointType lType = DebuggerClient::Line;
+ bool lEnabled = true;
Added: head/textproc/zorba/files/patch-include-zorba-config.h.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/zorba/files/patch-include-zorba-config.h.cmake Fri Jun 27 08:07:59 2014 (r359465)
@@ -0,0 +1,11 @@
+--- include/zorba/config.h.cmake.orig 2014-06-13 15:08:16.000000000 +0200
++++ include/zorba/config.h.cmake 2014-06-13 15:08:29.000000000 +0200
+@@ -126,7 +126,7 @@
+
+ ////////// C++ tr1 include directory & namespace //////////////////////////////
+
+-#if defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 430)
++#if !defined(__clang__) && defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 430)
+ # define ZORBA_GCC_OLDER_THAN_430 1
+ #endif
+
Added: head/textproc/zorba/files/patch-src-store-api_item_handle.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/zorba/files/patch-src-store-api_item_handle.h Fri Jun 27 08:07:59 2014 (r359465)
@@ -0,0 +1,11 @@
+--- src/store/api/item_handle.h.orig 2014-06-13 15:24:23.000000000 +0200
++++ src/store/api/item_handle.h 2014-06-13 15:34:05.000000000 +0200
+@@ -16,6 +16,8 @@
+ #ifndef ZORBA_STORE_ITEM_HANDLE_H
+ #define ZORBA_STORE_ITEM_HANDLE_H
+
++#include <string>
++#include <sstream>
+
+
+ namespace zorba
Added: head/textproc/zorba/files/patch-src-util_tracer.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/zorba/files/patch-src-util_tracer.h Fri Jun 27 08:07:59 2014 (r359465)
@@ -0,0 +1,17 @@
+--- src/util/tracer.h.orig 2014-06-13 15:42:33.000000000 +0200
++++ src/util/tracer.h 2014-06-13 15:42:58.000000000 +0200
+@@ -21,12 +21,12 @@
+
+
+ #if !defined WIN32 && !defined WINCE
+-#define TRACE __PRETTY_FUNCTION__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
++#define TRACE __PRETTY_FUNCTION__<<" ("<<__FILE__<<':'<<std::dec<<__LINE__<<")"
+ #define LOCATION (__oss.str(""), \
+ __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__PRETTY_FUNCTION__, \
+ __oss.str())
+ #elif defined WIN32
+-#define TRACE __FUNCSIG__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
++#define TRACE __FUNCSIG__<<" ("<<__FILE__<<':'<<std::dec<<__LINE__<<")"
+ #define LOCATION (__oss.str(""), \
+ __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__FUNCTION__, \
+ __oss.str())
Modified: head/textproc/zorba/pkg-plist
==============================================================================
--- head/textproc/zorba/pkg-plist Fri Jun 27 07:52:34 2014 (r359464)
+++ head/textproc/zorba/pkg-plist Fri Jun 27 08:07:59 2014 (r359465)
@@ -464,3 +464,5 @@ share/cmake/Modules/zorba-%%FULLVERSION%
@dirrm %%DATADIR%%/uris/core
@dirrm %%DATADIR%%/uris
@dirrm %%DATADIR%%
+ at dirrmtry share/cmake/Modules
+ at dirrmtry share/cmake
More information about the svn-ports-all
mailing list