Update to 1.1 milestone m53

22 files changed, 462 insertions, 523 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 253016584318..ce16ea6591cb 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -7,30 +7,30 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	1.1.4.${SNAPDATE}
-PORTREVISION=	2
 CATEGORIES+=	editors
-MASTER_SITES+=	${MASTER_SITE_LOCAL} \
+MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.0/src/:moz \
+		http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.0/src/:mozsrc \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help3 \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
-MASTER_SITE_SUBDIR=	maho/openoffice.org
-DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
+		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
+		ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
+DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
-
-IGNORE=		"openoffice-1.1 is preceding this port a while"
-
-SNAPDATE=	20041101
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
+SNAPDATE=	20050413
 NO_LATEST_LINK=	yes
+
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
 MOZILLA_SOURCE=		mozilla-source-1.0.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT} ${MOZILLA_SOURCE}:moz
+DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
@@ -49,6 +49,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
 
@@ -56,28 +60,34 @@ LANG_CONFIGURE_ARG?=	ENUS
 DISTFILES+=	${L10NHELP}:help
 .endif
 .if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+=	helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
-		helpcontent_34_unix.tgz:help helpcontent_39_unix.tgz:help \
-		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
-		helpcontent_55_unix.tgz:help \
-		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
-		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help \
+DISTFILES+=	helpcontent_07_unix.tgz:help3 \
+		helpcontent_31_unix.tgz:help  helpcontent_33_unix.tgz:help \
+		helpcontent_34_unix.tgz:help  helpcontent_39_unix.tgz:help \
+		helpcontent_42_unix.tgz:help2 helpcontent_43_unix.tgz:help2 \
+		helpcontent_46_unix.tgz:help  helpcontent_49_unix.tgz:help \
+		helpcontent_50_unix.tgz:help2 helpcontent_55_unix.tgz:help \
+		helpcontent_81_unix.tgz:help  helpcontent_82_unix.tgz:help \
+		helpcontent_86_unix.tgz:help  helpcontent_88_unix.tgz:help \
 		helpcontent_90_unix.tgz:help
-L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
+L10NHELPS=	helpcontent_07_unix.tgz \
+		helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
 		helpcontent_34_unix.tgz helpcontent_39_unix.tgz \
+		helpcontent_42_unix.tgz helpcontent_43_unix.tgz \
 		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
-		helpcontent_55_unix.tgz \
+		helpcontent_50_unix.tgz helpcontent_55_unix.tgz \
 		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
 		helpcontent_86_unix.tgz helpcontent_88_unix.tgz \
 		helpcontent_90_unix.tgz
 .endif
 
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-BUILD_NR=		645
+CODELINE=		645
 RELEASE_NR=		1.1.4
-INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-DIST_SUBDIR=		openoffice1.1
+MILESTONE=		53
+INSTALLATION_BASEDIR=   openoffice.org${RELEASE_NR}m${MILESTONE}
+EXECBASE=               openoffice.org-${RELEASE_NR}m${MILESTONE}
+DIST_SUBDIR=		openoffice.org1.1
 SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+PACKAGE_BASENAME=       OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
 
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
@@ -88,7 +98,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
@@ -103,82 +112,36 @@ 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
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
 .if defined(WITHOUT_JAVA)
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 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
-	@${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 tweak, extremely useful when you build all localized language versions
@@ -198,6 +161,9 @@ pre-everything::
 .endif
 
 post-extract:
+.if defined(WITH_TTF_BYTECODE_ENABLED)
+	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
+.endif
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
@@ -211,8 +177,8 @@ 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)
@@ -229,11 +195,11 @@ post-patch:
 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
+	@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 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
+	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
 	#
