Update to DEV300_m27.

6 files changed, 10 insertions, 232 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index f0bb484bd217..6acb72fd280a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		25
+MILESTONE?=		26
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080716
+SNAPDATE=		20080722
 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 2aaf1d70fd39..d185551725d5 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 4bedaf45e24a1184c413da225de21ccc
-SHA256 (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 95a890c61308557fe5bb9b23eca3b85cca05f1fbebe17892c53afc14298acc74
-SIZE (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 316588320
+MD5 (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 72eaaf76962f7799552321aea55bdea5
+SHA256 (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 0722ec6308315e7911eabfc13027202f0851320660d5a8edf5eee19f0cefb44f
+SIZE (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 316660782
 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-i91455 b/editors/openoffice-3-devel/files/patch-i91455
deleted file mode 100644
index 275ad23db629..000000000000
--- a/editors/openoffice-3-devel/files/patch-i91455
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: redland/raptor-1.4.17.patch
-===================================================================
-RCS file: /cvs/external/redland/raptor-1.4.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 raptor-1.4.17.patch
---- redland/raptor-1.4.17.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/raptor-1.4.17.patch	8 Jul 2008 03:07:43 -0000
-@@ -245,3 +245,29 @@
-  
-  
-  #include <windows.h>
-+--- misc/raptor-1.4.17/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
-++++ misc/build/raptor-1.4.17/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
-+@@ -3262,9 +3262,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor`
-+@@ -3344,8 +3344,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)
-Index: redland/rasqal-0.9.15.patch
-===================================================================
-RCS file: /cvs/external/redland/rasqal-0.9.15.patch,v
-retrieving revision 1.2
-diff -u -r1.2 rasqal-0.9.15.patch
---- redland/rasqal-0.9.15.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/rasqal-0.9.15.patch	8 Jul 2008 03:07:43 -0000
-@@ -199,3 +199,29 @@
-  #ifdef _DEBUG
-  #define RASQAL_DEBUG 1
-  #endif
-+--- misc/rasqal-0.9.15/ltmain.sh	2006-03-12 03:49:04.000000000 +0900
-++++ misc/build/rasqal-0.9.15/ltmain.sh	2008-07-08 12:00:00.000000000 +0900
-+@@ -3195,9 +3195,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor - 1`
-+@@ -3275,8 +3275,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)
-Index: redland/redland-1.0.7.patch
-===================================================================
-RCS file: /cvs/external/redland/redland-1.0.7.patch,v
-retrieving revision 1.2
-diff -u -r1.2 redland-1.0.7.patch
---- redland/redland-1.0.7.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/redland-1.0.7.patch	8 Jul 2008 03:07:43 -0000
-@@ -684,3 +684,29 @@
- +later version may be used, or where a choice of which version of the 
- +LGPL is applied is otherwise unspecified.
- +
-+--- misc/redland-1.0.7/ltmain.sh	2007-11-28 06:23:09.000000000 +0900
-++++ misc/build/redland-1.0.7/ltmain.sh	2008-07-08 11:59:22.000000000 +0900
-+@@ -3237,9 +3237,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor`
-+@@ -3319,8 +3319,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index f0bb484bd217..6acb72fd280a 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		25
+MILESTONE?=		26
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080716
+SNAPDATE=		20080722
 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 2aaf1d70fd39..d185551725d5 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 4bedaf45e24a1184c413da225de21ccc
-SHA256 (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 95a890c61308557fe5bb9b23eca3b85cca05f1fbebe17892c53afc14298acc74
-SIZE (openoffice.org3/OOo_DEV300_m25_source.tar.bz2) = 316588320
+MD5 (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 72eaaf76962f7799552321aea55bdea5
+SHA256 (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 0722ec6308315e7911eabfc13027202f0851320660d5a8edf5eee19f0cefb44f
+SIZE (openoffice.org3/OOo_DEV300_m26_source.tar.bz2) = 316660782
 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-i91455 b/editors/openoffice.org-3-devel/files/patch-i91455
deleted file mode 100644
index 275ad23db629..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i91455
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: redland/raptor-1.4.17.patch
-===================================================================
-RCS file: /cvs/external/redland/raptor-1.4.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 raptor-1.4.17.patch
---- redland/raptor-1.4.17.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/raptor-1.4.17.patch	8 Jul 2008 03:07:43 -0000
-@@ -245,3 +245,29 @@
-  
-  
-  #include <windows.h>
-+--- misc/raptor-1.4.17/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
-++++ misc/build/raptor-1.4.17/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
-+@@ -3262,9 +3262,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor`
-+@@ -3344,8 +3344,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)
-Index: redland/rasqal-0.9.15.patch
-===================================================================
-RCS file: /cvs/external/redland/rasqal-0.9.15.patch,v
-retrieving revision 1.2
-diff -u -r1.2 rasqal-0.9.15.patch
---- redland/rasqal-0.9.15.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/rasqal-0.9.15.patch	8 Jul 2008 03:07:43 -0000
-@@ -199,3 +199,29 @@
-  #ifdef _DEBUG
-  #define RASQAL_DEBUG 1
-  #endif
-+--- misc/rasqal-0.9.15/ltmain.sh	2006-03-12 03:49:04.000000000 +0900
-++++ misc/build/rasqal-0.9.15/ltmain.sh	2008-07-08 12:00:00.000000000 +0900
-+@@ -3195,9 +3195,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor - 1`
-+@@ -3275,8 +3275,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)
-Index: redland/redland-1.0.7.patch
-===================================================================
-RCS file: /cvs/external/redland/redland-1.0.7.patch,v
-retrieving revision 1.2
-diff -u -r1.2 redland-1.0.7.patch
---- redland/redland-1.0.7.patch	17 Jun 2008 16:12:50 -0000	1.2
-+++ redland/redland-1.0.7.patch	8 Jul 2008 03:07:43 -0000
-@@ -684,3 +684,29 @@
- +later version may be used, or where a choice of which version of the 
- +LGPL is applied is otherwise unspecified.
- +
-+--- misc/redland-1.0.7/ltmain.sh	2007-11-28 06:23:09.000000000 +0900
-++++ misc/build/redland-1.0.7/ltmain.sh	2008-07-08 11:59:22.000000000 +0900
-+@@ -3237,9 +3237,9 @@
-+ 	    revision="$number_revision"
-+ 	    ;;
-+ 	  freebsd-aout|freebsd-elf|sunos)
-+-	    current="$number_major"
-+-	    revision="$number_minor"
-+-	    age="0"
-++	    current=`expr $number_major + $number_minor`
-++	    age="$number_minor"
-++	    revision="$number_revision"
-+ 	    ;;
-+ 	  irix|nonstopux)
-+ 	    current=`expr $number_major + $number_minor`
-+@@ -3319,8 +3319,8 @@
-+ 	  ;;
-+ 
-+ 	freebsd-elf)
-+-	  major=".$current"
-+-	  versuffix=".$current";
-++	  major=.`expr $current - $age`
-++	  versuffix="$major.$age.$revision"
-+ 	  ;;
-+ 
-+ 	irix | nonstopux)