kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 3.2.0.

Browse source 
Release note http://development.openoffice.org/releases/3.2.0.html
M.N.'s build on FBSD8 can be found at:
http://ooopackages.good-day.net/pub/OpenOffice.org/FreeBSD/packages-8-amd64/
http://ooopackages.good-day.net/pub/OpenOffice.org/FreeBSD/packages-8-i386/
.

Funded by OpenOffice.org community.
This commit is contained in:
Maho Nakata 2010-02-14 04:10:44 +00:00
parent 443aff133d
commit 912643411d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=249826
40 changed files with 840 additions and 480 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
editors/openoffice-3/Makefile
View file

@ -7,32 +7,38 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= ${OOOSRC}
#de facto maintainer is maho@FreeBSD.org
#patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
OOOVERSION= 3.1.1
OOOVERSION= 3.2.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
.if !defined(WITHOUT_MOZILLA)
DISTFILES+= ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= libidl
SEAMONKEY_VERSION= 1.1.14
SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc
USE_GNOME+= libidl
.endif
USE_GNOME= desktopfileutils gtk20
.if defined(WITH_KDE4) && defined(WITH_KDE)
.error "Cannot define WITH_KDE and WITH_KDE4 at the same time"
.endif
.if defined(WITH_KDE4)
USE_KDE4= kdelibs
USE_QT_VER= 4
.endif
.if defined(WITH_KDE)
@ -67,8 +73,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 19
OOOTAG?= OOO310_m${MILESTONE}
MILESTONE?= 12
OOOTAG?= OOO320_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
@ -113,12 +119,10 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
imake:${PORTSDIR}/devel/imake \
gtar:${PORTSDIR}/archivers/gtar \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
.endif
#see #i85469# for gperf
USE_BISON= build
GNU_CONFIGURE= yes
@ -136,6 +140,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--with-system-zlib \
--with-system-stdlibs \
--with-epm=internal \
--enable-hids \
--enable-minimizer \
--enable-presenter-console \
--enable-pdfimport \
@ -148,9 +153,6 @@ OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt
OOOEXTENSIONS+= sun-report-builder.oxt
.if ${ARCH} == amd64
WITHOUT_MOZILLA= yes
.endif
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
@ -185,22 +187,20 @@ post-extract:
cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \
done
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
.endif
.if !defined(WITHOUT_MOZILLA)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
.endif
pre-configure:
#Workaround for gperf. #i85469#
@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
.if defined(WITH_KDE4)
@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
.endif
do-build:
@cd ${WRKSRC} ; ./bootstrap
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
.if ${LOCALIZED_LANG} == "alllangs"
@${MAKE} languagepack
@ -208,13 +208,13 @@ do-build:
do-install:
.if ${LOCALIZED_LANG} == "alllangs"
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \
done
@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
@ -222,19 +222,23 @@ do-install:
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
.else
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
.endif
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/310/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
post-install:
@${ECHO_MSG} "===> Add wrapper scripts";

15
editors/openoffice-3/distinfo
View file

@ -1,12 +1,9 @@
MD5 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 29a3f5de50afbc1a19121a0b2fcbe7ef
SHA256 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 877ebfbbc62bb6e5d66582e561f6b4692508c28cf770a7bfc5b9173296bbe5ca
SIZE (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 407469121
MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865
SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26
SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144
MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org3/gpc231.tar.Z) = 27917
MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712
SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28
SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082

15
editors/openoffice-3/files/Makefile.knobs
View file

@ -4,6 +4,11 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
.if defined(WITH_KDE4)
CONFIGURE_ARGS+= --enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
QT_COMPONENTS+= moc
.endif
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
.endif
@ -26,7 +31,6 @@ CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
@ -34,7 +38,6 @@ USE_GNOME+= glib20
.endif
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+= --with-system-freetype=yes
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
@ -64,7 +67,7 @@ pre-fetch:
.endif
.if !defined(WITHOUT_MOZILLA)
@${ECHO}
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
.if !defined(WITHOUT_GNOME)
@ -87,10 +90,10 @@ pre-fetch:
@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
@${ECHO} "make -DWITH_KDE"
.endif
.if !defined(WITH_GPC)
.if !defined(WITH_KDE4)
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
@${ECHO} "You can compile OOo to use Qt/KDE4 vclplug with"
@${ECHO} "make -DWITH_KDE4"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}

10
editors/openoffice-3/files/Makefile.others
View file

