Update to DEV300_m41.

Note: this milestone is the first milestone towards to 3.2.

Funded by OpenOffice.org community.

6 files changed, 12 insertions, 44 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index b4d0acb83afa..09c13aa097d6 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	3.1.${SNAPDATE}
+PORTVERSION?=	3.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		40
+MILESTONE?=		41
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090127
+SNAPDATE=		20090131
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 97f0a54957fb..48f926e9d022 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m41_source.tar.bz2) = ccc26541f4e9a98e546e4c1a8f8f9818
+SHA256 (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 7d54931b6fb467503bcc821a67e5b32dbf199077adc8566560825ae0ccb68adc
+SIZE (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 390008199
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i98513 b/editors/openoffice-3-devel/files/patch-i98513
deleted file mode 100644
index 508eac3c6009..000000000000
--- a/editors/openoffice-3-devel/files/patch-i98513
+++ /dev/null
@@ -1,16 +0,0 @@
-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/Makefile b/editors/openoffice.org-3-devel/Makefile
index b4d0acb83afa..09c13aa097d6 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	3.1.${SNAPDATE}
+PORTVERSION?=	3.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		40
+MILESTONE?=		41
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090127
+SNAPDATE=		20090131
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 97f0a54957fb..48f926e9d022 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m41_source.tar.bz2) = ccc26541f4e9a98e546e4c1a8f8f9818
+SHA256 (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 7d54931b6fb467503bcc821a67e5b32dbf199077adc8566560825ae0ccb68adc
+SIZE (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 390008199
 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-i98513 b/editors/openoffice.org-3-devel/files/patch-i98513
deleted file mode 100644
index 508eac3c6009..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i98513
+++ /dev/null
@@ -1,16 +0,0 @@
-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 $@ \