Update to 2.3.1.

This is a bug fix release, no new features are introduced.
http://development.openoffice.org/releases/2.3.1.html
It also fixes http://www.openoffice.org/security/cves/CVE-2007-4575.html.

Approved by:	portmgr(edwin)

6 files changed, 15 insertions, 18 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 56064cadc96a..9d9340e1c0ee 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.0
+OOOVERSION=	2.3.1
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -73,7 +72,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		6
+MILESTONE?=		9
 OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 02aad53d65da..958922082891 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 20feb0839b14ada805068d2bc6c01262
-SHA256 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 9d9fde118bb5155217db316b3fff17e7be9bee388f2d9803f6f9d896b24ebbf7
-SIZE (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 291618064
+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/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 56064cadc96a..9d9340e1c0ee 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.0
+OOOVERSION=	2.3.1
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -73,7 +72,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		6
+MILESTONE?=		9
 OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 02aad53d65da..958922082891 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 20feb0839b14ada805068d2bc6c01262
-SHA256 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 9d9fde118bb5155217db316b3fff17e7be9bee388f2d9803f6f9d896b24ebbf7
-SIZE (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 291618064
+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/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 56064cadc96a..9d9340e1c0ee 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.0
+OOOVERSION=	2.3.1
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -73,7 +72,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		6
+MILESTONE?=		9
 OOOTAG?=		OOG680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 02aad53d65da..958922082891 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 20feb0839b14ada805068d2bc6c01262
-SHA256 (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 9d9fde118bb5155217db316b3fff17e7be9bee388f2d9803f6f9d896b24ebbf7
-SIZE (openoffice.org2/OOo_OOG680_m6_source.tar.bz2) = 291618064
+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/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144