Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile +++ editors/openoffice-devel/Makefile @@ -59,8 +59,9 @@ libtextcat.so:${PORTSDIR}/textproc/libtextcat \ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ librdf.so:${PORTSDIR}/textproc/redland \ - libserf-1.so:${PORTSDIR}/www/serf -# libgraphite.so:${PORTSDIR}/graphics/silgraphite + libserf-1.so:${PORTSDIR}/www/serf \ + libgraphite.so:${PORTSDIR}/graphics/silgraphite \ + libboost_system.so:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ @@ -100,8 +101,9 @@ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes -USE_GCC= 4.8 -USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:xz +#USE_GCC= 4.8 +USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:xz compiler:c++11-lib +#USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:xz USE_PERL5= build WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes @@ -155,6 +157,9 @@ .endif CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ PATH=${WRKSRC}/solenv/bin:$$PATH +.if ${CHOSEN_COMPILER_TYPE} == clang +CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib" +.endif USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes @@ -220,7 +225,9 @@ --enable-wiki-publisher \ --x-includes={LOCALBASE}/include \ --x-libraries=${LOCALBASE}lib \ - --with-system-zlib + --with-system-zlib \ + --with-system-graphite \ + --with-system-boost # system-graphite causes breakage when compiled with clang and linked # with libc++ because aoo is compiled with gcc and linked with libstdc++. # --with-system-graphite Index: editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig 2014-09-19 17:51:13 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx +@@ -24,7 +24,7 @@ + // MARKER(update_precomp.py): autogen include statement, do not remove + #include "precompiled_bridges.hxx" + +-#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) ++#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__) + #include + #endif + Index: editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -0,0 +1,63 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2014-09-19 17:51:12 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -26,6 +26,9 @@ + #include + #include + #include ++#include ++ ++using namespace ::__cxxabiv1; + + namespace CPPU_CURRENT_NAMESPACE + { +@@ -34,6 +37,7 @@ void dummy_can_throw_anything( char cons + + // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h + ++#if 0 + struct _Unwind_Exception + { + unsigned exception_class __attribute__((__mode__(__DI__))); +@@ -62,18 +66,21 @@ struct __cxa_exception + + _Unwind_Exception unwindHeader; + }; ++#endif + + extern "C" void *__cxa_allocate_exception( + std::size_t thrown_size ) throw(); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + ++#if 0 + struct __cxa_eh_globals + { + __cxa_exception *caughtExceptions; + unsigned int uncaughtExceptions; + }; + extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); ++#endif + + // ----- + +@@ -84,3 +91,20 @@ void raiseException( + void fillUnoException( + __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); + } ++ ++class __class_type_info : public std::type_info ++{ ++public: ++ explicit __class_type_info( const char* pRttiName) ++ : std::type_info( pRttiName) ++ {} ++}; ++ ++class __si_class_type_info : public __class_type_info ++{ ++ const __class_type_info* mpBaseType; ++public: ++ explicit __si_class_type_info( const char* pRttiName, __class_type_info* pBaseType) ++ : __class_type_info( pRttiName), mpBaseType( pBaseType) ++ {} ++}; Index: editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-09-19 17:51:13 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx +@@ -446,7 +446,7 @@ static void cpp_call( + catch (...) + { + // fill uno exception +- fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); ++ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); + + // temporary params + for ( ; nTempIndizes--; ) Index: editors/openoffice-devel/files/patch-freebsd.mk =================================================================== --- editors/openoffice-devel/files/patch-freebsd.mk +++ editors/openoffice-devel/files/patch-freebsd.mk @@ -1,6 +1,22 @@ ---- solenv/gbuild/platform/freebsd.mk 2012-10-31 10:39:44.000000000 +0900 -+++ solenv/gbuild/platform/freebsd.mk 2012-10-31 17:40:48.000000000 +0900 -@@ -121,6 +121,7 @@ +--- solenv/gbuild/platform/freebsd.mk.orig 2014-09-19 18:16:41 UTC ++++ solenv/gbuild/platform/freebsd.mk +@@ -96,6 +96,7 @@ gb_CXXFLAGS := \ + -fvisibility-inlines-hidden \ + -fvisibility=hidden \ + -pipe \ ++ -DHAVE_STL_INCLUDE_PATH \ + + ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) + gb_CFLAGS_WERROR := -Werror +@@ -110,7 +111,6 @@ endif + gb_LinkTarget_EXCEPTIONFLAGS := \ + -DEXCEPTIONS_ON \ + -fexceptions \ +- -fno-enforce-eh-specs \ + + gb_LinkTarget_NOEXCEPTIONFLAGS := \ + -DEXCEPTIONS_OFF \ +@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \ -Wl,-z,combreloc \ -Wl,-z,defs \ $(subst -L../lib , ,$(SOLARLIB)) \ Index: editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx @@ -0,0 +1,10 @@ +--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig 2014-09-19 18:15:07 UTC ++++ shell/source/unix/sysshell/recently_used_file_handler.cxx +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + namespace /* private */ { + //######################################## Index: editors/openoffice-devel/files/patch-unxfbsd.mk =================================================================== --- editors/openoffice-devel/files/patch-unxfbsd.mk +++ editors/openoffice-devel/files/patch-unxfbsd.mk @@ -1,13 +1,32 @@ ---- solenv/inc/unxfbsd.mk~ 2012-10-31 10:39:44.000000000 +0900 -+++ solenv/inc/unxfbsd.mk 2012-10-31 17:42:59.000000000 +0900 -@@ -80,14 +80,14 @@ +--- solenv/inc/unxfbsd.mk.orig 2014-09-19 18:16:56 UTC ++++ solenv/inc/unxfbsd.mk +@@ -27,7 +27,7 @@ ASM= + AFLAGS= + + SOLAR_JAVA*= +-PICSWITCH*:=-fpic ++PICSWITCH*:=-fPIC + JAVAFLAGSDEBUG=-g + + # Include arch specific makefile. +@@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g + #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" + + # _PTHREADS is needed for the stl +-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 ++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DHAVE_STL_INCLUDE_PATH + + # enable visibility define in "sal/types.h" + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +@@ -86,14 +86,14 @@ CFLAGSENABLESYMBOLS=-g # was temporarily .ENDIF # flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) +CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%% # Flags for enabling exception handling - CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs ++CFLAGSEXCEPTIONS=-fexceptions # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions @@ -17,9 +36,9 @@ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -145,7 +145,7 @@ - LINKFLAGSRUNPATH_OXT= - LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' +@@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT= + LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' + #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) +LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)