o Update to cws_src680_ooo20040815 checked out at 2004/Aug/12

o Marked as broken again

96 files changed, 4296 insertions, 3084 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice-2.0-devel/files/Makefile.localized b/editors/openoffice-2.0-devel/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice-2.0-devel/files/Makefile.localized
+++ b/editors/openoffice-2.0-devel/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst b/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice-3-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-3-devel/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst b/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst b/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ b/editors/openoffice-3/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice-3/files/patch-libxml2+prj+build.lst b/editors/openoffice-3/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice-3/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice-3/files/patch-wizards+prj+build.lst b/editors/openoffice-3/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice-3/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice-3/files/patch-wizards+prj+d.lst b/editors/openoffice-3/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice-3/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.localized
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.localized b/editors/openoffice.org-2.0-devel/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-2.0/files/Makefile.localized b/editors/openoffice.org-2.0/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-2.0/files/Makefile.localized
+++ b/editors/openoffice.org-2.0/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-2/files/Makefile.localized
+++ b/editors/openoffice.org-2/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-2/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-2/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-2/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-2/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.localized
+++ b/editors/openoffice.org-3-RC/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.localized
+++ b/editors/openoffice.org-3-devel/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-3/files/Makefile.localized
+++ b/editors/openoffice.org-3/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-3/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-3/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-3/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-3/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index bf16cff1e5ec..4efabff60837 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -10,57 +10,63 @@ PORTVERSION=	2.0
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		http://people.freebsd.org/~mbr/ooo/:moz
+		http://people.freebsd.org/~mbr/ooo/:moz \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
 
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
-USE_CCACHE=		yes
-USE_XLIB=		yes
+SNAPDATE=	20040812
+NO_LATEST_LINK=	yes
+USE_GNOME=	orbit gtk12 gtk20
+USE_PERL5=	yes
+#USE_BISON=	yes #bison1.875d is required
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+WITHOUT_MOZILLA=	yes # WIP for Mozilla 1.7
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
+LANG_PKGNAME?=   en-US
+LANG_EXT?=       01
+LANG_CONFIGURE_ARG?=   ENUS
+
+.if defined(ALL_LOCALIZED_LANGS)
+DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
+		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
+		helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+		helpcontent_90_unix.tgz:help
+L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
+		helpcontent_55_unix.tgz \
+		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
+		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
+		helpcontent_90_unix.tgz
 .endif
 
-NO_LATEST_LINK=		yes
-UNZIP?=			${LOCALBASE}/bin/unzip
-ZIP?=			${LOCALBASE}/bin/zip
-ANT?=			${LOCALBASE}/bin/ant
-TCSH?=			/bin/tcsh
-DIST_SUBDIR=		openoffice2.0
+BROKEN=		"Work In Progress, Bison 1.875d is required"
+
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m41
+MILESTONE=		m48
 RELEASE_NR=		2.0
-SNAPDATE=		20040611
-SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXTRACT_ONLY=		OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
-LANG_EXT?=		01
-LANG_CONFIGURE_ARG?=	ENUS
-WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
-
-#XXX dirty
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+DIST_SUBDIR=		openoffice2.0
+SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
-
-.if defined(USE_CCACHE)
-BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_CCACHE)
+BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CC=	ccache gcc32
 CXX=	ccache g++32
 .else
@@ -68,73 +74,32 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
-BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils
-
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+		zip:${PORTSDIR}/archivers/zip \
+		unzip:${PORTSDIR}/archivers/unzip \
+		gcp:${PORTSDIR}/sysutils/coreutils \
+		${ANT}:${PORTSDIR}/devel/apache-ant \
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		bison1875:${PORTSDIR}/devel/bison1875
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-#
-# configuration for language specific slave ports
-#
-.if exists(${.CURDIR}/pkg-descr)
-DESCR=	${.CURDIR}/pkg-descr
-.endif
-.if exists(${.CURDIR}/pkg-message)
-PKGMESSAGE=	${.CURDIR}/pkg-message
-.endif
-#
-# Set prefix and suffix
-#
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=	${LANG_PKGNAME}-
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=	-${LANG_SUFFIX}
-.endif
-.endif # if defined(LANG_PKGNAME)
-
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	en_US.ISO8859-15
-LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
-.else
-.if !defined(USE_LANG)
-USE_LANG=	${LANG}
-.endif
-.endif
-
-LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
-
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z
-
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
-JAVAVM=		${JDKDIR}/bin/java
-
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 259
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
+USE_AUTOCONF_VER=	259
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
+ANT?=		${LOCALBASE}/bin/ant
+TCSH?=		/bin/tcsh
+ZIP?=		${PREFIX}/bin/zip
+UNZIP?=		${PREFIX}/bin/unzip
 BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