@ -11,7 +11,7 @@
package-rename:
@${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload";
@${MV} ${PKGFILE} \
@${LN} ${PKGFILE} \
${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
package-canonical:
@ -24,7 +24,7 @@ sdk:
@${RM} -fr ${WRKDIR}/sdk_tmp
@${MKDIR} ${WRKDIR}/sdk_tmp
@cd ${WRKDIR}/sdk_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/ooobasis*.t?z
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd/ooobasis*.t?z
@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
@ -35,7 +35,7 @@ ure:
@${RM} -fr ${WRKDIR}/ure_tmp
@${MKDIR} ${WRKDIR}/ure_tmp
@cd ${WRKDIR}/ure_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd/openoffice*.t?z
@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \
${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@ -57,11 +57,11 @@ languagepack:
@${RM} -fr ${WRKDIR}/langpack_tmp
@${MKDIR} ${WRKDIR}/langpack_tmp
.if defined (LOCALIZED_LANG)
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ls openoffice*.t?z ooobasis*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
@cd ${WRKDIR}/langpack_tmp ; \
for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
done
@cd ${WRKDIR}/langpack_tmp/opt/ ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \

15
editors/openoffice-3/files/patch-i100395 Normal file
View file

@ -0,0 +1,15 @@
--- solenv/inc/unx.mk~ 2009-02-25 02:58:24.000000000 +0900
+++ solenv/inc/unx.mk 2009-03-20 16:52:22.000000000 +0900
@@ -242,9 +242,9 @@
# potentially affects multiple commands following on the recipe line:
.IF "$(USE_SHELL)" == "bash"
AUGMENT_LIBRARY_PATH *= : && \
- LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
+ LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR):.
.ELSE
AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
- eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
- if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
+ eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR):."' && \
+ if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR):." &&
.ENDIF

11
editors/openoffice-3/files/patch-i101333
View file

@ -1,11 +0,0 @@
--- openssl/makefile.mk~ 2009-04-25 09:42:18.000000000 +0900
+++ openssl/makefile.mk 2009-04-25 13:00:45.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILE_NAME=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8k.map \

34
editors/openoffice-3/files/patch-i102181 Normal file
View file

@ -0,0 +1,34 @@
--- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900
+++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+.IF "$(OS)" == "LINUX"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \
@@ -103,6 +103,22 @@
.ENDIF
.ENDIF
+.IF "$(OS)" == "FREEBSD"
+ PATCH_FILES=openssllnx.patch
+ ADDITIONAL_FILES:= \
+ libcrypto_OOo_0_9_8l.map \
+ libssl_OOo_0_9_8l.map
+ .IF "$(CPU)" == "I"
+ CONFIGURE_ACTION=Configure BSD-x86-elf
+ .ELIF "$(BUILD64)" == "1"
+ CONFIGURE_ACTION=Configure BSD-x86_64
+ .ELSE
+ CONFIGURE_ACTION=Configure BSD-generic32
+ .ENDIF
+ # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
+ #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
+.ENDIF
+
.IF "$(OS)" == "WNT"
.IF "$(COM)"=="GCC"

36
editors/openoffice-3/files/patch-i102183 Normal file
View file

@ -0,0 +1,36 @@
--- redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:52:31.000000000 +0900
@@ -40,7 +40,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)
--- redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:52:09.000000000 +0900
@@ -32,7 +32,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)
--- redlan_/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:54.000000000 +0900
@@ -52,7 +52,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)

11
editors/openoffice-3/files/patch-i102184 Normal file
View file

@ -0,0 +1,11 @@
--- libxslt/libxslt-1.1.24.patch 2009-05-24 16:32:30.000000000 +0900
+++ libxslt/libxslt-1.1.24.patch 2009-05-24 16:38:38.000000000 +0900
@@ -20,7 +20,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)

194
editors/openoffice-3/files/patch-i103792 Normal file
View file

