Update to 1.1.4

Many thanks to: Pavel Janik, Kris Kennaway
and SUN Microsystems, Inc (esp. Hamburg team).
Additional contributors: daichi, kan, lofi, nork, obrien

42 files changed, 522 insertions, 1720 deletions

diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index afb1fa7d66f1..54460ef14d38 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -6,30 +6,33 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES+=	editors
-MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
+		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.0/src/&,}:mozsrc \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/%SUBDIR%/ \
 		ftp://ftp.tu-chemnitz.de/pub/openoffice/%SUBDIR%/ \
 		http://ftp.stardiv.de/pub/OpenOffice.org/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://people.freebsd.org/~mbr/ooo/:moz \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
-DISTFILES+=	OOo_${PORTVERSION}-1_source.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${PORTVERSION}-1_source.tar.gz
+MASTER_SITE_SUBDIR=     stable/${PORTVERSION}
+DISTFILES+=	OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 USE_GNOME=	gtk20
+MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
+MOZILLA_SOURCE=		mozilla-source-1.0.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
@@ -47,6 +50,10 @@ JAVA_BUILD=	jdk
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
+BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade your rtld"
+.endif
+
 LANG_EXT?=	01
 LANG_CONFIGURE_ARG?=	ENUS
 
@@ -70,12 +77,13 @@ L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
 		helpcontent_90_unix.tgz
 .endif
 
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-BUILD_NR=		645
+CODELINE=		645
 RELEASE_NR=		${PORTVERSION}
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
+EXECBASE=		openoffice.org-${RELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
 SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+PACKAGE_BASENAME=       OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
@@ -86,7 +94,6 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -101,6 +108,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
+
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
@@ -116,83 +124,24 @@ BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	259
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/OOo_${RELEASE_NR}_src
-CONFIGURE_WRKSRC=	${WRKDIR}/OOo_${RELEASE_NR}_src/config_office
+WRKSRC=		${WRKDIR}
+CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 TCSH?=		/bin/tcsh
 ZIP?=		${PREFIX}/bin/zip
 UNZIP?=		${PREFIX}/bin/unzip
-BUILD=		dmake
+PKGMESSAGE=	${WRKDIR}/pkg-message
+NUMOFPROCESSES?=	8
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
 .endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp
 
-.if defined(WITHOUT_JAVA)
-CONFIGURE_ARGS+=	--disable-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--enable-symbols
-.endif
-.endif
-
-pre-fetch:
-	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OOo debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
+.include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
-# really tewak, extremely useful when you build all localized language versions
+# really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
@@ -222,36 +171,29 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
-	for file in ${L10NHELPS}; do \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	for helpfile in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
 	done
 .endif
+.if !defined(WITHOUT_MOZILLA)
+	@cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch
+	@${MKDIR} ${WRKSRC}/moz/download
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
+	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
 
-.if !defined(WITHOUT_MOZILLA) && ( \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) )
-.include <${FILESDIR}/Makefile.mozilla>
-do-build: mozilla
-.else
 do-build:
+	@cd ${WRKSRC} ; ./bootstrap
+.if !defined(WITHOUT_MOZILLA)
+	@cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
+	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	#
@@ -259,66 +201,54 @@ do-build:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-.endif
-	@cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
-	@${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 .endif
+
 do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \
-	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \
-	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
-.endif
+	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX}
 
 install-user:
-	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%LANG%%#${USE_LANG}#g' \
-			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
+			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
-		${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}-smath
-	@${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-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+		${PREFIX}/bin/${EXECBASE}
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
+	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
+			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
+			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
+			${PKGMESSAGE}
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
@@ -334,13 +264,12 @@ package-rename:
 .endif
 
 sdk:
-	@${ECHO_MSG} "===>   Make SDK of OOo"
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
+	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
+	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
 
 solver:
-	@${ECHO_MSG} "===>   Make Solver of OOo"
-	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
+	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
+	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 8e31b2f1a226..dd9df7721a32 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,11 +1,11 @@
-MD5 (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 9df288bb534964d4b96efdf7bf029456
-SIZE (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 215360913
+MD5 (openoffice1.1/OOo_1.1.4_source.tar.gz) = 20c10db97865ae4c51dc827d668b8939
+SIZE (openoffice1.1/OOo_1.1.4_source.tar.gz) = 219743530
 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice1.1/gpc231.tar.Z) = 27917
-MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-SIZE (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 29105
-MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-SIZE (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
+SIZE (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708
+MD5 (openoffice1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20
+SIZE (openoffice1.1/mozilla-source-1.0.tar.gz) = 39881558
 MD5 (openoffice1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
 SIZE (openoffice1.1/helpcontent_31_unix.tgz) = 12073861
 MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
diff --git a/editors/openoffice-1.1/files/Makefile.knobs b/editors/openoffice-1.1/files/Makefile.knobs
new file mode 100644
index 000000000000..09dce7f71bdc
--- /dev/null
+++ b/editors/openoffice-1.1/files/Makefile.knobs
@@ -0,0 +1,68 @@
+# Makefile for knobs
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(WITHOUT_JAVA)
+CONFIGURE_ARGS+=	--disable-java
+.else
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
+.endif
+
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
+CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
+.endif
+
+.if defined(WITH_DEBUG)
+.if ${WITH_DEBUG} == 2
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
+.endif
+.endif
+
+pre-fetch:
+.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
+	@${ECHO}
+	@${ECHO} "WARNING"
+	@${ECHO} "Your rtld seems to be old."
+	@${ECHO} "Please remake your rtld by:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "AT YOUR OWN RISK!"
+.endif
+	@${ECHO} "OPTIONS:"
+.if !defined(WITH_DEBUG)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
+	@${ECHO}
+	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
+	@${ECHO} "OOo debug support."
+.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity by"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
+.if !defined(WITHOUT_JAVA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Java support by"
+	@${ECHO} "make -DWITHOUT_JAVA"
+.endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
+	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
+
diff --git a/editors/openoffice-1.1/files/Makefile.localized b/editors/openoffice-1.1/files/Makefile.localized
index d01203363382..aacbb4a7f2b9 100644
--- a/editors/openoffice-1.1/files/Makefile.localized
+++ b/editors/openoffice-1.1/files/Makefile.localized
@@ -102,7 +102,6 @@ LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-PKGMESSAGE=     ${FILESDIR}/pkg-message.de
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
diff --git a/editors/openoffice-1.1/files/Makefile.mozilla b/editors/openoffice-1.1/files/Makefile.mozilla
deleted file mode 100644
index 9593c16dba89..000000000000
--- a/editors/openoffice-1.1/files/Makefile.mozilla
+++ /dev/null
@@ -1,56 +0,0 @@
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@cd ${WRKDIR} ; tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
-.endif
-	@cd ${WRKDIR}/mozilla ; ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla ; ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${REINPLACE_CMD} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-#XXX FIXME! we shuold add CFLAGS="${CLFAGS}" to honor CFLAGS!!
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime ; ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime ; ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime ; export MOZILLA_FIVE_HOME=. \
-		; export LD_LIBRARY_PATH=.:./lib && ./regxpcom
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla
diff --git a/editors/openoffice-1.1/files/moz-patch b/editors/openoffice-1.1/files/moz-patch
new file mode 100644
index 000000000000..7341aed5cdd5
--- /dev/null
+++ b/editors/openoffice-1.1/files/moz-patch
@@ -0,0 +1,19 @@
+#iZ 28398
+#iZ 11424
+
+http://qa.openoffice.org/issues/show_bug.cgi?id=28398
+http://qa.openoffice.org/issues/show_bug.cgi?id=11424
+
+--- moz/extractfiles.mk.org	Sat Oct 30 22:01:49 2004
++++ moz/extractfiles.mk	Sat Oct 30 22:00:21 2004
+@@ -269,8 +269,8 @@
+ 	+$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
+ 	+$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
+ .ELSE
+-	+$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
+-	+$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
++	+$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR)
++	+$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR)
+ .ENDIF
+ 
+ .IF "$(GUI)"=="UNX"
diff --git a/editors/openoffice-1.1/files/openoffice-wrapper b/editors/openoffice-1.1/files/openoffice-wrapper
index 9265261affa7..3e0c2171e1d9 100644
--- a/editors/openoffice-1.1/files/openoffice-wrapper
+++ b/editors/openoffice-1.1/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.14 2004-08-07 08:39:51 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.15 2005-01-11 23:17:42 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice-1.1/files/optpatch-freetype+patch b/editors/openoffice-1.1/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice-1.1/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in
index 5a73be9d0bbe..76cb40db51e6 100644
--- a/editors/openoffice-1.1/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.1/files/patch-config_office+configure.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=40189
+
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map
deleted file mode 100644
index bbbfeab36816..000000000000
--- a/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map
+++ /dev/null
@@ -1,10 +0,0 @@
---- cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
-+++ cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
-@@ -299,6 +299,7 @@
- _ZNK4cppu6UnoUrl11getProtocolEv;
- _ZNK4cppu6UnoUrl13getConnectionEv;
- _ZNK4cppu6UnoUrl13getObjectNameEv;
-+_end;
- 
- 	local:
- 		*;
diff --git a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1/files/patch-sch_setLogicRectHack
deleted file mode 100644
index 44de26bd9cfd..000000000000
--- a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack
+++ /dev/null
@@ -1,69 +0,0 @@
-#iZ 9462
-
---- sch/source/ui/unoidl/ChXChartObject.cxx.orig	7 Aug 2002 16:01:42 -0000	1.34
-+++ sch/source/ui/unoidl/ChXChartObject.cxx	20 Feb 2004 00:43:10 -0000
-@@ -161,9 +161,11 @@
- // XShape
- 
- // the following 'Hack' methods are copied from svx/unodraw/unoshape.cxx
--// they are needed as long as the drawing layer requires this
-+// they are needed as long as the drawing layer requires this.  Must
-+// prefix these with 'sch' to make sure the symbols don't conflict with
-+// those in svx and cause Bad Things To Happen (TM)  #i9462#
- 
--sal_Bool needLogicRectHack( SdrObject* pObj )
-+static sal_Bool sch_needLogicRectHack( SdrObject* pObj )
- {
- 	if( pObj->GetObjInventor() == SdrInventor)
- 	{
-@@ -189,9 +191,9 @@
- 	return sal_False;
- }
- 
--Rectangle getLogicRectHack( SdrObject* pObj )
-+static Rectangle sch_getLogicRectHack( SdrObject* pObj )
- {
--	if(needLogicRectHack(pObj))
-+	if(sch_needLogicRectHack(pObj))
- 	{
- 		return pObj->GetSnapRect();
- 	}
-@@ -201,9 +203,9 @@
- 	}
- }
- 
--void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
-+static void sch_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
- {
--	if(needLogicRectHack(pObj))
-+	if(sch_needLogicRectHack(pObj))
- 	{
- 		pObj->SetSnapRect( rRect );
- 	}
-@@ -244,7 +246,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ));
-+		Rectangle aRect( sch_getLogicRectHack( pObj ));
- 		Point aPt( aRect.Left(), aRect.Top() );
- 
- 		// Position is relative to anchor - calculate absoulte position
-@@ -277,7 +279,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ) );
-+		Rectangle aRect( sch_getLogicRectHack( pObj ) );
- 		Point aLocalPos( aPosition.X, aPosition.Y );
- 
- 		// Position is absolute - position relative to anchor is required
-@@ -309,7 +311,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ));
-+		Rectangle aRect( sch_getLogicRectHack( pObj ));
- 		Size aObjSize( aRect.GetWidth(), aRect.GetHeight() );
- 		return awt::Size( aObjSize.getWidth(), aObjSize.getHeight() );
- 	}
diff --git a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx
deleted file mode 100644
index 420c61cc7b7b..000000000000
--- a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-Weird bug?
-http://qa.openoffice.org/issues/show_bug.cgi?id=22253
-
---- sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
-+++ sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
-@@ -118,6 +118,10 @@
- 		catch(com::sun::star::ucb::InteractiveAugmentedIOException&)
- 		{
- 		}
-+		// PJ: This is a workaround for weird error on FreeBSD (#i22253#)
-+		catch(com::sun::star::uno::Exception&)
-+		{
-+		}
- 		sal_Bool bIsDocument;
- 		if ( (aAny >>= bIsDocument) && bIsDocument )
- 			return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED );
diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index 196084c1657b..6cf440329e06 100644
--- a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -1,3 +1,13 @@
+In solver/645/unxfbsd.pro/inc/rtl/string.hxx,
+even though there is a descrioptin like
+static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
+and In /usr/include/machine/_types.h, 
+typedef int                     __int32_t;
+typedef __int32_t       __time_t;               /* time()... */
+and
+/usr/include/time.h:typedef     __time_t        time_t;
+this cast seems to be mandatory. Why??
+
 --- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
 +++ shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
 @@ -188,9 +188,12 @@