@@ -142,47 +107,34 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant 
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
 CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
+.endif
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
 CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .endif
 
 pre-fetch:
-	@${ECHO}
-.if !defined(LANG)
-	@${ECHO} "REQUIREMENTS:"
-	@${ECHO}
-	@${ECHO} "OO requires that the ENV variable LANG"
-	@${ECHO} "is set to a proper value. Dependent on"
-	@${ECHO} "which language port you use, OO does"
-	@${ECHO} "automatically set LANG to a suitable"
-	@${ECHO} "value. You can change this with:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=\"preferred language\""
-	@${ECHO}
-	@${ECHO} "and set a different language"
-	@${ECHO} "like:"
-	@${ECHO}
-	@${ECHO} "${LANG_SORTED}"
-	@${ECHO}
-	@${ECHO} "Your current setting is:"
-	@${ECHO}
-	@${ECHO} "USE_LANG=${USE_LANG}"
-	@${ECHO}
-	@${ECHO}
-.endif
 	@${ECHO} "OPTIONS:"
 .if !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
+	@${ECHO} "You can compile OOo with debug symbols"
 	@${ECHO} "if you call make with WITH_DEBUG=1"
 	@${ECHO}
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
+	@${ECHO} "OOo debug support."
 	@${ECHO}
 .endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,34 +150,56 @@ pre-fetch:
 	@${ECHO} "quality of glyphs at small bitmap sizes."
 	@${ECHO}
 .endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
 	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
 
-.include <${FILESDIR}/Makefile.mozilla>
+pre-everything::
+# really tewak, extremely useful when you build all localized language versions
+# needed after when you build with ALL_LOCALIZED_LANGS.
+.if defined(TWEAK_L10N)
+	@${RM} -f ${WRKDIR}/.PLIST*
+	@${RM} -f ${WRKDIR}/.install_done.*
+	@${RM} -f ${WRKDIR}/.package_done.*
+	@${RM} -f ${WRKDIR}/.extract_done.*
+	@${RM} -f ${WRKDIR}/.patch_done.*
+	@${RM} -f ${WRKDIR}/.configure_done.*
+	@${RM} -f ${WRKDIR}/.build_done.*
+	@${TOUCH} ${EXTRACT_COOKIE}
+	@${TOUCH} ${PATCH_COOKIE}
+	@${TOUCH} ${CONFIGURE_COOKIE}
+	@${TOUCH} ${BUILD_COOKIE}
+.endif
 
 post-extract:
-	@for file in ${EXTRACT_REST}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
-			${EXTRACT_BEFORE_ARGS_R} \
-			${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
-		then \
-			exit 1; \
-		fi \
-	done
+	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	@${MAKE} extract-mozilla
-	@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
 .if defined(L10NHELP)
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP && \
+	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
+.if defined(ALL_LOCALIZED_LANGS)
+	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP ; \
+	for file in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	done
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk
-	@${MAKE} patch-mozilla
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
 		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
@@ -236,14 +210,18 @@ post-patch:
 	fi
 .endif
 
+.include <${FILESDIR}/Makefile.mozilla>
+
 do-build:
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
-.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
+.if !defined(WITHOUT_MOZILLA)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
+.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
 	@${MAKE} mozilla
 .endif
 .endif
 .endif
+.endif
 .if exists(${WRKDIR}/.Xvfb.pid)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
@@ -255,31 +233,26 @@ do-build:
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 .endif
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP)
+	@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
-.endif
-.if defined(LANG_PKGNAME)
-	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
 .endif