@ -0,0 +1,194 @@
--- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900
@@ -12,6 +12,7 @@
do
if test -f "$_config"; then
echo "$_config";
+
--- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
@@ -1,4 +1,4 @@
@@ -86,7 +87,7 @@
PYTHON = @MOZ_PYTHON@
--- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
endif
#
@@ -106,6 +107,13 @@
+endif # IS_COMPONENT
+endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+#
# Include any personal overrides the user might think are needed.
#
@@ -5810,7 +5818,7 @@
else
--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
OS_LIBS = -lc
endif
@@ -5818,6 +5826,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/pldsmap.sun
@@ -5838,7 +5850,7 @@
# dependencies in the same directory where it resides.
--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
OS_LIBS = -lc
endif
@@ -5846,6 +5858,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/plcmap.sun
@@ -6353,3 +6369,120 @@
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
+
+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900
+@@ -52,6 +52,7 @@
+
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
+--- misc/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:45.000000000 +0900
++++ misc/build/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:01.000000000 +0900
+@@ -277,8 +277,8 @@
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
+-# ifdef __x86_64__
+- "-D__x86_64__",
++# if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
+ # endif
+ # ifdef __GNUC__
+ "-traditional",
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:03:28.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:14:17.000000000 +0900
+@@ -249,6 +249,10 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++endif
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
+@@ -306,7 +306,7 @@
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+ endif
+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
++ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD FreeBSD, $(OS_ARCH)))
+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ ifeq ($(OS_ARCH),OS2)
+
+########################################
+following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
+but since re_comp, re_exec are deprecated, shared libs are not provided.
+This causes a problem for amd64 arch at extension project like following:
+
+Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
+ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
+/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
+/usr/lib/libcompat.a: could not read symbols: Bad value
+dmake: Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
+.
+
+However, simply activating via "#define NEED_BSDREGEX" doesn't work as
+regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
+stop include unistd.h :-(
+
+In file included from getfilter.c:53:
+../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
+/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
+../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
+/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
+
+--- misc/mozilla/directory/c-sdk/ldap/include/portable.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h 2009-07-02 10:35:23.000000000 +0900
+@@ -131,7 +131,7 @@
+ * some systems don't have the BSD re_comp and re_exec routines
+ */
+ #ifndef NEED_BSDREGEX
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+ #define NEED_BSDREGEX
+ #endif
+ #endif
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2006-02-03 23:44:42.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2009-07-02 11:05:54.000000000 +0900
+@@ -267,7 +267,7 @@
+
+ char *
+ LDAP_CALL
+-re_comp( char *pat )
++re_comp( const char *pat )
+ {
+ register REGEXCHAR *p; /* pattern pointer */
+ register REGEXCHAR *mp=nfa; /* nfa pointer */
+@@ -513,7 +513,7 @@
+
+ int
+ LDAP_CALL
+-re_exec( char *lp )
++re_exec( const char *lp )
+ {
+ register REGEXCHAR c;
+ register REGEXCHAR *ep = 0;
+--- misc/mozilla/directory/c-sdk/ldap/include/regex.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h 2009-07-02 11:05:24.000000000 +0900
+@@ -73,8 +73,8 @@
+ int re_init( void );
+ void re_lock( void );
+ int re_unlock( void );
+-char * LDAP_CALL re_comp( char *pat );
+-int LDAP_CALL re_exec( char *lp );
++char * LDAP_CALL re_comp( const char *pat );
++int LDAP_CALL re_exec( const char *lp );
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+
+

20
editors/openoffice-3/files/patch-i104014 Normal file
View file

@ -0,0 +1,20 @@
--- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900
+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900
@@ -141,12 +141,12 @@
# default linker flags
LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)

13
editors/openoffice-3/files/patch-i104015 Normal file
View file

@ -0,0 +1,13 @@
origin support
--- stlport/STLport-4.5.patch~ 2009-07-23 10:00:59.000000000 +0900
+++ stlport/STLport-4.5.patch 2009-08-03 01:33:01.000000000 +0900
@@ -137,7 +137,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so

17
editors/openoffice-3/files/patch-i105977 Normal file
View file

@ -0,0 +1,17 @@
--- nss/makefile.mk~ 2009-10-18 14:50:43.000000000 +0900
+++ nss/makefile.mk 2009-10-18 14:50:56.000000000 +0900
@@ -65,6 +65,14 @@
.ENDIF # "$(CPU)"=="X"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+.IF "$(CPU)"=="X"
+# force 64-bit buildmode
+USE_64:=1
+.EXPORT : USE_64
+.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+
.IF "$(OS)"=="MACOSX"
.IF "$(EXTRA_CFLAGS)"!=""

17
editors/openoffice-3/files/patch-i65514
View file

@ -1,13 +1,12 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
@@ -105,6 +105,10 @@
--- berkeleydb/makefile.mk 2009-09-26 08:52:35.000000000 +0900
+++ berkeleydb/makefile.mk 2009-09-26 08:54:31.000000000 +0900
@@ -102,6 +102,9 @@
CONFIGURE_ACTION= \
..$/dist$/configure
CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+.IF "$(COM)$(CPU)"=="GCCX"
+.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
+
# just pass ARCH_FLAGS to native build
CFLAGS+:=$(ARCH_FLAGS)
CXXFLAGS+:=$(ARCH_FLAGS)
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF

107
editors/openoffice-3/files/patch-i75190
View file

@ -1,107 +0,0 @@
http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon)
http://qa.openoffice.org/issues/show_bug.cgi?id=75190
Turn the GTK Recent Manager feature off.
Other workaround
% setenv OOO_FORCE_DESKTOP gnome
Backout of misfeature in cws_src680_obr05 branch.
* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx
See also
http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html
gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
(rev. 1.8.44.2)
gsl/shell/source/unix/sysshell/systemshell.cxx
(rev. 1.7.44.1)
Index: systemshell.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
retrieving revision 1.8
diff -u -u -r1.8 systemshell.cxx
--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8
+++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000
@@ -72,9 +72,6 @@
const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so");
const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext");
-void * (* sym_gtk_recent_manager_get_default) () = NULL;
-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL;
-
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
@@ -114,57 +111,31 @@
return url;
}
- bool init_recent_manager_api()
- {
- oslModule hDefault;
- if( osl_getModuleHandle( NULL, &hDefault ) )
- {
- sym_gtk_recent_manager_get_default = (void * (*)())
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default");
- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *))
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item");
-
- }
- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item);
- return ret;
- }
-
-
//##############################
void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
{
- static bool bIsRecentManagerPresent = init_recent_manager_api();
-
// Convert file URL for external use (see above)
rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
+ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
+
if( 0 == externalUrl.getLength() )
externalUrl = aFileUrl;
-
- if( bIsRecentManagerPresent )
- {
- void * recent_manager = sym_gtk_recent_manager_get_default();
- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr());
- }
- else
+
+ if (librecentfile_url.getLength())
{
- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
-
- if (librecentfile_url.getLength())
- {
- osl::Module module(librecentfile_url);
+ osl::Module module(librecentfile_url);
- if (module.is())
- {
- // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
- // not allowed in gcc 3.3 without permissive.
- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
- reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
-
- if (add_to_recently_used_file_list)
- add_to_recently_used_file_list(aFileUrl, aMimeType);
- }
+ if (module.is())
+ {
+ // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
+ // not allowed in gcc 3.3 without permissive.
+ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
+ reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
+
+ if (add_to_recently_used_file_list)
+ add_to_recently_used_file_list(aFileUrl, aMimeType);
}
- }
+ }
}
} // namespace SystemShell