@@ -241,15 +207,15 @@ do-build:
 	#
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c 'source FreeBSDEnv.Set ; ${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} ; ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}'
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
+	@cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX}
 
 install-user:
 	@${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
@@ -258,28 +224,39 @@ 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/openoffice.org
+	@${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
+	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
+	@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";
@@ -295,13 +272,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-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 119f1b1d1517..759e65d2399d 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,32 +1,40 @@
-MD5 (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 5898440ddd78fd87819d45d613c0b57e
-SIZE (openoffice1.1/OOo_1.1.4.20041101_source.tar.bz2) = 198438413
-MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SIZE (openoffice1.1/gpc231.tar.Z) = 27917
-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
-SIZE (openoffice1.1/helpcontent_33_unix.tgz) = 12574720
-MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
-SIZE (openoffice1.1/helpcontent_34_unix.tgz) = 12554240
-MD5 (openoffice1.1/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
-SIZE (openoffice1.1/helpcontent_39_unix.tgz) = 12482560
-MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
-SIZE (openoffice1.1/helpcontent_46_unix.tgz) = 12072960
-MD5 (openoffice1.1/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
-SIZE (openoffice1.1/helpcontent_49_unix.tgz) = 13649920
-MD5 (openoffice1.1/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
-SIZE (openoffice1.1/helpcontent_55_unix.tgz) = 11549758
-MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
-SIZE (openoffice1.1/helpcontent_81_unix.tgz) = 12902400
-MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
-SIZE (openoffice1.1/helpcontent_82_unix.tgz) = 12369920
-MD5 (openoffice1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
-SIZE (openoffice1.1/helpcontent_86_unix.tgz) = 12769280
-MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
-SIZE (openoffice1.1/helpcontent_88_unix.tgz) = 12953600
-MD5 (openoffice1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
-SIZE (openoffice1.1/helpcontent_90_unix.tgz) = 12495734
+MD5 (openoffice.org1.1/OOo_1.1.5m53_source.tar.bz2) = feb2225b47ce6589c628c9a6d551f291
+SIZE (openoffice.org1.1/OOo_1.1.5m53_source.tar.bz2) = 198588570
+MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
+MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
+SIZE (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708
+MD5 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20
+SIZE (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 39881558
+MD5 (openoffice.org1.1/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611
+SIZE (openoffice.org1.1/helpcontent_07_unix.tgz) = 13820401
+MD5 (openoffice.org1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
+SIZE (openoffice.org1.1/helpcontent_31_unix.tgz) = 12073861
+MD5 (openoffice.org1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3
+SIZE (openoffice.org1.1/helpcontent_33_unix.tgz) = 12574720
+MD5 (openoffice.org1.1/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29
+SIZE (openoffice.org1.1/helpcontent_34_unix.tgz) = 12554240
+MD5 (openoffice.org1.1/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34
+SIZE (openoffice.org1.1/helpcontent_39_unix.tgz) = 12482560
+MD5 (openoffice.org1.1/helpcontent_42_unix.tgz) = 1b5f3f30c7939c2244f654bab0a68d91
+SIZE (openoffice.org1.1/helpcontent_42_unix.tgz) = 13250743
+MD5 (openoffice.org1.1/helpcontent_43_unix.tgz) = 1869d02ead606229a1fb94ec7abc33d9
+SIZE (openoffice.org1.1/helpcontent_43_unix.tgz) = 9016309
+MD5 (openoffice.org1.1/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58
+SIZE (openoffice.org1.1/helpcontent_46_unix.tgz) = 12072960
+MD5 (openoffice.org1.1/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
+SIZE (openoffice.org1.1/helpcontent_49_unix.tgz) = 13649920
+MD5 (openoffice.org1.1/helpcontent_50_unix.tgz) = 5e0464e3940d589c6358da4f2a3fbfae
+SIZE (openoffice.org1.1/helpcontent_50_unix.tgz) = 15804777
+MD5 (openoffice.org1.1/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e
+SIZE (openoffice.org1.1/helpcontent_55_unix.tgz) = 11549758
+MD5 (openoffice.org1.1/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a
+SIZE (openoffice.org1.1/helpcontent_81_unix.tgz) = 12902400
+MD5 (openoffice.org1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65
+SIZE (openoffice.org1.1/helpcontent_82_unix.tgz) = 12369920
+MD5 (openoffice.org1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66
+SIZE (openoffice.org1.1/helpcontent_86_unix.tgz) = 12769280
+MD5 (openoffice.org1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65
+SIZE (openoffice.org1.1/helpcontent_88_unix.tgz) = 12953600
+MD5 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5
+SIZE (openoffice.org1.1/helpcontent_90_unix.tgz) = 12495734
diff --git a/editors/openoffice-1.1-devel/files/Makefile.knobs b/editors/openoffice-1.1-devel/files/Makefile.knobs
new file mode 100644
index 000000000000..e6331c1a376d
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/Makefile.knobs
@@ -0,0 +1,82 @@
+# Makefile for knobs
+# Whom:         Maho Nakata <maho@FreeBSD.org>
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.knobs,v 1.1 2005-04-25 12:32:33 maho Exp $
+
+.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} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
+	@${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(WITH_TTF_BYTECODE_ENABLED)
+	@${ECHO}
+	@${ECHO} "You may get better quality of glyphs"
+	@${ECHO} "at small bitmap sizes, If you have"
+	@${ECHO} "licensed the Apple patents"
+	@${ECHO} "US05155805 US05159668 and US05325479, by"
+	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
+	@${ECHO} "See http://www.freetype.org/patents.html for details"
+.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.org, 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-devel/files/Makefile.localized b/editors/openoffice-1.1-devel/files/Makefile.localized
index 064f04588288..871c8d9e7d22 100644
--- a/editors/openoffice-1.1-devel/files/Makefile.localized
+++ b/editors/openoffice-1.1-devel/files/Makefile.localized
@@ -1,6 +1,6 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.4 2004-08-13 03:04:04 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.5 2005-04-25 12:32:33 maho Exp $
 
 ################################################################
 .if defined(LOCALIZED_LANG)
@@ -53,6 +53,7 @@ L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_PKGNAME=   cs
 LANG_EXT=       42
 LANG_CONFIGURE_ARG=     CZECH
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "dk"
@@ -102,7 +103,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"
@@ -142,8 +142,8 @@ CATEGORIES=	japanese
 LANG_PKGNAME=   ja
 LANG_EXT=       81
 LANG_CONFIGURE_ARG=     JAPN
-MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
-RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
+RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
@@ -216,6 +216,7 @@ CATEGORIES=	russian
 LANG_PKGNAME=	ru
 LANG_EXT=	07
 LANG_CONFIGURE_ARG=	RUSS
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "es"
@@ -236,6 +237,7 @@ LANG_CONFIGURE_ARG=	SWED
 LANG_PKGNAME=	sk
 LANG_EXT=	43
 LANG_CONFIGURE_ARG=	SLOVAK
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sl-SI"
@@ -243,6 +245,7 @@ LANG_PKGNAME=	sl
 LANG_SUFFIX=	SI
 LANG_EXT=	50
 LANG_CONFIGURE_ARG=	SLOVENIAN
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice-1.1-devel/files/moz-patch b/editors/openoffice-1.1-devel/files/moz-patch
index 7341aed5cdd5..818bc154943d 100644
--- a/editors/openoffice-1.1-devel/files/moz-patch
+++ b/editors/openoffice-1.1-devel/files/moz-patch
@@ -4,6 +4,9 @@
 http://qa.openoffice.org/issues/show_bug.cgi?id=28398
 http://qa.openoffice.org/issues/show_bug.cgi?id=11424
 
+disable freetype2 support since build broken and
+this functionality is not used at all.
+
 --- 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 @@
@@ -17,3 +20,24 @@ http://qa.openoffice.org/issues/show_bug.cgi?id=11424
  .ENDIF
  
  .IF "$(GUI)"=="UNX"
+
+--- moz/mozilla-source-1.0.patch.org	Tue Feb 10 19:44:34 2004
++++ moz/mozilla-source-1.0.patch	Sat Mar 19 12:51:35 2005
+@@ -4471,14 +4471,15 @@
+      return NS_OK;
+  }
+ 
+---- miss/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
++--- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
+ +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
+-@@ -0,0 +1,8 @@
++@@ -0,0 +1,9 @@
+ +ac_add_options --disable-tests
+ +ac_add_options --disable-xprint
+ +ac_add_options --without-system-zlib
+ +ac_add_options --enable-ldap
+ +ac_add_options --disable-debug
+++ac_add_options --disable-freetype2
+ +ac_add_options --enable-optimize
+ +ac_add_options --enable-crypto
+ +ac_add_options --enable-strip
diff --git a/editors/openoffice-1.1-devel/files/openoffice-wrapper b/editors/openoffice-1.1-devel/files/openoffice-wrapper
index 3c0197bee83b..cad4fa1a3c86 100644
--- a/editors/openoffice-1.1-devel/files/openoffice-wrapper
+++ b/editors/openoffice-1.1-devel/files/openoffice-wrapper
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.13 2004-07-31 04:06:32 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.14 2005-04-25 12:32:33 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-devel/files/optpatch-freetype b/editors/openoffice-1.1-devel/files/optpatch-freetype
new file mode 100644
index 000000000000..fb96fb1fadac
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/optpatch-freetype
@@ -0,0 +1,87 @@
+Index: freetype/freetype-2.1.4.patch
+===================================================================
+RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v
+retrieving revision 1.2
+diff -u -r1.2 freetype-2.1.4.patch
+--- freetype/freetype-2.1.4.patch	17 Apr 2003 15:11:01 -0000	1.2
++++ freetype/freetype-2.1.4.patch	16 Jan 2005 08:29:56 -0000
+@@ -1,5 +1,5 @@
+-*** misc/freetype-2.1.4/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
+---- misc/build/freetype-2.1.4/builds/compiler/visualc.mk	Wed Apr  9 16:45:16 2003
++*** misc/freetype-2.1.4/builds/compiler/visualc.mk	Thu Dec 14 08:44:33 2000
++--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk	Sun Jan 16 17:01:31 2005
+ ***************
+ *** 63,69 ****
+   #   ANSI compliance.
+@@ -17,8 +17,8 @@
+   endif
+   
+   # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+-*** misc/freetype-2.1.4/builds/unix/ltmain.sh	Sat Jan 18 17:39:18 2003
+---- misc/build/freetype-2.1.4/builds/unix/ltmain.sh	Wed Apr  9 16:45:16 2003
++*** misc/freetype-2.1.4/builds/unix/ltmain.sh	Sun Jan 19 01:39:18 2003
++--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh	Sun Jan 16 17:01:31 2005
+ ***************
+ *** 2296,2302 ****
+   	  ;;
+@@ -36,8 +36,8 @@
+   
+   	  case $version_type in
+   	    nonstopux) verstring_prefix=nonstopux ;;
+-*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Fri Jan 31 00:24:18 2003
+---- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Wed Apr  9 16:45:16 2003
++*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Fri Jan 31 08:24:18 2003
++--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Sun Jan 16 17:01:32 2005
+ ***************
+ *** 44,51 ****
+   # PROP Output_Dir "..\..\..\objs\release"
+@@ -57,8 +57,8 @@
+   # SUBTRACT CPP /nologo /YX
+   # ADD BASE RSC /l 0x409 /d "NDEBUG"
+   # ADD RSC /l 0x409 /d "NDEBUG"
+-*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h	Thu Oct 31 09:29:31 2002
+---- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h	Wed Apr  9 16:45:16 2003
++*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h	Thu Oct 31 17:29:31 2002
++--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h	Sun Jan 16 17:01:32 2005
+ ***************
+ *** 1,8 ****
+   FT_USE_MODULE(autohint_module_class)
+@@ -92,8 +92,8 @@
+   FT_USE_MODULE(winfnt_driver_class)
+ + #endif
+   
+-*** misc/freetype-2.1.4/include/freetype/config/ftoption.h	Fri Jan 31 00:24:18 2003
+---- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h	Wed Apr  9 16:45:16 2003
++*** misc/freetype-2.1.4/include/freetype/config/ftoption.h	Fri Jan 31 08:24:18 2003
++--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h	Sun Jan 16 17:04:45 2005
+ ***************
+ *** 108,114 ****
+     /*   this will however force you to link the zlib to any program that    */
+@@ -111,8 +111,25 @@
+   
+   
+     /*************************************************************************/
+-*** misc/freetype-2.1.4/src/base/ftobjs.c	Thu Mar 27 22:35:43 2003
+---- misc/build/freetype-2.1.4/src/base/ftobjs.c	Sun Apr 13 17:57:51 2003
++***************
++*** 378,384 ****
++    /*   do not #undef this macro here, since the build system might         */
++    /*   define for certain configurations                                   */
++    /*                                                                       */
++! /* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++  
++  
++    /*************************************************************************/
++--- 378,384 ----
++    /*   do not #undef this macro here, since the build system might         */
++    /*   define for certain configurations                                   */
++    /*                                                                       */
++! #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++  
++  
++    /*************************************************************************/
++*** misc/freetype-2.1.4/src/base/ftobjs.c	Fri Mar 28 06:35:43 2003
++--- misc/build/freetype-2.1.4/src/base/ftobjs.c	Sun Jan 16 17:01:32 2005
+ ***************
+ *** 804,810 ****
+       {
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
index 5a73be9d0bbe..76cb40db51e6 100644
--- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.1-devel/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-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
deleted file mode 100644
index bbbfeab36816..000000000000
--- a/editors/openoffice-1.1-devel/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-devel/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx
new file mode 100644
index 000000000000..6ef5bf464ef9
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx
@@ -0,0 +1,34 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=40643
+
+Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however,
+it is not certified by SUN Microsystems. FreeBSD can use Linux's Java
+since there is a binary compatibility (NOT EMULATION!)
+Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default,
+we need to add several seachpaths.
+
+Index: jvmaccess/source/javainfoimpl.cxx
+===================================================================
+RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v
+retrieving revision 1.7.12.5
+diff -u -r1.7.12.5 javainfoimpl.cxx
+--- jvmaccess/source/javainfoimpl.cxx	20 Oct 2004 11:43:13 -0000	1.7.12.5
++++ jvmaccess/source/javainfoimpl.cxx	14 Jan 2005 10:58:53 -0000
+@@ -240,8 +240,16 @@
+                         "java", \
+                         "Home", \
+                         "IBMJava2-" ARCH "-131", \
+-                        "IBMJava2-" ARCH "-141"
+-
++                        "IBMJava2-" ARCH "-141" , \
++                        "jdk1.4.2", \
++                        "diablo-jre1.3.1", \
++                        "diablo-jdk1.3.1", \
++                        "linux-sun-jdk1.3.1", \
++                        "linux-sun-jdk1.4.2", \
++                        "linux-ibm-jdk1.3.1", \
++                        "linux-ibm-jdk1.4.2", \
++                        "linux-blackdown-jdk1.3.1", \
++                        "linux-blackdown-jdk1.4.2"
+ 
+ /* These are directories in which a java installation is
+    looked for.
diff --git a/editors/openoffice-1.1-devel/files/patch-python b/editors/openoffice-1.1-devel/files/patch-python
deleted file mode 100644
index 6993ab033ffe..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-python
+++ /dev/null
@@ -1,20 +0,0 @@
-Hope fix bento builds.
-
-Index: python/makefile.mk
-===================================================================
-RCS file: /cvs/external/python/makefile.mk,v
-retrieving revision 1.6.2.3
-diff -u -r1.6.2.3 makefile.mk
---- python/makefile.mk	28 Jan 2004 12:02:42 -0000	1.6.2.3
-+++ python/makefile.mk	6 Nov 2004 13:16:14 -0000
-@@ -102,6 +102,10 @@
- DSP_DIR=PCbuild
- .IF "$(GUI)" == "UNX"
- CONFIGURE_ACTION= ./configure --prefix=../python-inst
-+.IF "$(OS)"=="FREEBSD"
-+CFLAGS+=${PTHREAD_CFLAGS}
-+LDFLAGS+=${PTHREAD_LIBS}
-+.ENDIF
- .IF "$(OS)" == "IRIX"
- BUILD_ACTION=$(ENV_BUILD) gmake ; gmake install
- .ELSE
diff --git a/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack
deleted file mode 100644
index 44de26bd9cfd..000000000000
--- a/editors/openoffice-1.1-devel/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-devel/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice-1.1-devel/files/patch-scp+source+office+unxbasic.scp
new file mode 100644
index 000000000000..daba6e99866f
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-scp+source+office+unxbasic.scp
@@ -0,0 +1,20 @@
+Index: scp/source/office/unxbasic.scp
+===================================================================
+RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v
+retrieving revision 1.49.8.9
+diff -u -r1.49.8.9 unxbasic.scp
+--- scp/source/office/unxbasic.scp	27 Aug 2004 11:43:50 -0000	1.49.8.9
++++ scp/source/office/unxbasic.scp	15 Jan 2005 10:22:08 -0000
+@@ -924,12 +924,6 @@
+ 		Dim sofficeFile As String
+ 		Dim linkName As String
+ 
+-		sofficeFile = DirEntry(GetSetupEnv.DestPath, "program", "soffice")
+-
+-		linkName = "/usr/bin/soffice"
+-
+-		shell("/bin/sh -c " & "'ln -s " & chr(34) & sofficeFile & chr(34) & " " & linkName & " >/dev/null 2>&1'")
+-
+ 	End Sub
+ 
+ };
diff --git a/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx
deleted file mode 100644
index 420c61cc7b7b..000000000000
--- a/editors/openoffice-1.1-devel/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-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index 196084c1657b..6cf440329e06 100644
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice-1.1-devel/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-devel/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack
deleted file mode 100644
index e8c2725e58ab..000000000000
--- a/editors/openoffice-1.1-devel/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-devel/files/patch-translation_limit_64k b/editors/openoffice-1.1-devel/files/patch-translation_limit_64k
index ce15548f052b..109833162541 100644
--- a/editors/openoffice-1.1-devel/files/patch-translation_limit_64k
+++ b/editors/openoffice-1.1-devel/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-devel/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
index 073390f79ab1..88225ffe8308 100644
--- a/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
@@ -1,6 +1,6 @@
-#iz XXXXX
-sys/socket.h is needed, there should be
-appropreate place to give this definition, though.
+http://www.openoffice.org/issues/show_bug.cgi?id=40191
+
+sys/socket.h is needed for FreeBSD
 
 Index: ucbhelper/source/client/proxydecider.cxx
 ===================================================================
@@ -8,15 +8,15 @@ 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 Oct 2004 23:08:26 -0000
-@@ -107,6 +107,10 @@
- using namespace com::sun::star;
- using namespace ucbhelper;
++++ 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
 +
- #define CONFIG_ROOT_KEY     "org.openoffice.Inet/Settings"
- #define PROXY_TYPE_KEY      "ooInetProxyType"
- #define NO_PROXY_LIST_KEY   "ooInetNoProxy"
+ #ifdef SOLARIS
+ 
+ extern "C"
diff --git a/editors/openoffice-1.1-devel/files/pkg-message.de b/editors/openoffice-1.1-devel/files/pkg-message.de
deleted file mode 100644
index 4466bdb7bee5..000000000000
--- a/editors/openoffice-1.1-devel/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-devel/files/pkg-message.in b/editors/openoffice-1.1-devel/files/pkg-message.in
new file mode 100644
index 000000000000..8b63380621c8
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/pkg-message.in
@@ -0,0 +1,55 @@
+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/openoffice.org
+%%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-devel/pkg-descr b/editors/openoffice-1.1-devel/pkg-descr
index 31fd1b12161a..bc2ede1b8c2b 100644
--- a/editors/openoffice-1.1-devel/pkg-descr
+++ b/editors/openoffice-1.1-devel/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-1.1-devel/pkg-message b/editors/openoffice-1.1-devel/pkg-message
deleted file mode 100644
index a34e518b06cf..000000000000
--- a/editors/openoffice-1.1-devel/pkg-message
+++ /dev/null
@@ -1,79 +0,0 @@
-OpenOffice.org Build 1.1.2 Personal Install How-To
-
-Written by:	Martin Blapp <mbr@freebsd.org>
-
-1 User installation
--------------------
-
-Just type "openoffice" after you have successfully
-installed the package. If there is no installed
-OO.org dir in hour homedir, you'll be prompted to
-install some files and choose a installed JDK.
-The setup installs a "OpenOffice.org1.1.2" folder
-in your homedir.
-
-If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
-After removing the problematic line you should be able to
-install again.
-
-2 Start OO.org
---------------
-
-There are some wrappers installed for fast startup.
-Add "${PREFIX}/bin/" to your PATH and you will be able
-to use them.
-
-${PREFIX}/bin/openoffice-1.1.2
-${PREFIX}/bin/openoffice-1.1.2-sagenda
-${PREFIX}/bin/openoffice-1.1.2-scalc
-${PREFIX}/bin/openoffice-1.1.2-sdraw
-${PREFIX}/bin/openoffice-1.1.2-setup
-${PREFIX}/bin/openoffice-1.1.2-sfax
-${PREFIX}/bin/openoffice-1.1.2-simpress
-${PREFIX}/bin/openoffice-1.1.2-spadmin
-${PREFIX}/bin/openoffice-1.1.2-sweb
-${PREFIX}/bin/openoffice-1.1.2-swriter
-
-OO.org does need $LANG to be set to a suitable value.
-If it is not already set, a default value is chosen.
-Some old X-Servers before XFree86 4.2 do not like the
-western locale with Euro symbol (ISO_8859-15).
-You should ignore the warning message then or upgrade to
-to a more recent X-server.
-
-If you have chosen US-ASCII as locale, you cannot load
-and save documents with special characters and these
-characters are also not available in swriter and scalc.
-
-3 Setup problems (FreeBSD < 4.7-RELEASE only)
----------------------------------------------
-
-If the setup complains about a missing file "setup.ins",
-it's time to upgrade your FreeBSD system to the latest
-version. You will encounter this bug only if your OS is
-older than FreeBSD 4.7-RELEASE.
-
-4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
-----------------------------------------------------------
-
-OO.org can crash if you enter a non existing path
-or URL in the location bar. To fix these crashes
-you need the following patch. You will see this
-bug only if your OS is older than FreeBSD 4.7-RELEASE.
-
-http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
-
-5 Crash at startup after using a localized version
---------------------------------------------------
-
-If you had installed the english version, and then have
-switched to a localized OO.org, it will crash instantly.
-
-To solve this issue, please remove the already installed
-OpenOffice.org1.1Beta dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.