From 798755fe7b6e9cebd90986640ee0b26d4be54c24 Mon Sep 17 00:00:00 2001 From: maho Date: Tue, 14 Feb 2012 11:15:29 +0000 Subject: 1. update to svn 1243485. 2. enable --enable-category-b . 3. USE_GCC=4.6+ to avoid compilation errors. --- editors/openoffice-3-devel/Makefile | 16 +- editors/openoffice-3-devel/distinfo | 8 +- editors/openoffice-3-devel/files/patch-coinmp | 175 ++++++++++++++++++++++ editors/openoffice-3-devel/files/patch-freebsd.mk | 8 + editors/openoffice-3-devel/files/patch-unxfbsd.mk | 19 ++- 5 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 editors/openoffice-3-devel/files/patch-coinmp diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index fccc3f16bbef..6ee28ab97872 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -26,6 +26,7 @@ USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes +USE_GCC= 4.6+ USE_GMAKE= yes USE_PYTHON= yes USE_PERL5_BUILD= yes @@ -53,7 +54,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX} OOODIR= openoffice.org3 -SVNREVISION= 1242624 +SVNREVISION= 1243485 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -162,7 +163,9 @@ CONFIGURE_ARGS+= --enable-verbose \ --enable-presenter-console \ --enable-wiki-publisher \ --enable-dbus \ - --enable-opengl + --enable-opengl \ + --enable-category-b \ + --without-stlport OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt @@ -195,6 +198,15 @@ pre-everything:: post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ +post-patch: +.if defined (USE_GCC) + ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk + ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk +.else + ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk + ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk +.endif + pre-configure: @${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip .if defined(WITH_KDE4) diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 43e759c5cc46..113a729d5ace 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1242624.tar.bz2) = 0500ee4db71cd4d047d0722011d67c13b5d7ef8199dc32ff38fc251dad32443e -SIZE (openoffice/ApacheOpenOffice.r1242624.tar.bz2) = 250748120 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1242624.tar.bz2) = 5c5639bcff30ec8e86e001de54056265b3e6004f70074d04604b614ca2017f41 -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1242624.tar.bz2) = 214762706 +SHA256 (openoffice/ApacheOpenOffice.r1243485.tar.bz2) = 300b53f96b709c5b736fd97338fdd812004cae1f00a4b2b55c4cea2a881562fb +SIZE (openoffice/ApacheOpenOffice.r1243485.tar.bz2) = 250741860 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1243485.tar.bz2) = 576b076d0d889e0443feb250a0097126d1038fe458f1161137dcb0ed636a32cd +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1243485.tar.bz2) = 215139732 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-coinmp b/editors/openoffice-3-devel/files/patch-coinmp new file mode 100644 index 000000000000..97f624f2295b --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-coinmp @@ -0,0 +1,175 @@ +--- ../ext_libraries/coinmp/coinmp-1.6.0.patch.org 2012-02-14 12:01:15.000000000 +0900 ++++ ../ext_libraries/coinmp/coinmp-1.6.0.patch 2012-02-14 12:50:05.000000000 +0900 +@@ -21,3 +21,172 @@ + generalMessageHandler->message(CLP_GENERAL, generalMessages) + << generalPrint + << CoinMessageEol; ++ ++--- misc/CoinMP-1.6.0/Cbc/ltmain.sh 2010-06-14 02:52:10.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/Cbc/ltmain.sh 2012-02-14 12:43:54.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) ++--- misc/CoinMP-1.6.0/Cgl/ltmain.sh 2010-06-14 02:52:57.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/Cgl/ltmain.sh 2012-02-14 12:47:44.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) ++--- misc/CoinMP-1.6.0/Clp/ltmain.sh 2010-06-14 02:53:25.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/Clp/ltmain.sh 2012-02-14 12:47:52.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) ++--- misc/CoinMP-1.6.0/CoinMP/ltmain.sh 2011-08-08 00:09:46.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/CoinMP/ltmain.sh 2012-02-14 12:48:03.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) ++--- misc/CoinMP-1.6.0/CoinUtils/ltmain.sh 2010-06-14 02:53:51.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/CoinUtils/ltmain.sh 2012-02-14 12:48:08.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) ++--- misc/CoinMP-1.6.0/Osi/ltmain.sh 2010-06-14 02:59:18.000000000 +0900 +++++ misc/build/CoinMP-1.6.0/Osi/ltmain.sh 2012-02-14 12:48:24.000000000 +0900 ++@@ -3186,12 +3186,12 @@ ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++- darwin|linux|osf|windows) +++ darwin|linux|osf|windows|freebsd-elf) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++- freebsd-aout|freebsd-elf|sunos) +++ freebsd-aout|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++@@ -3267,8 +3267,8 @@ ++ ;; ++ ++ freebsd-elf) ++- major=".$current" ++- versuffix=".$current"; +++ major=.`expr $current - $age` +++ versuffix="$major" ++ ;; ++ ++ irix | nonstopux) diff --git a/editors/openoffice-3-devel/files/patch-freebsd.mk b/editors/openoffice-3-devel/files/patch-freebsd.mk index 4ca8d789d31e..81ad7207f48a 100644 --- a/editors/openoffice-3-devel/files/patch-freebsd.mk +++ b/editors/openoffice-3-devel/files/patch-freebsd.mk @@ -1,5 +1,13 @@ --- solenv/gbuild/platform/freebsd.mk~ 2011-12-24 18:45:27.000000000 +0900 +++ solenv/gbuild/platform/freebsd.mk 2011-12-25 11:01:37.000000000 +0900 +@@ -120,6 +120,7 @@ + -Wl,-z,combreloc \ + -Wl,-z,defs \ + $(subst -L../lib , ,$(SOLARLIB)) \ ++ %%RPATH%% \ + + ifeq ($(HAVE_LD_HASH_STYLE),TRUE) + gb_LinkTarget_LDFLAGS += \ @@ -302,7 +302,7 @@ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ diff --git a/editors/openoffice-3-devel/files/patch-unxfbsd.mk b/editors/openoffice-3-devel/files/patch-unxfbsd.mk index 25d02ac17328..76b9d3969704 100644 --- a/editors/openoffice-3-devel/files/patch-unxfbsd.mk +++ b/editors/openoffice-3-devel/files/patch-unxfbsd.mk @@ -1,5 +1,22 @@ --- solenv/inc/unxfbsd.mk.orig 2011-12-21 09:47:20.000000000 +0900 +++ solenv/inc/unxfbsd.mk 2011-12-25 20:48:29.000000000 +0900 +@@ -84,14 +84,14 @@ + .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 + # Flags for disabling exception handling + CFLAGS_NO_EXCEPTIONS=-fno-exceptions + + # -fpermissive should be removed as soon as possible +-CFLAGSCXX= -pipe $(ARCH_FLAGS) ++CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%% + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + CFLAGSCXX += -fvisibility-inlines-hidden + .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -140,16 +140,16 @@ LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -20,7 +37,7 @@ +LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) -+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) ++LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ -- cgit