31
editors/openoffice-3/files/patch-i80129
View file

@ -1,35 +1,16 @@
Merely a workaround
Index: libxml2/libxml2-2.6.31.patch
===================================================================
RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
retrieving revision 1.2
diff -u -r1.2 libxml2-2.6.31.patch
--- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2
+++ libxml2/libxml2-2.6.31.patch 10 Jun 2008 09:34:51 -0000
@@ -87,7 +87,7 @@
;;
+++ libxml2/libxml2-2.6.31.patch 8 Jul 2008 02:54:59 -0000
@@ -88,7 +88,7 @@
freebsd-elf)
-! major=.`expr $current - $age`
+! major=`expr $current - $age`
! versuffix=".$major.$age.$revision";
! major=.`expr $current - $age`
-! versuffix=".$major.$age.$revision";
+! versuffix="$major";
;;
Index: scp2/source/ooo/ure.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
retrieving revision 1.7
diff -u -r1.7 ure.scp
--- scp2/source/ooo/ure.scp 6 Jun 2008 17:05:51 -0000 1.7
+++ scp2/source/ooo/ure.scp 10 Jun 2008 09:45:54 -0000
@@ -679,6 +679,8 @@
#endif
#elif defined MACOSX
Name = SCP2_URE_DL_NORMAL("xml2.2");
+#elif defined FREEBSD
+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
#else
Name = SCP2_URE_DL_VER("xml2", "2");
#endif
irix | nonstopux)

9
editors/openoffice-3/files/patch-i85972
View file

@ -34,16 +34,16 @@ diff -u -r1.4 lp_solve_5.5.patch
--- lpsolve/makefile.mk.orig 2008-12-24 09:40:11.000000000 +0900
+++ lpsolve/makefile.mk 2008-12-24 12:09:06.000000000 +0900
@@ -46,7 +46,7 @@
PATCH_FILE_NAME=lp_solve_5.5-windows.patch
@@ -46,7 +47,7 @@
PATCH_FILES=lp_solve_5.5-windows.patch
.ELSE
PATCH_FILE_NAME=lp_solve_5.5.patch
PATCH_FILES=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
.ENDIF
CONFIGURE_DIR=
@@ -73,11 +73,16 @@
@@ -73,11 +74,16 @@
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
.ELSE
@ -59,4 +59,3 @@ diff -u -r1.4 lp_solve_5.5.patch
+.ENDIF
OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h

4
editors/openoffice-3/files/patch-i91318
View file

@ -1,5 +1,5 @@
--- hunspell/hunspell-1.2.8.patch~ 2009-02-21 08:52:35.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-05 09:30:33.000000000 +0900
--- hunspell/hunspell-1.2.8.patch~ 2009-03-11 22:17:54.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-20 21:37:49.000000000 +0900
@@ -619,3 +619,11 @@
p++;
}

25
editors/openoffice-3/files/patch-i91369
View file

@ -1,25 +0,0 @@
#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine)
#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine)
...-lsupc++ is static, and cannot find -lgcc_s
#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine)
cannot find -lgcc_s
--- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900
+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900
@@ -76,6 +76,7 @@
.ENDIF
# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied
.IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2"
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= -lsupc++
@@ -86,6 +87,8 @@
.IF "$(CCNUMVER)"<="000399999999"
SHL1STDLIBS+= -lsupc++
.ENDIF # CCNUMVER
+.ELIF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=
.ELIF "$(CCNUMVER)"<="000400000999"
SHL1STDLIBS+= -lsupc++ -lgcc_s
.ENDIF

4
editors/openoffice-3/files/patch-i98781
View file

