From 584dcc1a0602882d3b8478e699bd113b41d5b0ae Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Tue, 5 Jul 2005 09:29:31 +0000
Subject: update to m114

---
 editors/openoffice-2.0-devel/Makefile              |  4 ++--
 editors/openoffice-2.0-devel/distinfo              |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice-3-devel/Makefile                |  4 ++--
 editors/openoffice-3-devel/distinfo                |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice-3/Makefile                      |  4 ++--
 editors/openoffice-3/distinfo                      |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-2-RC/Makefile               |  4 ++--
 editors/openoffice.org-2-RC/distinfo               |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-2-devel/Makefile            |  4 ++--
 editors/openoffice.org-2-devel/distinfo            |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-2.0-devel/Makefile          |  4 ++--
 editors/openoffice.org-2.0-devel/distinfo          |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-2.0/Makefile                |  4 ++--
 editors/openoffice.org-2.0/distinfo                |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-2/Makefile                  |  4 ++--
 editors/openoffice.org-2/distinfo                  |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-3-RC/Makefile               |  4 ++--
 editors/openoffice.org-3-RC/distinfo               |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-3-devel/Makefile            |  4 ++--
 editors/openoffice.org-3-devel/distinfo            |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-3/Makefile                  |  4 ++--
 editors/openoffice.org-3/distinfo                  |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 editors/openoffice.org-vcltesttool/Makefile        |  4 ++--
 editors/openoffice.org-vcltesttool/distinfo        |  4 ++--
 .../files/patch-scp2+source+ure+ure.scp            | 25 ----------------------
 36 files changed, 48 insertions(+), 348 deletions(-)
 delete mode 100644 editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice-3/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp
 delete mode 100644 editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp

(limited to 'editors')

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp b/editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp b/editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/patch-scp2+source+ure+ure.scp b/editors/openoffice-3/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice-3/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 0f0cadca72cc..f7fab41fa5cc 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -50,8 +50,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		113
-SNAPDATE=		20050701
+MILESTONE=		114
+SNAPDATE=		20050704
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 92d3eac6da0c..43462826e2cc 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = bff4e15647e2bc41e79166962dd586d4
-SIZE (openoffice.org2.0/OOo_1.9m113_source.tar.bz2) = 228641110
+MD5 (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = dbab405d79a76345534384c8a17c048a
+SIZE (openoffice.org2.0/OOo_1.9m114_source.tar.bz2) = 228702659
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp b/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp
deleted file mode 100644
index aa55e9eeac99..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author:     : <maho@openoffice.org> (JCA)
-Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
-
-Index: scp2/source/ure/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.2
-diff -u -r1.2 ure.scp
---- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
-+++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
-@@ -601,7 +601,11 @@
- #if defined WNT
-     Name = SCP2_URE_DL_NORMAL(libxml2);
- #else
--    Name = SCP2_URE_DL_VER(xml2, 2);
-+    #ifdef MACOSX
-+       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
-+    #else
-+       Name = SCP2_URE_DL_VER(xml2,2.6.17);
-+    #endif
- #endif
-     Styles = (PACKED);
- End
-- 
cgit v1.2.3