From 7a89ba87075b8e31dcbb266bbf895281a862cbd3 Mon Sep 17 00:00:00 2001
From: maho <maho@FreeBSD.org>
Date: Fri, 1 Jun 2007 10:25:14 +0000
Subject: Update to OOF680_m18.

---
 editors/openoffice.org-2-RC/Makefile | 8 ++++----
 editors/openoffice.org-2-RC/distinfo | 6 +++---
 editors/openoffice.org-3-RC/Makefile | 8 ++++----
 editors/openoffice.org-3-RC/distinfo | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 404a75800d36..bcade35f3237 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.2.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
-		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
@@ -73,10 +73,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		17
+MILESTONE?=		18
 OOOTAG?=		OOF680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070522
+SNAPDATE=		20070531
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 217fecfe29af..a0242e93bb9f 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = f07aa36e8ccea9bc0d3c97f9dfdc7466
-SHA256 (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = f23f3b1ffc579be218e54ddd88689050483cc867bf6e8f872032f3e97ced2651
-SIZE (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = 268958986
+MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
+SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
+SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
 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-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 404a75800d36..bcade35f3237 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.2.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
-		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
@@ -73,10 +73,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		17
+MILESTONE?=		18
 OOOTAG?=		OOF680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070522
+SNAPDATE=		20070531
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 217fecfe29af..a0242e93bb9f 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = f07aa36e8ccea9bc0d3c97f9dfdc7466
-SHA256 (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = f23f3b1ffc579be218e54ddd88689050483cc867bf6e8f872032f3e97ced2651
-SIZE (openoffice.org2/OOo_OOF680_m17_source.tar.bz2) = 268958986
+MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
+SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
+SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
-- 
cgit