@ -92,7 +92,7 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
@@ -121,7 +121,7 @@
@@ -121,7 +122,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
@ -101,7 +101,7 @@ in files/patches-i85126
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -160,7 +160,7 @@
@@ -160,7 +161,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );

72
editors/openoffice.org-3/Makefile
View file

@ -7,32 +7,38 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= ${OOOSRC}
#de facto maintainer is maho@FreeBSD.org
#patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
OOOVERSION= 3.1.1
OOOVERSION= 3.2.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
.if !defined(WITHOUT_MOZILLA)
DISTFILES+= ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= libidl
SEAMONKEY_VERSION= 1.1.14
SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc
USE_GNOME+= libidl
.endif
USE_GNOME= desktopfileutils gtk20
.if defined(WITH_KDE4) && defined(WITH_KDE)
.error "Cannot define WITH_KDE and WITH_KDE4 at the same time"
.endif
.if defined(WITH_KDE4)
USE_KDE4= kdelibs
USE_QT_VER= 4
.endif
.if defined(WITH_KDE)
@ -67,8 +73,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 19
OOOTAG?= OOO310_m${MILESTONE}
MILESTONE?= 12
OOOTAG?= OOO320_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
@ -113,12 +119,10 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
imake:${PORTSDIR}/devel/imake \
gtar:${PORTSDIR}/archivers/gtar \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
.endif
#see #i85469# for gperf
USE_BISON= build
GNU_CONFIGURE= yes
@ -136,6 +140,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--with-system-zlib \
--with-system-stdlibs \
--with-epm=internal \
--enable-hids \
--enable-minimizer \
--enable-presenter-console \
--enable-pdfimport \
@ -148,9 +153,6 @@ OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt
OOOEXTENSIONS+= sun-report-builder.oxt
.if ${ARCH} == amd64
WITHOUT_MOZILLA= yes
.endif
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
@ -185,22 +187,20 @@ post-extract:
cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \
done
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
.endif
.if !defined(WITHOUT_MOZILLA)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
.endif
pre-configure:
#Workaround for gperf. #i85469#
@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
.if defined(WITH_KDE4)
@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
.endif
do-build:
@cd ${WRKSRC} ; ./bootstrap
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
.if ${LOCALIZED_LANG} == "alllangs"
@${MAKE} languagepack
@ -208,13 +208,13 @@ do-build:
do-install:
.if ${LOCALIZED_LANG} == "alllangs"
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \
done
@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
@ -222,19 +222,23 @@ do-install:
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
.else
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
.endif
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/310/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
post-install:
@${ECHO_MSG} "===> Add wrapper scripts";

15
editors/openoffice.org-3/distinfo
View file

@ -1,12 +1,9 @@
MD5 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 29a3f5de50afbc1a19121a0b2fcbe7ef
SHA256 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 877ebfbbc62bb6e5d66582e561f6b4692508c28cf770a7bfc5b9173296bbe5ca
SIZE (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 407469121
MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865
SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26
SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144
MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org3/gpc231.tar.Z) = 27917
MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712
SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28
SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082

15
editors/openoffice.org-3/files/Makefile.knobs
View file

@ -4,6 +4,11 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
.if defined(WITH_KDE4)
CONFIGURE_ARGS+= --enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
QT_COMPONENTS+= moc
.endif
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
.endif
@ -26,7 +31,6 @@ CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
@ -34,7 +38,6 @@ USE_GNOME+= glib20
.endif
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+= --with-system-freetype=yes
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
@ -64,7 +67,7 @@ pre-fetch:
.endif
.if !defined(WITHOUT_MOZILLA)
@${ECHO}
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
.if !defined(WITHOUT_GNOME)
@ -87,10 +90,10 @@ pre-fetch:
@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
@${ECHO} "make -DWITH_KDE"
.endif
.if !defined(WITH_GPC)
.if !defined(WITH_KDE4)
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
@${ECHO} "You can compile OOo to use Qt/KDE4 vclplug with"
@${ECHO} "make -DWITH_KDE4"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}

10
editors/openoffice.org-3/files/Makefile.others
View file

