10 files changed, 38 insertions, 70 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 57f5f4e4d826..d7bbed5afa1b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -85,11 +85,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		79
+MILESTONE?=		80
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100529
+SNAPDATE=		20100605
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index b61f499904dc..32b719c8b31b 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 8e5e72c284fcc6a20739c715c370eca3
-SHA256 (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 9cb9fd4b4a59f0ee03058c9fe1d6b3c6ced579fb3a9757bd4d46ec54e56d6e05
-SIZE (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 309453513
+MD5 (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = a3f65ccb0b51a67b608baa8edc7a6ba3
+SHA256 (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = 4307b32950c1d4c2c020a19e14115fcfffa5551aa2df103a332446f6129219c9
+SIZE (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = 309506079
 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41
 SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef
 SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823
diff --git a/editors/openoffice-3-devel/files/patch-i102184 b/editors/openoffice-3-devel/files/patch-i102184
index e84902f436e0..b03694aaca31 100644
--- a/editors/openoffice-3-devel/files/patch-i102184
+++ b/editors/openoffice-3-devel/files/patch-i102184
@@ -1,8 +1,8 @@
---- libxslt/libxslt-1.1.24.patch	2009-05-24 16:32:30.000000000 +0900
-+++ libxslt/libxslt-1.1.24.patch	2009-05-24 16:38:38.000000000 +0900
+--- libxslt/libxslt-configure.patch.org	2010-06-06 08:21:40.000000000 +0900
++++ libxslt/libxslt-configure.patch	2010-06-06 08:21:53.000000000 +0900
 @@ -20,7 +20,7 @@
  -	  major=".$current"
- -	  versuffix=".$current";
+ -	  versuffix=".$current"
  +	  major=.`expr $current - $age`
 -+	  versuffix="$major.$age.$revision"
 ++	  versuffix="$major"
diff --git a/editors/openoffice-3-devel/files/patch-i111385 b/editors/openoffice-3-devel/files/patch-i111385
deleted file mode 100644
index fabd312ba7be..000000000000
--- a/editors/openoffice-3-devel/files/patch-i111385
+++ /dev/null
@@ -1,11 +0,0 @@
---- cppunit/makefile.mk	2010-04-29 13:16:42.000000000 +0900
-+++ cppunit/makefile.mk	2010-05-05 13:09:50.000000000 +0900
-@@ -97,7 +97,7 @@
- # execute that program; however, the program would fail to locate the STLport
- # library (another work-around might be to add something like --as-needed around
- # $(LIBSTLPORT)):
--.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "FREEBSD"
- .IF "$(LD_LIBRARY_PATH)" == ""
- LD_LIBRARY_PATH := $(SOLARLIBDIR)
-     # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
diff --git a/editors/openoffice-3-devel/files/patch-i80129 b/editors/openoffice-3-devel/files/patch-i80129
index f590cb16a50d..de87f789df9c 100644
--- a/editors/openoffice-3-devel/files/patch-i80129
+++ b/editors/openoffice-3-devel/files/patch-i80129
@@ -1,16 +1,11 @@
-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	8 Jul 2008 02:54:59 -0000
-@@ -88,7 +88,7 @@
-   
-   	freebsd-elf)
- ! 	  major=.`expr $current - $age`
--! 	  versuffix=".$major.$age.$revision";
-+! 	  versuffix="$major"; 
-   	  ;;
-   
-   	irix | nonstopux)
+--- libxml2/libxml2-configure.patch.org	2010-06-06 08:23:29.000000000 +0900
++++ libxml2/libxml2-configure.patch	2010-06-06 08:23:45.000000000 +0900
+@@ -7,7 +7,7 @@
+ -	  major=".$current"
+ -	  versuffix=".$current"
+ +	  major=.`expr $current - $age`
+-+	  versuffix=".$major.$age.$revision";
+++	  versuffix="$major";
+  	  ;;
+  
+  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 57f5f4e4d826..d7bbed5afa1b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -85,11 +85,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		79
+MILESTONE?=		80
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100529
+SNAPDATE=		20100605
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index b61f499904dc..32b719c8b31b 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 8e5e72c284fcc6a20739c715c370eca3
-SHA256 (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 9cb9fd4b4a59f0ee03058c9fe1d6b3c6ced579fb3a9757bd4d46ec54e56d6e05
-SIZE (openoffice.org3/OOo_DEV300_m79_source.tar.bz2) = 309453513
+MD5 (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = a3f65ccb0b51a67b608baa8edc7a6ba3
+SHA256 (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = 4307b32950c1d4c2c020a19e14115fcfffa5551aa2df103a332446f6129219c9
+SIZE (openoffice.org3/OOo_DEV300_m80_source.tar.bz2) = 309506079
 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41
 SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef
 SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823
diff --git a/editors/openoffice.org-3-devel/files/patch-i102184 b/editors/openoffice.org-3-devel/files/patch-i102184
index e84902f436e0..b03694aaca31 100644
--- a/editors/openoffice.org-3-devel/files/patch-i102184
+++ b/editors/openoffice.org-3-devel/files/patch-i102184
@@ -1,8 +1,8 @@
---- libxslt/libxslt-1.1.24.patch	2009-05-24 16:32:30.000000000 +0900
-+++ libxslt/libxslt-1.1.24.patch	2009-05-24 16:38:38.000000000 +0900
+--- libxslt/libxslt-configure.patch.org	2010-06-06 08:21:40.000000000 +0900
++++ libxslt/libxslt-configure.patch	2010-06-06 08:21:53.000000000 +0900
 @@ -20,7 +20,7 @@
  -	  major=".$current"
- -	  versuffix=".$current";
+ -	  versuffix=".$current"
  +	  major=.`expr $current - $age`
 -+	  versuffix="$major.$age.$revision"
 ++	  versuffix="$major"
diff --git a/editors/openoffice.org-3-devel/files/patch-i111385 b/editors/openoffice.org-3-devel/files/patch-i111385
deleted file mode 100644
index fabd312ba7be..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i111385
+++ /dev/null
@@ -1,11 +0,0 @@
---- cppunit/makefile.mk	2010-04-29 13:16:42.000000000 +0900
-+++ cppunit/makefile.mk	2010-05-05 13:09:50.000000000 +0900
-@@ -97,7 +97,7 @@
- # execute that program; however, the program would fail to locate the STLport
- # library (another work-around might be to add something like --as-needed around
- # $(LIBSTLPORT)):
--.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "FREEBSD"
- .IF "$(LD_LIBRARY_PATH)" == ""
- LD_LIBRARY_PATH := $(SOLARLIBDIR)
-     # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
diff --git a/editors/openoffice.org-3-devel/files/patch-i80129 b/editors/openoffice.org-3-devel/files/patch-i80129
index f590cb16a50d..de87f789df9c 100644
--- a/editors/openoffice.org-3-devel/files/patch-i80129
+++ b/editors/openoffice.org-3-devel/files/patch-i80129
@@ -1,16 +1,11 @@
-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	8 Jul 2008 02:54:59 -0000
-@@ -88,7 +88,7 @@
-   
-   	freebsd-elf)
- ! 	  major=.`expr $current - $age`
--! 	  versuffix=".$major.$age.$revision";
-+! 	  versuffix="$major"; 
-   	  ;;
-   
-   	irix | nonstopux)
+--- libxml2/libxml2-configure.patch.org	2010-06-06 08:23:29.000000000 +0900
++++ libxml2/libxml2-configure.patch	2010-06-06 08:23:45.000000000 +0900
+@@ -7,7 +7,7 @@
+ -	  major=".$current"
+ -	  versuffix=".$current"
+ +	  major=.`expr $current - $age`
+-+	  versuffix=".$major.$age.$revision";
+++	  versuffix="$major";
+  	  ;;
+  
+  	irix | nonstopux)