From 437cdc00bdaca43f183b3c29633dfcd7d28d8b9c Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sun, 13 Jun 2004 23:57:01 +0000
Subject: 1) Remove IGNORE. Now runs 2) cleanups 3) procedure of localized
 builds have been substantially    changed 4) make use of ccache

---
 editors/openoffice-2.0-devel/Makefile              | 62 ++++++++++++----------
 editors/openoffice-2.0-devel/distinfo              | 20 +++++++
 .../openoffice-2.0-devel/files/Makefile.localized  | 31 +++++++++++
 editors/openoffice-2.0-devel/files/oo_setup.resp   |  2 +-
 .../openoffice-2.0-devel/files/openoffice-wrapper  |  4 +-
 editors/openoffice-3-devel/Makefile                | 62 ++++++++++++----------
 editors/openoffice-3-devel/distinfo                | 20 +++++++
 .../openoffice-3-devel/files/Makefile.localized    | 31 +++++++++++
 editors/openoffice-3-devel/files/oo_setup.resp     |  2 +-
 .../openoffice-3-devel/files/openoffice-wrapper    |  2 +-
 editors/openoffice-3/Makefile                      | 62 ++++++++++++----------
 editors/openoffice-3/distinfo                      | 20 +++++++
 editors/openoffice-3/files/Makefile.localized      | 31 +++++++++++
 editors/openoffice-3/files/oo_setup.resp           |  2 +-
 editors/openoffice-3/files/openoffice-wrapper      |  4 +-
 editors/openoffice.org-2-RC/Makefile               | 62 ++++++++++++----------
 editors/openoffice.org-2-RC/distinfo               | 20 +++++++
 .../openoffice.org-2-RC/files/Makefile.localized   | 31 +++++++++++
 editors/openoffice.org-2-RC/files/oo_setup.resp    |  2 +-
 .../openoffice.org-2-RC/files/openoffice-wrapper   |  4 +-
 editors/openoffice.org-2-devel/Makefile            | 62 ++++++++++++----------
 editors/openoffice.org-2-devel/distinfo            | 20 +++++++
 .../files/Makefile.localized                       | 31 +++++++++++
 editors/openoffice.org-2-devel/files/oo_setup.resp |  2 +-
 .../files/openoffice-wrapper                       |  4 +-
 editors/openoffice.org-2.0-devel/Makefile          | 62 ++++++++++++----------
 editors/openoffice.org-2.0-devel/distinfo          | 20 +++++++
 .../files/Makefile.localized                       | 31 +++++++++++
 .../openoffice.org-2.0-devel/files/oo_setup.resp   |  2 +-
 .../files/openoffice-wrapper                       |  4 +-
 editors/openoffice.org-2.0/Makefile                | 62 ++++++++++++----------
 editors/openoffice.org-2.0/distinfo                | 20 +++++++
 .../openoffice.org-2.0/files/Makefile.localized    | 31 +++++++++++
 editors/openoffice.org-2.0/files/oo_setup.resp     |  2 +-
 .../openoffice.org-2.0/files/openoffice-wrapper    |  4 +-
 editors/openoffice.org-2/Makefile                  | 62 ++++++++++++----------
 editors/openoffice.org-2/distinfo                  | 20 +++++++
 editors/openoffice.org-2/files/Makefile.localized  | 31 +++++++++++
 editors/openoffice.org-2/files/oo_setup.resp       |  2 +-
 editors/openoffice.org-2/files/openoffice-wrapper  |  4 +-
 editors/openoffice.org-3-RC/Makefile               | 62 ++++++++++++----------
 editors/openoffice.org-3-RC/distinfo               | 20 +++++++
 .../openoffice.org-3-RC/files/Makefile.localized   | 31 +++++++++++
 editors/openoffice.org-3-RC/files/oo_setup.resp    |  2 +-
 .../openoffice.org-3-RC/files/openoffice-wrapper   |  4 +-
 editors/openoffice.org-3-devel/Makefile            | 62 ++++++++++++----------
 editors/openoffice.org-3-devel/distinfo            | 20 +++++++
 .../files/Makefile.localized                       | 31 +++++++++++
 editors/openoffice.org-3-devel/files/oo_setup.resp |  2 +-
 .../files/openoffice-wrapper                       |  4 +-
 editors/openoffice.org-3/Makefile                  | 62 ++++++++++++----------
 editors/openoffice.org-3/distinfo                  | 20 +++++++
 editors/openoffice.org-3/files/Makefile.localized  | 31 +++++++++++
 editors/openoffice.org-3/files/oo_setup.resp       |  2 +-
 editors/openoffice.org-3/files/openoffice-wrapper  |  4 +-
 editors/openoffice.org-vcltesttool/Makefile        | 62 ++++++++++++----------
 editors/openoffice.org-vcltesttool/distinfo        | 20 +++++++
 .../files/Makefile.localized                       | 31 +++++++++++
 .../openoffice.org-vcltesttool/files/oo_setup.resp |  2 +-
 .../files/openoffice-wrapper                       |  4 +-
 60 files changed, 1043 insertions(+), 383 deletions(-)
 create mode 100644 editors/openoffice-2.0-devel/files/Makefile.localized
 create mode 100644 editors/openoffice-3-devel/files/Makefile.localized
 create mode 100644 editors/openoffice-3/files/Makefile.localized
 create mode 100644 editors/openoffice.org-2-RC/files/Makefile.localized
 create mode 100644 editors/openoffice.org-2-devel/files/Makefile.localized
 create mode 100644 editors/openoffice.org-2.0-devel/files/Makefile.localized
 create mode 100644 editors/openoffice.org-2.0/files/Makefile.localized
 create mode 100644 editors/openoffice.org-2/files/Makefile.localized
 create mode 100644 editors/openoffice.org-3-RC/files/Makefile.localized
 create mode 100644 editors/openoffice.org-3-devel/files/Makefile.localized
 create mode 100644 editors/openoffice.org-3/files/Makefile.localized
 create mode 100644 editors/openoffice.org-vcltesttool/files/Makefile.localized