@ -11,7 +11,7 @@
package-rename:
@${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload";
@${MV} ${PKGFILE} \
@${LN} ${PKGFILE} \
${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
package-canonical:
@ -24,7 +24,7 @@ sdk:
@${RM} -fr ${WRKDIR}/sdk_tmp
@${MKDIR} ${WRKDIR}/sdk_tmp
@cd ${WRKDIR}/sdk_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/ooobasis*.t?z
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd/ooobasis*.t?z
@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
@ -35,7 +35,7 @@ ure:
@${RM} -fr ${WRKDIR}/ure_tmp
@${MKDIR} ${WRKDIR}/ure_tmp
@cd ${WRKDIR}/ure_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd/openoffice*.t?z
@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \
${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@ -57,11 +57,11 @@ languagepack:
@${RM} -fr ${WRKDIR}/langpack_tmp
@${MKDIR} ${WRKDIR}/langpack_tmp
.if defined (LOCALIZED_LANG)
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ls openoffice*.t?z ooobasis*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
@cd ${WRKDIR}/langpack_tmp ; \
for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
done
@cd ${WRKDIR}/langpack_tmp/opt/ ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \

15
editors/openoffice.org-3/files/patch-i100395 Normal file
View file

@ -0,0 +1,15 @@
--- solenv/inc/unx.mk~ 2009-02-25 02:58:24.000000000 +0900
+++ solenv/inc/unx.mk 2009-03-20 16:52:22.000000000 +0900
@@ -242,9 +242,9 @@
# potentially affects multiple commands following on the recipe line:
.IF "$(USE_SHELL)" == "bash"
AUGMENT_LIBRARY_PATH *= : && \
- LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
+ LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR):.
.ELSE
AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
- eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
- if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
+ eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR):."' && \
+ if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR):." &&
.ENDIF

11
editors/openoffice.org-3/files/patch-i101333
View file

@ -1,11 +0,0 @@
--- openssl/makefile.mk~ 2009-04-25 09:42:18.000000000 +0900
+++ openssl/makefile.mk 2009-04-25 13:00:45.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILE_NAME=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8k.map \

34
editors/openoffice.org-3/files/patch-i102181 Normal file
View file

@ -0,0 +1,34 @@
--- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900
+++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+.IF "$(OS)" == "LINUX"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \
@@ -103,6 +103,22 @@
.ENDIF
.ENDIF
+.IF "$(OS)" == "FREEBSD"
+ PATCH_FILES=openssllnx.patch
+ ADDITIONAL_FILES:= \
+ libcrypto_OOo_0_9_8l.map \
+ libssl_OOo_0_9_8l.map
+ .IF "$(CPU)" == "I"
+ CONFIGURE_ACTION=Configure BSD-x86-elf
+ .ELIF "$(BUILD64)" == "1"
+ CONFIGURE_ACTION=Configure BSD-x86_64
+ .ELSE
+ CONFIGURE_ACTION=Configure BSD-generic32
+ .ENDIF
+ # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
+ #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
+.ENDIF
+
.IF "$(OS)" == "WNT"
.IF "$(COM)"=="GCC"

36
editors/openoffice.org-3/files/patch-i102183 Normal file
View file

@ -0,0 +1,36 @@
--- redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:52:31.000000000 +0900
@@ -40,7 +40,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)
--- redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:52:09.000000000 +0900
@@ -32,7 +32,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)
--- redlan_/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:32.000000000 +0900
+++ redland/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:54.000000000 +0900
@@ -52,7 +52,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)

11
editors/openoffice.org-3/files/patch-i102184 Normal file
View file

@ -0,0 +1,11 @@
--- libxslt/libxslt-1.1.24.patch 2009-05-24 16:32:30.000000000 +0900
+++ libxslt/libxslt-1.1.24.patch 2009-05-24 16:38:38.000000000 +0900
@@ -20,7 +20,7 @@
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
++ versuffix="$major"
;;
irix | nonstopux)

194
editors/openoffice.org-3/files/patch-i103792 Normal file
View file

