diff options
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i84586 | 43 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i85972 | 16 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i87583 | 14 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i93235 | 88 |
6 files changed, 13 insertions, 164 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index a6d83141d679..b57c1e8f5bd9 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -7,8 +7,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 3.0.${SNAPDATE} -PORTREVISION?= 1 +PORTVERSION?= 3.1.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -73,11 +72,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 15 -OOOTAG?= OOO300_m${MILESTONE} +MILESTONE?= 1 +OOOTAG?= OOO310_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20090113 +SNAPDATE= 20090214 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) @@ -134,7 +133,6 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl USE_BISON= build GNU_CONFIGURE= yes WRKSRC?= ${WRKDIR}/${OOOTAG} -CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message MAXPROCESSES?= 1 diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 834c7a7ca68d..b24884a790b0 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 97923bc2f9d98ffec7863f1170ef4291 -SHA256 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = dcd6ca79fe264608a4d3089a7de06eaa57bd897f7071a546e40ac2b5ab951dce -SIZE (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 335188535 +MD5 (openoffice.org3/OOo_OOO310_m1_source.tar.bz2) = 44951e5ca20c37aa1ddcc012563ac8c0 +SHA256 (openoffice.org3/OOo_OOO310_m1_source.tar.bz2) = efa5d4ebfc6acf223272f20163673e71cd7485fe4c6d7d3f973528a147946b83 +SIZE (openoffice.org3/OOo_OOO310_m1_source.tar.bz2) = 390121902 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-RC/files/patch-i84586 b/editors/openoffice.org-3-RC/files/patch-i84586 deleted file mode 100644 index 7b624c3f77f1..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-i84586 +++ /dev/null @@ -1,43 +0,0 @@ -? sc/unxfbsdi.pro -Index: sc/source/ui/vba/vbaaxis.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v -retrieving revision 1.2 -diff -u -r1.2 vbaaxis.cxx ---- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2 -+++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000 -@@ -47,8 +47,8 @@ - - const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); - const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); --const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); --const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); - ScVbaChart* - ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) - { -@@ -142,12 +142,12 @@ - bCrossesAreCustomized = sal_False; - return; - case xlAxisCrossesMinimum: // The axis crosses at the minimum value. -- mxPropertySet->getPropertyValue(MIN) >>= fNum; -+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum; - setCrossesAt( fNum ); - bCrossesAreCustomized = sal_False; - break; - case xlAxisCrossesMaximum: // The axis crosses at the maximum value. -- mxPropertySet->getPropertyValue(MAX) >>= fNum; -+ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum; - setCrossesAt(fNum); - bCrossesAreCustomized = sal_False; - break; -@@ -182,7 +182,7 @@ - mxPropertySet->getPropertyValue(ORIGIN) >>= forigin; - //obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max")); - double fmin = 0.0; -- mxPropertySet->getPropertyValue(MIN) >>= fmin; -+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin; - if (forigin == fmin) - nCrosses = xlAxisCrossesMinimum; - else diff --git a/editors/openoffice.org-3-RC/files/patch-i85972 b/editors/openoffice.org-3-RC/files/patch-i85972 index 931cbb8c535d..9a87976fcbb1 100644 --- a/editors/openoffice.org-3-RC/files/patch-i85972 +++ b/editors/openoffice.org-3-RC/files/patch-i85972 @@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch ++fi ++ ++rm *.o 2>/dev/null -Index: lpsolve/makefile.mk -=================================================================== -RCS file: /cvs/external/lpsolve/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- lpsolve/makefile.mk 11 Apr 2008 07:18:41 -0000 1.5 -+++ lpsolve/makefile.mk 3 Jul 2008 00:20:53 -0000 + +--- 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 .ELSE PATCH_FILE_NAME=lp_solve_5.5.patch --ADDITIONAL_FILES=lpsolve55$/ccc.solaris -+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd +-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 ++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd .ENDIF CONFIGURE_DIR= -@@ -70,11 +70,16 @@ +@@ -73,11 +73,16 @@ .IF "$(COMNAME)"=="sunpro5" BUILD_ACTION=sh ccc.solaris .ELSE diff --git a/editors/openoffice.org-3-RC/files/patch-i87583 b/editors/openoffice.org-3-RC/files/patch-i87583 index e82f268d7ad0..750935a3030b 100644 --- a/editors/openoffice.org-3-RC/files/patch-i87583 +++ b/editors/openoffice.org-3-RC/files/patch-i87583 @@ -1,17 +1,3 @@ ---- configmgr/source/cmdtools/setofficelang.sh.orig 2008-06-09 08:42:48.000000000 -0400 -+++ configmgr/source/cmdtools/setofficelang.sh 2008-06-27 15:47:37.000000000 -0400 -@@ -75,6 +75,11 @@ - export DYLD_LIBRARY_PATH - ;; - -+ FreeBSD) -+ LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} -+ export LD_LIBRARY_PATH -+ ;; -+ - HP-UX) - SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} - export SHLIB_PATH --- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400 +++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400 @@ -75,6 +75,15 @@ diff --git a/editors/openoffice.org-3-RC/files/patch-i93235 b/editors/openoffice.org-3-RC/files/patch-i93235 deleted file mode 100644 index a581a2c34afd..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-i93235 +++ /dev/null @@ -1,88 +0,0 @@ -Add support for Diablo JDK 1.6.0 and above. - ---- /dev/null 2008-08-27 17:05:37.000000000 -0400 -+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400 -@@ -0,0 +1,38 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+ -+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" -+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -+ -+ <updated>2008-08-27</updated> -+ -+ <vendorInfos> -+ <vendor name="Sun Microsystems Inc."> -+ <minVersion>1.3.1</minVersion> -+ </vendor> -+ <vendor name="The FreeBSD Foundation"> -+ <minVersion>1.6.0</minVersion> -+ </vendor> -+ <vendor name="IBM Corporation"> -+ <minVersion>1.3.1</minVersion> -+ <maxVersion>1.4.2</maxVersion> -+ </vendor> -+ <vendor name="Blackdown Java-Linux Team"> -+ <minVersion>1.3.1</minVersion> -+ </vendor> -+ <vendor name="Free Software Foundation, Inc."> -+ <minVersion>1.4.2</minVersion> -+ </vendor> -+ <vendor name="BEA Systems, Inc."> -+ <minVersion>1.4.1</minVersion> -+ </vendor> -+ </vendorInfos> -+ -+ <plugins> -+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ </plugins> -+</javaSelection> ---- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig 2008-04-11 06:16:59.000000000 -0400 -+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 2008-08-27 17:09:45.000000000 -0400 -@@ -43,9 +43,11 @@ - .IF "$(SOLAR_JAVA)"!="" - $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml - .IF "$(GUI)"=="UNX" --.IF "$(OS)"=="MACOSX" -+.IF "$(OS)"=="FREEBSD" -+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml -+.ELIF "$(OS)"=="MACOSX" - -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml --.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" -+.ELIF "$(OS)"=="LINUX" - -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml - .ELSE - -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml ---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig 2008-04-11 06:19:31.000000000 -0400 -+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2008-08-27 17:19:35.000000000 -0400 -@@ -128,13 +128,15 @@ - rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); - rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); - rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); -+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); - if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True - || sVendor2.equals(pInfo->sVendor) == sal_True - || sVendor3.equals(pInfo->sVendor) == sal_True - || sVendor4.equals(pInfo->sVendor) == sal_True - || sVendor5.equals(pInfo->sVendor) == sal_True - || sVendor6.equals(pInfo->sVendor) == sal_True -- || sVendor7.equals(pInfo->sVendor) == sal_True)) -+ || sVendor7.equals(pInfo->sVendor) == sal_True -+ || sVendor8.equals(pInfo->sVendor) == sal_True)) - return 0; - - rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); ---- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx.orig 2008-04-11 06:24:39.000000000 -0400 -+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 2008-08-27 17:13:00.000000000 -0400 -@@ -56,6 +56,7 @@ - VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo) - VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo) - VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo) -+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) - END_VENDOR_MAP() - - |