6 files changed, 24 insertions, 28 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 1ac1d1646de7..3ffd09b45286 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -48,7 +48,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	autoconf:262
 
 .include <bsd.port.pre.mk>
 
@@ -71,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		59
+MILESTONE?=		60
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090916
+SNAPDATE=		20090926
 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 7b4aadcb50f7..83683e34afea 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m60_source.tar.bz2) = e526954409b83f4042b9ce766a15406e
+SHA256 (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 65f26630e5e0ad2f69973a4dc13b1f6ee85505351bdc1cb1933cba170c4aa1e5
+SIZE (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 454443470
 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 343e6ec27fe0..f12266b5fede 100644
--- a/editors/openoffice-3-devel/files/patch-i65514
+++ b/editors/openoffice-3-devel/files/patch-i65514
@@ -1,13 +1,12 @@
---- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
-+++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -105,6 +105,10 @@
+--- berkeleydb/makefile.mk	2009-09-26 08:52:35.000000000 +0900
++++ berkeleydb/makefile.mk	2009-09-26 08:54:31.000000000 +0900
+@@ -102,6 +102,9 @@
+ CONFIGURE_ACTION= \
  	..$/dist$/configure
  CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
- 
 +.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
-+
- # just pass ARCH_FLAGS to native build
- CFLAGS+:=$(ARCH_FLAGS)
- CXXFLAGS+:=$(ARCH_FLAGS)
+ .IF "$(OS)"=="MACOSX"
+ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+ .ENDIF
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 1ac1d1646de7..3ffd09b45286 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -48,7 +48,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	autoconf:262
 
 .include <bsd.port.pre.mk>
 
@@ -71,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		59
+MILESTONE?=		60
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090916
+SNAPDATE=		20090926
 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 7b4aadcb50f7..83683e34afea 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m60_source.tar.bz2) = e526954409b83f4042b9ce766a15406e
+SHA256 (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 65f26630e5e0ad2f69973a4dc13b1f6ee85505351bdc1cb1933cba170c4aa1e5
+SIZE (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 454443470
 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-i65514 b/editors/openoffice.org-3-devel/files/patch-i65514
index 343e6ec27fe0..f12266b5fede 100644
--- a/editors/openoffice.org-3-devel/files/patch-i65514
+++ b/editors/openoffice.org-3-devel/files/patch-i65514
@@ -1,13 +1,12 @@
---- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
-+++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -105,6 +105,10 @@
+--- berkeleydb/makefile.mk	2009-09-26 08:52:35.000000000 +0900
++++ berkeleydb/makefile.mk	2009-09-26 08:54:31.000000000 +0900
+@@ -102,6 +102,9 @@
+ CONFIGURE_ACTION= \
  	..$/dist$/configure
  CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
- 
 +.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
-+
- # just pass ARCH_FLAGS to native build
- CFLAGS+:=$(ARCH_FLAGS)
- CXXFLAGS+:=$(ARCH_FLAGS)
+ .IF "$(OS)"=="MACOSX"
+ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+ .ENDIF