@ -0,0 +1,194 @@
--- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900
@@ -12,6 +12,7 @@
do
if test -f "$_config"; then
echo "$_config";
+
--- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
@@ -1,4 +1,4 @@
@@ -86,7 +87,7 @@
PYTHON = @MOZ_PYTHON@
--- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
endif
#
@@ -106,6 +107,13 @@
+endif # IS_COMPONENT
+endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+#
# Include any personal overrides the user might think are needed.
#
@@ -5810,7 +5818,7 @@
else
--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
OS_LIBS = -lc
endif
@@ -5818,6 +5826,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/pldsmap.sun
@@ -5838,7 +5850,7 @@
# dependencies in the same directory where it resides.
--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
OS_LIBS = -lc
endif
@@ -5846,6 +5858,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/plcmap.sun
@@ -6353,3 +6369,120 @@
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
+
+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900
+@@ -52,6 +52,7 @@
+
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
+--- misc/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:45.000000000 +0900
++++ misc/build/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:01.000000000 +0900
+@@ -277,8 +277,8 @@
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
+-# ifdef __x86_64__
+- "-D__x86_64__",
++# if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
+ # endif
+ # ifdef __GNUC__
+ "-traditional",
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:03:28.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:14:17.000000000 +0900
+@@ -249,6 +249,10 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++endif
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
+@@ -306,7 +306,7 @@
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+ endif
+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
++ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD FreeBSD, $(OS_ARCH)))
+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ ifeq ($(OS_ARCH),OS2)
+
+########################################
+following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
+but since re_comp, re_exec are deprecated, shared libs are not provided.
+This causes a problem for amd64 arch at extension project like following:
+
+Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
+ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
+/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
+/usr/lib/libcompat.a: could not read symbols: Bad value
+dmake: Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
+.
+
+However, simply activating via "#define NEED_BSDREGEX" doesn't work as
+regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
+stop include unistd.h :-(
+
+In file included from getfilter.c:53:
+../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
+/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
+../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
+/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
+
+--- misc/mozilla/directory/c-sdk/ldap/include/portable.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h 2009-07-02 10:35:23.000000000 +0900
+@@ -131,7 +131,7 @@
+ * some systems don't have the BSD re_comp and re_exec routines
+ */
+ #ifndef NEED_BSDREGEX
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+ #define NEED_BSDREGEX
+ #endif
+ #endif
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2006-02-03 23:44:42.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2009-07-02 11:05:54.000000000 +0900
+@@ -267,7 +267,7 @@
+
+ char *
+ LDAP_CALL
+-re_comp( char *pat )
++re_comp( const char *pat )
+ {
+ register REGEXCHAR *p; /* pattern pointer */
+ register REGEXCHAR *mp=nfa; /* nfa pointer */
+@@ -513,7 +513,7 @@
+
+ int
+ LDAP_CALL
+-re_exec( char *lp )
++re_exec( const char *lp )
+ {
+ register REGEXCHAR c;
+ register REGEXCHAR *ep = 0;
+--- misc/mozilla/directory/c-sdk/ldap/include/regex.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h 2009-07-02 11:05:24.000000000 +0900
+@@ -73,8 +73,8 @@
+ int re_init( void );
+ void re_lock( void );
+ int re_unlock( void );
+-char * LDAP_CALL re_comp( char *pat );
+-int LDAP_CALL re_exec( char *lp );
++char * LDAP_CALL re_comp( const char *pat );
++int LDAP_CALL re_exec( const char *lp );
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+
+

20
editors/openoffice.org-3/files/patch-i104014 Normal file
View file

@ -0,0 +1,20 @@
--- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900
+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900
@@ -141,12 +141,12 @@
# default linker flags
LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)

13
editors/openoffice.org-3/files/patch-i104015 Normal file
View file

@ -0,0 +1,13 @@
origin support
--- stlport/STLport-4.5.patch~ 2009-07-23 10:00:59.000000000 +0900
+++ stlport/STLport-4.5.patch 2009-08-03 01:33:01.000000000 +0900
@@ -137,7 +137,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so

17
editors/openoffice.org-3/files/patch-i105977 Normal file
View file

@ -0,0 +1,17 @@
--- nss/makefile.mk~ 2009-10-18 14:50:43.000000000 +0900
+++ nss/makefile.mk 2009-10-18 14:50:56.000000000 +0900
@@ -65,6 +65,14 @@
.ENDIF # "$(CPU)"=="X"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+.IF "$(CPU)"=="X"
+# force 64-bit buildmode
+USE_64:=1
+.EXPORT : USE_64
+.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+
.IF "$(OS)"=="MACOSX"
.IF "$(EXTRA_CFLAGS)"!=""

17
editors/openoffice.org-3/files/patch-i65514
View file

@ -1,13 +1,12 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
@@ -105,6 +105,10 @@
--- berkeleydb/makefile.mk 2009-09-26 08:52:35.000000000 +0900
+++ berkeleydb/makefile.mk 2009-09-26 08:54:31.000000000 +0900
@@ -102,6 +102,9 @@
CONFIGURE_ACTION= \
..$/dist$/configure
CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+.IF "$(COM)$(CPU)"=="GCCX"
+.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
+
# just pass ARCH_FLAGS to native build
CFLAGS+:=$(ARCH_FLAGS)
CXXFLAGS+:=$(ARCH_FLAGS)
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF

107
editors/openoffice.org-3/files/patch-i75190
View file

@ -1,107 +0,0 @@
http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon)
http://qa.openoffice.org/issues/show_bug.cgi?id=75190
Turn the GTK Recent Manager feature off.
Other workaround
% setenv OOO_FORCE_DESKTOP gnome
Backout of misfeature in cws_src680_obr05 branch.
* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx
See also
http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html
gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
(rev. 1.8.44.2)
gsl/shell/source/unix/sysshell/systemshell.cxx
(rev. 1.7.44.1)
Index: systemshell.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
retrieving revision 1.8
diff -u -u -r1.8 systemshell.cxx
--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8
+++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000
@@ -72,9 +72,6 @@
const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so");
const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext");
-void * (* sym_gtk_recent_manager_get_default) () = NULL;
-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL;
-
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
@@ -114,57 +111,31 @@
return url;
}
- bool init_recent_manager_api()
- {
- oslModule hDefault;
- if( osl_getModuleHandle( NULL, &hDefault ) )
- {
- sym_gtk_recent_manager_get_default = (void * (*)())
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default");
- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *))
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item");
-
- }
- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item);
- return ret;
- }
-
-
//##############################
void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
{
- static bool bIsRecentManagerPresent = init_recent_manager_api();
-
// Convert file URL for external use (see above)
rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
+ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
+
if( 0 == externalUrl.getLength() )
externalUrl = aFileUrl;
-
- if( bIsRecentManagerPresent )
- {
- void * recent_manager = sym_gtk_recent_manager_get_default();
- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr());
- }
- else
+
+ if (librecentfile_url.getLength())
{
- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
-
- if (librecentfile_url.getLength())
- {
- osl::Module module(librecentfile_url);
+ osl::Module module(librecentfile_url);
- if (module.is())
- {
- // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
- // not allowed in gcc 3.3 without permissive.
- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
- reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
-
- if (add_to_recently_used_file_list)
- add_to_recently_used_file_list(aFileUrl, aMimeType);
- }
+ if (module.is())
+ {
+ // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
+ // not allowed in gcc 3.3 without permissive.
+ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
+ reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
+
+ if (add_to_recently_used_file_list)
+ add_to_recently_used_file_list(aFileUrl, aMimeType);
}
- }
+ }
}
} // namespace SystemShell

