aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2008-03-29 06:26:03 +0800
committermaho <maho@FreeBSD.org>2008-03-29 06:26:03 +0800
commit2c7bd63b6df88c6e4a2743a16b86add95e2c7492 (patch)
tree91adcb6edcc07f8e59cf013d90e12d028f34bb13 /editors
parentf2049459e05181c0dcb34d33824725ebe9596212 (diff)
downloadfreebsd-ports-gnome-2c7bd63b6df88c6e4a2743a16b86add95e2c7492.tar.gz
freebsd-ports-gnome-2c7bd63b6df88c6e4a2743a16b86add95e2c7492.tar.zst
freebsd-ports-gnome-2c7bd63b6df88c6e4a2743a16b86add95e2c7492.zip
Update to 2.4.0.
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-3/Makefile8
-rw-r--r--editors/openoffice-3/distinfo6
-rw-r--r--editors/openoffice-3/files/Makefile.knobs10
-rw-r--r--editors/openoffice-3/files/patch-i6551415
-rw-r--r--editors/openoffice-3/files/patch-i7841710
-rw-r--r--editors/openoffice-3/files/patch-i7887531
-rw-r--r--editors/openoffice-3/files/patch-i8000322
-rw-r--r--editors/openoffice-3/files/patch-i8029520
-rw-r--r--editors/openoffice-3/files/patch-i8454917
-rw-r--r--editors/openoffice-3/files/patch-i8458643
-rw-r--r--editors/openoffice.org-2/Makefile8
-rw-r--r--editors/openoffice.org-2/distinfo6
-rw-r--r--editors/openoffice.org-2/files/Makefile.knobs10
-rw-r--r--editors/openoffice.org-2/files/patch-i6551415
-rw-r--r--editors/openoffice.org-2/files/patch-i7841710
-rw-r--r--editors/openoffice.org-2/files/patch-i7887531
-rw-r--r--editors/openoffice.org-2/files/patch-i8000322
-rw-r--r--editors/openoffice.org-2/files/patch-i8029520
-rw-r--r--editors/openoffice.org-2/files/patch-i8454917
-rw-r--r--editors/openoffice.org-2/files/patch-i8458643
-rw-r--r--editors/openoffice.org-3/Makefile8
-rw-r--r--editors/openoffice.org-3/distinfo6
-rw-r--r--editors/openoffice.org-3/files/Makefile.knobs10
-rw-r--r--editors/openoffice.org-3/files/patch-i6551415
-rw-r--r--editors/openoffice.org-3/files/patch-i7841710
-rw-r--r--editors/openoffice.org-3/files/patch-i7887531
-rw-r--r--editors/openoffice.org-3/files/patch-i8000322
-rw-r--r--editors/openoffice.org-3/files/patch-i8029520
-rw-r--r--editors/openoffice.org-3/files/patch-i8454917
-rw-r--r--editors/openoffice.org-3/files/patch-i8458643
30 files changed, 225 insertions, 321 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index f0958f125efc..93ecaa92d932 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,6 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -32,7 +31,7 @@ DISTFILES+= ${CWSARCHIVE}:cws
.endif
CWSARCHIVE= ${WITH_CWS}.tar.gz
-OOOVERSION= 2.3.1
+OOOVERSION= 2.4.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
@@ -72,9 +71,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
-CODELINE= 680
-MILESTONE?= 9
-OOOTAG?= OOG680_m${MILESTONE}
+MILESTONE?= 12
+OOOTAG?= OOH680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 958922082891..c355613080ec 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 49d1448cc53f68455027b6fb3823e0b9
-SHA256 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 61e21dc39434755117355c427611e1c715fd6c5bc351eb23f3b88b2996f1ff6c
-SIZE (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 291515039
+MD5 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 40b8a3a214f780d4bc8e823f3c580660
+SHA256 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 66752fca6177059f2cf2f533db2ef694aae70e7cc0a508c51e2518870e918d7b
+SIZE (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 286332380
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index f31353c9e2fe..a24d1fdea61f 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -4,10 +4,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-#.if defined(WITH_VBA)
-#CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
-#EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
-#.endif
+CONFIGURE_ARGS+= --with-vba-package-format="builtin"
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
@@ -93,11 +90,6 @@ pre-fetch:
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
.endif
-#.if !defined(WITH_VBA)
-# @${ECHO}
-# @${ECHO} "You can compile OOo with VBA support with"
-# @${ECHO} "make -DWITH_VBA"
-#.endif
.if !defined(WITH_SYSTEM_FREETYPE)
@${ECHO}
@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice-3/files/patch-i65514 b/editors/openoffice-3/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice-3/files/patch-i65514
+++ b/editors/openoffice-3/files/patch-i65514
@@ -1,12 +1,13 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ ..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+
+.IF "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
-
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice-3/files/patch-i78417 b/editors/openoffice-3/files/patch-i78417
deleted file mode 100644
index fee06f2fa429..000000000000
--- a/editors/openoffice-3/files/patch-i78417
+++ /dev/null
@@ -1,10 +0,0 @@
---- sw/source/core/bastyp/swregion.cxx
-+++ sw/source/core/bastyp/swregion.cxx
-@@ -79,6 +79,7 @@
- {
- if( rDel )
- {
-+ pData = (SwRect*) pData;
- *(pData+nPos) = rRect;
- rDel = FALSE;
- }
diff --git a/editors/openoffice-3/files/patch-i78875 b/editors/openoffice-3/files/patch-i78875
deleted file mode 100644
index aff1f83eead5..000000000000
--- a/editors/openoffice-3/files/patch-i78875
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: libtextcat/libtextcat-2.2.patch
-===================================================================
-RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
-retrieving revision 1.3
-diff -u -r1.3 libtextcat-2.2.patch
---- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3
-+++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000
-@@ -18,6 +18,23 @@
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
- archive_cmds=
-+***************
-+*** 6280,6286 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 6281,6287 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003
- --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007
- ***************
diff --git a/editors/openoffice-3/files/patch-i80003 b/editors/openoffice-3/files/patch-i80003
deleted file mode 100644
index 453610348c91..000000000000
--- a/editors/openoffice-3/files/patch-i80003
+++ /dev/null
@@ -1,22 +0,0 @@
-correct patch by jkim
-http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
-will be go into cws obo15.
-
-Index: libxslt/makefile.mk
-===================================================================
-RCS file: /cvs/external/libxslt/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
-+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
-@@ -96,6 +96,10 @@
- BUILD_DIR=$(CONFIGURE_DIR)
- .ENDIF
-
-+.IF "$(OS)"=="FREEBSD"
-+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
-+.ENDIF
-+
- OUT2INC=libxslt$/*.h
-
- .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice-3/files/patch-i80295 b/editors/openoffice-3/files/patch-i80295
deleted file mode 100644
index d66798903a3c..000000000000
--- a/editors/openoffice-3/files/patch-i80295
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: svx/source/dialog/cuifmsearch.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 cuifmsearch.hxx
---- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
-+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
-@@ -93,10 +93,10 @@
-
- struct FmSearchProgress;
-
-+class FmSearchEngine;
-+
- class FmSearchDialog : public ModalDialog
- {
-- friend class FmSearchEngine;
--
- // meine ganzen Controls
- FixedLine m_flSearchFor;
- RadioButton m_rbSearchForText;
diff --git a/editors/openoffice-3/files/patch-i84549 b/editors/openoffice-3/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20
++++ neon/neon.patch 13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ !
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ !
diff --git a/editors/openoffice-3/files/patch-i84586 b/editors/openoffice-3/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i84586
@@ -0,0 +1,43 @@
+? 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-2/Makefile b/editors/openoffice.org-2/Makefile
index f0958f125efc..93ecaa92d932 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,6 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -32,7 +31,7 @@ DISTFILES+= ${CWSARCHIVE}:cws
.endif
CWSARCHIVE= ${WITH_CWS}.tar.gz
-OOOVERSION= 2.3.1
+OOOVERSION= 2.4.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
@@ -72,9 +71,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
-CODELINE= 680
-MILESTONE?= 9
-OOOTAG?= OOG680_m${MILESTONE}
+MILESTONE?= 12
+OOOTAG?= OOH680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 958922082891..c355613080ec 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 49d1448cc53f68455027b6fb3823e0b9
-SHA256 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 61e21dc39434755117355c427611e1c715fd6c5bc351eb23f3b88b2996f1ff6c
-SIZE (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 291515039
+MD5 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 40b8a3a214f780d4bc8e823f3c580660
+SHA256 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 66752fca6177059f2cf2f533db2ef694aae70e7cc0a508c51e2518870e918d7b
+SIZE (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 286332380
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index f31353c9e2fe..a24d1fdea61f 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -4,10 +4,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-#.if defined(WITH_VBA)
-#CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
-#EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
-#.endif
+CONFIGURE_ARGS+= --with-vba-package-format="builtin"
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
@@ -93,11 +90,6 @@ pre-fetch:
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
.endif
-#.if !defined(WITH_VBA)
-# @${ECHO}
-# @${ECHO} "You can compile OOo with VBA support with"
-# @${ECHO} "make -DWITH_VBA"
-#.endif
.if !defined(WITH_SYSTEM_FREETYPE)
@${ECHO}
@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice.org-2/files/patch-i65514 b/editors/openoffice.org-2/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice.org-2/files/patch-i65514
+++ b/editors/openoffice.org-2/files/patch-i65514
@@ -1,12 +1,13 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ ..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+
+.IF "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
-
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice.org-2/files/patch-i78417 b/editors/openoffice.org-2/files/patch-i78417
deleted file mode 100644
index fee06f2fa429..000000000000
--- a/editors/openoffice.org-2/files/patch-i78417
+++ /dev/null
@@ -1,10 +0,0 @@
---- sw/source/core/bastyp/swregion.cxx
-+++ sw/source/core/bastyp/swregion.cxx
-@@ -79,6 +79,7 @@
- {
- if( rDel )
- {
-+ pData = (SwRect*) pData;
- *(pData+nPos) = rRect;
- rDel = FALSE;
- }
diff --git a/editors/openoffice.org-2/files/patch-i78875 b/editors/openoffice.org-2/files/patch-i78875
deleted file mode 100644
index aff1f83eead5..000000000000
--- a/editors/openoffice.org-2/files/patch-i78875
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: libtextcat/libtextcat-2.2.patch
-===================================================================
-RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
-retrieving revision 1.3
-diff -u -r1.3 libtextcat-2.2.patch
---- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3
-+++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000
-@@ -18,6 +18,23 @@
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
- archive_cmds=
-+***************
-+*** 6280,6286 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 6281,6287 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003
- --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007
- ***************
diff --git a/editors/openoffice.org-2/files/patch-i80003 b/editors/openoffice.org-2/files/patch-i80003
deleted file mode 100644
index 453610348c91..000000000000
--- a/editors/openoffice.org-2/files/patch-i80003
+++ /dev/null
@@ -1,22 +0,0 @@
-correct patch by jkim
-http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
-will be go into cws obo15.
-
-Index: libxslt/makefile.mk
-===================================================================
-RCS file: /cvs/external/libxslt/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
-+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
-@@ -96,6 +96,10 @@
- BUILD_DIR=$(CONFIGURE_DIR)
- .ENDIF
-
-+.IF "$(OS)"=="FREEBSD"
-+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
-+.ENDIF
-+
- OUT2INC=libxslt$/*.h
-
- .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-2/files/patch-i80295 b/editors/openoffice.org-2/files/patch-i80295
deleted file mode 100644
index d66798903a3c..000000000000
--- a/editors/openoffice.org-2/files/patch-i80295
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: svx/source/dialog/cuifmsearch.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 cuifmsearch.hxx
---- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
-+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
-@@ -93,10 +93,10 @@
-
- struct FmSearchProgress;
-
-+class FmSearchEngine;
-+
- class FmSearchDialog : public ModalDialog
- {
-- friend class FmSearchEngine;
--
- // meine ganzen Controls
- FixedLine m_flSearchFor;
- RadioButton m_rbSearchForText;
diff --git a/editors/openoffice.org-2/files/patch-i84549 b/editors/openoffice.org-2/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20
++++ neon/neon.patch 13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ !
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ !
diff --git a/editors/openoffice.org-2/files/patch-i84586 b/editors/openoffice.org-2/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i84586
@@ -0,0 +1,43 @@
+? 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/Makefile b/editors/openoffice.org-3/Makefile
index f0958f125efc..93ecaa92d932 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,6 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -32,7 +31,7 @@ DISTFILES+= ${CWSARCHIVE}:cws
.endif
CWSARCHIVE= ${WITH_CWS}.tar.gz
-OOOVERSION= 2.3.1
+OOOVERSION= 2.4.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
@@ -72,9 +71,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
-CODELINE= 680
-MILESTONE?= 9
-OOOTAG?= OOG680_m${MILESTONE}
+MILESTONE?= 12
+OOOTAG?= OOH680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 958922082891..c355613080ec 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 49d1448cc53f68455027b6fb3823e0b9
-SHA256 (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 61e21dc39434755117355c427611e1c715fd6c5bc351eb23f3b88b2996f1ff6c
-SIZE (openoffice.org2/OOo_OOG680_m9_source.tar.bz2) = 291515039
+MD5 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 40b8a3a214f780d4bc8e823f3c580660
+SHA256 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 66752fca6177059f2cf2f533db2ef694aae70e7cc0a508c51e2518870e918d7b
+SIZE (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 286332380
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index f31353c9e2fe..a24d1fdea61f 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -4,10 +4,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
-#.if defined(WITH_VBA)
-#CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin"
-#EXTRA_PATCHES+= ${FILESDIR}/cws-npower7.diff
-#.endif
+CONFIGURE_ARGS+= --with-vba-package-format="builtin"
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
@@ -93,11 +90,6 @@ pre-fetch:
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
.endif
-#.if !defined(WITH_VBA)
-# @${ECHO}
-# @${ECHO} "You can compile OOo with VBA support with"
-# @${ECHO} "make -DWITH_VBA"
-#.endif
.if !defined(WITH_SYSTEM_FREETYPE)
@${ECHO}
@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice.org-3/files/patch-i65514 b/editors/openoffice.org-3/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice.org-3/files/patch-i65514
+++ b/editors/openoffice.org-3/files/patch-i65514
@@ -1,12 +1,13 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ ..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+
+.IF "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
-
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice.org-3/files/patch-i78417 b/editors/openoffice.org-3/files/patch-i78417
deleted file mode 100644
index fee06f2fa429..000000000000
--- a/editors/openoffice.org-3/files/patch-i78417
+++ /dev/null
@@ -1,10 +0,0 @@
---- sw/source/core/bastyp/swregion.cxx
-+++ sw/source/core/bastyp/swregion.cxx
-@@ -79,6 +79,7 @@
- {
- if( rDel )
- {
-+ pData = (SwRect*) pData;
- *(pData+nPos) = rRect;
- rDel = FALSE;
- }
diff --git a/editors/openoffice.org-3/files/patch-i78875 b/editors/openoffice.org-3/files/patch-i78875
deleted file mode 100644
index aff1f83eead5..000000000000
--- a/editors/openoffice.org-3/files/patch-i78875
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: libtextcat/libtextcat-2.2.patch
-===================================================================
-RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
-retrieving revision 1.3
-diff -u -r1.3 libtextcat-2.2.patch
---- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3
-+++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000
-@@ -18,6 +18,23 @@
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
- archive_cmds=
-+***************
-+*** 6280,6286 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 6281,6287 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003
- --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007
- ***************
diff --git a/editors/openoffice.org-3/files/patch-i80003 b/editors/openoffice.org-3/files/patch-i80003
deleted file mode 100644
index 453610348c91..000000000000
--- a/editors/openoffice.org-3/files/patch-i80003
+++ /dev/null
@@ -1,22 +0,0 @@
-correct patch by jkim
-http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
-will be go into cws obo15.
-
-Index: libxslt/makefile.mk
-===================================================================
-RCS file: /cvs/external/libxslt/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- libxslt/makefile.mk 19 Jul 2007 11:21:19 -0000 1.7
-+++ libxslt/makefile.mk 24 Jul 2007 20:33:55 -0000
-@@ -96,6 +96,10 @@
- BUILD_DIR=$(CONFIGURE_DIR)
- .ENDIF
-
-+.IF "$(OS)"=="FREEBSD"
-+xslt_LDFLAGS+=-L$(SOLARLIBDIR)
-+.ENDIF
-+
- OUT2INC=libxslt$/*.h
-
- .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-3/files/patch-i80295 b/editors/openoffice.org-3/files/patch-i80295
deleted file mode 100644
index d66798903a3c..000000000000
--- a/editors/openoffice.org-3/files/patch-i80295
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: svx/source/dialog/cuifmsearch.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 cuifmsearch.hxx
---- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6
-+++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000
-@@ -93,10 +93,10 @@
-
- struct FmSearchProgress;
-
-+class FmSearchEngine;
-+
- class FmSearchDialog : public ModalDialog
- {
-- friend class FmSearchEngine;
--
- // meine ganzen Controls
- FixedLine m_flSearchFor;
- RadioButton m_rbSearchForText;
diff --git a/editors/openoffice.org-3/files/patch-i84549 b/editors/openoffice.org-3/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20
++++ neon/neon.patch 13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ !
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ !
diff --git a/editors/openoffice.org-3/files/patch-i84586 b/editors/openoffice.org-3/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i84586
@@ -0,0 +1,43 @@
+? 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