Update to SRX645_m52

6 files changed, 8 insertions, 86 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 93bfb9ebc6fa..3d0da5113aaa 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -11,7 +11,6 @@ CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.0/src/:moz \
-		${MASTER_SITE_LOCAL}:moz \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
@@ -22,13 +21,13 @@ EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 
-SNAPDATE=	20041030
+SNAPDATE=	20041101
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
 MOZILLA_SOURCE=		mozilla-source-1.0.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:moz
+DISTFILES+=	${MOZILLA_PROJECT} ${MOZILLA_SOURCE}:moz
 USE_GNOME+=	orbit gtk12
 .endif
 
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 8ec0d36a5f9c..119f1b1d1517 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = d51db6b6acbb14f707b3bb2360785666
-SIZE (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = 194262145
+MD5 (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 5898440ddd78fd87819d45d613c0b57e
+SIZE (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 198438413
 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4 b/editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4
deleted file mode 100644
index 66ed9ab18607..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4
+++ /dev/null
@@ -1,38 +0,0 @@
-Version number should be 1.1.4
-http://www.openoffice.org/issues/show_bug.cgi?id=35584
-
---- instsetoo/util/openoffice.lst.org	Fri Oct 15 14:34:45 2004
-+++ instsetoo/util/openoffice.lst	Fri Oct 15 14:34:51 2004
-@@ -5,7 +5,7 @@
- 		variables
- 		{
- 			PRODUCTNAME OpenOffice.org
--			PRODUCTVERSION 1.1.3
-+			PRODUCTVERSION 1.1.4
- 			PRODUCTEXTENSION
- 			LONG_PRODUCTEXTENSION
- 			EVAL
---- setup2/wrapper/install.sh.org	Fri Aug 27 18:20:00 2004
-+++ setup2/wrapper/install.sh	Fri Oct 15 14:34:29 2004
-@@ -4,8 +4,8 @@
- cd `dirname $0`
- 
- # Set the Defaults Here
--oo_version="OpenOffice.org 1.1.3"
--oo_home=OpenOffice.org1.1.3
-+oo_version="OpenOffice.org 1.1.4"
-+oo_home=OpenOffice.org1.1.4
- oo_default_prefix=/usr/local
- oo_default_netflg=-net
- oo_default_interact=no
---- sdk_oo/util/makefile.pmk.org	Fri Oct 15 14:34:14 2004
-+++ sdk_oo/util/makefile.pmk	Fri Oct 15 14:34:18 2004
-@@ -59,7 +59,7 @@
- #
- #
- #*************************************************************************
--PRODUCT_RELEASE=1.1.3
-+PRODUCT_RELEASE=1.1.4
- OFFICENAME=OpenOffice.org
- PRODUCT_NAME=$(OFFICENAME)$(PRODUCT_RELEASE)_SDK
- PRODUCTZIPFILE=$(PRODUCT_NAME).zip
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 93bfb9ebc6fa..3d0da5113aaa 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -11,7 +11,6 @@ CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.0/src/:moz \
-		${MASTER_SITE_LOCAL}:moz \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
@@ -22,13 +21,13 @@ EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 
-SNAPDATE=	20041030
+SNAPDATE=	20041101
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
 MOZILLA_SOURCE=		mozilla-source-1.0.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:moz
+DISTFILES+=	${MOZILLA_PROJECT} ${MOZILLA_SOURCE}:moz
 USE_GNOME+=	orbit gtk12
 .endif
 
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 8ec0d36a5f9c..119f1b1d1517 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = d51db6b6acbb14f707b3bb2360785666
-SIZE (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = 194262145
+MD5 (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 5898440ddd78fd87819d45d613c0b57e
+SIZE (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 198438413
 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice.org-1.1-devel/files/patch-1.1.3-1.1.4 b/editors/openoffice.org-1.1-devel/files/patch-1.1.3-1.1.4
deleted file mode 100644
index 66ed9ab18607..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-1.1.3-1.1.4
+++ /dev/null
@@ -1,38 +0,0 @@
-Version number should be 1.1.4
-http://www.openoffice.org/issues/show_bug.cgi?id=35584
-
---- instsetoo/util/openoffice.lst.org	Fri Oct 15 14:34:45 2004
-+++ instsetoo/util/openoffice.lst	Fri Oct 15 14:34:51 2004
-@@ -5,7 +5,7 @@
- 		variables
- 		{
- 			PRODUCTNAME OpenOffice.org
--			PRODUCTVERSION 1.1.3
-+			PRODUCTVERSION 1.1.4
- 			PRODUCTEXTENSION
- 			LONG_PRODUCTEXTENSION
- 			EVAL
---- setup2/wrapper/install.sh.org	Fri Aug 27 18:20:00 2004
-+++ setup2/wrapper/install.sh	Fri Oct 15 14:34:29 2004
-@@ -4,8 +4,8 @@
- cd `dirname $0`
- 
- # Set the Defaults Here
--oo_version="OpenOffice.org 1.1.3"
--oo_home=OpenOffice.org1.1.3
-+oo_version="OpenOffice.org 1.1.4"
-+oo_home=OpenOffice.org1.1.4
- oo_default_prefix=/usr/local
- oo_default_netflg=-net
- oo_default_interact=no
---- sdk_oo/util/makefile.pmk.org	Fri Oct 15 14:34:14 2004
-+++ sdk_oo/util/makefile.pmk	Fri Oct 15 14:34:18 2004
-@@ -59,7 +59,7 @@
- #
- #
- #*************************************************************************
--PRODUCT_RELEASE=1.1.3
-+PRODUCT_RELEASE=1.1.4
- OFFICENAME=OpenOffice.org
- PRODUCT_NAME=$(OFFICENAME)$(PRODUCT_RELEASE)_SDK
- PRODUCTZIPFILE=$(PRODUCT_NAME).zip