31
editors/openoffice.org-3/files/patch-i80129
View file

@ -1,35 +1,16 @@
Merely a workaround
Index: libxml2/libxml2-2.6.31.patch
===================================================================
RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
retrieving revision 1.2
diff -u -r1.2 libxml2-2.6.31.patch
--- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2
+++ libxml2/libxml2-2.6.31.patch 10 Jun 2008 09:34:51 -0000
@@ -87,7 +87,7 @@
;;
+++ libxml2/libxml2-2.6.31.patch 8 Jul 2008 02:54:59 -0000
@@ -88,7 +88,7 @@
freebsd-elf)
-! major=.`expr $current - $age`
+! major=`expr $current - $age`
! versuffix=".$major.$age.$revision";
! major=.`expr $current - $age`
-! versuffix=".$major.$age.$revision";
+! versuffix="$major";
;;
Index: scp2/source/ooo/ure.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
retrieving revision 1.7
diff -u -r1.7 ure.scp
--- scp2/source/ooo/ure.scp 6 Jun 2008 17:05:51 -0000 1.7
+++ scp2/source/ooo/ure.scp 10 Jun 2008 09:45:54 -0000
@@ -679,6 +679,8 @@
#endif
#elif defined MACOSX
Name = SCP2_URE_DL_NORMAL("xml2.2");
+#elif defined FREEBSD
+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
#else
Name = SCP2_URE_DL_VER("xml2", "2");
#endif
irix | nonstopux)

9
editors/openoffice.org-3/files/patch-i85972
View file

@ -34,16 +34,16 @@ diff -u -r1.4 lp_solve_5.5.patch
--- lpsolve/makefile.mk.orig 2008-12-24 09:40:11.000000000 +0900
+++ lpsolve/makefile.mk 2008-12-24 12:09:06.000000000 +0900
@@ -46,7 +46,7 @@
PATCH_FILE_NAME=lp_solve_5.5-windows.patch
@@ -46,7 +47,7 @@
PATCH_FILES=lp_solve_5.5-windows.patch
.ELSE
PATCH_FILE_NAME=lp_solve_5.5.patch
PATCH_FILES=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
.ENDIF
CONFIGURE_DIR=
@@ -73,11 +73,16 @@
@@ -73,11 +74,16 @@
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
.ELSE
@ -59,4 +59,3 @@ diff -u -r1.4 lp_solve_5.5.patch
+.ENDIF
OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h

4
editors/openoffice.org-3/files/patch-i91318
View file

@ -1,5 +1,5 @@
--- hunspell/hunspell-1.2.8.patch~ 2009-02-21 08:52:35.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-05 09:30:33.000000000 +0900
--- hunspell/hunspell-1.2.8.patch~ 2009-03-11 22:17:54.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-20 21:37:49.000000000 +0900
@@ -619,3 +619,11 @@
p++;
}

25
editors/openoffice.org-3/files/patch-i91369
View file

@ -1,25 +0,0 @@
#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine)
#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine)
...-lsupc++ is static, and cannot find -lgcc_s
#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine)
cannot find -lgcc_s
--- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900
+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900
@@ -76,6 +76,7 @@
.ENDIF
# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied
.IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2"
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= -lsupc++
@@ -86,6 +87,8 @@
.IF "$(CCNUMVER)"<="000399999999"
SHL1STDLIBS+= -lsupc++
.ENDIF # CCNUMVER
+.ELIF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=
.ELIF "$(CCNUMVER)"<="000400000999"
SHL1STDLIBS+= -lsupc++ -lgcc_s
.ENDIF

4
editors/openoffice.org-3/files/patch-i98781
View file

@ -92,7 +92,7 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
@@ -121,7 +121,7 @@
@@ -121,7 +122,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
@ -101,7 +101,7 @@ in files/patches-i85126
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -160,7 +160,7 @@
@@ -160,7 +161,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );