Unbreak the port and fix the remaining pkg files.

Have fun with OpenOffice1.1Beta !

51 files changed, 1462 insertions, 1309 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-1.1-devel/files/oo_setup.resp b/editors/openoffice-1.1-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 100644
--- a/editors/openoffice-1.1-devel/files/oo_setup.resp
+++ b/editors/openoffice-1.1-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.1-devel/pkg-message b/editors/openoffice-1.1-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-1.1-devel/pkg-message
+++ b/editors/openoffice-1.1-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-1.1/files/oo_setup.resp b/editors/openoffice-1.1/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 100644
--- a/editors/openoffice-1.1/files/oo_setup.resp
+++ b/editors/openoffice-1.1/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-1.1/pkg-message b/editors/openoffice-1.1/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-1.1/pkg-message
+++ b/editors/openoffice-1.1/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-2.0-devel/files/oo_setup.resp b/editors/openoffice-2.0-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-2.0-devel/pkg-message b/editors/openoffice-2.0-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-2.0-devel/pkg-message
+++ b/editors/openoffice-2.0-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-3-devel/files/oo_setup.resp b/editors/openoffice-3-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3-devel/pkg-message b/editors/openoffice-3-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-3-devel/pkg-message
+++ b/editors/openoffice-3-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-3/files/oo_setup.resp b/editors/openoffice-3/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-3/pkg-message b/editors/openoffice-3/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-3/pkg-message
+++ b/editors/openoffice-3/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice-devel/files/oo_setup.resp b/editors/openoffice-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 100644
--- a/editors/openoffice-devel/files/oo_setup.resp
+++ b/editors/openoffice-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice-devel/pkg-message b/editors/openoffice-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice-devel/pkg-message
+++ b/editors/openoffice-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-1.1-devel/files/oo_setup.resp b/editors/openoffice.org-1.1-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 100644
--- a/editors/openoffice.org-1.1-devel/files/oo_setup.resp
+++ b/editors/openoffice.org-1.1-devel/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1-devel/pkg-message b/editors/openoffice.org-1.1-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-1.1-devel/pkg-message
+++ b/editors/openoffice.org-1.1-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-1.1/files/oo_setup.resp b/editors/openoffice.org-1.1/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 100644
--- a/editors/openoffice.org-1.1/files/oo_setup.resp
+++ b/editors/openoffice.org-1.1/files/oo_setup.resp
@@ -1,7 +1,7 @@
 [Environment]
 InstallationMode = INSTALL_NETWORK
 InstallationType = STANDARD
-DestinationPath = %%PREFIX%%/OpenOffice.org-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-1.1/pkg-message b/editors/openoffice.org-1.1/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-1.1/pkg-message
+++ b/editors/openoffice.org-1.1/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2-RC/files/oo_setup.resp b/editors/openoffice.org-2-RC/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-RC/pkg-message b/editors/openoffice.org-2-RC/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-2-RC/pkg-message
+++ b/editors/openoffice.org-2-RC/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-2-devel/pkg-message
+++ b/editors/openoffice.org-2-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
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 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0-devel/pkg-message b/editors/openoffice.org-2.0-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-2.0-devel/pkg-message
+++ b/editors/openoffice.org-2.0-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2.0/files/oo_setup.resp b/editors/openoffice.org-2.0/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2.0/pkg-message b/editors/openoffice.org-2.0/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-2.0/pkg-message
+++ b/editors/openoffice.org-2.0/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2/files/oo_setup.resp b/editors/openoffice.org-2/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2/pkg-message b/editors/openoffice.org-2/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-2/pkg-message
+++ b/editors/openoffice.org-2/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-RC/files/oo_setup.resp b/editors/openoffice.org-3-RC/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-RC/pkg-message b/editors/openoffice.org-3-RC/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-3-RC/pkg-message
+++ b/editors/openoffice.org-3-RC/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-devel/files/oo_setup.resp b/editors/openoffice.org-3-devel/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3-devel/pkg-message b/editors/openoffice.org-3-devel/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-3-devel/pkg-message
+++ b/editors/openoffice.org-3-devel/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3/files/oo_setup.resp b/editors/openoffice.org-3/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-3/pkg-message b/editors/openoffice.org-3/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-3/pkg-message
+++ b/editors/openoffice.org-3/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 56bfb2ce9819..b7c98d7c8b3a 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -23,8 +23,6 @@ DISTFILES+=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-BROKEN=		"Does not build"
-
 SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
@@ -38,8 +36,9 @@ PASTE?=	/usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
-INSTALLATION_BASEDIR=	OpenOffice.org-${PORTVERSION}
-BUILD_NR=		644
+BUILD_NR=		${PORTVERSION}
+RELEASE_NR=		1.1
+INSTALLATION_BASEDIR=	OpenOffice.org-${BUILD_NR}
 DIST_SUBDIR=		openoffice
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
@@ -141,8 +140,8 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
-JDKDIR=		${LOCALBASE}/jdk1.4.1
-JAVAVM=         ${JDKDIR}/bin/java
+JDKDIR?=	${LOCALBASE}/jdk1.4.1
+JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
@@ -150,7 +149,7 @@ WANT_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
-LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 .if ${WITH_DEBUG} == 2
@@ -498,8 +497,9 @@ do-build:
 .endif
 
 pre-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
