6 files changed, 12 insertions, 84 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 039a567667d5..1ac1d1646de7 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -48,6 +48,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
+USE_AUTOTOOLS=	autoconf:262
 
 .include <bsd.port.pre.mk>
 
@@ -70,11 +71,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		58
+MILESTONE?=		59
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090911
+SNAPDATE=		20090916
 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 77474d03afb3..7b4aadcb50f7 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = 9e1fefae8f485a9dac37be66f61b975b
-SHA256 (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = c0f4e623fe39d1fbcad76aed166a9c4b0c60c95336df7fc9481fe529db8351e9
-SIZE (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = 435903210
+MD5 (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 2995983a8f8d604cd4099bd853898461
+SHA256 (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 9e9c4c1c49be6b6881082f0cd700610898e728f7b92dcfbe2232737c863f83fd
+SIZE (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 435643069
 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-i102182 b/editors/openoffice-3-devel/files/patch-i102182
deleted file mode 100644
index 9fb0323532fc..000000000000
--- a/editors/openoffice-3-devel/files/patch-i102182
+++ /dev/null
@@ -1,37 +0,0 @@
---- curl/curl-7.12.2.patch	2009-05-24 09:11:23.000000000 +0900
-+++ curl/curl-7.12.2.patch	2009-05-24 15:47:48.000000000 +0900
-@@ -1057,29 +1057,14 @@
-  	    current="$number_major"
-  	    revision="$number_minor"
-  	    age="0"
--@@ -2990,16 +2990,6 @@
-- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+@@ -2996,8 +2996,8 @@
-  	  ;;
-  
---	freebsd-aout)
---	  major=".$current"
---	  versuffix=".$current.$revision";
---	  ;;
---
---	freebsd-elf)
-+ 	freebsd-elf)
- -	  major=".$current"
- -	  versuffix=".$current";
---	  ;;
---
-- 	irix | nonstopux)
-- 	  major=`expr $current - $age + 1`
-- 
--@@ -3022,7 +3012,7 @@
-- 	  versuffix="$major.$revision"
-++	  major=.`expr $current - $age`
-++	  versuffix="$major"
-  	  ;;
-  
---	linux)
--+	linux|freebsd-aout|freebsd-elf)
-- 	  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 039a567667d5..1ac1d1646de7 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -48,6 +48,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
+USE_AUTOTOOLS=	autoconf:262
 
 .include <bsd.port.pre.mk>
 
@@ -70,11 +71,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		58
+MILESTONE?=		59
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090911
+SNAPDATE=		20090916
 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 77474d03afb3..7b4aadcb50f7 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = 9e1fefae8f485a9dac37be66f61b975b
-SHA256 (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = c0f4e623fe39d1fbcad76aed166a9c4b0c60c95336df7fc9481fe529db8351e9
-SIZE (openoffice.org3/OOo_DEV300_m58_source.tar.bz2) = 435903210
+MD5 (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 2995983a8f8d604cd4099bd853898461
+SHA256 (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 9e9c4c1c49be6b6881082f0cd700610898e728f7b92dcfbe2232737c863f83fd
+SIZE (openoffice.org3/OOo_DEV300_m59_source.tar.bz2) = 435643069
 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-i102182 b/editors/openoffice.org-3-devel/files/patch-i102182
deleted file mode 100644
index 9fb0323532fc..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i102182
+++ /dev/null
@@ -1,37 +0,0 @@
---- curl/curl-7.12.2.patch	2009-05-24 09:11:23.000000000 +0900
-+++ curl/curl-7.12.2.patch	2009-05-24 15:47:48.000000000 +0900
-@@ -1057,29 +1057,14 @@
-  	    current="$number_major"
-  	    revision="$number_minor"
-  	    age="0"
--@@ -2990,16 +2990,6 @@
-- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+@@ -2996,8 +2996,8 @@
-  	  ;;
-  
---	freebsd-aout)
---	  major=".$current"
---	  versuffix=".$current.$revision";
---	  ;;
---
---	freebsd-elf)
-+ 	freebsd-elf)
- -	  major=".$current"
- -	  versuffix=".$current";
---	  ;;
---
-- 	irix | nonstopux)
-- 	  major=`expr $current - $age + 1`
-- 
--@@ -3022,7 +3012,7 @@
-- 	  versuffix="$major.$revision"
-++	  major=.`expr $current - $age`
-++	  versuffix="$major"
-  	  ;;
-  
---	linux)
--+	linux|freebsd-aout|freebsd-elf)
-- 	  major=.`expr $current - $age`
-- 	  versuffix="$major.$age.$revision"
-- 	  ;;
-+ 	irix | nonstopux)