diff --git a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1/files/patch-svx_setLogicRectHack
deleted file mode 100644
index e8c2725e58ab..000000000000
--- a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack
+++ /dev/null
@@ -1,84 +0,0 @@
-#i9462#
---- svx/source/unodraw/unoshape.cxx.orig	4 Feb 2004 13:21:23 -0000	1.109
-+++ svx/source/unodraw/unoshape.cxx	20 Feb 2004 00:43:50 -0000
-@@ -1067,8 +1067,10 @@
- // XShape
- 
- //----------------------------------------------------------------------
-+// This code also existed in sch, and those duplicate symbols
-+// cause Bad Things To Happen (TM)  #i9462#.  Prefixing with 'svx'.
- 
--sal_Bool needLogicRectHack( SdrObject* pObj )
-+static sal_Bool svx_needLogicRectHack( SdrObject* pObj )
- {
- 	if( pObj->GetObjInventor() == SdrInventor)
- 	{
-@@ -1096,9 +1098,9 @@
- 
- //----------------------------------------------------------------------
- 
--Rectangle getLogicRectHack( SdrObject* pObj )
-+static Rectangle svx_getLogicRectHack( SdrObject* pObj )
- {
--	if(needLogicRectHack(pObj))
-+	if(svx_needLogicRectHack(pObj))
- 	{
- 		return pObj->GetSnapRect();
- 	}
-@@ -1110,9 +1112,9 @@
- 
- //----------------------------------------------------------------------
- 
--void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
-+static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
- {
--	if(needLogicRectHack(pObj))
-+	if(svx_needLogicRectHack(pObj))
- 	{
- 		pObj->SetSnapRect( rRect );
- 	}
-@@ -1130,7 +1132,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Point aPt( aRect.Left(), aRect.Top() );
- 
- 		// Position is relativ to anchor, so recalc to absolut position
-@@ -1157,7 +1159,7 @@
- 		// transformation matrix
- 		if(!pObj->ISA(E3dCompoundObject))
- 		{
--			Rectangle aRect( getLogicRectHack(pObj) );
-+			Rectangle aRect( svx_getLogicRectHack(pObj) );
- 			Point aLocalPos( Position.X, Position.Y );
- 			ForceMetricToItemPoolMetric(aLocalPos);
- 
-@@ -1183,7 +1185,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Size aObjSize( aRect.GetWidth(), aRect.GetHeight() );
- 		ForceMetricTo100th_mm(aObjSize);
- 		return ::com::sun::star::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() );
-@@ -1200,7 +1202,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Size aLocalSize( rSize.Width, rSize.Height );
- 		ForceMetricToItemPoolMetric(aLocalSize);
- 		if(pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_MEASURE )
-@@ -1213,7 +1215,7 @@
- 		else
- 		{
- 			aRect.SetSize(aLocalSize);
--			setLogicRectHack( pObj, aRect );
-+			svx_setLogicRectHack( pObj, aRect );
- 		}
- 
- 		pModel->SetChanged();
diff --git a/editors/openoffice-1.1/files/patch-translation_limit_64k b/editors/openoffice-1.1/files/patch-translation_limit_64k
index ce15548f052b..109833162541 100644
--- a/editors/openoffice-1.1/files/patch-translation_limit_64k
+++ b/editors/openoffice-1.1/files/patch-translation_limit_64k
@@ -1,5 +1,7 @@
 #iZ 33228#
 #iZ 34210#
+Kannada doesn't build since some resources are limited to 64k.
+it won't fix for 1.1.x
 
 Index: inc/sc.hrc
 ===================================================================
diff --git a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
new file mode 100644
index 000000000000..88225ffe8308
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
@@ -0,0 +1,22 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=40191
+
+sys/socket.h is needed for FreeBSD
+
+Index: ucbhelper/source/client/proxydecider.cxx
+===================================================================
+RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v
+retrieving revision 1.3.16.1
+diff -u -r1.3.16.1 proxydecider.cxx
+--- ucbhelper/source/client/proxydecider.cxx	20 Oct 2004 12:04:36 -0000	1.3.16.1
++++ ucbhelper/source/client/proxydecider.cxx	30 Dec 2004 04:12:01 -0000
+@@ -127,6 +127,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#if defined (FREEBSD)
++#include <sys/socket.h>
++#endif
++
+ #ifdef SOLARIS
+ 
+ extern "C"
diff --git a/editors/openoffice-1.1/files/pkg-message.de b/editors/openoffice-1.1/files/pkg-message.de
deleted file mode 100644
index 4466bdb7bee5..000000000000
--- a/editors/openoffice-1.1/files/pkg-message.de
+++ /dev/null
@@ -1,89 +0,0 @@
-OpenOffice.org Version 1.1.2 Installationsanleitung
-
-Geschrieben von:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org ist bald im Verzeichnis
-${PREFIX}/OpenOffice.org1.1.2/ installiert.
-
-1 Benutzerinstallation
-----------------------
-
-Nachdem der Port oder das Package installiert ist
-kann OO.org mit "openoffice" gestartet werden. Beim
-ersten Mal wird das OO.org Setup aufgerufen und in
-Ihrem Benutzerverzeichnis das Verzeichnis
-"OpenOffice.org1.1.2" angelegt. Ebenfalls werden
-Sie während des Setups nach einem installierten
-Java JDK gefragt.
-
-Falls das Setup mit der Fehlermeldung abbricht, dass
-schon eine Version installiert sei (von einem vorherigen
-Installationsversuch), kann ein Blick in die Datei
-".sversionrc" helfen. In dieser Datei speichern Openoffice
-wie auch alle Staroffice Versionen Informationen ’…r die
-Installation ab. Lšáhen Sie die problematische Zeile
-und die Installation wird nun funktionieren.
-
-2 Start von OO.org
-------------------
-
-Die FreeBSD-Version von OO.org installiert nun ein Skript
-zum schnellen Aufruf. Bitte fӋn Sie "${PREFIX}/bin/" 
-zu Ihrer ENV-Variable PATH hinzu und sie werden OO.org
-einfacher aufrufen k˜Žen:
-
-${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
-
-OO.org verlangt dass die ENV-Variable LANG auf einen
-brauchbaren Wert gesetzt ist. Wenn LANG nicht definiert
-ist, so verwendet das Startup-Skript eine Standard-Einstellung,
-Momentan wird "de_DE.ISO_8859-15" verwendet. Sie k˜Žen diese
-Einstellung auch im Startup-Skript ändern.
-
-Wenn Sie einen älteren X-Server vor der XFree86 Version 4.2
-verwenden, k˜Žen Warnungen auftreten. Ignorieren Sie diese
-oder verwenden Sie eine neuere Version.
-
-Falls US-ASCII verwendet wird, k˜Žen Sie Dokumente mit
-Umlauten und Sonderzeichen im Dateinamen nicht mehr speichern
-und laden, und natšŒich werden Sie auch im OO.org keine
-dieser Zeichen mehr tippen k˜Žen.
-
-3 Setup Probleme (nur FreeBSD < 4.7-RELEASE)
---------------------------------------------
-
-Falls sich das Setup ’…r eine fehlende Datei mit Namen
-"setup.ins" beklagt, so ist es an der Zeit Ihr System auf
-die neueste FreeBSD-Version zu aktualisieren. FreeBSD
-4.7-RELEASE und neuer hat dieses Problem nicht.
-
-4 Abstšše bei der URL-Leiste (nur FreeBSD < 4.7-RELEASE)
----------------------------------------------------------
-
-Bei älteren FreeBSD-Version als 4.7-RELEASE kann OO.org
-bei Eingaben in der URL-Leiste abstššen, falls ein nicht
-existierender Dateiname eingegeben wird. Der folgende
-Systempatch schafft Abhilfe:
-
-http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
-
-5 Absturz nach dem Wechseln zu einer anderen Sprachversion
-----------------------------------------------------------
-
-Falls Sie zuerst die englische Version von OO.org installiert
-haben und nachträglich auf eine andere Sprachversion gewechselt
-haben, so kann dies OO.org zum Absturz bringen.
-
-Abhilfe schafft in diesem Fall nur das Lšáhen des bestehenden
-OpenOffice.org1.1.2 Verzeichnisses und des entsprechenden
-Eintrags aus der Datei ".sversionrc" mit anschliessender neuer
-Benutzer-Installation.
diff --git a/editors/openoffice-1.1/files/pkg-message.in b/editors/openoffice-1.1/files/pkg-message.in
new file mode 100644
index 000000000000..5d97699bd0f0
--- /dev/null
+++ b/editors/openoffice-1.1/files/pkg-message.in
@@ -0,0 +1,54 @@
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
+
+Written by:	Martin Blapp <mbr@freebsd.org>
+		and Maho Nakata <maho@FreeBSD.org>
+
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
+%%PREFIX%%/%%EXECBASE%%
+
+1 User installation
+-------------------
+
+Just type "%%EXECBASE%%" after you have successfully
+installed the package. If there is no installed
+OO.org dir in your homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org%%RELEASE_NR%%" 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/%%EXECBASE%%
+%%PREFIX%%/bin/%%EXECBASE%%-sagenda
+%%PREFIX%%/bin/%%EXECBASE%%-scalc
+%%PREFIX%%/bin/%%EXECBASE%%-sdraw
+%%PREFIX%%/bin/%%EXECBASE%%-setup
+%%PREFIX%%/bin/%%EXECBASE%%-sfax
+%%PREFIX%%/bin/%%EXECBASE%%-simpress
+%%PREFIX%%/bin/%%EXECBASE%%-spadmin
+%%PREFIX%%/bin/%%EXECBASE%%-sweb
+%%PREFIX%%/bin/%%EXECBASE%%-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+
+3 If you stuck into a trouble
+--------------------------------------------------
+Somehow you can stuck into a trouble. 
+To solve this issue, please remove the already installed
+"OpenOffice.org%%RELEASE_NR%%" 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/files/zipmoz.sh b/editors/openoffice-1.1/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice-1.1/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice-1.1/pkg-descr b/editors/openoffice-1.1/pkg-descr
index 31fd1b12161a..bc2ede1b8c2b 100644
--- a/editors/openoffice-1.1/pkg-descr
+++ b/editors/openoffice-1.1/pkg-descr
@@ -12,3 +12,6 @@ Components include:
   * A tool for creating effective eye-catching presentations.
   * A vector-oriented draw module that enables the creation of 3D
     illustrations
+
+WWW: http://www.openoffice.org/
+     http://porting.openoffice.org/freebsd/
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index afb1fa7d66f1..54460ef14d38 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -6,30 +6,33 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES+=	editors
-MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
+		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.0/src/&,}:mozsrc \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/%SUBDIR%/ \
 		ftp://ftp.tu-chemnitz.de/pub/openoffice/%SUBDIR%/ \
 		http://ftp.stardiv.de/pub/OpenOffice.org/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://people.freebsd.org/~mbr/ooo/:moz \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
-DISTFILES+=	OOo_${PORTVERSION}-1_source.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${PORTVERSION}-1_source.tar.gz
+MASTER_SITE_SUBDIR=     stable/${PORTVERSION}
+DISTFILES+=	OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 USE_GNOME=	gtk20
+MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
+MOZILLA_SOURCE=		mozilla-source-1.0.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
+DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
@@ -47,6 +50,10 @@ JAVA_BUILD=	jdk
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
+BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade your rtld"
+.endif
+
 LANG_EXT?=	01
 LANG_CONFIGURE_ARG?=	ENUS
 
@@ -70,12 +77,13 @@ L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
 		helpcontent_90_unix.tgz
 .endif
 
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-BUILD_NR=		645
+CODELINE=		645
 RELEASE_NR=		${PORTVERSION}
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
+EXECBASE=		openoffice.org-${RELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
 SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+PACKAGE_BASENAME=       OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
@@ -86,7 +94,6 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -101,6 +108,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
+
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
 .endif
@@ -116,83 +124,24 @@ BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	259
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/OOo_${RELEASE_NR}_src
-CONFIGURE_WRKSRC=	${WRKDIR}/OOo_${RELEASE_NR}_src/config_office
+WRKSRC=		${WRKDIR}
+CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 TCSH?=		/bin/tcsh
 ZIP?=		${PREFIX}/bin/zip
 UNZIP?=		${PREFIX}/bin/unzip
-BUILD=		dmake
+PKGMESSAGE=	${WRKDIR}/pkg-message
+NUMOFPROCESSES?=	8
 
 .if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
 .endif
-
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp
 
-.if defined(WITHOUT_JAVA)
-CONFIGURE_ARGS+=	--disable-java
-.else
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
-.endif
-
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+=	--disable-mozilla
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-.endif
-
-.if defined(WITH_DEBUG)
-.if ${WITH_DEBUG} == 2
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--enable-symbols
-.endif
-.endif
-
-pre-fetch:
-	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OOo debug support."
-	@${ECHO}
-.endif
-.if !defined(WITH_TTF_BYTECODE_ENABLED)
-	@${ECHO}
-	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
-	@${ECHO} "if you like to use the Freetype library to"
-	@${ECHO} "render TTF fonts. Normally the TTF lib is"
-	@${ECHO} "not used to render fonts."
-	@${ECHO}
-	@${ECHO} "If you have licensed the Apple patents"
-	@${ECHO} "US05155805 US05159668 and US05325479"
-	@${ECHO} "you can enable this option to get better"
-	@${ECHO} "quality of glyphs at small bitmap sizes."
-	@${ECHO}
-.endif
-	@${ECHO}
-	@${ECHO} "NOTICE:"
-	@${ECHO}
-	@${ECHO} "To build Openoffice, you should have a lot"
-.if defined(WITH_DEBUG)
-	@${ECHO} "of free diskspace (~ 8GB)."
-.else
-	@${ECHO} "of free diskspace (~ 4GB)."
-.endif
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
+.include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
-# really tewak, extremely useful when you build all localized language versions
+# really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
@@ -222,36 +171,29 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
-	for file in ${L10NHELPS}; do \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	for helpfile in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
 	done
 .endif
+.if !defined(WITHOUT_MOZILLA)
+	@cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch
+	@${MKDIR} ${WRKSRC}/moz/download
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
+	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
-		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
-		fi; \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
-	fi
-.endif
 
-.if !defined(WITHOUT_MOZILLA) && ( \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \
-	!exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) )
-.include <${FILESDIR}/Makefile.mozilla>
-do-build: mozilla
-.else
 do-build:
+	@cd ${WRKSRC} ; ./bootstrap
+.if !defined(WITHOUT_MOZILLA)
+	@cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
+	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	#
@@ -259,66 +201,54 @@ do-build:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-.endif
-	@cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
-.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
-	@${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 .else
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 .endif
+
 do-install:
-.if !defined(DISPLAY)
-	#
-	# UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \
-	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \
-	SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
-.endif
+	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX}
 
 install-user:
-	@SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+	@${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%LANG%%#${USE_LANG}#g' \
-			-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
+			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
-		${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}-smath
-	@${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-${RELEASE_NR} > ${TMPPLIST}
-	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
+		${PREFIX}/bin/${EXECBASE}
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
+	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
+	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
+			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
+			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
+			${PKGMESSAGE}
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for OOo mirror upload";
@@ -334,13 +264,12 @@ package-rename:
 .endif
 
 sdk:
-	@${ECHO_MSG} "===>   Make SDK of OOo"
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
-		${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
+	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
+	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
 
 solver:
-	@${ECHO_MSG} "===>   Make Solver of OOo"
-	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
+	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
+	@cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 8e31b2f1a226..dd9df7721a32 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,11 +1,11 @@
-MD5 (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 9df288bb534964d4b96efdf7bf029456
-SIZE (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 215360913
+MD5 (openoffice1.1/OOo_1.1.4_source.tar.gz) = 20c10db97865ae4c51dc827d668b8939
+SIZE (openoffice1.1/OOo_1.1.4_source.tar.gz) = 219743530
 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice1.1/gpc231.tar.Z) = 27917
-MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-SIZE (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 29105
-MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-SIZE (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = 7292
+MD5 (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
+SIZE (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708
+MD5 (openoffice1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20
+SIZE (openoffice1.1/mozilla-source-1.0.tar.gz) = 39881558
 MD5 (openoffice1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
 SIZE (openoffice1.1/helpcontent_31_unix.tgz) = 12073861
 MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
diff --git a/editors/openoffice.org-1.1/files/Makefile.knobs b/editors/openoffice.org-1.1/files/Makefile.knobs
new file mode 100644
index 000000000000..09dce7f71bdc
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/Makefile.knobs
@@ -0,0 +1,68 @@
+# Makefile for knobs
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD$
+
+.if defined(WITHOUT_JAVA)
+CONFIGURE_ARGS+=	--disable-java
+.else
+CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
+.endif
+
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=	--disable-mozilla
+.endif
+
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
+CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
+.endif
+
+.if defined(WITH_DEBUG)
+.if ${WITH_DEBUG} == 2
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--enable-symbols
+.endif
+.endif
+
+pre-fetch:
+.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000)
+	@${ECHO}
+	@${ECHO} "WARNING"
+	@${ECHO} "Your rtld seems to be old."
+	@${ECHO} "Please remake your rtld by:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "AT YOUR OWN RISK!"
+.endif
+	@${ECHO} "OPTIONS:"
+.if !defined(WITH_DEBUG)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1"
+	@${ECHO}
+	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
+	@${ECHO} "OOo debug support."
+.endif
+.if !defined(WITHOUT_MOZILLA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Mozilla connectivity by"
+	@${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
+.if !defined(WITHOUT_JAVA)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without Java support by"
+	@${ECHO} "make -DWITHOUT_JAVA"
+.endif
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
+	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
+
diff --git a/editors/openoffice.org-1.1/files/Makefile.localized b/editors/openoffice.org-1.1/files/Makefile.localized
index d01203363382..aacbb4a7f2b9 100644
--- a/editors/openoffice.org-1.1/files/Makefile.localized
+++ b/editors/openoffice.org-1.1/files/Makefile.localized
@@ -102,7 +102,6 @@ LANG_EXT=	49
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	GER
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-PKGMESSAGE=     ${FILESDIR}/pkg-message.de
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "el"
diff --git a/editors/openoffice.org-1.1/files/Makefile.mozilla b/editors/openoffice.org-1.1/files/Makefile.mozilla
deleted file mode 100644
index 9593c16dba89..000000000000
--- a/editors/openoffice.org-1.1/files/Makefile.mozilla
+++ /dev/null
@@ -1,56 +0,0 @@
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@cd ${WRKDIR} ; tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
-.endif
-	@cd ${WRKDIR}/mozilla ; ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla ; ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${REINPLACE_CMD} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-#XXX FIXME! we shuold add CFLAGS="${CLFAGS}" to honor CFLAGS!!
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime ; ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime ; ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime ; export MOZILLA_FIVE_HOME=. \
-		; export LD_LIBRARY_PATH=.:./lib && ./regxpcom
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime ; ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla
diff --git a/editors/openoffice.org-1.1/files/moz-patch b/editors/openoffice.org-1.1/files/moz-patch
new file mode 100644
index 000000000000..7341aed5cdd5
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/moz-patch
@@ -0,0 +1,19 @@
+#iZ 28398
+#iZ 11424
+
+http://qa.openoffice.org/issues/show_bug.cgi?id=28398
+http://qa.openoffice.org/issues/show_bug.cgi?id=11424
+
+--- moz/extractfiles.mk.org	Sat Oct 30 22:01:49 2004
++++ moz/extractfiles.mk	Sat Oct 30 22:00:21 2004
+@@ -269,8 +269,8 @@
+ 	+$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
+ 	+$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
+ .ELSE
+-	+$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
+-	+$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
++	+$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR)
++	+$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR)
+ .ENDIF
+ 
+ .IF "$(GUI)"=="UNX"
diff --git a/editors/openoffice.org-1.1/files/openoffice-wrapper b/editors/openoffice.org-1.1/files/openoffice-wrapper
index ee190c0db79c..d340832c03dc 100644
--- a/editors/openoffice.org-1.1/files/openoffice-wrapper
+++ b/editors/openoffice.org-1.1/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice-wrapper,v 1.14 2004-08-07 08:39:51 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice-wrapper,v 1.15 2005-01-11 23:17:42 maho Exp $
 
-oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
 program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
 
 case $program in
diff --git a/editors/openoffice.org-1.1/files/optpatch-freetype+patch b/editors/openoffice.org-1.1/files/optpatch-freetype+patch
deleted file mode 100644
index b426a8fb7fcc..000000000000
--- a/editors/openoffice.org-1.1/files/optpatch-freetype+patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: files/patch-freetype::patch
-===================================================================
-RCS file: files/patch-freetype::patch
-diff -N files/patch-freetype::patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
-@@ -0,0 +1,201 @@
-+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
-+--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
-++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
-+@@ -1,118 +1,79 @@
-+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
-+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 63,69 ****
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+---- 63,69 ----
-+-  #   ANSI compliance.
-+-  #
-+-  ifndef CFLAGS
-+-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-+-  endif
-+-  
-+-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 631,637 ****
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+---- 631,637 ----
-+-      if test "$build_old_libs" = yes; then
-+-        if test "$pic_mode" != yes; then
-+-  	# Don't build PIC code
-+-! 	command="$base_compile $srcfile -DPIC $pic_flag"
-+-        else
-+-  	# All platforms use -DPIC, to notify preprocessed assembler code.
-+-  	command="$base_compile $srcfile $pic_flag -DPIC"
-+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 1,7 ****
-+---- 1,9 ----
-+-  FT_USE_MODULE(autohint_module_class)
-+-  FT_USE_MODULE(cff_driver_class)
-+-  FT_USE_MODULE(t1cid_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(pcf_driver_class)
-+-+ */
-+-  FT_USE_MODULE(psaux_module_class)
-+-  FT_USE_MODULE(psnames_module_class)
-+-  FT_USE_MODULE(ft_raster1_renderer_class)
-+-***************
-+-*** 9,12 ****
-+---- 11,16 ----
-+-  FT_USE_MODULE(ft_smooth_renderer_class)
-+-  FT_USE_MODULE(tt_driver_class)
-+-  FT_USE_MODULE(t1_driver_class)
-+-+ /*
-+-  FT_USE_MODULE(winfnt_driver_class)
-+-+ */
-+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
-+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
-+-***************
-+-*** 70,76 ****
-+---- 70,79 ----
-+-    /*   All convenience functions are declared as such in their             */
-+-    /*   documentation.                                                      */
-+-    /*                                                                       */
-+-+ /*
-+-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-+ */
-+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+-  
-+-  
-+-    /*************************************************************************/
-+-***************
-+-*** 108,116 ****
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-- 
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+---- 111,121 ----
-+-    /*   use a vector `plotter' format that isn't supported when this        */
-+-    /*   macro is undefined.                                                 */
-+-    /*                                                                       */
-+-+ /*
-+-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-+ */
-+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-+-  
-+-    /*************************************************************************/
-+-    /*                                                                       */
-+-    /* Glyph Postscript Names handling                                       */
-+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
-+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
-+-***************
-+-*** 2251,2257 ****
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age + 1`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-+---- 2251,2257 ----
-+-  	  ;;
-+-  
-+-  	irix)
-+-! 	  major=`expr $current - $age`
-+-  	  verstring="sgi$major.$revision"
-+-  
-+-  	  # Add in all the interfaces that we are compatible with.
-++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
-++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
-++@@ -63,7 +63,7 @@
-++ #   ANSI compliance.
-++ #
-++ ifndef CFLAGS
-++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
-+++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
-++ endif
-++ 
-++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
-++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
-++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
-+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
-++@@ -631,7 +631,7 @@
-++     if test "$build_old_libs" = yes; then
-++       if test "$pic_mode" != yes; then
-++ 	# Don't build PIC code
-++-	command="$base_compile $srcfile"
-+++	command="$base_compile $srcfile -DPIC $pic_flag"
-++       else
-++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
-++ 	command="$base_compile $srcfile $pic_flag -DPIC"
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
-++@@ -1,7 +1,9 @@
-++ FT_USE_MODULE(autohint_module_class)
-++ FT_USE_MODULE(cff_driver_class)
-++ FT_USE_MODULE(t1cid_driver_class)
-+++/*
-++ FT_USE_MODULE(pcf_driver_class)
-+++*/
-++ FT_USE_MODULE(psaux_module_class)
-++ FT_USE_MODULE(psnames_module_class)
-++ FT_USE_MODULE(ft_raster1_renderer_class)
-++@@ -9,4 +11,6 @@
-++ FT_USE_MODULE(ft_smooth_renderer_class)
-++ FT_USE_MODULE(tt_driver_class)
-++ FT_USE_MODULE(t1_driver_class)
-+++/*
-++ FT_USE_MODULE(winfnt_driver_class)
-+++*/
-++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
-++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
-+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
-++@@ -70,7 +70,10 @@
-++   /*   All convenience functions are declared as such in their             */
-++   /*   documentation.                                                      */
-++   /*                                                                       */
-+++/*
-++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-+++*/
-+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-++ 
-++ 
-++   /*************************************************************************/
-++@@ -108,8 +111,10 @@
-++   /*   use a vector `plotter' format that isn't supported when this        */
-++   /*   macro is undefined.                                                 */
-++   /*                                                                       */
-+++/*
-++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++-
-+++*/
-+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-++ 
-++   /*************************************************************************/
-++   /*                                                                       */
-++@@ -338,7 +343,7 @@
-++   /* By undefining this, you will only compile the code necessary to load  */
-++   /* TrueType glyphs without hinting.                                      */
-++   /*                                                                       */
-++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-++ 
-++ 
-++   /*************************************************************************/
diff --git a/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e8..000000000000
--- a/editors/openoffice.org-1.1/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-config_office+configure.in b/editors/openoffice.org-1.1/files/patch-config_office+configure.in
index 5a73be9d0bbe..76cb40db51e6 100644
--- a/editors/openoffice.org-1.1/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-1.1/files/patch-config_office+configure.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=40189
+
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map
deleted file mode 100644
index bbbfeab36816..000000000000
--- a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map
+++ /dev/null
@@ -1,10 +0,0 @@
---- cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
-+++ cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
-@@ -299,6 +299,7 @@
- _ZNK4cppu6UnoUrl11getProtocolEv;
- _ZNK4cppu6UnoUrl13getConnectionEv;
- _ZNK4cppu6UnoUrl13getObjectNameEv;
-+_end;
- 
- 	local:
- 		*;
diff --git a/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack b/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack
deleted file mode 100644
index 44de26bd9cfd..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack
+++ /dev/null
@@ -1,69 +0,0 @@
-#iZ 9462
-
---- sch/source/ui/unoidl/ChXChartObject.cxx.orig	7 Aug 2002 16:01:42 -0000	1.34
-+++ sch/source/ui/unoidl/ChXChartObject.cxx	20 Feb 2004 00:43:10 -0000
-@@ -161,9 +161,11 @@
- // XShape
- 
- // the following 'Hack' methods are copied from svx/unodraw/unoshape.cxx
--// they are needed as long as the drawing layer requires this
-+// they are needed as long as the drawing layer requires this.  Must
-+// prefix these with 'sch' to make sure the symbols don't conflict with
-+// those in svx and cause Bad Things To Happen (TM)  #i9462#
- 
--sal_Bool needLogicRectHack( SdrObject* pObj )
-+static sal_Bool sch_needLogicRectHack( SdrObject* pObj )
- {
- 	if( pObj->GetObjInventor() == SdrInventor)
- 	{
-@@ -189,9 +191,9 @@
- 	return sal_False;
- }
- 
--Rectangle getLogicRectHack( SdrObject* pObj )
-+static Rectangle sch_getLogicRectHack( SdrObject* pObj )
- {
--	if(needLogicRectHack(pObj))
-+	if(sch_needLogicRectHack(pObj))
- 	{
- 		return pObj->GetSnapRect();
- 	}
-@@ -201,9 +203,9 @@
- 	}
- }
- 
--void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
-+static void sch_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
- {
--	if(needLogicRectHack(pObj))
-+	if(sch_needLogicRectHack(pObj))
- 	{
- 		pObj->SetSnapRect( rRect );
- 	}
-@@ -244,7 +246,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ));
-+		Rectangle aRect( sch_getLogicRectHack( pObj ));
- 		Point aPt( aRect.Left(), aRect.Top() );
- 
- 		// Position is relative to anchor - calculate absoulte position
-@@ -277,7 +279,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ) );
-+		Rectangle aRect( sch_getLogicRectHack( pObj ) );
- 		Point aLocalPos( aPosition.X, aPosition.Y );
- 
- 		// Position is absolute - position relative to anchor is required
-@@ -309,7 +311,7 @@
- 	SdrObject* pObj = GetCurrentSdrObject();
- 	if( pObj )
- 	{
--		Rectangle aRect( getLogicRectHack( pObj ));
-+		Rectangle aRect( sch_getLogicRectHack( pObj ));
- 		Size aObjSize( aRect.GetWidth(), aRect.GetHeight() );
- 		return awt::Size( aObjSize.getWidth(), aObjSize.getHeight() );
- 	}
diff --git a/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx
deleted file mode 100644
index 420c61cc7b7b..000000000000
--- a/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-Weird bug?
-http://qa.openoffice.org/issues/show_bug.cgi?id=22253
-
---- sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
-+++ sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
-@@ -118,6 +118,10 @@
- 		catch(com::sun::star::ucb::InteractiveAugmentedIOException&)
- 		{
- 		}
-+		// PJ: This is a workaround for weird error on FreeBSD (#i22253#)
-+		catch(com::sun::star::uno::Exception&)
-+		{
-+		}
- 		sal_Bool bIsDocument;
- 		if ( (aAny >>= bIsDocument) && bIsDocument )
- 			return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED );
diff --git a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index 196084c1657b..6cf440329e06 100644
--- a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -1,3 +1,13 @@
+In solver/645/unxfbsd.pro/inc/rtl/string.hxx,
+even though there is a descrioptin like
+static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
+and In /usr/include/machine/_types.h, 
+typedef int                     __int32_t;
+typedef __int32_t       __time_t;               /* time()... */
+and
+/usr/include/time.h:typedef     __time_t        time_t;
+this cast seems to be mandatory. Why??
+
 --- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
 +++ shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
 @@ -188,9 +188,12 @@
diff --git a/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack b/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack
deleted file mode 100644
index e8c2725e58ab..000000000000
--- a/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack
+++ /dev/null
@@ -1,84 +0,0 @@
-#i9462#
---- svx/source/unodraw/unoshape.cxx.orig	4 Feb 2004 13:21:23 -0000	1.109
-+++ svx/source/unodraw/unoshape.cxx	20 Feb 2004 00:43:50 -0000
-@@ -1067,8 +1067,10 @@
- // XShape
- 
- //----------------------------------------------------------------------
-+// This code also existed in sch, and those duplicate symbols
-+// cause Bad Things To Happen (TM)  #i9462#.  Prefixing with 'svx'.
- 
--sal_Bool needLogicRectHack( SdrObject* pObj )
-+static sal_Bool svx_needLogicRectHack( SdrObject* pObj )
- {
- 	if( pObj->GetObjInventor() == SdrInventor)
- 	{
-@@ -1096,9 +1098,9 @@
- 
- //----------------------------------------------------------------------
- 
--Rectangle getLogicRectHack( SdrObject* pObj )
-+static Rectangle svx_getLogicRectHack( SdrObject* pObj )
- {
--	if(needLogicRectHack(pObj))
-+	if(svx_needLogicRectHack(pObj))
- 	{
- 		return pObj->GetSnapRect();
- 	}
-@@ -1110,9 +1112,9 @@
- 
- //----------------------------------------------------------------------
- 
--void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
-+static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
- {
--	if(needLogicRectHack(pObj))
-+	if(svx_needLogicRectHack(pObj))
- 	{
- 		pObj->SetSnapRect( rRect );
- 	}
-@@ -1130,7 +1132,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Point aPt( aRect.Left(), aRect.Top() );
- 
- 		// Position is relativ to anchor, so recalc to absolut position
-@@ -1157,7 +1159,7 @@
- 		// transformation matrix
- 		if(!pObj->ISA(E3dCompoundObject))
- 		{
--			Rectangle aRect( getLogicRectHack(pObj) );
-+			Rectangle aRect( svx_getLogicRectHack(pObj) );
- 			Point aLocalPos( Position.X, Position.Y );
- 			ForceMetricToItemPoolMetric(aLocalPos);
- 
-@@ -1183,7 +1185,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Size aObjSize( aRect.GetWidth(), aRect.GetHeight() );
- 		ForceMetricTo100th_mm(aObjSize);
- 		return ::com::sun::star::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() );
-@@ -1200,7 +1202,7 @@
- 
- 	if( pObj && pModel)
- 	{
--		Rectangle aRect( getLogicRectHack(pObj) );
-+		Rectangle aRect( svx_getLogicRectHack(pObj) );
- 		Size aLocalSize( rSize.Width, rSize.Height );
- 		ForceMetricToItemPoolMetric(aLocalSize);
- 		if(pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_MEASURE )
-@@ -1213,7 +1215,7 @@
- 		else
- 		{
- 			aRect.SetSize(aLocalSize);
--			setLogicRectHack( pObj, aRect );
-+			svx_setLogicRectHack( pObj, aRect );
- 		}
- 
- 		pModel->SetChanged();
diff --git a/editors/openoffice.org-1.1/files/patch-translation_limit_64k b/editors/openoffice.org-1.1/files/patch-translation_limit_64k
index ce15548f052b..109833162541 100644
--- a/editors/openoffice.org-1.1/files/patch-translation_limit_64k
+++ b/editors/openoffice.org-1.1/files/patch-translation_limit_64k
@@ -1,5 +1,7 @@
 #iZ 33228#
 #iZ 34210#
+Kannada doesn't build since some resources are limited to 64k.
+it won't fix for 1.1.x
 
 Index: inc/sc.hrc
 ===================================================================
diff --git a/editors/openoffice.org-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice.org-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
new file mode 100644
index 000000000000..88225ffe8308
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
@@ -0,0 +1,22 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=40191
+
+sys/socket.h is needed for FreeBSD
+
+Index: ucbhelper/source/client/proxydecider.cxx
+===================================================================
+RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v
+retrieving revision 1.3.16.1
+diff -u -r1.3.16.1 proxydecider.cxx
+--- ucbhelper/source/client/proxydecider.cxx	20 Oct 2004 12:04:36 -0000	1.3.16.1
++++ ucbhelper/source/client/proxydecider.cxx	30 Dec 2004 04:12:01 -0000
+@@ -127,6 +127,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#if defined (FREEBSD)
++#include <sys/socket.h>
++#endif
++
+ #ifdef SOLARIS
+ 
+ extern "C"
diff --git a/editors/openoffice.org-1.1/files/pkg-message.de b/editors/openoffice.org-1.1/files/pkg-message.de
deleted file mode 100644
index 4466bdb7bee5..000000000000
--- a/editors/openoffice.org-1.1/files/pkg-message.de
+++ /dev/null
@@ -1,89 +0,0 @@
-OpenOffice.org Version 1.1.2 Installationsanleitung
-
-Geschrieben von:	Martin Blapp <mbr@freebsd.org>
-
-OpenOffice.org ist bald im Verzeichnis
-${PREFIX}/OpenOffice.org1.1.2/ installiert.
-
-1 Benutzerinstallation
-----------------------
-
-Nachdem der Port oder das Package installiert ist
-kann OO.org mit "openoffice" gestartet werden. Beim
-ersten Mal wird das OO.org Setup aufgerufen und in
-Ihrem Benutzerverzeichnis das Verzeichnis
-"OpenOffice.org1.1.2" angelegt. Ebenfalls werden
-Sie während des Setups nach einem installierten
-Java JDK gefragt.
-
-Falls das Setup mit der Fehlermeldung abbricht, dass
-schon eine Version installiert sei (von einem vorherigen
-Installationsversuch), kann ein Blick in die Datei
-".sversionrc" helfen. In dieser Datei speichern Openoffice
-wie auch alle Staroffice Versionen Informationen ’…r die
-Installation ab. Lšáhen Sie die problematische Zeile
-und die Installation wird nun funktionieren.
-
-2 Start von OO.org
-------------------
-
-Die FreeBSD-Version von OO.org installiert nun ein Skript
-zum schnellen Aufruf. Bitte fӋn Sie "${PREFIX}/bin/" 
-zu Ihrer ENV-Variable PATH hinzu und sie werden OO.org
-einfacher aufrufen k˜Žen:
-
-${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
-
-OO.org verlangt dass die ENV-Variable LANG auf einen
-brauchbaren Wert gesetzt ist. Wenn LANG nicht definiert
-ist, so verwendet das Startup-Skript eine Standard-Einstellung,
-Momentan wird "de_DE.ISO_8859-15" verwendet. Sie k˜Žen diese
-Einstellung auch im Startup-Skript ändern.
-
-Wenn Sie einen älteren X-Server vor der XFree86 Version 4.2
-verwenden, k˜Žen Warnungen auftreten. Ignorieren Sie diese
-oder verwenden Sie eine neuere Version.
-
-Falls US-ASCII verwendet wird, k˜Žen Sie Dokumente mit
-Umlauten und Sonderzeichen im Dateinamen nicht mehr speichern
-und laden, und natšŒich werden Sie auch im OO.org keine
-dieser Zeichen mehr tippen k˜Žen.
-
-3 Setup Probleme (nur FreeBSD < 4.7-RELEASE)
---------------------------------------------
-
-Falls sich das Setup ’…r eine fehlende Datei mit Namen
-"setup.ins" beklagt, so ist es an der Zeit Ihr System auf
-die neueste FreeBSD-Version zu aktualisieren. FreeBSD
-4.7-RELEASE und neuer hat dieses Problem nicht.
-
-4 Abstšše bei der URL-Leiste (nur FreeBSD < 4.7-RELEASE)
----------------------------------------------------------
-
-Bei älteren FreeBSD-Version als 4.7-RELEASE kann OO.org
-bei Eingaben in der URL-Leiste abstššen, falls ein nicht
-existierender Dateiname eingegeben wird. Der folgende
-Systempatch schafft Abhilfe:
-
-http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
-
-5 Absturz nach dem Wechseln zu einer anderen Sprachversion
-----------------------------------------------------------
-
-Falls Sie zuerst die englische Version von OO.org installiert
-haben und nachträglich auf eine andere Sprachversion gewechselt
-haben, so kann dies OO.org zum Absturz bringen.
-
-Abhilfe schafft in diesem Fall nur das Lšáhen des bestehenden
-OpenOffice.org1.1.2 Verzeichnisses und des entsprechenden
-Eintrags aus der Datei ".sversionrc" mit anschliessender neuer
-Benutzer-Installation.
diff --git a/editors/openoffice.org-1.1/files/pkg-message.in b/editors/openoffice.org-1.1/files/pkg-message.in
new file mode 100644
index 000000000000..5d97699bd0f0
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/pkg-message.in
@@ -0,0 +1,54 @@
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
+
+Written by:	Martin Blapp <mbr@freebsd.org>
+		and Maho Nakata <maho@FreeBSD.org>
+
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
+%%PREFIX%%/%%EXECBASE%%
+
+1 User installation
+-------------------
+
+Just type "%%EXECBASE%%" after you have successfully
+installed the package. If there is no installed
+OO.org dir in your homedir, you'll be prompted to
+install some files and choose a installed JDK.
+The setup installs a "OpenOffice.org%%RELEASE_NR%%" 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/%%EXECBASE%%
+%%PREFIX%%/bin/%%EXECBASE%%-sagenda
+%%PREFIX%%/bin/%%EXECBASE%%-scalc
+%%PREFIX%%/bin/%%EXECBASE%%-sdraw
+%%PREFIX%%/bin/%%EXECBASE%%-setup
+%%PREFIX%%/bin/%%EXECBASE%%-sfax
+%%PREFIX%%/bin/%%EXECBASE%%-simpress
+%%PREFIX%%/bin/%%EXECBASE%%-spadmin
+%%PREFIX%%/bin/%%EXECBASE%%-sweb
+%%PREFIX%%/bin/%%EXECBASE%%-swriter
+
+OO.org does need $LANG to be set to a suitable value.
+If it is not already set, a default value is chosen.
+
+3 If you stuck into a trouble
+--------------------------------------------------
+Somehow you can stuck into a trouble. 
+To solve this issue, please remove the already installed
+"OpenOffice.org%%RELEASE_NR%%" 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/files/zipmoz.sh b/editors/openoffice.org-1.1/files/zipmoz.sh
deleted file mode 100644
index 43a4591f3430..000000000000
--- a/editors/openoffice.org-1.1/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-
diff --git a/editors/openoffice.org-1.1/pkg-descr b/editors/openoffice.org-1.1/pkg-descr
index 31fd1b12161a..bc2ede1b8c2b 100644
--- a/editors/openoffice.org-1.1/pkg-descr
+++ b/editors/openoffice.org-1.1/pkg-descr
@@ -12,3 +12,6 @@ Components include:
   * A tool for creating effective eye-catching presentations.
   * A vector-oriented draw module that enables the creation of 3D
     illustrations
+
+WWW: http://www.openoffice.org/
+     http://porting.openoffice.org/freebsd/