Update to DEV300_m23.

7 files changed, 144 insertions, 36 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6d9bea63cfab..2d96154af0ad 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?=		22
+MILESTONE?=		23
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080704
+SNAPDATE=		20080706
 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 f43a4b3a745a..4a521c7e104d 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m22_source.tar.bz2) = 1d9272f56bf624bcc92627b82c0b125e
-SHA256 (openoffice.org3/OOo_DEV300_m22_source.tar.bz2) = 2a5a757abb8feb6781b0d5b08381ae027c734c1c0873a725932b01b8963c623b
-SIZE (openoffice.org3/OOo_DEV300_m22_source.tar.bz2) = 309471733
+MD5 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = df7c726ae8a6cbeda1541932cf0ca24d
+SHA256 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 14394a3dbf82c7af1c123558b6f5ab311b38036a542280f99646645656113005
+SIZE (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 316589381
 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-i65514 b/editors/openoffice-3-devel/files/patch-i65514
index 3a7cabaad912..343e6ec27fe0 100644
--- a/editors/openoffice-3-devel/files/patch-i65514
+++ b/editors/openoffice-3-devel/files/patch-i65514
@@ -4,7 +4,7 @@
  	..$/dist$/configure
  CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
  
-+.IF "$(COM)$(CPU)"=="GCCX"
++.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
 +
diff --git a/editors/openoffice-3-devel/files/patch-i80129 b/editors/openoffice-3-devel/files/patch-i80129
index d6d5861503e0..f590cb16a50d 100644
--- a/editors/openoffice-3-devel/files/patch-i80129
+++ b/editors/openoffice-3-devel/files/patch-i80129
@@ -1,35 +1,16 @@
-Merely a workaround
-
 Index: libxml2/libxml2-2.6.31.patch
 ===================================================================
 RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
 retrieving revision 1.2
 diff -u -r1.2 libxml2-2.6.31.patch
 --- libxml2/libxml2-2.6.31.patch	6 Jun 2008 11:48:45 -0000	1.2
-+++ libxml2/libxml2-2.6.31.patch	10 Jun 2008 09:34:51 -0000
-@@ -87,7 +87,7 @@
-   	  ;;
++++ libxml2/libxml2-2.6.31.patch	8 Jul 2008 02:54:59 -0000
+@@ -88,7 +88,7 @@
    
    	freebsd-elf)
--! 	  major=.`expr $current - $age`
-+! 	  major=`expr $current - $age`
- ! 	  versuffix=".$major.$age.$revision";
+ ! 	  major=.`expr $current - $age`
+-! 	  versuffix=".$major.$age.$revision";
++! 	  versuffix="$major"; 
    	  ;;
    
-
-Index: scp2/source/ooo/ure.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
-retrieving revision 1.7
-diff -u -r1.7 ure.scp
---- scp2/source/ooo/ure.scp	6 Jun 2008 17:05:51 -0000	1.7
-+++ scp2/source/ooo/ure.scp	10 Jun 2008 09:45:54 -0000
-@@ -679,6 +679,8 @@
- #endif
- #elif defined MACOSX
-     Name = SCP2_URE_DL_NORMAL("xml2.2");
-+#elif defined FREEBSD
-+    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
- #else
-     Name = SCP2_URE_DL_VER("xml2", "2");
- #endif
+   	irix | nonstopux)
diff --git a/editors/openoffice-3-devel/files/patch-i91318 b/editors/openoffice-3-devel/files/patch-i91318
index 172af1ddae5a..250231caac1c 100644
--- a/editors/openoffice-3-devel/files/patch-i91318
+++ b/editors/openoffice-3-devel/files/patch-i91318
@@ -1,11 +1,11 @@
 Index: hunspell/hunspell-1.1.12.patch
 ===================================================================
 RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.11
-diff -u -r1.11 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
-+++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
-@@ -450,3 +450,10 @@
+retrieving revision 1.12
+diff -u -r1.12 hunspell-1.1.12.patch
+--- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
++++ hunspell/hunspell-1.1.12.patch	6 Jul 2008 01:23:13 -0000
+@@ -487,3 +487,10 @@
   i68568utf.test \
   1706659.test \
   digits_in_words.test \
diff --git a/editors/openoffice-3-devel/files/patch-i91393 b/editors/openoffice-3-devel/files/patch-i91393
new file mode 100644
index 000000000000..a934ba8cb508
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i91393
@@ -0,0 +1,16 @@
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.53
+diff -u -r1.53 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	1 Jul 2008 15:41:50 -0000	1.53
++++ solenv/bin/modules/installer/parameter.pm	6 Jul 2008 22:58:42 -0000
+@@ -305,7 +305,7 @@
+ 	
+ 	if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
+ 
+-	if ($ENV{OS} == 'LINUX')
++	if ($ENV{OS} eq 'LINUX')
+ 	{
+ 		$installer::globals::islinuxbuild = 1;
+ 		if ( $installer::globals::packageformat eq "rpm" )
diff --git a/editors/openoffice-3-devel/files/patch-i91455 b/editors/openoffice-3-devel/files/patch-i91455
new file mode 100644
index 000000000000..275ad23db629
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i91455
@@ -0,0 +1,111 @@
+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)