+	@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
+		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
 
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
-		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_PKGNAME}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -288,17 +261,17 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
-		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_PKGNAME}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
@@ -320,15 +293,15 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
-	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
 .if defined(LANG_SUFFIX)
 	@${MV} ${PKGFILE} \
 	${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 8b3246083348..c9b64dc5f45e 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883
-SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281
+MD5 (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 94237d2c75ac34a49e5bb4bd8998b8a4
+SIZE (openoffice2.0/OOo_680m48_20040812_source.tar.bz2) = 226340108
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
@@ -18,6 +18,8 @@ MD5 (openoffice2.0/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
 SIZE (openoffice2.0/helpcontent_46_unix.tgz) = 12072960
 MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
 SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice2.0/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice2.0/helpcontent_55_unix.tgz) = 11549758
 MD5 (openoffice2.0/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
 SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
 MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
@@ -26,3 +28,5 @@ MD5 (openoffice2.0/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
 SIZE (openoffice2.0/helpcontent_86_unix.tgz) = 12769280
 MD5 (openoffice2.0/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
 SIZE (openoffice2.0/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice2.0/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice2.0/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index f37d00f28198..9973b43605d6 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -2,23 +2,103 @@
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
+################################################################
 .if defined(LOCALIZED_LANG)
+.if ${LOCALIZED_LANG} == "af"
+LANG_PKGNAME=   af
+LANG_EXT=       27
+LANG_CONFIGURE_ARG=     AFRIK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ar"
+CATEGORIES=     arabic
+LANG_PKGNAME=   ar
+LANG_EXT=       96
+LANG_CONFIGURE_ARG=     ARAB
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ca"
+LANG_PKGNAME=   ca
+LANG_EXT=       37
+LANG_CONFIGURE_ARG=     CAT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "cs"
+LANG_PKGNAME=   cs
+LANG_EXT=       42
+LANG_CONFIGURE_ARG=     CZECH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "dk"
+LANG_PKGNAME=   dk
+LANG_EXT=       45
+LANG_CONFIGURE_ARG=     DAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "et"
+LANG_PKGNAME=   et
+LANG_EXT=       77
+LANG_CONFIGURE_ARG=     ESTONIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fi"
+LANG_PKGNAME=   fi
+LANG_EXT=       35
+LANG_CONFIGURE_ARG=     FINN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "fr"
+CATEGORIES=     french
+LANG_PKGNAME=   fr
+LANG_EXT=       33
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     FREN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
-
 CATEGORIES=	german
-.if !defined (LANG) && !defined(USE_LANG)
-USE_LANG=	de_DE.ISO8859-15
-.endif
-LANG_LIST=	de_DE.ISO8859-15 de_AT.ISO8859-15 de_DE.ISO8859-15 \
-		de_DE.ISO8859-1 de_AT.ISO8859-1 de_DE.ISO8859-1
 LANG_PKGNAME=	de
 LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-
-.elseif ${LOCALIZED_LANG} == "ja"
-
+PKGMESSAGE=     ${FILESDIR}/pkg-message.de
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "he"
+LANG_PKGNAME=   he
+LANG_EXT=       97
+LANG_CONFIGURE_ARG=     HEBREW
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "hu"
+CATEGORIES=     hungarian
+LANG_PKGNAME=   hu
+LANG_EXT=       36
+LANG_CONFIGURE_ARG=     HUNG
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "it"
+LANG_PKGNAME=   it
+LANG_EXT=       39
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     ITAL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ja"
 CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
@@ -26,6 +106,136 @@ LANG_CONFIGURE_ARG=     JAPN
 MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "ko"
+CATEGORIES=     korean
+LANG_PKGNAME=   ko
+LANG_EXT=       82
+LANG_CONFIGURE_ARG=     KOREAN
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nb"
+LANG_PKGNAME=   nb
+LANG_EXT=       47
+LANG_CONFIGURE_ARG=     NORBOK
 .endif
+################################################################
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "nn"
+LANG_PKGNAME=   nn
+LANG_EXT=       79
+LANG_CONFIGURE_ARG=     NORNYN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ns"
+LANG_PKGNAME=   ns
+LANG_EXT=       26
+LANG_CONFIGURE_ARG=     NSOTHO
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pl"
+CATEGORIES=	polish
+LANG_PKGNAME=	pl
+LANG_EXT=	48
+LANG_CONFIGURE_ARG=	POL
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt"
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=	portuguese
+LANG_PKGNAME=	pt
+LANG_EXT=	03
+LANG_CONFIGURE_ARG=	PORT
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "pt-BR"
+COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+CATEGORIES=     portuguese
+LANG_PKGNAME=	pt
+LANG_SUFFIX=	BR
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_EXT=	55
+LANG_CONFIGURE_ARG=	PORTBR
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ru"
+CATEGORIES=	russian
+LANG_PKGNAME=	ru
+LANG_EXT=	07
+LANG_CONFIGURE_ARG=	RUSS
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sv"
+LANG_PKGNAME=	sv
+LANG_EXT=	46
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	SWED
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sk"
+LANG_PKGNAME=	sk
+LANG_EXT=	43
+LANG_CONFIGURE_ARG=	SLOVAK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sl-SI"
+LANG_PKGNAME=	sl
+LANG_SUFFIX=	SI
+LANG_EXT=	50
+LANG_CONFIGURE_ARG=	SLOVENIAN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tr"
+LANG_PKGNAME=	tr
+LANG_EXT=	90
+LANG_CONFIGURE_ARG=	TURK
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "we"
+LANG_PKGNAME=   cy
+LANG_EXT=       53
+LANG_CONFIGURE_ARG=     WELSH
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zu"
+LANG_PKGNAME=   zu
+LANG_EXT=       28
+LANG_CONFIGURE_ARG=     ZULU
+.endif
+################################################################
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?=		-${LANG_SUFFIX}
+.endif
+.endif
+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
index 6ef4e95358e8..9cb8bdad0c2f 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
@@ -1,5 +1,4 @@
-#i27028 and #i27028
-http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+#i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
 
 Index: config_office/configure.in
@@ -9,14 +8,6 @@ retrieving revision 1.63
 diff -u -r1.63 configure.in
 --- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
 +++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
-@@ -1478,6 +1478,7 @@
- elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
-+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
- 
-    if test "x$x_includes" = "x"; then
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst
deleted file mode 100644
index f0d7b8f05fc8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libxml2/prj/build.lst
-===================================================================
-RCS file: /cvs/external/libxml2/prj/build.lst,v
-retrieving revision 1.1
-diff -u -r1.1 build.lst
---- ../libxml2/prj/build.lst	6 Feb 2004 10:15:09 -0000	1.1
-+++ ../libxml2/prj/build.lst	4 May 2004 20:20:20 -0000
-@@ -1,3 +1,3 @@
--lx	libxml2	: soltools NULL

-+lx	libxml2	: soltools xml2cmp NULL

- lx	libxml2			    usr1	-	all	lx_mkout NULL

- lx	libxml2			    nmake	-	all	lx_libxml2 NULL

diff --git a/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
deleted file mode 100644
index 10c3f3c1f6e8..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24315
-
-For FreeBSD, time_t is defined as 
-at /usr/include/machine/_types.h 
-49th typedef int                     __int32_t;
-90th typedef __int32_t       __time_t;               /* time()... */
-and 
-/usr/include/pwd.h:typedef      __time_t        time_t;
-/usr/include/time.h:typedef     __time_t        time_t;
-/usr/include/timeconv.h:typedef __time_t        time_t;
-/usr/include/utime.h:typedef    __time_t        time_t;
-so time_t is equal to 32 bit integer
-
-For LinuxPPC (Yellowdog 3.0.1)
-
-
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
-@@ -188,9 +188,12 @@
-             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
-             write_xml_tag(TAG_URI, uri_, file);
-             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
--                                
--            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
--            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-+#if defined FREEBSD
-+            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
-+#else
-+            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
-+#endif
-+	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
-                         
-             if (is_private_)            
-                 write_xml_tag(TAG_PRIVATE, file);                               
diff --git a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst
deleted file mode 100644
index 5d5abb75a07e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29656
-
-Index: wizards/prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.23
-diff -u -r1.23 build.lst
---- ../wizards/prj/build.lst	19 May 2004 16:35:11 -0000	1.23
-+++ ../wizards/prj/build.lst	8 Jun 2004 22:43:04 -0000
-@@ -1,4 +1,4 @@
--wz      wizards                                                 :                               rsc javaunohelper jut unoil NULL
-+wz      wizards                                                 :                               rsc qadevOOo javaunohelper jut unoil NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
diff --git a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst
deleted file mode 100644
index d1b4255cca46..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=29666
-
-Index: wizards/prj/d.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/d.lst,v
-retrieving revision 1.13
-diff -u -r1.13 d.lst
---- ../wizards/prj/d.lst	2 Feb 2004 19:16:11 -0000	1.13
-+++ ../wizards/prj/d.lst	9 Jun 2004 08:25:50 -0000
-@@ -1,5 +1,6 @@
- mkdir: %COMMON_DEST%\bin%_EXT%\hid
- mkdir: %_DEST%\pck%_EXT%
-+mkdir: %_DEST%\pck%_EXT%\img
- ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res