Now passes compilation for recent 4.8-STABLE and 5-CURRENT,

but still fails during/after the installtion :(

a) follow up to recent cvs checkout
  (cws_srx645_ooo11rc3, 2003/08/15)

b) Use gcc33 from ports for both 4 and 5.
   gcc-3.3 of 5-CURRENT seems to brake somewhere,
   and recent version of OOo hits some internal
   error of gcc-3.2.3.

c) remove --enable-gcc3, --with-os-version and --with-ant-home
   gcc3 is deprecated, os version and ant home should be
   detected automatically by configure(setting os version
   had been dangerous, since difference can be seen between
   /usr/include/osreldate.h and sysctl kern.osreldate)
   however nowadays it is not so dangerous)

d) add build dependency for Xft and gtk-2.0.

34 files changed, 187 insertions, 731 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 8c3e09ad4969..136b174b0f2b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	645
-SNAPDATE=	20030712
+SNAPDATE=	20030815
 CATEGORIES+=	editors
 MASTER_SITES+=	http://projects.imp.ch/openoffice/%SUBDIR%/ \
 		http://people.freebsd.org/~maho/files/ \
@@ -38,7 +38,7 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-BROKEN=			"Does not work yet, installation problems"
+#BROKEN=			"Does not work yet, installation problems"
 BUILD_NR=		${PORTVERSION}
 RELEASE_NR=		1.1
 INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
@@ -88,26 +88,10 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
-.if ${OSVERSION} < 500000
-#
-# OO build is broken with the system gcc on STABLE.
-#
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-USE_GCC=3.2
-.endif
-
-.if ${OSVERSION} > 500000
-#
-# OO is still broken with the system gcc on CURRENT.
-#
-.if defined(USE_GCC) && ${USE_GCC} == 3.2
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-CC=		gcc32
-CXX=		g++32
-.endif
-.endif
+# OOo requires gcc 3.3 (not systems's gcc)
+USE_GCC=3.3 # make no sense yet
+CC=  gcc33
+CXX= g++33
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
@@ -121,15 +105,12 @@ COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 # following dependencies use the same JDK.
 #
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-
-#.if !defined(USE_GCC)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-#.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
@@ -154,6 +135,8 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -175,14 +158,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} \
-			--with-os-version=${OSVERSION} \
-			--with-ant-home=${LOCALBASE}
-
-#.if !defined(USE_GCC)
-#CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
-#.endif
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -190,14 +166,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 .endif
 
-.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
-.if ${OSVERSION} > 500000 && !defined(USE_GCC)
-CONFIGURE_ARGS+=	--enable-gcc3
-.endif
-
 pre-fetch:
 	@${ECHO}
 .if !defined(LANG)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index e8459328f20d..ee4e7edbb925 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_645_src_20030712.tar.bz2) = e607ee4f0a4329ac33fb8122cf595ae7
+MD5 (openoffice/oo_645_src_20030815.tar.bz2) = 3776e5c1c822b2e03e45b15c0f47f2b2
 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a