-	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%PORTVERSION%%#${BUILD_NR}#g' \
+	${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
 .if !defined(DISPLAY)
@@ -529,16 +529,16 @@ post-install:
 	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
 	@${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR}
-	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR}
+	@${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
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter
 	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
 	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-vcltesttool/files/oo_setup.resp b/editors/openoffice.org-vcltesttool/files/oo_setup.resp
index 8eeeb11bd95e..5f5b018518dd 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-643
+DestinationPath = %%PREFIX%%/OpenOffice.org-644
 
 [Java]
 JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-vcltesttool/pkg-message b/editors/openoffice.org-vcltesttool/pkg-message
index 1dc749f301c2..0c50ff9d3143 100644
--- a/editors/openoffice.org-vcltesttool/pkg-message
+++ b/editors/openoffice.org-vcltesttool/pkg-message
@@ -1,73 +1,82 @@
-OpenOffice.org Build 643 Personal Install How-To
+OpenOffice.org Build 644 Beta Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org-643/
-
-Warning:
---------
-
-This port is experimental. Do not use it for production.
-
+OpenOffice.org 1.1Beta will soon been installed in
+${PREFIX}/OpenOffice.org-644
 
 1 User installation
 -------------------
 
-1.1 OO.org installed from the ports collection
-
-Once this is done you have to run "make install-user" as the
-user you like to use OO.org and choose a standard workstation
-installation.
-
-1.2 OO.org installed as package
-
-First check if procfs is running. OO.org setup does depend on
-procfs and does crash without it. This dependency will be
-removed in future, but at the moment it is needed.
-Please read the procfs(5) manpage and ensure the the following
-line is in /etc/fstab:
-
-proc /proc procfs rw 0 0
-
-If you have just installed OO.org as package, there is no
-"make install-user" option available. Instead you'll have
-to run as the user you like to use OO.org:
-
-"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
-installation.
-
-2 JDK-Installation
-------------------
-
-If OO.org asks you to choose the Java JDK during
-"make install-user", you must choose the linux jdk1.3.1.
-Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
-OO.org does ignore it.
-
-3 Start OO.org
+Just type "openoffice" after you have successfully
+installed the package. If there is no installed
+OO.org dir in hour homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org1.1Beta" folder
+in your homedir.
+
+If the setup tells you there is already an installed
+version, you may look at the file ".sversionrc" in
+your homedir. In this file OpenOffice and StarOffice
+have both a line for each version which is installed.
+After removing the problematic line you should be able to
+install again.
+
+2 Start OO.org
 --------------
 
 There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice
-${PREFIX}/bin/openoffice-sagenda
-${PREFIX}/bin/openoffice-scalc
-${PREFIX}/bin/openoffice-sdraw
-${PREFIX}/bin/openoffice-setup
-${PREFIX}/bin/openoffice-sfax
-${PREFIX}/bin/openoffice-simpress
-${PREFIX}/bin/openoffice-spadmin
-${PREFIX}/bin/openoffice-sweb
-${PREFIX}/bin/openoffice-swriter
-
-4 Setup problems
-----------------
+${PREFIX}/bin/openoffice_1.1
+${PREFIX}/bin/openoffice_1.1-sagenda
+${PREFIX}/bin/openoffice_1.1-scalc
+${PREFIX}/bin/openoffice_1.1-sdraw
+${PREFIX}/bin/openoffice_1.1-setup
+${PREFIX}/bin/openoffice_1.1-sfax
+${PREFIX}/bin/openoffice_1.1-simpress
+${PREFIX}/bin/openoffice_1.1-spadmin
+${PREFIX}/bin/openoffice_1.1-sweb
+${PREFIX}/bin/openoffice_1.1-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+Some old X-Servers before XFree86 4.2 do not like the
+western locale with Euro symbol (ISO_8859-15).
+You should ignore the warning message then or upgrade to
+to a more recent X-server.
+
+If you have chosen US-ASCII as locale, you cannot load
+and save documents with special characters and these
+characters are also not available in swriter and scalc.
+
+3 Setup problems (FreeBSD < 4.7-RELEASE only)
+---------------------------------------------
 
 If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the lastest
+it's time to upgrade your FreeBSD system to the latest
 version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
-4.6.2-RELEASE are still affected.
+older than FreeBSD 4.7-RELEASE.
+
+4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
+----------------------------------------------------------
+
+OO.org can crash if you enter a non existing path
+or URL in the location bar. To fix these crashes
+you need the following patch. You will see this
+bug only if your OS is older than FreeBSD 4.7-RELEASE.
+
+http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
+
+5 Crash at startup after using a localized version
+--------------------------------------------------
+
+If you had installed the english version, and then have
+switched to a localized OO.org, it will crash instantly.
+
+To solve this issue, please remove the already installed
+OpenOffice.org1.1Beta dir in your homedir and remove the
+appropriate entry from ".sversionrc". After you have done
+this, redo the user installation and the problem will
+go away.