6 files changed, 12 insertions, 40 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index f279f46ef973..2318c51c2955 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	3.0.${SNAPDATE}
+PORTVERSION?=	3.1.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		32
+MILESTONE?=		33
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20081007
+SNAPDATE=		20081009
 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 03cfbc92fafb..5275b7dc33cf 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = 5ccc8a783fb69e0d57e902374658bf78
-SHA256 (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = f44eced6aba23d304d11509e5a7a62ffc04037f724ae0277c4c890276d35555d
-SIZE (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = 381794783
+MD5 (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 29251d54a92b493696eb4482de48879b
+SHA256 (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 8aa7b987bc3de71cf4802334c577863023c3f525d8174734c618baeab8dc9fe3
+SIZE (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 381880918
 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-i87583 b/editors/openoffice-3-devel/files/patch-i87583
index e82f268d7ad0..750935a3030b 100644
--- a/editors/openoffice-3-devel/files/patch-i87583
+++ b/editors/openoffice-3-devel/files/patch-i87583
@@ -1,17 +1,3 @@
---- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
-+++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
-@@ -75,6 +75,11 @@
-     export DYLD_LIBRARY_PATH
-     ;;
- 
-+  FreeBSD)
-+    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+    export LD_LIBRARY_PATH
-+    ;;
-+
-   HP-UX)
-     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
-     export SHLIB_PATH
 --- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
 +++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
 @@ -75,6 +75,15 @@
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index f279f46ef973..2318c51c2955 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	3.0.${SNAPDATE}
+PORTVERSION?=	3.1.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		32
+MILESTONE?=		33
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20081007
+SNAPDATE=		20081009
 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 03cfbc92fafb..5275b7dc33cf 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = 5ccc8a783fb69e0d57e902374658bf78
-SHA256 (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = f44eced6aba23d304d11509e5a7a62ffc04037f724ae0277c4c890276d35555d
-SIZE (openoffice.org3/OOo_DEV300_m32_source.tar.bz2) = 381794783
+MD5 (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 29251d54a92b493696eb4482de48879b
+SHA256 (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 8aa7b987bc3de71cf4802334c577863023c3f525d8174734c618baeab8dc9fe3
+SIZE (openoffice.org3/OOo_DEV300_m33_source.tar.bz2) = 381880918
 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-i87583 b/editors/openoffice.org-3-devel/files/patch-i87583
index e82f268d7ad0..750935a3030b 100644
--- a/editors/openoffice.org-3-devel/files/patch-i87583
+++ b/editors/openoffice.org-3-devel/files/patch-i87583
@@ -1,17 +1,3 @@
---- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
-+++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
-@@ -75,6 +75,11 @@
-     export DYLD_LIBRARY_PATH
-     ;;
- 
-+  FreeBSD)
-+    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+    export LD_LIBRARY_PATH
-+    ;;
-+
-   HP-UX)
-     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
-     export SHLIB_PATH
 --- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
 +++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
 @@ -75,6 +75,15 @@