5 files changed, 44 insertions, 95 deletions

diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index ce357d35557e..b4d0acb83afa 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	3.1.${SNAPDATE}
-PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
@@ -71,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		39
+MILESTONE?=		40
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090117
+SNAPDATE=		20090127
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -132,7 +131,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-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 2577265b04e2..97f0a54957fb 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m39_source.tar.bz2) = 0759c1d09a6a864a17f75551c54037b4
-SHA256 (openoffice.org3/OOo_DEV300_m39_source.tar.bz2) = c388dcd49ffb0adc6570801d82095d39fe42c0d78076716f9b02968aa996b168
-SIZE (openoffice.org3/OOo_DEV300_m39_source.tar.bz2) = 389789418
+MD5 (openoffice.org3/OOo_DEV300_m40_source.tar.bz2) = c6aa17ee8d646f42c03fa909a27bda4b
+SHA256 (openoffice.org3/OOo_DEV300_m40_source.tar.bz2) = 859f2260a854372f9088b9fbdc87e79159e9294c1e837a9bb4674f6b7e6ccb9f
+SIZE (openoffice.org3/OOo_DEV300_m40_source.tar.bz2) = 390027564
 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-devel/files/patch-i93235 b/editors/openoffice.org-3-devel/files/patch-i93235
deleted file mode 100644
index a581a2c34afd..000000000000
--- a/editors/openoffice.org-3-devel/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()    
- 
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-i98513 b/editors/openoffice.org-3-devel/files/patch-i98513
new file mode 100644
index 000000000000..508eac3c6009
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i98513
@@ -0,0 +1,16 @@
+Index: makefile.pmk
+===================================================================
+--- readlicense_oo/util/makefile.pmk (revision 266942)
++++ readlicense_oo/util/makefile.pmk (working copy)
+@@ -55,7 +55,11 @@
+ virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
+ 
+ $(MISC)$/readme_text.xsl : virtual
++.IF "$(USE_SHELL)"!="4nt"
++ 	$(SED) 's#method="html".*>#method="text"/>#' < ..$/readme.xsl > $@
++.ELSE			# "$(USE_SHELL)"!="4nt"
+ 	$(SED) "s/method=\"html\".*>/method=\"text\"\/>/" < ..$/readme.xsl > $@
++.ENDIF			# "$(USE_SHELL)"!="4nt"
+ 
+ $(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
+ 	$(XSLTPROC) --nonet -o $@ \
diff --git a/editors/openoffice.org-3-devel/files/patch-i98550 b/editors/openoffice.org-3-devel/files/patch-i98550
new file mode 100644
index 000000000000..796fc9be02d1
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i98550
@@ -0,0 +1,23 @@
+--- dictionaries/hu_HU/makefile.mk.orig	2009-01-27 07:57:31.000000000 +0900
++++ dictionaries/hu_HU/makefile.mk	2009-01-31 18:43:47.000000000 +0900
+@@ -57,17 +57,16 @@
+     $(EXTENSIONDIR)$/hu_HU.dic \
+     $(EXTENSIONDIR)$/hyph_hu_HU.dic \
+     $(EXTENSIONDIR)$/README_hu_HU.txt \
+-    $(EXTENSIONDIR)$/README_hyph_hu_HU.txt \
+- 	$(EXTENSIONDIR)$/LICENSES-en.txt \
++    $(EXTENSIONDIR)$/README_hyph_hu_HU.txt
+ 
+ COMPONENT_CONFIGDEST=.
+ COMPONENT_XCU= \
+     $(EXTENSIONDIR)$/dictionaries.xcu
+ 
+ # disable fetching default OOo license text
+-#CUSTOM_LICENSE=COPYING_OASIS
++CUSTOM_LICENSE=LICENSES-en.txt
+ # override default license destination
+-#PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
++PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
+ 
+ COMPONENT_ZIP:=$(PWD)$/thes_hu_HU_v2.zip
+ COMPONENT_UNZIP_FILES= \