(limited to 'editors')

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice-2.0-devel/files/Makefile.localized b/editors/openoffice-2.0-devel/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice-2.0-devel/files/oo_setup.resp b/editors/openoffice-2.0-devel/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice-2.0-devel/files/oo_setup.resp
+++ b/editors/openoffice-2.0-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-2.0-devel/files/openoffice-wrapper b/editors/openoffice-2.0-devel/files/openoffice-wrapper
index 3141aec8b892..34e3d5d23973 100644
--- a/editors/openoffice-2.0-devel/files/openoffice-wrapper
+++ b/editors/openoffice-2.0-devel/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice-3-devel/files/oo_setup.resp b/editors/openoffice-3-devel/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice-3-devel/files/oo_setup.resp
+++ b/editors/openoffice-3-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3-devel/files/openoffice-wrapper b/editors/openoffice-3-devel/files/openoffice-wrapper
index aa417e8e6f5b..e56dae313e45 100644
--- a/editors/openoffice-3-devel/files/openoffice-wrapper
+++ b/editors/openoffice-3-devel/files/openoffice-wrapper
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice-3/files/oo_setup.resp b/editors/openoffice-3/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice-3/files/oo_setup.resp
+++ b/editors/openoffice-3/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper
index 79ab2ce1f6e4..447b0a2d9945 100644
--- a/editors/openoffice-3/files/openoffice-wrapper
+++ b/editors/openoffice-3/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-2-RC/files/oo_setup.resp b/editors/openoffice.org-2-RC/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-2-RC/files/oo_setup.resp
+++ b/editors/openoffice.org-2-RC/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-RC/files/openoffice-wrapper b/editors/openoffice.org-2-RC/files/openoffice-wrapper
index a80bee4c0464..46aef947cb4a 100644
--- a/editors/openoffice.org-2-RC/files/openoffice-wrapper
+++ b/editors/openoffice.org-2-RC/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-2-devel/files/oo_setup.resp
+++ b/editors/openoffice.org-2-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper
index 3fc6d1fbb823..86d121d5163b 100644
--- a/editors/openoffice.org-2-devel/files/openoffice-wrapper
+++ b/editors/openoffice.org-2-devel/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.localized b/editors/openoffice.org-2.0-devel/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-2.0-devel/files/oo_setup.resp b/editors/openoffice.org-2.0-devel/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-2.0-devel/files/oo_setup.resp
+++ b/editors/openoffice.org-2.0-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper
index 1aa8d443b086..7808524518a9 100644
--- a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper
+++ b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-2.0/files/Makefile.localized b/editors/openoffice.org-2.0/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-2.0/files/oo_setup.resp b/editors/openoffice.org-2.0/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-2.0/files/oo_setup.resp
+++ b/editors/openoffice.org-2.0/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0/files/openoffice-wrapper b/editors/openoffice.org-2.0/files/openoffice-wrapper
index edd22c0074bd..92dfcdb6e9b6 100644
--- a/editors/openoffice.org-2.0/files/openoffice-wrapper
+++ b/editors/openoffice.org-2.0/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-2/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-2/files/oo_setup.resp b/editors/openoffice.org-2/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-2/files/oo_setup.resp
+++ b/editors/openoffice.org-2/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2/files/openoffice-wrapper b/editors/openoffice.org-2/files/openoffice-wrapper
index 10efb49b98af..1bc308624489 100644
--- a/editors/openoffice.org-2/files/openoffice-wrapper
+++ b/editors/openoffice.org-2/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-3-RC/files/oo_setup.resp b/editors/openoffice.org-3-RC/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-3-RC/files/oo_setup.resp
+++ b/editors/openoffice.org-3-RC/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper
index 0750a0ff3671..4f93ff5bc3a3 100644
--- a/editors/openoffice.org-3-RC/files/openoffice-wrapper
+++ b/editors/openoffice.org-3-RC/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-3-devel/files/oo_setup.resp b/editors/openoffice.org-3-devel/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-3-devel/files/oo_setup.resp
+++ b/editors/openoffice.org-3-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-devel/files/openoffice-wrapper b/editors/openoffice.org-3-devel/files/openoffice-wrapper
index 086546f7cfad..ae2a03ef4408 100644
--- a/editors/openoffice.org-3-devel/files/openoffice-wrapper
+++ b/editors/openoffice.org-3-devel/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-3/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-3/files/oo_setup.resp b/editors/openoffice.org-3/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-3/files/oo_setup.resp
+++ b/editors/openoffice.org-3/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3/files/openoffice-wrapper b/editors/openoffice.org-3/files/openoffice-wrapper
index dc5d6523297b..a43a2b42bc10 100644
--- a/editors/openoffice.org-3/files/openoffice-wrapper
+++ b/editors/openoffice.org-3/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6c660a7b6fb8..d90612414a6a 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -15,16 +15,26 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 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
-.if defined(L10NHELP)
-DISTFILES+=	${L10NHELP:S/$/:help/}
-.endif
 
 MAINTAINER=	openoffice@FreeBSD.org
 .if !defined(COMMENT)
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 .endif
 
-IGNORE=		"Installation is not complete, manual installation works"
+USE_GNOME=		orbit gtk12 gtk20
+USE_REINPLACE=		yes
+USE_PERL5=		yes
+USE_BZIP2=		yes
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_CCACHE=		yes
+
+.include <bsd.port.pre.mk>
+.include <${FILESDIR}/Makefile.localized>
+
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
 NO_LATEST_LINK=		yes
 UNZIP?=			${LOCALBASE}/bin/unzip
@@ -35,16 +45,10 @@ DIST_SUBDIR=		openoffice2.0
 BUILD_NR=		680
 MILESTONE=		m41
 RELEASE_NR=		2.0
-FRELEASE_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
-USE_GNOME=		orbit gtk12 gtk20
-USE_REINPLACE=		yes
-USE_PERL5=		yes
-USE_BZIP2=		yes
-USE_BISON=		yes
-USE_GMAKE=		yes
 LANG_EXT?=		01
 LANG_CONFIGURE_ARG?=	ENUS
 WRKDIR=			${WRKDIRPREFIX}${.CURDIR}/work
@@ -53,8 +57,17 @@ WRKSRC=			${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 #XXX dirty
 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
+
+.if defined(USE_CCACHE)
+BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+CC=	ccache gcc32
+CXX=	ccache g++32
+.else
 CC=	gcc32
 CXX=	g++32
+.endif
+
+
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
@@ -72,8 +85,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-.include <bsd.port.pre.mk>
-
 #
 # configuration for language specific slave ports
 #
@@ -132,7 +143,7 @@ DISPLAYHACK=localhost:1001
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 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
+CONFIGURE_ARGS+=	--with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp  --enable-mozilla=yes
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -208,7 +219,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -266,10 +277,9 @@ do-build:
 pre-install:
 	@${CP} ${FILESDIR}/oo_setup.resp \
 		${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
-	@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
 
 do-install:
 .if !defined(DISPLAY)
@@ -278,34 +288,28 @@ do-install:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+	@-SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
 		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
 .endif
 
 install-user:
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@-SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%LANG%%#${USE_LANG}#g' \
 			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
-			${WRKDIR}/openoffice-wrapper \
-			${WRKDIR}/freebsd-local.sh
+			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/openoffice-${RELEASE_NR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
-		${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
 	@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 23f567c61dd8..8b3246083348 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -6,3 +6,23 @@ MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f9
 SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
 MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
 SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice2.0/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice2.0/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice2.0/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice2.0/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice2.0/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice2.0/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice2.0/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice2.0/helpcontent_39_unix.tgz) = 12482560
+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_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice2.0/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice2.0/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice2.0/helpcontent_82_unix.tgz) = 12369920
+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
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
new file mode 100644
index 000000000000..f37d00f28198
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -0,0 +1,31 @@
+# localized makefile
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(LOCALIZED_LANG)
+.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"
+
+CATEGORIES=	japanese
+LANG_PKGNAME=   ja
+LANG_EXT=       81
+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
+.endif
diff --git a/editors/openoffice.org-vcltesttool/files/oo_setup.resp b/editors/openoffice.org-vcltesttool/files/oo_setup.resp
index a85c68b65d8a..6c6080103dbb 100644
--- a/editors/openoffice.org-vcltesttool/files/oo_setup.resp
+++ b/editors/openoffice.org-vcltesttool/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
+DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%%
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper
index 994bb83bb18f..4b9a158cfc3e 100644
--- a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper
+++ b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
+oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
-- 
cgit v1.2.3