After repocopied by PR 85372, old ports must be

removed. PR: 85372
svn path=/head/; revision=141220
2024-11-23 00:43:28 +00:00 · 2005-08-29 01:32:13 +00:00 · 2005-08-29 01:32:13 +00:00 · 1e4dcdff78 · 2021-03-31 03:12:20 +00:00
commit 1e4dcdff78
parent 80b68d6061
206 changed files with 0 additions and 13034 deletions
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@ -1,261 +0,0 @@
-# New ports collection makefile for: OpenOffice.org
-# Date created:		28 Februar 2002
-# Whom:                 Martin Blapp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openoffice
-PORTVERSION=	1.0.3
-PORTREVISION=	5
-CATEGORIES+=	editors
-MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}src/:mozsrc \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent-1.0/:help \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:ru
-DISTFILES+=	OOo_${RELEASE_NR}_source.tar.gz gpc231.tar.Z:gpc patch-translation-ru-1.0.3.bz2:ru
-EXTRACT_ONLY=	OOo_${RELEASE_NR}_source.tar.gz
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-
-MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
-MOZILLA_VERSION=	1.0
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
-DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
-USE_GNOME=	orbit
-USE_XLIB=	yes
-USE_PERL5=	yes
-USE_BISON=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.3
-JAVA_BUILD=	jdk
-NO_LATEST_LINK=	yes
-WITHOUT_CPU_CFLAGS=	true
-
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.localized>
-
-LANG_EXT?=	01
-LANG_CONFIGURE_ARG?=	ENUS
-L10NHELP?=     helpcontent_01_unix.tgz
-
-DISTFILES+=	${L10NHELP}:help
-.if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+=	helpcontent_07_unix.tgz:help \
-		helpcontent_30_unix.tgz:help helpcontent_33_unix.tgz:help \
-		helpcontent_34_unix.tgz:help helpcontent_35_unix.tgz:help \
-		helpcontent_39_unix.tgz:help helpcontent_42_unix.tgz:help \
-		helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \
-		helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \
-		helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help
-L10NHELPS=	helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
-		helpcontent_30_unix.tgz helpcontent_33_unix.tgz \
-		helpcontent_34_unix.tgz helpcontent_35_unix.tgz \
-		helpcontent_39_unix.tgz helpcontent_42_unix.tgz \
-		helpcontent_46_unix.tgz helpcontent_49_unix.tgz \
-		helpcontent_81_unix.tgz helpcontent_82_unix.tgz \
-		helpcontent_86_unix.tgz helpcontent_88_unix.tgz
-.endif
-
-CODELINE=		641
-RELEASE_NR=		1.0.3
-INSTALLATION_BASEDIR=   OpenOffice.org${RELEASE_NR}
-EXECBASE=               openoffice.org-${RELEASE_NR}
-DIST_SUBDIR=		openoffice.org1.0
-SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=       OOo_${RELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
-
-# FIXME (Somehow INDEX build fails)
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=          ${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?=         -${LANG_SUFFIX}
-.endif
-
-# This port might build with gcc 2.95.2+
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
-# FIXME (correctly add ccache before gcc and g++)
-.if defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CC=	ccache gcc32
-CXX=	ccache g++32
-.else
-CC=	gcc32
-CXX=	g++32
-.endif
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		imake:${X_IMAKE_PORT} \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT}
-GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 253
-WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
-TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-DISPLAYHACK=localhost:1001
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" \
-			--with-os-version=${OSVERSION}
-.include <${FILESDIR}/Makefile.knobs>
-
-pre-everything::
-# 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*
-	@${RM} -f ${WRKDIR}/.install_done.*
-	@${RM} -f ${WRKDIR}/.package_done.*
-	@${RM} -f ${WRKDIR}/.extract_done.*
-	@${RM} -f ${WRKDIR}/.patch_done.*
-	@${RM} -f ${WRKDIR}/.configure_done.*
-	@${RM} -f ${WRKDIR}/.build_done.*
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
-.endif
-post-extract:
-.if defined(WITH_TTF_BYTECODE_ENABLED)
-	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
-.endif
-#XXX not yet: fix for gnome/kde wrapper
-	@#${REINPLACE_CMD} -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/kde2/kdeint
-	@#${REINPLACE_CMD} -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/gnome/gnomeint
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-translation-ru-1.0.3.bz2 | ${BZIP2_CMD} | ${PATCH}
-	@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/
-	@${CHMOD} +x ${WRKSRC}/solenv/bin/zipdep.pl
-
-	@${MKDIR} ${WRKDIR}/L10NHELP
-	@cd ${WRKDIR}/L10NHELP ; \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
-.if defined(ALL_LOCALIZED_LANGS)
-	@cd ${WRKDIR}/L10NHELP ; \
-	for helpfile in ${L10NHELPS}; do \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
-	done
-.endif
-	@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
-
-post-patch:
-#patch for SDK
-	@${REINPLACE_CMD} 's|%%GNUTR%%|${LOCALBASE}/bin/gtr|g'   ${WRKSRC}/odk/util/makefile.pmk
-	@${REINPLACE_CMD} 's|%%GNUCOPY%%|${LOCALBASE}/bin/gcp|g' ${WRKSRC}/solenv/inc/unitools.mk
-	${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g' \
-			  -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-				${WRKSRC}/product/settings/settings.mk
-do-build:
-	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
-	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
-	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}'
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-
-do-install:
-.if exists(${WRKDIR}/.Xvfb.pid)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
-	@${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-	@${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}"
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-#XXX temporary hack (contains space in dir name)
-	@${RM} -rf ${PREFIX}/${INSTALLATION_BASEDIR}/share/kde/net/applnk
-
-install-user:
-	@${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
-
-post-install:
-	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			${WRKDIR}/openoffice.org-wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
-		${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";
-.if defined(LANG_SUFFIX)
-	@${MV} ${PKGFILE} \
-	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
-.elif defined(LANG_PKGNAME)
-	@${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LANG_PKGNAME}${PKG_SUFX}
-.else
-	@${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install${PKG_SUFX}
-.endif
-
-sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/native/unix ; dmake ; deliver.pl'
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/com/sun/star/beans ; dmake ; deliver.pl'
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd netbeans_integration ; build.pl ; deliver.pl'
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/OOSupport ; dmake ; deliver.pl'
-	@${MKDIR} -p ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK/freebsd/lib
-	@${TOUCH} ${WRKSRC}/odk/unxfbsd.pro/misc/deltree.txt
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/pack/copying ; dmake ; deliver.pl'
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/util ; dmake ; deliver.pl'
-#somehow SDK's version is 1.0.2 and not 1.0.3
-	${MV} ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.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>
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@ -1,38 +0,0 @@
-MD5 (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = e85acb04b2906a460dfdd19a309c1aea
-SIZE (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = 184856160
-MD5 (openoffice.org1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SIZE (openoffice.org1.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 2b8091f8fe3201c6763715f6eb3872f4
-SIZE (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 11247
-MD5 (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
-SIZE (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 39708
-MD5 (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20
-SIZE (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 39881558
-MD5 (openoffice.org1.0/helpcontent_01_unix.tgz) = ff3eb5095a74ae7a9b2918ef5874288f
-SIZE (openoffice.org1.0/helpcontent_01_unix.tgz) = 12693536
-MD5 (openoffice.org1.0/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611
-SIZE (openoffice.org1.0/helpcontent_07_unix.tgz) = 13820401
-MD5 (openoffice.org1.0/helpcontent_30_unix.tgz) = ef9d577e467b54d07cf443e1ed5e904f
-SIZE (openoffice.org1.0/helpcontent_30_unix.tgz) = 16754161
-MD5 (openoffice.org1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-SIZE (openoffice.org1.0/helpcontent_33_unix.tgz) = 13190241
-MD5 (openoffice.org1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-SIZE (openoffice.org1.0/helpcontent_34_unix.tgz) = 13208085
-MD5 (openoffice.org1.0/helpcontent_35_unix.tgz) = cf90274a2e46ddd04422c08157575780
-SIZE (openoffice.org1.0/helpcontent_35_unix.tgz) = 12221016
-MD5 (openoffice.org1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-SIZE (openoffice.org1.0/helpcontent_39_unix.tgz) = 13045311
-MD5 (openoffice.org1.0/helpcontent_42_unix.tgz) = a7bcb51e5bff1673b32113308a026563
-SIZE (openoffice.org1.0/helpcontent_42_unix.tgz) = 12997234
-MD5 (openoffice.org1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-SIZE (openoffice.org1.0/helpcontent_46_unix.tgz) = 12622320
-MD5 (openoffice.org1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-SIZE (openoffice.org1.0/helpcontent_49_unix.tgz) = 14230759
-MD5 (openoffice.org1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
-SIZE (openoffice.org1.0/helpcontent_81_unix.tgz) = 13567923
-MD5 (openoffice.org1.0/helpcontent_82_unix.tgz) = ea45780e3027317ec6b4f38f009b579b
-SIZE (openoffice.org1.0/helpcontent_82_unix.tgz) = 13259424
-MD5 (openoffice.org1.0/helpcontent_86_unix.tgz) = ea0debc121b6912a42cdc24e1b99b625
-SIZE (openoffice.org1.0/helpcontent_86_unix.tgz) = 13308043
-MD5 (openoffice.org1.0/helpcontent_88_unix.tgz) = 260a17a84a16c18b4371a84b95cea2cb
-SIZE (openoffice.org1.0/helpcontent_88_unix.tgz) = 13308769
--- a/editors/openoffice-1.0/files/Makefile.knobs
+++ b/editors/openoffice-1.0/files/Makefile.knobs
@ -1,63 +0,0 @@
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g
-.if ${WITH_DEBUG} == 2
-BUILD=		dmake debug="true"
-.else
-BUILD=		dmake
-.endif
-.else
-BUILD=		dmake strip="true"
-.endif
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=	--with-lang=ALL
-.else
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
-.endif
-
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "OPTIONS:"
-.if !defined(WITH_DEBUG)
-	@${ECHO}
-	@${ECHO} "You can compile OO with debug symbols"
-	@${ECHO} "if you call make with WITH_DEBUG=1"
-	@${ECHO}
-	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
-	@${ECHO} "OO.org debug support."
-	@${ECHO}
-.endif
-.if !defined(LOCALIZED_LANG)
-	@${ECHO}
-	@${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'"
-	@${ECHO} "while xx can be one of the following:"
-	@${ECHO} "ar de dk el es fr it ja ko nl pl pt ru"
-	@${ECHO} "sv tr zh-CN zh-TW"
-	@${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
--- a/editors/openoffice-1.0/files/Makefile.localized
+++ b/editors/openoffice-1.0/files/Makefile.localized
@ -1,156 +0,0 @@
-# localized makefile
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-################################################################
-# consult oo_1.0.3_src/config_office/set_soenv.in for
-# available localized languages
-################################################################
-.if defined(LOCALIZED_LANG)
-################################################################
-.if ${LOCALIZED_LANG} == "ar"
-CATEGORIES=     arabic
-LANG_PKGNAME=   ar
-LANG_EXT=       96
-LANG_CONFIGURE_ARG=     ARAB
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-CN"
-CATEGORIES=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	CN
-LANG_EXT=       86
-LANG_CONFIGURE_ARG=	CHINSIM
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-TW"
-CATEGORIES=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	TW
-LANG_EXT=	88
-LANG_CONFIGURE_ARG=	CHINTRAD
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "dk"
-LANG_PKGNAME=   dk
-LANG_EXT=       45
-LANG_CONFIGURE_ARG=     DAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "nl"
-LANG_PKGNAME=	nl
-LANG_EXT=	31
-LANG_CONFIGURE_ARG=	DTCH
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "fr"
-CATEGORIES=     french
-LANG_PKGNAME=   fr
-LANG_EXT=       33
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     FREN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "el"
-LANG_PKGNAME=	el
-LANG_EXT=	30
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	GREEK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "de"
-CATEGORIES=	german
-LANG_PKGNAME=	de
-LANG_EXT=	49
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	GER
-COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "it"
-LANG_PKGNAME=   it
-LANG_EXT=       39
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     ITAL
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ja"
-CATEGORIES=	japanese
-LANG_PKGNAME=   ja
-LANG_EXT=       81
-LANG_CONFIGURE_ARG=     JAPN
-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
-################################################################
-.if ${LOCALIZED_LANG} == "ko"
-CATEGORIES=     korean
-LANG_PKGNAME=   ko
-LANG_EXT=       82
-LANG_CONFIGURE_ARG=     KOREAN
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pl"
-CATEGORIES=	polish
-LANG_PKGNAME=	pl
-LANG_EXT=	48
-LANG_CONFIGURE_ARG=	POL
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "pt"
-COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
-CATEGORIES=	portuguese
-LANG_PKGNAME=	pt
-LANG_EXT=	03
-LANG_CONFIGURE_ARG=	PORT
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "ru"
-CATEGORIES=	russian
-LANG_PKGNAME=	ru
-LANG_EXT=	07
-LANG_CONFIGURE_ARG=	RUSS
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "es"
-LANG_PKGNAME=   es
-LANG_EXT=       34
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     SPAN
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-LANG_PKGNAME=	tr
-LANG_EXT=	90
-LANG_CONFIGURE_ARG=	TURK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sv"
-LANG_PKGNAME=	sv
-LANG_EXT=	46
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	SWED
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "tr"
-LANG_PKGNAME=	tr
-LANG_EXT=	90
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	TURK
-.endif
-################################################################
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=		${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?=		-${LANG_SUFFIX}
-.endif
-.endif
-
--- a/editors/openoffice-1.0/files/generate.pl
+++ b/editors/openoffice-1.0/files/generate.pl
@ -1,21 +0,0 @@
-#!/usr/bin/perl
-# generate full build shell script for OpenOffice.org
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.3 2005-08-28 08:25:09 maho Exp $
-
-print "#!/bin/csh\n";
-print "make deinstall clean\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
-print "rm work/.configure* work/.build* \n";
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
-
-open ( FILE,  "< Makefile.localized") ;
-while(<FILE>){
-@tmp=split (' ',$_);
-@tmp2=split ('"',$tmp[3]);
-if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; 
-	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
-	}
-}
-close FILE;
--- a/editors/openoffice-1.0/files/moz-patch
+++ b/editors/openoffice-1.0/files/moz-patch
@ -1,40 +0,0 @@
-o disable freetype2 support since build broken and
-  this functionality is not used at all.
-o reduce dependency (gtk is no longer needed)
-o GNUCOPY is not supported by 1.0 series
-
--- 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)
-+	+cp -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
-+	+cp -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
- .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,16 @@
-      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,10 @@
- +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-default-toolkit=xlib
- +ac_add_options --enable-optimize
- +ac_add_options --enable-crypto
- +ac_add_options --enable-strip
--- a/editors/openoffice-1.0/files/openoffice.org-wrapper
+++ b/editors/openoffice-1.0/files/openoffice.org-wrapper
@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 02:16:38 maho Exp $
-
-oopath=%%PREFIX%%/OpenOffice.org1.0.3/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
-
-case $program in
-$0)
-	exec $oopath/soffice "$@"
-	;;
-	*)
-	exec $oopath/$program "$@"
-	;;
-esac
--- a/editors/openoffice-1.0/files/optpatch-freetype
+++ b/editors/openoffice-1.0/files/optpatch-freetype
@ -1,211 +0,0 @@
--- 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
-+ 
-+ 
-+   /*************************************************************************/
--- vcl/util/makefile.pmk.orig	Mon Apr 28 10:25:02 2003
-+++ vcl/util/makefile.pmk	Mon Apr 28 10:25:17 2003
-@@ -67,7 +67,7 @@
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
-.IF "$(GUI)" == "UNX"
-+.IF "$(GUI)" == "UNX" && "$(OS)" != "FREEBSD"
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
- 
--- a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
+++ b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
@ -1,106 +0,0 @@
--- berkeleydb/db-3.2.9.patch.orig	Sun Jan 19 14:58:19 2003
-+++ berkeleydb/db-3.2.9.patch	Sun Jan 19 15:00:02 2003
-@@ -62,54 +62,57 @@
-   	solaris*)	JINCSUBDIRS="solaris";;
-   	linux*)		JINCSUBDIRS="linux genunix";;
- + 	irix*)		JINCSUBDIRS="irix";;
-+ netbsd*)	JINCSUBDIRS="netbsd linux solaris genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd linux solaris genunix";;
-   	*)		JINCSUBDIRS="genunix";;
-   	esac
-   
- *** misc/db-3.2.9/dist/ltconfig	Fri Oct 13 16:23:00 2000
- --- misc/build/db-3.2.9/dist/ltconfig	Tue Jan  7 11:37:05 2003
-***************
-*** 1194,1204 ****
-  
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--     else
-        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-        # can we support soname and/or expsyms with a.out? -oliva
-      fi
-      ;;
-  
---- 1194,1205 ----
-  
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-        # can we support soname and/or expsyms with a.out? -oliva
-+     else
-+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+       need_version=no
-      fi
-      ;;
-  
-*** misc/db-3.2.9/dist/ltconfig	Fri Oct 13 16:23:00 2000
---- misc/build/db-3.2.9/dist/ltconfig	Tue Jan  7 11:37:05 2003
-***************
-*** 1955,1961 ****
-    version_type=irix
-    need_lib_prefix=no
-    need_version=no
-!   soname_spec='${libname}${release}.so.$major'
-    library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-    case "$host_os" in
-    irix5*)
---- 1955,1961 ----
-    version_type=irix
-    need_lib_prefix=no
-    need_version=no
-!   soname_spec='${libname}${release}.so'
-    library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-    case "$host_os" in
-    irix5*)
-+@@ -1202,6 +1202,17 @@
-+     fi
-+     ;;
-+ 
-++  freebsd*)
-++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-++      # can we support soname and/or expsyms with a.out? -oliva
-++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-++      need_version=no
-++    fi
-++    ;;
-++
-+   solaris* | sysv5*)
-+     if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+       ld_shlibs=no
-+@@ -1955,7 +1966,7 @@
-+   version_type=irix
-+   need_lib_prefix=no
-+   need_version=no
-+-  soname_spec='${libname}${release}.so.$major'
-++  soname_spec='${libname}${release}.so'
-+   library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-+   case "$host_os" in
-+   irix5*)
-+@@ -2019,6 +2030,20 @@
-+     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+     soname_spec='${libname}${release}.so$major'
-+     dynamic_linker='NetBSD ld.elf_so'
-++  fi
-++  shlibpath_var=LD_LIBRARY_PATH
-++  ;;
-++
-++freebsd*)
-++  version_type=sunos
-++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-++    dynamic_linker='FreeBSD (a.out) ld.so'
-++  else
-++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-++    soname_spec='${libname}${release}.so$major'
-++    dynamic_linker='FreeBSD ld.elf_so'
-+   fi
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
--- a/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk
@ -1,12 +0,0 @@
--- berkeleydb/makefile.mk.orig	Sat Apr 12 14:45:40 2003
-+++ berkeleydb/makefile.mk	Sat Apr 12 14:46:29 2003
-@@ -84,7 +84,9 @@
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=make
-+.IF "$(OS)"!="FREEBSD"
- BUILD_FLAGS=-j$(MAXPROCESS)
-+.ENDIF
- 
- OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so
- 
--- a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice-1.0/files/patch-bridges+prj+build.lst
@ -1,11 +0,0 @@
--- bridges/prj/build.lst.orig	Tue Mar 19 22:06:50 2002
-+++ bridges/prj/build.lst	Tue Jun  4 12:24:46 2002
-@@ -9,6 +9,8 @@
- br	bridges\source\cpp_uno\gcc2_linux_intel	nmake	-	u	br_gccli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_freebsd_intel	nmake	-	u	br_gccfi br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj	nmake	-	u	br_gccfi br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_linux_powerpc	nmake	-	u	br_gcclp br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_macosx_powerpc			nmake	-	u	br_gccmacoxp br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
@ -1,11 +0,0 @@
--- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig	Fri May 31 10:22:18 2002
-+++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Fri May 31 10:22:46 2002
-@@ -76,7 +76,7 @@
- 
- # --- Files --------------------------------------------------------
- 
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
- 
- CFLAGSNOOPT=-O0
- NOOPTFILES=$(SLO)$/uno2cpp.obj
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
+++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
--- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
--- a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx
+++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx
@ -1,23 +0,0 @@
-Index: bridges/source/remote/iiop/dispatch.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/remote/iiop/dispatch.cxx,v
-retrieving revision 1.5.14.1
-diff -u -r1.5.14.1 dispatch.cxx
--- bridges/source/remote/iiop/dispatch.cxx	8 Aug 2002 02:49:44 -0000	1.5.14.1
-+++ bridges/source/remote/iiop/dispatch.cxx	28 Jul 2005 12:17:15 -0000
-@@ -58,14 +58,7 @@
-  *
-  *
-  ************************************************************************/
-#if defined(SOLARIS) || defined(IRIX)
-#include <alloca.h>
-#elif defined MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
-+#include <stdlib.h>
- 
- #include <osl/diagnose.h>
- 
--- a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx
+++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx
@ -1,23 +0,0 @@
-Index: bridges/source/remote/iiop/unmarshal.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/remote/iiop/unmarshal.cxx,v
-retrieving revision 1.4.10.1
-diff -u -r1.4.10.1 unmarshal.cxx
--- bridges/source/remote/iiop/unmarshal.cxx	8 Aug 2002 02:49:44 -0000	1.4.10.1
-+++ bridges/source/remote/iiop/unmarshal.cxx	28 Jul 2005 12:18:13 -0000
-@@ -58,14 +58,7 @@
-  *
-  *
-  ************************************************************************/
-#if defined(SOLARIS) || defined(IRIX)
-#include <alloca.h>
-#elif defined MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
-+#include <stdlib.h>
- 
- #include <osl/diagnose.h>
- 
--- a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx
+++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx
@ -1,23 +0,0 @@
-Index: bridges/source/remote/static/proxy.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/remote/static/proxy.cxx,v
-retrieving revision 1.3.6.1
-diff -u -r1.3.6.1 proxy.cxx
--- bridges/source/remote/static/proxy.cxx	8 Aug 2002 02:49:46 -0000	1.3.6.1
-+++ bridges/source/remote/static/proxy.cxx	28 Jul 2005 12:08:44 -0000
-@@ -59,14 +59,7 @@
-  *
-  ************************************************************************/
- #include <assert.h>
-#if defined(SOLARIS) || defined(IRIX)
-#include <alloca.h>
-#elif defined MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
-+#include <stdlib.h>
- 
- #include <bridges/remote/proxy.hxx>
- #include <bridges/remote/context.h>
--- a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx
+++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx
@ -1,23 +0,0 @@
-Index: bridges/source/remote/static/stub.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/remote/static/stub.cxx,v
-retrieving revision 1.2.26.1
-diff -u -r1.2.26.1 stub.cxx
--- bridges/source/remote/static/stub.cxx	8 Aug 2002 02:49:47 -0000	1.2.26.1
-+++ bridges/source/remote/static/stub.cxx	28 Jul 2005 12:13:32 -0000
-@@ -58,14 +58,7 @@
-  *
-  *
-  ************************************************************************/
-#if defined(SOLARIS) || defined(IRIX)
-#include <alloca.h>
-#elif defined MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
-+#include <stdlib.h>
- 
- #include <osl/diagnose.h>
- 
--- a/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx
+++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx
@ -1,23 +0,0 @@
-Index: bridges/source/remote/urp/urp_dispatch.cxx
-===================================================================
-RCS file: /cvs/udk/bridges/source/remote/urp/urp_dispatch.cxx,v
-retrieving revision 1.8.2.1
-diff -u -r1.8.2.1 urp_dispatch.cxx
--- bridges/source/remote/urp/urp_dispatch.cxx	8 Aug 2002 02:49:48 -0000	1.8.2.1
-+++ bridges/source/remote/urp/urp_dispatch.cxx	28 Jul 2005 12:15:51 -0000
-@@ -58,14 +58,7 @@
-  *
-  *
-  ************************************************************************/
-#if defined(SOLARIS) || defined(IRIX)
-#include <alloca.h>
-#elif MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
-+#include <stdlib.h>
- 
- #include <osl/mutex.hxx>
- #include <osl/diagnose.h>
--- a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
@ -1,11 +0,0 @@
--- chaos/util/makefile.mk.orig	Wed Jun 12 01:16:35 2002
-+++ chaos/util/makefile.mk	Wed Jun 12 01:16:47 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
--- a/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx
+++ b/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx
@ -1,14 +0,0 @@
--- codemaker/source/codemaker/global.cxx.orig	Fri Apr  4 00:14:50 2003
-+++ codemaker/source/codemaker/global.cxx	Fri Apr  4 00:14:53 2003
-@@ -149,11 +149,7 @@
- 	strcat(tmpPattern, "\\");
- 	strcat(tmpPattern, pPrefix);
- 	strcat(tmpPattern, "XXXXXX");
-#if defined(FREEBSD) || defined(MACOSX)
-	pTmpName = mkstemp(tmpPattern);
-#else
- 	pTmpName = mktemp(tmpPattern);
-#endif
- #endif
- 
- 	return OString(pTmpName);
--- a/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk
@ -1,15 +0,0 @@
-Index: codemaker/source/cppumaker/makefile.mk
-===================================================================
-RCS file: /cvs/udk/codemaker/source/cppumaker/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
--- codemaker/source/cppumaker/makefile.mk	17 Aug 2001 13:15:48 -0000	1.5
-+++ codemaker/source/cppumaker/makefile.mk	10 Jul 2005 07:39:54 -0000
-@@ -92,6 +92,7 @@
- APP1STDLIBS= \
-              $(SALLIB) \
-              $(SALHELPERLIB) \
-+             $(STORELIB) \
-              $(REGLIB) 
- 
- APP1LIBS= \
--- a/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk
@ -1,15 +0,0 @@
-Index: codemaker/source/javamaker/makefile.mk
-===================================================================
-RCS file: /cvs/udk/codemaker/source/javamaker/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
--- codemaker/source/javamaker/makefile.mk	17 Aug 2001 13:15:48 -0000	1.7
-+++ codemaker/source/javamaker/makefile.mk	10 Jul 2005 08:39:43 -0000
-@@ -96,6 +96,7 @@
- APP1STDLIBS= \
-              $(SALLIB) \
-              $(SALHELPERLIB)	\
-+             $(STORELIB) \
-              $(REGLIB)
- 
- APP1LIBS= \
--- a/editors/openoffice-1.0/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.0/files/patch-config_office+configure.in
@ -1,51 +0,0 @@
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.41.2.18
-diff -u -r1.41.2.18 configure.in
--- config_office/configure.in	12 Mar 2003 11:38:41 -0000	1.41.2.18
-+++ config_office/configure.in	10 Jul 2005 03:38:11 -0000
-@@ -383,10 +383,7 @@
-    if test "$COMPATH" != "NO_GCC"; then
-       AC_MSG_RESULT([checked (gcc $_gcc_version)])
-    fi
-
-dnl Set the include paths
-   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
-fi  
-+fi
- 
- dnl ===================================================================
- dnl  Test the solaris compiler version
-@@ -545,14 +542,27 @@
- fi
- 
- dnl ===================================================================
-dnl Set the gxx include directories
-+dnl Set the gcc/gxx include directories
- dnl ===================================================================
-+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
-+if test "$GXX" = "yes"; then
-+	if test "$_gcc_major" = "3" ; then
-+		_gccincname1="g++-v3"
-+	else
-+		_gccincname1="g++-3" #not checked
-+	fi
-+	_gcc_include_path=".."
-+	_gxx_include_path="$_gcc_include_path/$_gccincname1"
-+fi
-+else
- if test "$GXX" = "yes"; then
-   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
-+   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-+   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
-+	| $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
- dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
-+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-+fi
- fi
-
- 
- dnl ===================================================================
- dnl Extra checking for the SUN OS compiler
--- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
+++ b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
@ -1,102 +0,0 @@
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.3.2.2.2.8.2.2.2.3
-diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in
--- config_office/set_soenv.in	3 Apr 2003 04:52:43 -0000	1.3.2.2.2.8.2.2.2.3
-+++ config_office/set_soenv.in	3 Aug 2005 22:14:14 -0000
-@@ -52,8 +52,8 @@
- #-------------------------------------------------
- #
- # Platform independent constant values.
-my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
-"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); 
-+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER",
-+"ITAL", "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); 
- my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
-      $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
-      $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, 
-@@ -65,7 +65,7 @@
- my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
-       $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
-       $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR,
-      $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD );
-+      $JRETOOLKITDIR, $JRETHREADDIR, $JRETHREADDIR2, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD );
- #
- #-------------------------------------------
- # IIc. Declaring the environment variables.
-@@ -335,6 +335,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
-+      $JRETHREADDIR2  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."classic";
- } 
- elsif ( $platform eq "$Linux" ) 
- {
-@@ -875,24 +876,18 @@
-                         $ps.$JRETHREADDIR.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
- }
-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
-+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64"))
- {  $LD_LIBRARY_PATH   = $cur_dir.
-                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                         $ps.$JRELIBDIR.
-                         $ps.$JRETOOLKITDIR.
-                         $ps.$JRETHREADDIR.
-+                        $ps.$JRETHREADDIR2.
-                         $ps.$par_dir.$LIB.
-                         $ps_STLPORT_LIB.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $ps.$ENV{'LD_LIBRARY_PATH'};
- }
-elsif ($platform eq "$FreeBSD")
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                        $ps.$par_dir.$LIB.
-			$ps_STLPORT_LIB.
-                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
-}
- elsif ($platform eq "$Irix" || $platform eq "$Irix64")
- {  $LD_LIBRARY_PATH   = $cur_dir.
-                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-@@ -1165,7 +1160,7 @@
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
- }
-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
-+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
- {  $SOLARLIB          = $L.$par_dir.$LIB.
- 			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                         $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-@@ -1174,18 +1169,10 @@
-                         $L.$JRELIBDIR.
-                         $L.$JRETOOLKITDIR.
-                         $L.$JRETHREADDIR.
-+                        $L.$JRETHREADDIR2.
-                         $L_STLPORT_LIB.
-                         $L.$XLIB;
- }
-elsif ($platform eq "$FreeBSD")
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$JAVA_HOME'.$LIB.
-			$L_STLPORT_LIB.
-                        $L.$XLIB;
-}
- elsif ($platform eq "$Winnt")
- {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                         $L.$par_dir.$LIB.
-@@ -1251,7 +1238,9 @@
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$FreeBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-+{
-+   	$SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd".
-+   	                     $I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
- }
- elsif ($platform eq "$NetBSD")
- {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
@ -1,11 +0,0 @@
--- connectivity/source/drivers/adabas/makefile.mk.orig	Wed Jun 12 01:06:20 2002
-+++ connectivity/source/drivers/adabas/makefile.mk	Wed Jun 12 01:06:34 2002
-@@ -104,7 +104,7 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
@ -1,12 +0,0 @@
--- connectivity/source/drivers/calc/makefile.mk.orig	Wed Jun 12 01:36:16 2002
-+++ connectivity/source/drivers/calc/makefile.mk	Wed Jun 12 01:36:22 2002
-@@ -92,9 +92,7 @@
- 	$(SLO)$/CDriver.obj
- 
- .IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-.ENDIF
- .ENDIF
- # --- Library -----------------------------------
- 
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
@ -1,11 +0,0 @@
--- connectivity/source/drivers/dbase/makefile.mk.orig	Wed Jun 12 01:26:39 2002
-+++ connectivity/source/drivers/dbase/makefile.mk	Wed Jun 12 01:26:48 2002
-@@ -116,7 +116,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
@ -1,11 +0,0 @@
--- connectivity/source/drivers/file/makefile.mk.orig	Wed Jun 12 01:12:42 2002
-+++ connectivity/source/drivers/file/makefile.mk	Wed Jun 12 01:12:44 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
@ -1,11 +0,0 @@
--- connectivity/source/drivers/flat/makefile.mk.orig	Wed Jun 12 01:14:43 2002
-+++ connectivity/source/drivers/flat/makefile.mk	Wed Jun 12 01:15:03 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
@ -1,11 +0,0 @@
--- connectivity/source/drivers/jdbc/makefile.mk.orig	Wed Jun 12 00:57:12 2002
-+++ connectivity/source/drivers/jdbc/makefile.mk	Wed Jun 12 00:57:21 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="MACOSX"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
@ -1,12 +0,0 @@
--- connectivity/source/drivers/mozab/makefile.mk.orig	Wed Jun 12 01:37:30 2002
-+++ connectivity/source/drivers/mozab/makefile.mk	Wed Jun 12 01:37:47 2002
-@@ -107,9 +107,7 @@
- # --- MOZAB BASE Library -----------------------------------
- 
- SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
-.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@ -1,54 +0,0 @@
--- connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Tue Mar 19 12:56:24 2002
-+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Sat May 18 15:51:13 2002
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
- 
- PRJ=..$/..$/..$/..
-@@ -107,7 +107,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -123,7 +123,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS +=    -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
- 	    -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-             -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -141,7 +141,7 @@
- 	    -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- 	    -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- 	    -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap 
-+	    -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+=	    -DMOZILLA_CLIENT \
-             -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -157,6 +157,13 @@
-             -fno-rtti -Wall -Wconversion -Wpointer-arith \
-             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-             -Wno-long-long 
-+CDEFS     += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS +=   -fPIC
-+CFLAGSCXX += \
-+            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+            -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+            -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
- .ENDIF
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
@ -1,12 +0,0 @@
--- connectivity/source/drivers/mozaddressbook/makefile.mk.orig	Wed Jun 12 01:40:36 2002
-+++ connectivity/source/drivers/mozaddressbook/makefile.mk	Wed Jun 12 01:40:37 2002
-@@ -134,9 +134,7 @@
- SLOFILES+=$(SLO)$/staticmbmozab.obj
- .ENDIF
- 
-.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-.ENDIF
- # --- Library -----------------------------------
- 
- SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
--- a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx
+++ b/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx
@ -1,11 +0,0 @@
--- cppu/inc/cppu/macros.hxx.kan	Wed Jul 24 23:28:55 2002
-+++ cppu/inc/cppu/macros.hxx	Wed Jul 24 23:29:45 2002
-@@ -76,7 +76,7 @@
-     the struct inherits from a base struct the first member is no double or [unsigned] long long.
-     @internal
- */
-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
- #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
- #else
- #define CPPU_GCC3_ALIGN( base_struct )
--- a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
@ -1,11 +0,0 @@
--- cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
-+++ cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
-@@ -94,7 +94,7 @@
- #define	__CPPU_ENV gcc2
- #elif (__GNUC__ == 2)
- #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
-#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
-+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
- #define	__CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
- #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
--- a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst
+++ b/editors/openoffice-1.0/files/patch-cppu+prj+build.lst
@ -1,8 +0,0 @@
--- cppu/prj/build.lst.orig	Mon Mar 11 14:13:47 2002
-+++ cppu/prj/build.lst	Mon Mar 11 14:14:30 2002
-@@ -1,4 +1,4 @@
-cu	cppu	:	codemaker udkapi NULL
-+cu	cppu	:	codemaker udkapi offuh NULL
- cu	cppu									usr1	-	all	cu_mkout NULL
- cu	cppu\source								nmake	-	all	cu_source NULL
- cu	cppu\source\uno							nmake	-	all	cu_uno cu_source NULL
--- a/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx
+++ b/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx
@ -1,20 +0,0 @@
-Index: cppu/source/typelib/typelib.cxx
-===================================================================
-RCS file: /cvs/udk/cppu/source/typelib/typelib.cxx,v
-retrieving revision 1.14.10.1
-diff -u -r1.14.10.1 typelib.cxx
--- cppu/source/typelib/typelib.cxx	9 Aug 2002 02:30:50 -0000	1.14.10.1
-+++ cppu/source/typelib/typelib.cxx	10 Jul 2005 09:13:22 -0000
-@@ -71,12 +71,6 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-#ifdef MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
-#endif
- #if defined(SOLARIS) || defined(IRIX)
- #include <alloca.h>
- #endif
--- a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx
+++ b/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx
@ -1,20 +0,0 @@
--- cppu/source/uno/data.cxx.kan	Wed Jul 24 23:39:23 2002
-+++ cppu/source/uno/data.cxx	Wed Jul 24 23:38:49 2002
-@@ -295,7 +295,7 @@
- #	pragma pack(8)
- #endif
- 
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define MAX_ALIGNMENT_4
- #endif
- 
-@@ -307,7 +307,7 @@
-     if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", "  #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
- 
- #ifdef DEBUG
-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC))
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC))
- #define BINTEST_VERIFYSIZE( s, n ) \
-     fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
-     if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
--- a/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx
+++ b/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx
@ -1,18 +0,0 @@
-Index: cppu/source/uno/lbenv.cxx
-===================================================================
-RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v
-retrieving revision 1.23
-diff -u -r1.23 lbenv.cxx
--- cppu/source/uno/lbenv.cxx	13 Aug 2002 15:07:09 -0000	1.23
-+++ cppu/source/uno/lbenv.cxx	10 Jul 2005 09:32:20 -0000
-@@ -93,10 +93,6 @@
- #include <stdio.h>
- #ifdef SOLARIS
- #include <alloca.h>
-#elif defined MACOSX
-#include <sys/malloc.h>
-#else
-#include <malloc.h>
- #endif
- #include <hash_map>
- #include <vector>
--- a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h
+++ b/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h
@ -1,11 +0,0 @@
--- cppu/test/alignment/diagnose.h.orig	Sat Jul 20 23:54:59 2002
-+++ cppu/test/alignment/diagnose.h	Sat Jul 20 23:55:06 2002
-@@ -64,7 +64,7 @@
- #include <sal/types.h>
- #include <stdio.h>
- 
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
-+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
- #define __ALIGNMENT__(s, n) __alignof__ (s)
- #else
- #define __ALIGNMENT__(s, n) n
--- a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
@ -1,12 +0,0 @@
--- cppu/util/makefile.mk.orig	Wed Jun 12 01:39:28 2002
-+++ cppu/util/makefile.mk	Wed Jun 12 01:39:32 2002
-@@ -87,9 +87,7 @@
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
-.IF "$(OS)"!="FREEBSD"
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-.ENDIF
- 
- SHL1VERSIONMAP=$(TARGET).map
- 
--- a/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx
+++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx
@ -1,20 +0,0 @@
-Index: cppuhelper/source/implbase_ex.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v
-retrieving revision 1.5
-diff -u -r1.5 implbase_ex.cxx
--- cppuhelper/source/implbase_ex.cxx	15 Aug 2002 12:36:30 -0000	1.5
-+++ cppuhelper/source/implbase_ex.cxx	10 Jul 2005 09:41:00 -0000
-@@ -61,11 +61,8 @@
- 
- #ifdef SOLARIS
- #include <alloca.h>
-#elif defined MACOSX
-#include <sys/types.h>
-#include <sys/malloc.h>
- #else
-#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #include <string.h>
- 
--- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
@ -1,13 +0,0 @@
--- cppuhelper/source/makefile.mk.orig	Mon Mar 11 22:17:52 2002
-+++ cppuhelper/source/makefile.mk	Wed Apr  3 00:31:19 2002
-@@ -175,6 +175,10 @@
- #SHL1VERSIONMAP=gcc2_freebsd_intel.map
- .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
- SHL1VERSIONMAP=gcc3_linux_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
-+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
-+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
-+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
--- a/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx
+++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx
@ -1,16 +0,0 @@
-Index: cppuhelper/source/tdmgr.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/tdmgr.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 tdmgr.cxx
--- cppuhelper/source/tdmgr.cxx	15 Oct 2001 16:07:59 -0000	1.4
-+++ cppuhelper/source/tdmgr.cxx	10 Jul 2005 09:41:51 -0000
-@@ -60,7 +60,7 @@
-  ************************************************************************/
- 
- #ifndef MACOSX
-#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #ifdef SOLARIS
- #include <alloca.h>
--- a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx
+++ b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx
@ -1,13 +0,0 @@
--- desktop/source/pkgchk/pkgchk_packages.cxx.orig	Sun Jan 19 20:00:08 2003
-+++ desktop/source/pkgchk/pkgchk_packages.cxx	Sun Jan 19 20:01:51 2003
-@@ -124,6 +124,10 @@
- static char const s_platform_path [] = "/macosx_powerpc.plt";
- #elif defined (NETBSD) && defined (SPARC)
- static char const s_platform_path [] = "/netbsd_sparc.plt";
-+#elif defined (FREEBSD) && defined (INTEL)
-+static char const s_platform_path [] = "/freebsd_x86.plt";
-+#elif defined (FREEBSD) && defined (SPARC)
-+static char const s_platform_path [] = "/freebsd_sparc.plt";
- #else
- #error "unkonwn platform"
- insert your platform identifier above; inserted for the case the preprocessor ignores error
--- a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk
@ -1,20 +0,0 @@
--- desktop/util/makefile.mk.orig	Sun Jul 21 00:04:35 2002
-+++ desktop/util/makefile.mk	Sun Jul 21 00:04:38 2002
-@@ -81,7 +81,7 @@
- 
- # --- Linken der Applikation ---------------------------------------
- 
-.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
- # winXX is handled like solaris for now
- APP1_STDPRE=
-@@ -111,7 +111,7 @@
- 	$(SALHELPERLIB)
- 
- .IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- 
- APP1STDLIBS+= -lXext -lSM -lICE
- 
--- a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh
+++ b/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh
@ -1,244 +0,0 @@
--- dmake/unix/linux/gnu/make.sh.orig	Wed Mar 13 20:32:53 2002
-+++ dmake/unix/linux/gnu/make.sh	Wed Mar 13 20:33:00 2002
-@@ -3,188 +3,188 @@
- mkdir objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
- fi
- mv infer.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
- fi
- mv make.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
- fi
- mv stat.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
- fi
- mv expand.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
- fi
- mv dmstring.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
- fi
- mv hash.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
- fi
- mv dag.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
- fi
- mv dmake.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
- fi
- mv path.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
- fi
- mv imacs.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
- fi
- mv sysintf.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
- fi
- mv parse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
- fi
- mv getinp.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
- fi
- mv quit.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
- fi
- mv state.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
- fi
- mv dmdump.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
- fi
- mv macparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
- fi
- mv rulparse.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
- fi
- mv percent.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
- fi
- mv function.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
- fi
- mv arlib.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
- fi
- mv dirbrk.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
- fi
- mv rmprq.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
- fi
- mv ruletab.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
- fi
- mv runargv.o objects
- 
- if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
- fi
- mv dcache.o objects
- 
-gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-+${CC} ${CFLAGS} -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
- objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
- objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
- objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
--- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
+++ b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx
@ -1,19 +0,0 @@
--- dtrans/source/X11/X11_selection.cxx.orig	Sat Jul 20 23:18:03 2002
-+++ dtrans/source/X11/X11_selection.cxx	Sat Jul 20 23:18:05 2002
-@@ -65,7 +65,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
- #include <sys/poll.h>
- #else
- #include <poll.h>
-@@ -175,6 +175,7 @@
- 	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
- 	// eastern european encodings
- 	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
-+	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
- 	// String (== iso8859-1)
- 	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
-     // special for compound text
--- a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh
+++ b/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh
@ -1,11 +0,0 @@
--- external/dt/dtpatch.sh.orig	Wed Mar 13 17:09:43 2002
-+++ external/dt/dtpatch.sh	Wed Mar 13 17:09:47 2002
-@@ -96,7 +96,7 @@
-     done
- 
-     chmod -R +w rtufiles/*.h
-    patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch
-+    patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch
- 
-     if test -s "patcherror"; then
-        echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror
--- a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh
+++ b/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh
@ -1,11 +0,0 @@
--- external/expat/expatpatch.sh.orig	Wed Mar 13 16:59:16 2002
-+++ external/expat/expatpatch.sh	Wed Mar 13 17:00:18 2002
-@@ -87,7 +87,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
-     patch -i pat/$PNAME.pat rtufiles/$PNAME
-+     patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
-   for SDNAME in `cat flist.sd`
--- a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch
+++ b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch
@ -1,35 +0,0 @@
--- /dev/null	Sun Jun  2 16:11:00 2002
-+++ external/glibc/flist.pat	Sun Jun  2 12:00:09 2002
-@@ -0,0 +1 @@
-+patch-getopt.h
--- /dev/null	Sun Jun  2 16:11:00 2002
-+++ external/glibc/patch-getopt.h	Sun Jun  2 16:14:52 2002
-@@ -0,0 +1,14 @@
-+--- rtufiles/getopt.h.orig	Fri May 31 16:46:21 2002
-++++ rtufiles/getopt.h	Fri May 31 17:07:19 2002
-+@@ -133,7 +133,11 @@
-+    errors, only prototype getopt for the GNU C library.  */
-+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-+ # else /* not __GNU_LIBRARY__ */
-++#if (__GNUC__ == 3 && defined(FREEBSD))
-++/* skip getopt() definition , it conflicts with std.h */
-++#else
-+ extern int getopt ();
-++# endif /* FREEBSD */
-+ # endif /* __GNU_LIBRARY__ */
-+ 
-+ # ifndef __need_getopt
--- external/glibc/glibcpatch.sh.orig	Sun Jun  2 11:46:42 2002
-+++ external/glibc/glibcpatch.sh	Sun Jun  2 16:13:51 2002
-@@ -113,7 +113,10 @@
- # apply the patches
- #
- 
-# there is no need to apply patch here
-+for PNAME in `cat flist.pat`
-+  do
-+      patch < $PNAME
-+  done
- 
- 
- #
--- a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh
+++ b/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh
@ -1,11 +0,0 @@
--- external/jpeg/jpegpatch.sh.orig	Wed Mar 13 17:04:35 2002
-+++ external/jpeg/jpegpatch.sh	Wed Mar 13 17:08:02 2002
-@@ -112,7 +112,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
-      patch -i pat/$PNAME.pat $PNAME
-+      patch < pat/$PNAME.pat $PNAME
-   done
- 
-   cp -rf jpeg-6b/* rtufiles/
--- a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat
+++ b/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat
@ -1,112 +0,0 @@
--- /dev/null	Thu Aug  8 22:39:51 2002
-+++ external/neon/md5.c.pat	Thu Aug  8 22:35:33 2002
-@@ -0,0 +1,109 @@
-+*** ..\download\neon-0.14.0\src\md5.c	Sun Apr 29 13:23:08 2001
-+--- sub\md5.c	Tue May 08 12:52:02 2001
-+***************
-+*** 278,290 ****
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const md5_uint32 *words = buffer;
-+!   size_t nwords = len / sizeof (md5_uint32);
-+!   const md5_uint32 *endp = words + nwords;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+--- 278,289 ----
-+       const void *buffer;
-+       size_t len;
-+       struct md5_ctx *ctx;
-+  {
-+    md5_uint32 correct_words[16];
-+!   const unsigned char *words = buffer;
-+!   const unsigned char *endp = words + len;
-+    md5_uint32 A = ctx->A;
-+    md5_uint32 B = ctx->B;
-+    md5_uint32 C = ctx->C;
-+    md5_uint32 D = ctx->D;
-+  
-+***************
-+*** 313,324 ****
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+! 	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
-+! 	  ++words;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+--- 312,325 ----
-+  	 we store the swapped words in the array CORRECT_WORDS.  */
-+  
-+  #define OP(a, b, c, d, s, T)						\
-+        do								\
-+          {								\
-+!       md5_uint32 WORD_ = words[0] | (words[1] << 8) \
-+! 	                   | (words[2] << 16) | (words[3] << 24); \
-+! 	  a += FF (b, c, d) + (*cwp++ = WORD_) + T;		\
-+! 	  words += 4;							\
-+  	  CYCLIC (a, s);						\
-+  	  a += b;							\
-+          }								\
-+        while (0)
-+  
-+***************
-+*** 431,441 ****
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+--- 432,442 ----
-+    ctx->D = D;
-+  }
-+  
-+  /* Writes the ASCII representation of the MD5 digest into the
-+   * given buffer, which must be at least 33 characters long. */
-+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
-+  	buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
-+***************
-+*** 443,453 ****
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) 
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
-+--- 444,454 ----
-+      buffer[32] = '\0';
-+  }
-+  
-+  /* Reads the ASCII representation of an MD5 digest. The buffer must
-+   * be at least 32 characters long. */
-+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
-+  {
-+      int count;
-+      for (count = 0; count<16; count++) {
-+  	md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
-+  	    ASC2HEX(buffer[count*2+1]);
--- a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh
+++ b/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh
@ -1,14 +0,0 @@
--- external/neon/neonpatch.sh.orig	Tue May 29 17:40:10 2001
-+++ external/neon/neonpatch.sh	Thu Aug  8 22:43:04 2002
-@@ -119,10 +119,7 @@
- # apply the patches
- #
- 
-  for PNAME in `cat flist.pat`
-  do
-      patch -i pat/$PNAME.pat rtufiles/$PNAME
-  done
-+  patch < md5.c.pat rtufiles/md5.c
- 
- #
- # copy the SD files into rtufiles directory
--- a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh
+++ b/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh
@ -1,11 +0,0 @@
--- external/npsdk/npsdkpatch.sh.orig	Wed Mar 13 16:49:19 2002
-+++ external/npsdk/npsdkpatch.sh	Wed Mar 13 16:49:39 2002
-@@ -121,7 +121,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
-    patch -i pat/$PNAME.pat rtufiles/$PNAME
-+    patch < pat/$PNAME.pat rtufiles/$PNAME
-   done
- 
- #
--- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-freetype+makefile.mk
@ -1,11 +0,0 @@
--- freetype/makefile.mk.orig	Fri Aug 16 17:28:36 2002
-+++ freetype/makefile.mk	Sat Jan 18 13:39:03 2003
-@@ -95,6 +99,8 @@
- 	objs$/.libs$/libfreetype.a
- .IF "$(OS)"=="MACOSX"
- OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-+.ELIF "$(OS)"=="FREEBSD"
-+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
- .ELSE
- OUT2LIB+=objs$/.libs$/libfreetype.so.6*
- .ENDIF          # "$(OS)"=="MACOSX"
--- a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx
+++ b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx
@ -1,11 +0,0 @@
--- i18n/inc/collator.hxx.orig	Sat Apr  6 12:19:32 2002
-+++ i18n/inc/collator.hxx	Wed May  1 22:31:57 2002
-@@ -78,7 +78,7 @@
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #endif
- 
-#if !(defined WIN32 || defined MACOSX || defined NETBSD)
-+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD)
- #include <alloca.h>
- #endif
- #include <tools/string.hxx>
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx
+++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx
@ -1,10 +0,0 @@
--- i18npool/source/localedata/localedata.cxx.orig	Mon Feb 24 17:47:22 2003
-+++ i18npool/source/localedata/localedata.cxx	Tue Feb 25 16:41:58 2003
-@@ -150,6 +150,7 @@
- 	{ "pt_BR",  lcl_ASCII },
- 	{ "pt_PT",  lcl_ASCII },
- 	{ "ru_RU",  lcl_ASCII },
-+	{ "uk_UA",  lcl_ASCII },
- 	{ "sv_FI",  lcl_ASCII },
- 	{ "tr_TR",  lcl_ASCII },
- 	{ "th_TH",  lcl_ASCII },    // PlaDao convenience entry
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk
@ -1,18 +0,0 @@
--- i18npool/source/localedata_ascii/makefile.mk.orig	Sun Nov 17 23:27:32 2002
-+++ i18npool/source/localedata_ascii/makefile.mk	Tue Feb 25 16:43:21 2003
-@@ -138,6 +138,7 @@
- 	$(MISC)$/localedata_pt_BR.cxx	\
- 	$(MISC)$/localedata_pt_PT.cxx	\
- 	$(MISC)$/localedata_ru_RU.cxx	\
-+	$(MISC)$/localedata_uk_UA.cxx	\
- 	$(MISC)$/localedata_sv_FI.cxx	\
- 	$(MISC)$/localedata_tr_TR.cxx	\
- 	$(MISC)$/localedata_nb_NO.cxx	\
-@@ -208,6 +209,7 @@
- 	$(SLO)$/localedata_pt_BR.obj	\
- 	$(SLO)$/localedata_pt_PT.obj	\
- 	$(SLO)$/localedata_ru_RU.obj	\
-+	$(SLO)$/localedata_uk_UA.obj	\
- 	$(SLO)$/localedata_sv_FI.obj	\
- 	$(SLO)$/localedata_tr_TR.obj	\
- 	$(SLO)$/localedata_nb_NO.obj	\
--- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
+++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
@ -1,454 +0,0 @@
--- i18npool/source/localedata_ascii/uk_UA.xml.orig	Thu Jan  1 00:00:00 1970
-+++ i18npool/source/localedata_ascii/uk_UA.xml	Fri Feb 28 13:04:01 2003
-@@ -0,0 +1,451 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
-+<Locale version="1.2">
-+<LC_INFO>
-+<Language>
-+<LangID>uk</LangID>
-+<DefaultName>Ukrainian</DefaultName>
-+</Language>
-+<Country>
-+<CountryID>UA</CountryID>
-+<DefaultName>Ukraine</DefaultName>
-+</Country>
-+<Platform>
-+<PlatformID>generic</PlatformID>
-+</Platform>
-+<Varient></Varient>
-+</LC_INFO>
-+<LC_CTYPE unoid="generic">
-+<Separators>
-+<DateSeparator>.</DateSeparator>
-+<ThousandSeparator> </ThousandSeparator>
-+<DecimalSeparator>,</DecimalSeparator>
-+<TimeSeparator>:</TimeSeparator>
-+<Time100SecSeparator>,</Time100SecSeparator>
-+<ListSeparator>;</ListSeparator>
-+<LongDateDayOfWeekSeparator></LongDateDayOfWeekSeparator>
-+<LongDateDaySeparator> </LongDateDaySeparator>
-+<LongDateMonthSeparator> </LongDateMonthSeparator>
-+<LongDateYearSeparator> р.</LongDateYearSeparator>
-+</Separators>
-+<Markers>
-+<QuotationStart>‘</QuotationStart>
-+<QuotationEnd>’</QuotationEnd>
-+<DoubleQuotationStart>“</DoubleQuotationStart>
-+<DoubleQuotationEnd>”</DoubleQuotationEnd>
-+</Markers>
-+<TimeAM>AM</TimeAM>
-+<TimePM>PM</TimePM>
-+<MeasurementSystem>Metric</MeasurementSystem>
-+</LC_CTYPE>
-+<LC_FORMAT>
-+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
-+<FormatCode>M/D/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
-+<FormatCode>NN DD/MMM YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
-+<FormatCode>MM/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
-+<FormatCode>MMM DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
-+<FormatCode>MMMM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
-+<FormatCode>QQ YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
-+<FormatCode>MM/DD/YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
-+<FormatCode>MM/DD/YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-+<FormatCode>NNNNMMMM DD, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
-+<FormatCode>MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
-+<FormatCode>MMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
-+<FormatCode>MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-+<FormatCode>NN, MMM D, YY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-+<FormatCode>NN, MMMM D, YYYY</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-+<FormatCode>NNNNMMMM D, YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
-+<FormatCode>D. MMM. YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
-+<FormatCode>D. MMMM YYYY</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
-+<FormatCode>MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
-+<FormatCode>YY-MM-DD</FormatCode>
-+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-+<FormatCode>YYYY-MM-DD</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
-+<FormatCode>WW</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
-+<FormatCode>HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
-+<FormatCode>HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
-+<FormatCode>HH:MM AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
-+<FormatCode>HH:MM:SS AM/PM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
-+<FormatCode>[HH]:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
-+<FormatCode>MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
-+<FormatCode>[HH]:MM:SS,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
-+<FormatCode>MM/DD/YY HH:MM</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
-+<FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-+<FormatCode>Standard</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
-+<FormatCode>0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
-+<FormatCode>0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
-+<FormatCode># ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
-+<FormatCode># ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
-+<FormatCode># ###,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
-+<FormatCode>[$грн.-419]# ##0;-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
-+<FormatCode>[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
-+	<FormatCode>[$грн.-419]# ##0;[RED]-[$грн.-419]# ##0</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
-+<FormatCode>[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
-+<FormatCode># ##0,00 CCC</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
-+<FormatCode>[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,--</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-+<FormatCode>0%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
-+<FormatCode>0,00%</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
-+<FormatCode>0,00E+000</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
-+<FormatCode>0,00E+00</FormatCode>
-+<DefaultName></DefaultName>
-+</FormatElement>
-+</LC_FORMAT>
-+<LC_COLLATION>
-+<Collator unoid="uk_UA.alphanumeric" default="true"/>
-+<CollationOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</CollationOptions>
-+</LC_COLLATION>
-+<LC_SEARCH>
-+<SearchOptions>
-+<TransliterationModules>IGNORE_CASE</TransliterationModules>
-+</SearchOptions>
-+</LC_SEARCH>
-+<LC_CALENDAR>
-+<Calendar unoid="gregorian" default="true">
-+<DaysOfWeek>
-+<Day>
-+<DayID>sun</DayID>
-+<DefaultAbbrvName>Нд</DefaultAbbrvName>
-+<DefaultFullName>неділя</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>mon</DayID>
-+<DefaultAbbrvName>Пн</DefaultAbbrvName>
-+<DefaultFullName>понеділок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>tue</DayID>
-+<DefaultAbbrvName>Вт</DefaultAbbrvName>
-+<DefaultFullName>вівторок</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>wed</DayID>
-+<DefaultAbbrvName>Ср</DefaultAbbrvName>
-+<DefaultFullName>середа</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>thu</DayID>
-+<DefaultAbbrvName>Чт</DefaultAbbrvName>
-+<DefaultFullName>четвер</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>fri</DayID>
-+<DefaultAbbrvName>Пт</DefaultAbbrvName>
-+<DefaultFullName>п'ятниця</DefaultFullName>
-+</Day>
-+<Day>
-+<DayID>sat</DayID>
-+<DefaultAbbrvName>Сб</DefaultAbbrvName>
-+<DefaultFullName>субота</DefaultFullName>
-+</Day>
-+</DaysOfWeek>
-+<MonthsOfYear>
-+<Month>
-+<MonthID>jan</MonthID>
-+<DefaultAbbrvName>січ</DefaultAbbrvName>
-+<DefaultFullName>Січень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>feb</MonthID>
-+<DefaultAbbrvName>лют</DefaultAbbrvName>
-+<DefaultFullName>Лютий</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>mar</MonthID>
-+<DefaultAbbrvName>бер</DefaultAbbrvName>
-+<DefaultFullName>Березень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>apr</MonthID>
-+<DefaultAbbrvName>квт</DefaultAbbrvName>
-+<DefaultFullName>Квітень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>may</MonthID>
-+<DefaultAbbrvName>трв</DefaultAbbrvName>
-+<DefaultFullName>Травень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jun</MonthID>
-+<DefaultAbbrvName>чер</DefaultAbbrvName>
-+<DefaultFullName>Червень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>jul</MonthID>
-+<DefaultAbbrvName>лип</DefaultAbbrvName>
-+<DefaultFullName>Липень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>aug</MonthID>
-+<DefaultAbbrvName>сер</DefaultAbbrvName>
-+<DefaultFullName>Серпень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>sep</MonthID>
-+<DefaultAbbrvName>вер</DefaultAbbrvName>
-+<DefaultFullName>Вересень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>oct</MonthID>
-+<DefaultAbbrvName>жов</DefaultAbbrvName>
-+<DefaultFullName>Жовтень</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>nov</MonthID>
-+<DefaultAbbrvName>лис</DefaultAbbrvName>
-+<DefaultFullName>Листопад</DefaultFullName>
-+</Month>
-+<Month>
-+<MonthID>dec</MonthID>
-+<DefaultAbbrvName>гру</DefaultAbbrvName>
-+<DefaultFullName>Грудень</DefaultFullName>
-+</Month>
-+</MonthsOfYear>
-+<Eras>
-+<Era>
-+<EraID>bc</EraID>
-+<DefaultAbbrvName>до н.е.</DefaultAbbrvName>
-+<DefaultFullName>до н.е.</DefaultFullName>
-+</Era>
-+<Era>
-+<EraID>ad</EraID>
-+<DefaultAbbrvName>н.е.</DefaultAbbrvName>
-+<DefaultFullName>н.е.</DefaultFullName>
-+</Era>
-+</Eras>
-+<StartDayOfWeek>
-+<DayID>sun</DayID>
-+</StartDayOfWeek>
-+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
-+</Calendar>
-+</LC_CALENDAR>
-+<LC_CURRENCY>
-+<Currency default="true" usedInCompatibleFormatCodes="true">
-+<CurrencyID>грн.</CurrencyID>
-+<CurrencySymbol>грн.</CurrencySymbol>
-+<BankSymbol>UAH</BankSymbol>
-+<CurrencyName>Hrivnya</CurrencyName>
-+<DecimalPlaces>2</DecimalPlaces>
-+</Currency>
-+</LC_CURRENCY>
-+<LC_TRANSLITERATION>
-+<Transliteration unoid="UPPERCASE_LOWERCASE"/>
-+<Transliteration unoid="IGNORE_CASE"/>
-+<Transliteration unoid="LOWERCASE_UPPERCASE" />
-+</LC_TRANSLITERATION>
-+<LC_MISC>
-+<ReservedWords>
-+<trueWord>true</trueWord>
-+<falseWord>false</falseWord>
-+<quarter1Word>1st quarter</quarter1Word>
-+<quarter2Word>2nd quarter</quarter2Word>
-+<quarter3Word>3rd quarter</quarter3Word>
-+<quarter4Word>4th quarter</quarter4Word>
-+<aboveWord>above</aboveWord>
-+<belowWord>below</belowWord>
-+</ReservedWords>
-+</LC_MISC>
-+<LC_NumberingLevel>
-+<NumberingLevel Prefix=" " NumType="4" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="4" Suffix="." />
-+<NumberingLevel Prefix="(" NumType="4" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="2" Suffix="." />
-+<NumberingLevel Prefix=" " NumType="0" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="1" Suffix=")" />
-+<NumberingLevel Prefix="(" NumType="1" Suffix=")" />
-+<NumberingLevel Prefix=" " NumType="3" Suffix="." />
-+</LC_NumberingLevel>
-+<LC_OutLineNumberingLevel>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020"  BulletFontName=""            ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+<OutlineStyle>
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
-+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022"  BulletFontName="StarSymbol"  ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
-+</OutlineStyle>
-+</LC_OutLineNumberingLevel>
-+</Locale>
--- a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy
+++ b/editors/openoffice-1.0/files/patch-idlc+source+parser.yy
@ -1,36 +0,0 @@
--- idlc/source/parser.yy.orig	Wed Jul 10 11:43:18 2002
-+++ idlc/source/parser.yy	Thu Oct 31 10:00:47 2002
-@@ -995,7 +995,8 @@
- 	{
- 		idlc()->setParseState(PS_ConstantDeclSeen);
- 	}
-	';'
-+	';' {};
-+
- 
- const_dcl : 
- 	IDL_CONST
-@@ -1316,7 +1317,7 @@
- 		 * Push the scope of the exception on the scopes stack
- 		 */
- 		idlc()->scopes()->push(pExcept);
-		delete $1
-+		delete $1;
- 	}
- 	'{'
- 	{
-@@ -1705,10 +1706,10 @@
- 	{
- 		idlc()->setParseState(PS_TypedefSeen);
- 	}
-	type_declarator
-	| struct_type
-	| union_type
-	| enum_type
-+	type_declarator {}
-+	| struct_type {}
-+	| union_type {}
-+	| enum_type {}
- 	;
- 
- type_declarator :
--- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
@ -1,246 +0,0 @@
--- nas/nas-1.4.1.patch.orig	Wed Jan  8 02:52:13 2003
-+++ nas/nas-1.4.1.patch	Sat Jan 18 17:55:19 2003
-@@ -1,5 +1,5 @@
-*** misc/nas-1.4.1/config/NetAudio.tmpl	Sat Mar  4 21:40:50 2000
---- misc/build/nas-1.4.1/config/NetAudio.tmpl	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/config/NetAudio.tmpl	Sun Mar  5 03:40:50 2000
-+--- misc/build/nas-1.4.1/config/NetAudio.tmpl	Thu Nov  1 13:08:21 2001
- ***************
- *** 166,171 ****
- --- 166,177 ----
-@@ -15,8 +15,8 @@
-       INCLUDESRC = $(TOP)/include
-           INCDIR = $(INCROOT)/audio
-       WIDGET_DIR = $(TOP)/clients/audio/widgets
-*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 13:45:21 1999
---- misc/build/nas-1.4.1/lib/audio/Alibint.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Alibint.c	Sun Oct 24 19:45:21 1999
-+--- misc/build/nas-1.4.1/lib/audio/Alibint.c	Thu Nov  1 13:11:51 2001
- ***************
- *** 1336,1348 ****
-   static char *_SysErrorMsg (n)
-@@ -40,8 +40,8 @@
-   }
-   
-   #endif 	/* USL sharedlibs in don't define for AUD3.2 */
-*** misc/nas-1.4.1/lib/audio/Astreams.c	Sat May  8 21:10:05 1999
---- misc/build/nas-1.4.1/lib/audio/Astreams.c	Tue Jan  7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Astreams.c	Sun May  9 03:10:05 1999
-+--- misc/build/nas-1.4.1/lib/audio/Astreams.c	Thu Nov  1 13:05:48 2001
- ***************
- *** 51,59 ****
-   #include <errno.h>
-@@ -120,59 +120,157 @@
-   	    return(-1);
-   	}
-   
-*** misc/nas-1.4.1/lib/audio/Imakefile	Sat Jan  1 04:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile	Tue Jan  7 19:30:41 2003
-***************
-*** 25,30 ****
---- 25,32 ----
-  
-  #include "../../config/NetAudio.tmpl"
-  
-+ CCOPTIONS += $(EXTRA_CCOPTIONS)
-+ 
-  #if ProjectX < 5
-  /* Pre-X11R5 compatability */
-  #ifndef NormalLibX
-***************
-*** 119,124 ****
---- 121,127 ----
-  
-  #endif
-  BuildIncludes($(HEADERS),audio,..)
-+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-  InstallMultiple($(HEADERS),$(INCDIR))
-  #if ProjectX >= 5
-  InstallNonExecFile(AuErrorDB,$(LIBDIR))
-*** misc/nas-1.4.1/server/dia/gram.y	Sat Jan  1 22:35:49 2000
---- misc/build/nas-1.4.1/server/dia/gram.y	Tue Jan  7 19:42:40 2003
-***************
-*** 119,132 ****
-  			}
-  		| MAXRATE number
-  			{ ddaSetConfig(MAXRATE, (void *)$2); }
-! 		| MINRATE number
-! 			{ ddaSetConfig(MINRATE, (void *)$2); }
-  
-  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
-  					  strcpy(ptr, $1);
-  					  RemoveDQuote(ptr);
-  					  $$ = ptr;
-! 					}
-  number		: NUMBER		{ $$ = $1; }
-  		;
-  
---- 119,132 ----
-  			}
-  		| MAXRATE number
-  			{ ddaSetConfig(MAXRATE, (void *)$2); }
-! 		| MINRATE number 
-!                         { ddaSetConfig(MINRATE, (void *)$2); } ;
-  
-  string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
-  					  strcpy(ptr, $1);
-  					  RemoveDQuote(ptr);
-  					  $$ = ptr;
-!                                         };
-  number		: NUMBER		{ $$ = $1; }
-  		;
-  
-+--- misc/nas-1.4.1/Imakefile.orig	Wed Mar  6 02:20:01 2002
-++++ misc/build/nas-1.4.1/Imakefile	Wed Mar  6 02:20:07 2002
-+@@ -42,6 +42,8 @@
-+ 	@echo ""
-+ 	Date
-+ 	@echo ""
-++	@find . | egrep "\.(cxx|h|c)$$" | xargs \
-++                ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-+ 	$(MAKE) $(MFLAGS) Makefiles
-+ 	$(MAKE) $(MFLAGS) clean
-+ 	$(MAKE) $(MFLAGS) includes
-+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig	Wed Nov  5 18:50:21 1997
-++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c	Wed Nov  5 18:56:33 1997
-+@@ -133,6 +133,7 @@
-+     signal(SIGALRM, SIG_DFL);
-+ }
-+ 
-++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
-+ static void
-+ usleep(usecs)
-+ unsigned int    usecs;
-+@@ -149,7 +150,7 @@
-+     setitimer(ITIMER_REAL, &ntval, &otval);
-+     pause();
-+ }
-+-
-++#endif
-+ #endif						/* SYSV else not */
-+ #endif						/* VMS else not */
-+ #endif						/* NEEDUSLEEP */
-+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig	Sun Mar  5 03:40:55 2000
-++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c	Sat Dec 16 22:11:35 2000
-+@@ -155,8 +155,10 @@
-+ #include <assert.h>
-+ 
-+ #ifdef __FreeBSD__
-+-# include <machine/soundcard.h>
-+-# include <machine/pcaudioio.h>
-++# include <sys/soundcard.h>
-++# ifdef __i386__
-++#  include <machine/pcaudioio.h>
-++# endif
-+ #else
-+ # ifdef __NetBSD__
-+ #  include <sys/ioctl.h>
-+@@ -610,7 +612,11 @@
-+ 
-+     if(sndStatOut.fd == -1)
-+     {
-++#ifdef __FreeBSD__
-++       while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
-++#else
-+        while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
-++#endif
-+        {
-+            osLogMsg("openDevice: waiting on output device\n");
-+            sleep(1);
-+@@ -1230,6 +1236,11 @@
-+ /*
-+  * Setup soundcard at maximum audio quality.
-+  */
-++
-++#ifdef __FreeBSD__
-++#define NO_16_BIT_SAMPLING
-++#endif
-++
-+ static void setupSoundcard(sndStatPtr)
-+ SndStat* sndStatPtr;
-+ {
-+@@ -1380,7 +1391,11 @@
-+ 
-+     AL_initialized = AuTrue;
-+ 
-++#ifdef __FreeBSD__
-++    if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
-++#else
-+     if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
-++#endif
-+         UNIDENTMSG;
-+         return AuFalse;
-+     }
-+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig	Mon Oct 25 02:24:08 1999
-++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c	Sat Mar 25 14:56:23 2000
-+@@ -28,7 +28,7 @@
-+  */
-+ 
-+ #ifndef WIN32
-+-# ifdef __NetBSD__
-++# if defined(__NetBSD__) || defined(__FreeBSD__)
-+ #  include <limits.h>
-+ #  define MAXSHORT SHRT_MAX
-+ #  define MINSHORT SHRT_MIN
-+--- misc/nas-1.4.1/lib/audio/Imakefile.orig	Sun May 19 14:52:20 2002
-++++ misc/build/nas-1.4.1/lib/audio/Imakefile	Sun May 19 14:54:25 2002
-+@@ -25,6 +25,8 @@
-+ 
-+ #include "../../config/NetAudio.tmpl"
-+ 
-++CCOPTIONS += $(EXTRA_CCOPTIONS)
-++
-+ #if ProjectX < 5
-+ /* Pre-X11R5 compatability */
-+ #ifndef NormalLibX
-+@@ -64,10 +66,14 @@
-+     COMPAT_OBJS = AuGetBest.o
-+ #endif /* ProjectX < 5 */
-+ 
-++#if HasBSD44Sockets
-++    SOCK_DEFINES = -DBSD44SOCKETS
-++#endif
-++
-+      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-+ 
-+         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-+-   CONN_DEFINES = ConnectionFlags
-++   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
-+ 
-+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
-+           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
-+@@ -119,6 +125,7 @@
-+ 
-+ #endif
-+ BuildIncludes($(HEADERS),audio,..)
-++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-+ InstallMultiple($(HEADERS),$(INCDIR))
-+ #if ProjectX >= 5
-+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
-+--- misc/nas-1.4.1/config/NetAudio.def.orig	Sun Feb 13 05:31:14 2000
-++++ misc/build/nas-1.4.1/config/NetAudio.def	Fri Mar 24 04:55:49 2000
-+@@ -8,5 +8,5 @@
-+ 
-+ XCOMM Directory where NAS will look for it's config file(s)
-+ #ifndef NasConfigSearchPath
-+-#define NasConfigSearchPath /etc/nas/
-++#define NasConfigSearchPath $(PROJECTROOT)/etc/
-+ #endif
-+--- misc/nas-1.4.1/server/dia/gram.y.orig	Thu Oct 31 10:13:28 2002
-++++ misc/build/nas-1.4.1/server/dia/gram.y	Thu Oct 31 10:15:18 2002
-+@@ -120,13 +120,13 @@
-+ 		| MAXRATE number
-+ 			{ ddaSetConfig(MAXRATE, (void *)$2); }
-+ 		| MINRATE number
-+-			{ ddaSetConfig(MINRATE, (void *)$2); }
-++			{ ddaSetConfig(MINRATE, (void *)$2); };
-+ 
-+ string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
-+ 					  strcpy(ptr, $1);
-+ 					  RemoveDQuote(ptr);
-+ 					  $$ = ptr;
-+-					}
-++					};
-+ number		: NUMBER		{ $$ = $1; }
-+ 		;
-+ 
--- a/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk
@ -1,15 +0,0 @@
-Index: odk/pack/copying/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/pack/copying/makefile.mk,v
-retrieving revision 1.46.2.9
-diff -u -r1.46.2.9 makefile.mk
--- odk/pack/copying/makefile.mk	24 Feb 2003 16:48:59 -0000	1.46.2.9
-+++ odk/pack/copying/makefile.mk	4 Aug 2005 03:03:48 -0000
-@@ -16,6 +16,7 @@
- 
- DIRLIST = \
- 	$(DESTDIRDOCU) \
-+	$(DESTDIR)$/settings \
- 	$(DESTDIRDOCUIMAGES) \
- 	$(DESTDIRDOCU)$/DevStudioWizards \
- 	$(DESTDIRDOCU)$/DevStudioWizards$/images \
--- a/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk
@ -1,14 +0,0 @@
-Index: odk/source/OOSupport/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v
-retrieving revision 1.1.2.1
-diff -u -r1.1.2.1 makefile.mk
--- odk/source/OOSupport/makefile.mk	13 Jan 2003 10:58:17 -0000	1.1.2.1
-+++ odk/source/OOSupport/makefile.mk	4 Aug 2005 03:44:04 -0000
-@@ -336,5 +336,5 @@
- 	+cp -R ParserDB $(CLASSDIR)$/netbeans$/system
- 	+cp openoffice-nbm-license.txt $(CLASSDIR)
- 	+-mkdir $(CLASSDIR)$/netbeans$/modules
-	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule
-+	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java -classpath $(CLASSDIR) MakeModule
- 	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
--- a/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk
@ -1,21 +0,0 @@
-Index: odk/source/bean/native/unix/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/source/bean/native/unix/Attic/makefile.mk,v
-retrieving revision 1.4
-diff -u -r1.4 makefile.mk
--- odk/source/bean/native/unix/makefile.mk	6 May 2002 18:56:38 -0000	1.4
-+++ odk/source/bean/native/unix/makefile.mk	3 Aug 2005 07:10:36 -0000
-@@ -20,9 +20,12 @@
- SHL1LIBS=	$(SLB)$/$(TARGET).lib
- SHL1STDLIBS=-ljawt -lsal
- 
-.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- SHL1STDLIBS+=-lstdc++
- .ENDIF
-+.IF "$(OS)" == "FREEBSD"
-+SHL1STDLIBS+=-ljvm -lhpi
-+.ENDIF
- 
- NO_SHL1DESCRIPTION=TRUE
- 
--- a/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk
+++ b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk
@ -1,31 +0,0 @@
-Index: odk/util/makefile.pmk
-===================================================================
-RCS file: /cvs/api/odk/util/makefile.pmk,v
-retrieving revision 1.26.2.4
-diff -u -r1.26.2.4 makefile.pmk
--- odk/util/makefile.pmk	17 Feb 2003 15:51:33 -0000	1.26.2.4
-+++ odk/util/makefile.pmk	29 Jul 2005 13:57:12 -0000
-@@ -76,7 +76,7 @@
- #--------------------
- MY_DELETE_RECURSIVE=rm -rf
- MY_DIRCMP=dircmp 
-MY_TEXTCOPY= tr -d "\015"
-+MY_TEXTCOPY=%%GNUTR%% -d "\015"
- #MY_COPY=cat
- 
- MY_DLLPREFIX=lib
-@@ -116,6 +116,14 @@
- DESTDIRLIB=$(DESTDIR)$/netbsd$/lib
- DESTDIRDLL=$(DESTDIRLIB)
- 
-+.ELIF "$(OS)"=="FREEBSD"
-+###########
-+# FREEBSD
-+###########
-+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
-+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
-+DESTDIRDLL=$(DESTDIRLIB)
-+
- .ELIF "$(OS)"=="IRIX "
- ###########
- # IRIX
--- a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
+++ b/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl
@ -1,12 +0,0 @@
--- offapi/com/sun/star/setup/OSType.idl.orig	Mon Dec 18 16:34:26 2000
-+++ offapi/com/sun/star/setup/OSType.idl	Sun Jul 21 01:37:15 2002
-@@ -88,6 +88,9 @@
- 	UNIX_LINUX,
- 
- 	// DocMerge: empty anyway
-+	UNIX_FREEBSD,
-+
-+	// DocMerge: empty anyway
- 	UNIX_HP,
- 
- 	// DocMerge: empty anyway
--- a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk
+++ b/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk
@ -1,11 +0,0 @@
--- offapi/util/makefile.pmk.orig	Mon Mar 11 01:37:55 2002
-+++ offapi/util/makefile.pmk	Mon Mar 11 01:37:57 2002
-@@ -85,7 +85,7 @@
- 
- URDDOC=TRUE
- 
-.IF "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- .IF "$(CPU)"=="I"
- UNOIDL=unoidl
- .ENDIF
--- a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx
+++ b/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx
@ -1,20 +0,0 @@
--- package/inc/HashMaps.hxx.orig	Tue Oct 30 14:52:18 2001
-+++ package/inc/HashMaps.hxx	Wed Jun 12 23:10:42 2002
-@@ -79,7 +79,7 @@
- };
- 
- class ZipPackageFolder;
-class ContentInfo;
-+class ZipContentInfo;
- 
- typedef std::hash_map < rtl::OUString, 
- 						ZipPackageFolder *,
-@@ -87,7 +87,7 @@
- 						eqFunc > FolderHash;
- 
- typedef std::hash_map < rtl::OUString, 
-						vos::ORef < ContentInfo >,
-+						vos::ORef < ZipContentInfo >,
- 						::rtl::OUStringHash, 
- 						eqFunc > ContentHash;
- 
--- a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx
+++ b/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx
@ -1,11 +0,0 @@
--- package/inc/ZipPackageFolder.hxx.orig	Thu Nov 15 21:01:49 2001
-+++ package/inc/ZipPackageFolder.hxx	Wed Jun 12 23:10:42 2002
-@@ -106,7 +106,7 @@
- 
- 	void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
- 		throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-	ContentInfo & doGetByName( const ::rtl::OUString& aName )
-+	ZipContentInfo & doGetByName( const ::rtl::OUString& aName )
- 		throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- 	static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
- 	static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId()
--- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
+++ b/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
@ -1,34 +0,0 @@
--- package/source/zippackage/ContentInfo.hxx.orig	Tue Oct 30 14:54:47 2001
-+++ package/source/zippackage/ContentInfo.hxx	Wed Jun 12 23:10:42 2002
-@@ -75,7 +75,7 @@
- #endif
- #include <hash_map>
- 
-class ContentInfo : public cppu::OWeakObject
-+class ZipContentInfo : public cppu::OWeakObject
- {
- public:
- 	com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel;
-@@ -85,19 +85,19 @@
- 		ZipPackageFolder *pFolder;
- 		ZipPackageStream *pStream;
- 	};
-	ContentInfo ( ZipPackageStream * pNewStream ) 
-+	ZipContentInfo ( ZipPackageStream * pNewStream ) 
- 	: bFolder ( false )
- 	, pStream ( pNewStream )
- 	, xTunnel ( pNewStream )
- 	{
- 	}
-	ContentInfo ( ZipPackageFolder * pNewFolder ) 
-+	ZipContentInfo ( ZipPackageFolder * pNewFolder ) 
- 	: bFolder ( true )
- 	, pFolder ( pNewFolder )
- 	, xTunnel ( pNewFolder )
- 	{
- 	}
-	virtual ~ContentInfo () 
-+	virtual ~ZipContentInfo () 
- 	{
- 		if ( bFolder )
- 			pFolder->releaseUpwardRef();
--- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
+++ b/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
@ -1,41 +0,0 @@
--- package/source/zippackage/ZipPackageFolder.cxx.orig	Wed Jun 12 23:09:16 2002
-+++ package/source/zippackage/ZipPackageFolder.cxx	Wed Jun 12 23:10:42 2002
-@@ -212,7 +212,7 @@
- 	return maContents.size() > 0;
- }
- 	// XNameAccess
-ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
-+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
- 	throw(NoSuchElementException, WrappedTargetException, RuntimeException)
- {
- 	ContentHash::iterator aIter = maContents.find ( aName );
-@@ -286,7 +286,7 @@
- 		  aCI++)
- 	{ 
- 		const OUString &rShortName = (*aCI).first;
-		const ContentInfo &rInfo = *(*aCI).second;
-+		const ZipContentInfo &rInfo = *(*aCI).second;
- 
- 		Sequence < PropertyValue > aPropSet (2);
- 		PropertyValue *pValue = aPropSet.getArray();
-@@ -533,7 +533,7 @@
- 		  aCI!=maContents.end();
- 		  aCI++)
- 	{ 
-		ContentInfo &rInfo = * (*aCI).second;
-+		ZipContentInfo &rInfo = * (*aCI).second;
- 		if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () )
- 			rInfo.pFolder->releaseUpwardRef();
- 		else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() )
-@@ -577,9 +577,9 @@
- 		throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
- {
- 	if ( pEntry->IsFolder() )
-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
-+		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
- 	else
-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
-+		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
- 
- 	if ( bSetParent )
- 		pEntry->setParent ( *this );
--- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp
+++ b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp
@ -1,18 +0,0 @@
--- product/inc/scp/udk_basefiles.scp.orig	Tue Jan  7 14:52:10 2003
-+++ product/inc/scp/udk_basefiles.scp	Sun Jan 19 22:37:05 2003
-@@ -2,6 +2,7 @@
- 
- // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
- // (setup is linked against it).
-+#if ( !defined ( FREEBSD ))
- #if ( defined( _gcc3 ) && defined( C300 ) )
- 
- File gid_File_Lib_gcc
-@@ -34,6 +35,7 @@
- End
- 
- 
-+#endif
- #endif
- 
- File gid_File_Lib_Sal
--- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk
+++ b/editors/openoffice-1.0/files/patch-product+settings+settings.mk
@ -1,75 +0,0 @@
--- product/settings/settings.mk.orig	Sat Jan 18 18:23:17 2003
-+++ product/settings/settings.mk	Sat Jan 18 18:37:12 2003
-@@ -225,3 +226,72 @@
- 
- endif
- 
-+ifeq "$(PLATFORM)" "FreeBSD"
-+# Settings for FreeBSD using gcc compiler
-+
-+OS=FREEBSD
-+PLATFORM=freebsd
-+PS=/
-+LINK=$(CC)
-+LIB=$(CC)
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+PACKAGE_LIB_DIR=freebsd_x86.plt
-+    
-+GCC_VERSION=$(shell $(CC) -dumpversion)
-+
-+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
-+COMID=gcc3
-+CPPU_ENV=gcc3
-+else
-+COMID=GCC
-+CPPU_ENV=gcc2
-+endif
-+
-+OSEP=\<
-+CSEP=\>
-+    
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-lsal
-+CPPULIB=-lcppu
-+CPPUHELPERLIB=-lcppuhelper$(COMID)
-+SALHELPERLIB=-lsalhelper$(COMID)
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g
-+else
-+CC_FLAGS=-c -O
-+endif
-+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux
-+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport
-+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) %%PTHREAD_CFLAGS%%
-+
-+# define for used compiler necessary for UNO
-+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-+#-DCPPU_ENV=gcc3 -- gcc3 3.0
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared
-+EXE_LINK_FLAGS=-Wl -export-dynamic
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%%
-+
-+endif
--- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk
@ -1,32 +0,0 @@
--- product/util/makefile.mk.orig	Sat Jan 18 13:31:50 2003
-+++ product/util/makefile.mk	Sat Jan 18 13:30:54 2003
-@@ -131,13 +131,6 @@
- DESTDIRDLL=$(DESTDIRLIB)
- STLPORTLIBNAME=libstlport_gcc.so
- BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
-       $(DESTDIRDLL)$/libgcc_s.so.1            \
-       $(DESTDIRDLL)$/libgcc_s.so              \
-       $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3)           \
-       $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
-.ENDIF
- 
- .ELIF "$(OS)"=="NETBSD"
- ###########
-@@ -491,6 +484,7 @@
- # special targets for linux gcc3 
- .IF "$(COMID)"=="gcc3"
- 
-+.IF "$(OS)"!="FREEBSD"
- $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
-        $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
- 
-@@ -514,6 +508,7 @@
- $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
- 	+ln -s libgcc_s.so.1 $@
-+.ENDIF
- #-------------------------------------------------------------
- 
- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
--- a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
+++ b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx
@ -1,11 +0,0 @@
--- psprint/source/printer/printerinfomanager.cxx.orig	Sat Apr  6 11:56:35 2002
-+++ psprint/source/printer/printerinfomanager.cxx	Wed May  1 22:42:58 2002
-@@ -883,7 +883,7 @@
- 
- static const struct SystemCommandParameters aParms[] =
- {
-#if defined(LINUX) || defined(NETBSD)
-+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
-     { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "lpc status", "lpr -P (PRINTER)", "", ":", 0 },
-     { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 }
--- a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps
+++ b/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps
@ -1,13 +0,0 @@
--- psprint/source/printergfx/psheader.ps.orig	Tue Jun  4 22:33:58 2002
-+++ psprint/source/printergfx/psheader.ps
-@@ -303,8 +303,8 @@
-     /h /i /j /k /l /m /n /o
-     /p /q /r /s /t /u /v /w
-     /x /y /z /braceleft /bar /braceright /asciitilde /unused
-    /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused
-+    /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-+    /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused
-     /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
-     /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis
-     /space /exclamdown /cent /sterling /currency /yen /brokenbar /section
--- a/editors/openoffice-1.0/files/patch-registry+source+registry.cxx
+++ b/editors/openoffice-1.0/files/patch-registry+source+registry.cxx
@ -1,14 +0,0 @@
--- registry/source/registry.cxx.orig	Fri Apr  4 00:09:08 2003
-+++ registry/source/registry.cxx	Fri Apr  4 00:06:25 2003
-@@ -134,11 +134,7 @@
- 
- #ifdef UNX
- 	strcat(tmpPattern, "/reg_XXXXXX");
-#if defined(FREEBSD) || defined(MACOSX)
-	pTmpName = mkstemp(tmpPattern);
-#else
- 	pTmpName = mktemp(tmpPattern);
-#endif
- #endif
- 
- 	return OString(pTmpName);
--- a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
+++ b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
@ -1,12 +0,0 @@
--- registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
-+++ registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
-@@ -228,6 +228,9 @@
- {
- 	RegError _ret = REG_NO_ERROR;
- 
-+       if (!nSubKeys)
-+		return REG_NO_ERROR;
-+
- 	if (phSubKeys)
- 	{
- 		ORegistry* pReg = NULL;
--- a/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk
@ -1,39 +0,0 @@
-Index: registry/tools/makefile.mk
-===================================================================
-RCS file: /cvs/udk/registry/tools/makefile.mk,v
-retrieving revision 1.4
-diff -u -r1.4 makefile.mk
--- registry/tools/makefile.mk	18 May 2001 15:20:12 -0000	1.4
-+++ registry/tools/makefile.mk	10 Jul 2005 05:16:53 -0000
-@@ -88,6 +88,7 @@
- APP1STDLIBS=\
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-+            $(STORELIB) \
-             $(REGLIB)
- 
- .IF "$(GUI)"=="WNT"
-@@ -102,6 +103,7 @@
- APP2STDLIBS=\
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-+            $(STORELIB) \
-             $(REGLIB)
- 
- .IF "$(GUI)"=="WNT"
-@@ -115,6 +117,7 @@
- APP3STDLIBS=\
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-+            $(STORELIB) \
-             $(REGLIB)
- 
- .IF "$(GUI)"=="WNT"
-@@ -128,6 +131,7 @@
- APP4STDLIBS=\
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-+            $(STORELIB) \
-             $(REGLIB)
- 
- .IF "$(GUI)"=="WNT"
--- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h
+++ b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h
@ -1,12 +0,0 @@
--- rsc/source/rscpp/cpp.h.orig	Fri Mar  1 00:14:38 2002
-+++ rsc/source/rscpp/cpp.h	Fri Mar  1 00:15:03 2002
-@@ -462,7 +462,9 @@
- extern char     *strrchr();
- extern char     *strchr();
- #if ! ( defined UNX && defined ALPHA )
-+#if ! ( defined FREEBSD )
- extern long     time();
-+#endif
- #endif
- /* extern char     *sprintf();  */           /* Lint needs this              */
- 
--- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c
+++ b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c
@ -1,12 +0,0 @@
--- rsc/source/rscpp/cpp3.c.orig	Thu Jul 25 00:00:25 2002
-+++ rsc/source/rscpp/cpp3.c	Thu Jul 25 00:01:50 2002
-@@ -82,7 +82,9 @@
- #ifdef IRIX
- extern void 	abort(void);
- #else
-+#ifndef FREEBSD
- extern int      abort();                /* For debugging                */
-+#endif
- #endif
- #endif
- 
--- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
+++ b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
@ -1,20 +0,0 @@
--- sablot/Sablot-0.52.patch.orig	Sun Jan 19 15:13:42 2003
-+++ sablot/Sablot-0.52.patch	Sun Jan 19 15:15:15 2003
-@@ -3,7 +3,7 @@
- ***************
- *** 1 ****
- ! dummy
---- 1,159 ----
-+--- 1,161 ----
- ! #*************************************************************************
- ! #
- ! #   $RCSfile: makefile.mk,v $
-@@ -96,6 +96,8 @@
- ! .IF "$(GUI)"=="UNX"
- ! .IF "$(OS)"=="NETBSD"
- ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELIF "$(OS)"=="FREEBSD"
-+! CFLAGS+=     -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
- ! .ELSE
- ! .IF "$(OS)"=="MACOSX"
- ! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
--- a/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h
+++ b/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h
@ -1,20 +0,0 @@
--- sal/inc/osl/endian.h.orig	Thu May  8 20:19:09 2003
-+++ sal/inc/osl/endian.h	Thu May  8 20:29:00 2003
-@@ -107,7 +107,9 @@
- #endif
- 
- #ifdef FREEBSD
-+#   include <sys/param.h>
- #   include <machine/endian.h>
-+#if __FreeBSD_version < 500000
- #   if BYTE_ORDER == LITTLE_ENDIAN
- #   	define _LITTLE_ENDIAN
- #   elif BYTE_ORDER == BIG_ENDIAN
-@@ -115,6 +117,7 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
-+#endif
- #endif
- 
- #ifdef SCO
--- a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h
+++ b/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h
@ -1,21 +0,0 @@
--- sal/inc/rtl/textenc.h.orig	Mon Feb 24 17:46:26 2003
-+++ sal/inc/rtl/textenc.h	Tue Feb 25 16:45:00 2003
-@@ -173,8 +173,9 @@
- #define RTL_TEXTENCODING_MS_1361                (RTL_TEXTENC_CAST( 84 ))
- #define RTL_TEXTENCODING_GB_18030               (RTL_TEXTENC_CAST( 85 ))
- #define RTL_TEXTENCODING_BIG5_HKSCS             (RTL_TEXTENC_CAST( 86 ))
-+#define RTL_TEXTENCODING_KOI8_U                 (RTL_TEXTENC_CAST( 87 ))
- 
-#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 87 ))
-+#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 88 ))
- 
- #define RTL_TEXTENCODING_USER_START             (RTL_TEXTENC_CAST( 0x8000 ))
- #define RTL_TEXTENCODING_USER_END               (RTL_TEXTENC_CAST( 0xEFFF ))
-@@ -223,6 +224,7 @@
- Cyrillic (DOS/OS2-866/Russian)                  RTL_TEXTENCODING_IBM_866
- Cyrillic (ISO-8859-5)                           RTL_TEXTENCODING_ISO_8859_5
- Cyrillic (KOI8-R)                               RTL_TEXTENCODING_KOI8_R
-+Cyrillic (KOI8-U)                               RTL_TEXTENCODING_KOI8_U
- Cyrillic (Windows-1251)                         RTL_TEXTENCODING_MS_1251
- 
- Greek (Apple Macintosh)                         RTL_TEXTENCODING_APPLE_GREEK
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c
@ -1,30 +0,0 @@
--- sal/osl/unx/interlck.c.orig	Mon Jul 22 17:51:34 2002
-+++ sal/osl/unx/interlck.c	Mon Jul 22 18:03:42 2002
-@@ -81,10 +81,10 @@
- 	__asm__ __volatile__ (
- 		"movl $1, %0\n\t"
- 		"lock\n\t" 
-		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"incl %0"
-	:	"=a" (nCount), "=m" (*pCount)
-	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
-@@ -95,10 +95,10 @@
- 	__asm__ __volatile__ (
- 		"movl $-1, %0\n\t"
- 		"lock\n\t"
-		"xadd %0, %2\n\t"
-+		"xadd %0, %1\n\t"
- 		"decl %0"
-	:	"=a" (nCount), "=m" (*pCount)
-	:	"m" (*pCount)
-+	:	"=&a" (nCount), "+m" (*pCount)
-+	:
- 	:	"memory");
- }
- 
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
@ -1,135 +0,0 @@
--- sal/osl/unx/nlsupport.c.orig	Tue May 21 15:22:11 2002
-+++ sal/osl/unx/nlsupport.c	Tue Sep  3 12:58:48 2002
-@@ -63,7 +63,7 @@
- #include <osl/diagnose.h>
- #include <osl/process.h>
- 
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
- #include <pthread.h>
- #include <locale.h>
- #include <langinfo.h>
-@@ -241,12 +240,13 @@
-     return NULL;
- }
-         
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-  * from nl_langinfo(CODESET) to rtl_textencoding defines. 
- * nl_langinfo() is supported only on Linux, Solaris and IRIX. 
-+ * nl_langinfo() is supported only on Linux, Solaris and IRIX,
-+ * >= NetBSD 1.6 and >= FreeBSD 4.4
-  *
-  * This routine is SLOW because of the setlocale call, so
-  * grab the result and cache it.
-@@ -260,6 +260,12 @@
- #endif
- #endif
- 
-+/*
-+ * _nl_language_list[] is an array list of supported encodings. Because
-+ * we are using a binary search, the list has to be in ascending order.
-+ * We are comparing the encodings case insensitiv, so the list has
-+ * to be completly upper- , or lowercase.
-+ */
- 
- #if defined(SOLARIS)
- 
-@@ -497,7 +503,59 @@
-     { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
- };
- 
-#endif /* ifdef LINUX || NETBSD */
-+#elif defined(FREEBSD)
-+
-+const _pair _nl_language_list[] = {
-+   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
-+   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
-+   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
-+   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
-+   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
-+   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
-+   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
-+   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
-+   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
-+   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
-+   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
-+   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
-+   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
-+   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
-+   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
-+   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
-+   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
-+   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
-+};
-+
-+#elif defined(NETBSD)
-+
-+const _pair _nl_language_list[] = {
-+   { "ASCII",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
-+   { "BIG5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
-+   { "CP1251",		RTL_TEXTENCODING_MS_1251	}, /* MS-CYRL */
-+   { "CP866",		RTL_TEXTENCODING_IBM_866	}, /* CP866 866 */
-+   { "CTEXT",		RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
-+   { "EUCCN",		RTL_TEXTENCODING_EUC_CN		}, /* China - Simplified Chinese */
-+   { "EUCJP",		RTL_TEXTENCODING_EUC_JP		}, /* Japan */
-+   { "EUCKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
-+   { "EUCTW",		RTL_TEXTENCODING_EUC_TW		}, /* China - Traditional Chinese */
-+   { "ISO-2022-JP",	RTL_TEXTENCODING_DONTKNOW	}, /* */
-+   { "ISO-2022-JP-2",	RTL_TEXTENCODING_DONTKNOW	}, /* */
-+   { "ISO8859-1",	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
-+   { "ISO8859-15",	RTL_TEXTENCODING_ISO_8859_15	}, /* Western Updated (w/Euro sign) */
-+   { "ISO8859-2",	RTL_TEXTENCODING_ISO_8859_2	}, /* Central European */
-+   { "ISO8859-4",	RTL_TEXTENCODING_ISO_8859_4	}, /* LATIN4 L4 */
-+   { "ISO8859-5",	RTL_TEXTENCODING_ISO_8859_5	}, /* Cyrillic */
-+   { "ISO8859-7",	RTL_TEXTENCODING_ISO_8859_7	}, /* Greek */
-+   { "ISO8859-9",	RTL_TEXTENCODING_ISO_8859_9	}, /* Turkish */
-+   { "KOI8-R",		RTL_TEXTENCODING_KOI8_R		}, /* KOI8 */
-+   { "KOI8-U",		RTL_TEXTENCODING_KOI8_U		}, /* KOI8-U */
-+   { "SJIS",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
-+   { "US-ASCII",	RTL_TEXTENCODING_ASCII_US	}, /* US-ASCII */
-+   { "UTF-8",		RTL_TEXTENCODING_UTF8		}  /* ISO-10646/UTF-8 */
-+};
-+
-+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
- 
- static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
- 
-@@ -619,7 +677,7 @@
-     return ret;
- }
- 
-#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */
- 
- /*
-  * FIXME: the MacOS X implemetation is missing
-@@ -652,7 +710,7 @@
-     return 0;
- }
- 
-#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -685,6 +743,7 @@
-     { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-     { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-     { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-+    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-     { "pck",          RTL_TEXTENCODING_MS_932      },
- #if (0)
-     { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
-@@ -888,6 +947,6 @@
-     return 0;
- }
- 
-#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */
- 
- 
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c
@ -1,14 +0,0 @@
--- sal/osl/unx/pipe.c.orig	Mon Feb 18 13:48:55 2002
-+++ sal/osl/unx/pipe.c	Wed Apr  3 00:59:15 2002
-@@ -264,7 +264,11 @@
-     
- 	addr.sun_family = AF_UNIX;
- 	strncpy(addr.sun_path, name, sizeof(addr.sun_path));
-+#if defined(FREEBSD)
-+	 len = SUN_LEN(&addr);
-+#else
- 	len = sizeof(addr);
-+#endif
- 
- 	if ( Options & osl_Pipe_CREATE )
- 	{			
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
@ -1,20 +0,0 @@
--- sal/osl/unx/process.c.orig	Wed Jun  5 16:24:42 2002
-+++ sal/osl/unx/process.c	Wed Jan 15 01:25:17 2003
-@@ -222,7 +222,7 @@
- 	/* Memory layout of CMD_ARG_PRG:
-        progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
- 
-#if !defined(NETBSD)
-+#if !defined(NETBSD) && !defined(FREEBSD)
- 	extern sal_Char*  CMD_ARG_PRG;
- #endif
- 	extern sal_Char** CMD_ARG_ENV;
-@@ -862,7 +862,7 @@
- 
- 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
-#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- 			unsetenv("HOME");
- #else
- 			putenv("HOME=");
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c
@ -1,20 +0,0 @@
--- sal/osl/unx/socket.c.orig	Sun Mar 17 12:46:37 2002
-+++ sal/osl/unx/socket.c	Wed Apr  3 01:01:14 2002
-@@ -82,7 +82,7 @@
- #undef HAVE_POLL_H
- #endif
- 
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
- #include <sys/poll.h>
- #define HAVE_POLL_H
- #endif /* HAVE_POLL_H */
-@@ -1965,7 +1965,7 @@
- /*****************************************************************************/
- oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
- {
-#ifdef LINUX
-+#ifdef LINUX || defined(FREEBSD)
- 	socklen_t AddrLen;
- #else
- 	/* mfe: Solaris 'cc +w' means Addrlen should be signed! */
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c
@ -1,137 +0,0 @@
--- sal/osl/unx/system.c.orig	Tue Aug 20 08:49:46 2002
-+++ sal/osl/unx/system.c	Sat Apr 19 22:15:25 2003
-@@ -74,7 +74,8 @@
- static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
- 
- /* struct passwd differs on some platforms */
-#if defined NETBSD || defined MACOSX || defined FREEBSD
-+#if defined NETBSD || defined MACOSX || \
-+	(defined FREEBSD && (__FreeBSD_version < 500112))
- #include <pwd.h>
- #include <sys/types.h>
- 
-@@ -203,6 +204,73 @@
- }
- #endif
- 
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+           size_t buflen, struct passwd **result)
-+{
-+  struct passwd* res;
-+
-+  pthread_mutex_lock(&getrtl_mutex);
-+
-+  if ( res = getpwuid(uid) )
-+  {
-+    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-+
-+    pw_name = strlen(res->pw_name)+1;
-+    pw_passwd = strlen(res->pw_passwd)+1;
-+    pw_class = strlen(res->pw_class)+1;
-+    pw_gecos = strlen(res->pw_gecos)+1;
-+    pw_dir = strlen(res->pw_dir)+1;
-+    pw_shell = strlen(res->pw_shell)+1;
-+
-+    if (pw_name+pw_passwd+pw_class+pw_gecos
-+                                 +pw_dir+pw_shell < buflen)
-+    {
-+      memcpy(pwd, res, sizeof(struct passwd));
-+
-+      strncpy(buffer, res->pw_name, pw_name);
-+      pwd->pw_name = buffer;
-+      buffer += pw_name;
-+
-+      strncpy(buffer, res->pw_passwd, pw_passwd);
-+      pwd->pw_passwd = buffer;
-+      buffer += pw_passwd;
-+
-+      strncpy(buffer, res->pw_class, pw_class);
-+      pwd->pw_class = buffer;
-+      buffer += pw_class;
-+
-+      strncpy(buffer, res->pw_gecos, pw_gecos);
-+      pwd->pw_gecos = buffer;
-+      buffer += pw_gecos;
-+
-+      strncpy(buffer, res->pw_dir, pw_dir);
-+      pwd->pw_dir = buffer;
-+      buffer += pw_dir;
-+
-+      strncpy(buffer, res->pw_shell, pw_shell);
-+      pwd->pw_shell = buffer;
-+      buffer += pw_shell;
-+
-+      *result = pwd ;
-+      res = 0 ;
-+
-+    } else {
-+
-+      res = ENOMEM ;
-+
-+    }      
-+  
-+  } else {
-+
-+    res = errno ;
-+ 
-+  } 
-+
-+  pthread_mutex_unlock(&getrtl_mutex);
-+
-+  return res;
-+}
-+
- struct tm *localtime_r(const time_t *timep, struct tm *buffer)
- {
- 	struct tm* res;
-@@ -712,3 +780,50 @@
- }
- #endif
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+char *fcvt(double value, int ndigit, int *decpt, int *sign)
-+{
-+  static char ret[256];
-+  char buf[256],zahl[256],format[256]="%";
-+  char *v1,*v2;
-+ 
-+  if (value==0.0) value=1e-30;
-+  
-+  if (value<0.0) *sign=1; else *sign=0;
-+ 
-+  if (value<1.0) 
-+  {
-+    *decpt=(int)log10(value); 
-+	value*=pow(10.0,1-*decpt);
-+	ndigit+=*decpt-1;
-+	if (ndigit<0) ndigit=0;
-+  }
-+  else 
-+  {
-+    *decpt=(int)log10(value)+1;
-+  }
-+  
-+  sprintf(zahl,"%d",ndigit);
-+  strcat(format,zahl);
-+  strcat(format,".");
-+  strcat(format,zahl);
-+  strcat(format,"f");
-+  
-+  sprintf(buf,format,value);
-+  
-+  if (ndigit!=0)
-+  {
-+    v1=strtok(buf,".");
-+    v2=strtok(NULL,".");
-+	strcpy(ret,v1);
-+    strcat(ret,v2);
-+  }
-+  else
-+  {
-+    strcpy(ret,buf);
-+  }
-+    
-+  return(ret);
-+}
-+
-+#endif
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h
@ -1,57 +0,0 @@
--- sal/osl/unx/system.h.orig	Tue Aug 20 15:54:55 2002
-+++ sal/osl/unx/system.h	Thu May  8 20:31:08 2003
-@@ -203,12 +203,19 @@
- #   include <dlfcn.h>
- #   include <sys/filio.h>
- #   include <sys/ioctl.h>
-+#   include <sys/param.h>
- #   include <sys/time.h>
- #   include <sys/uio.h>
-+#   include <sys/exec.h>
-+#   include <vm/vm.h>
-+#   include <vm/vm_param.h>
-+#   include <vm/pmap.h>
-+#   include <vm/swap_pager.h>
- #	include <sys/un.h>
- #   include <netinet/tcp.h>
- #	define 	IORESOURCE_TRANSFER_BSD 
- #   include <machine/endian.h>
-+#ifdef __FreeBSD_version < 500000
- #   if BYTE_ORDER == LITTLE_ENDIAN
- #   	define _LITTLE_ENDIAN
- #   elif BYTE_ORDER == BIG_ENDIAN
-@@ -216,12 +223,14 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
-#   define  sched_yield() 				pthread_yield()
-#   define  pthread_testcancel()
-+#endif
- #	define  NO_PTHREAD_RTL
-#	define  NO_PTHREAD_PRIORITY
-#	define  CMD_ARG_PRG					__progname		
-#	define  CMD_ARG_ENV					environ
-+/* __progname isn't sufficient here. We need the full path as well 
-+ * for e.g. setup and __progname only points to the binary name. 
-+ */
-+#	define  CMD_ARG_PRG_IS_DEFINED
-+#	define  CMD_ARG_PRG			*((struct ps_strings *)PS_STRINGS)->ps_argvstr
-+#	define  CMD_ARG_ENV			environ
- #endif
- 
- #ifdef SCO
-@@ -569,12 +578,14 @@
- #endif
- 
- #ifdef NO_PTHREAD_RTL
-+#if !defined FREEBSD || (__FreeBSD_version < 500112)
- struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
- extern struct spwd *getspnam_r(const char *name, struct spwd *result,
- 							   char *buffer, int buflen);
- 
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
-+#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
- struct hostent *gethostbyname_r(const char *name, struct hostent *result,
- 								char *buffer, int buflen, int *h_errnop);
- #endif
--- a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c
+++ b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c
@ -1,19 +0,0 @@
--- sal/rtl/source/strtmpl.c.orig	Mon Mar 11 01:28:38 2002
-+++ sal/rtl/source/strtmpl.c	Mon Mar 11 01:30:42 2002
-@@ -1104,10 +1104,12 @@
-         }
-         else if ( *pStr == '+' )
-         {
-            if ( bExp && (nExp != 0) )
-                break;
-            if ( fRet != 0.0 )
-                break;
-+		if ( bExp ) {
-+			if ( nExp != 0 )
-+				break;
-+			}
-+		else if ( fRet != 0.0 )
-+			break;
-         }
-         /* Exponent separator */
-         else if ( (*pStr == 'e') || (*pStr == 'E') )
--- a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab
+++ b/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab
@ -1,173 +0,0 @@
--- sal/textenc/tcvtest1.tab.orig	Fri Oct 12 13:44:53 2001
-+++ sal/textenc/tcvtest1.tab	Tue Feb 25 16:47:50 2003
-@@ -4328,3 +4328,170 @@
-         "koi8-r",
-         RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-     /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
-+
-+/* ======================================================================= */
-+
-+/* KOI8_U */
-+/* Standard Charset for Ukrainian Cyrillic */
-+/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
-+/* Convert-Tables: typed per hand */
-+/* Last-Changes from us: */
-+
-+#define KOI8UUNI_START                  0x80
-+#define KOI8UUNI_END                    0xFF
-+static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] =
-+{
-+/*       0       1       2       3       4       5       6       7 */
-+/*       8       9       A       B       C       D       E       F */
-+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */
-+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */
-+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */
-+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */
-+    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */
-+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */
-+    0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */
-+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */
-+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */
-+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */
-+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */
-+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */
-+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */
-+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */
-+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */
-+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A  /* 0xF0 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UCHAR_START                 0x0410
-+#define KOI8UCHAR_END                   0x044F
-+static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] =
-+{
-+/*     0     1     2     3     4     5     6     7 */
-+/*     8     9     A     B     C     D     E     F */
-+    0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */
-+    0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */
-+    0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */
-+    0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */
-+    0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */
-+    0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */
-+    0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */
-+    0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1  /* 0x0440 */
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+#define KOI8UTOCHARTABEX_COUNT          72
-+static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] =
-+{
-+  { 0x00A0, 0x9A },
-+  { 0x00A9, 0xBF },
-+  { 0x00B0, 0x9C },
-+  { 0x00B2, 0x9D },
-+  { 0x00B7, 0x9E },
-+  { 0x00F7, 0x9F },
-+  { 0x0401, 0xB3 },
-+  { 0x0404, 0xB4 },
-+  { 0x0406, 0xB6 },
-+  { 0x0407, 0xB7 },
-+  { 0x0451, 0xA3 },
-+  { 0x0454, 0xA4 },
-+  { 0x0456, 0xA6 },
-+  { 0x0457, 0xA7 },
-+  { 0x0490, 0xBD },
-+  { 0x0491, 0xAD },
-+  { 0x2219, 0x95 },
-+  { 0x221A, 0x96 },
-+  { 0x2248, 0x97 },
-+  { 0x2264, 0x98 },
-+  { 0x2265, 0x99 },
-+  { 0x2320, 0x93 },
-+  { 0x2321, 0x9B },
-+  { 0x2500, 0x80 },
-+  { 0x2502, 0x81 },
-+  { 0x250C, 0x82 },
-+  { 0x2510, 0x83 },
-+  { 0x2514, 0x84 },
-+  { 0x2518, 0x85 },
-+  { 0x251C, 0x86 },
-+  { 0x2524, 0x87 },
-+  { 0x252C, 0x88 },
-+  { 0x2534, 0x89 },
-+  { 0x253C, 0x8A },
-+  { 0x2550, 0xA0 },
-+  { 0x2551, 0xA1 },
-+  { 0x2552, 0xA2 },
-+  { 0x2553, 0xA4 },
-+  { 0x2554, 0xA5 },
-+  { 0x2555, 0xA6 },
-+  { 0x2556, 0xA7 },
-+  { 0x2557, 0xA8 },
-+  { 0x2558, 0xA9 },
-+  { 0x2559, 0xAA },
-+  { 0x255A, 0xAB },
-+  { 0x255B, 0xAC },
-+  { 0x255C, 0xAD },
-+  { 0x255D, 0xAE },
-+  { 0x255E, 0xAF },
-+  { 0x255F, 0xB0 },
-+  { 0x2560, 0xB1 },
-+  { 0x2561, 0xB2 },
-+  { 0x2562, 0xB4 },
-+  { 0x2563, 0xB5 },
-+  { 0x2564, 0xB6 },
-+  { 0x2565, 0xB7 },
-+  { 0x2566, 0xB8 },
-+  { 0x2567, 0xB9 },
-+  { 0x2568, 0xBA },
-+  { 0x2569, 0xBB },
-+  { 0x256A, 0xBC },
-+  { 0x256B, 0xBD },
-+  { 0x256C, 0xBE },
-+  { 0x2580, 0x8B },
-+  { 0x2584, 0x8C },
-+  { 0x2588, 0x8D },
-+  { 0x258C, 0x8E },
-+  { 0x2590, 0x8F },
-+  { 0x2591, 0x90 },
-+  { 0x2592, 0x91 },
-+  { 0x2593, 0x92 },
-+  { 0x25A0, 0x94 }
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplByteConvertData const aImplKOI8UByteCvtData =
-+{
-+    aImplKOI8UToUniTab,
-+    NULL,
-+    KOI8UUNI_START, KOI8UUNI_END,
-+    NOTABUNI_START, NOTABUNI_END,
-+    aImplKOI8UToCharTab,
-+    NULL,
-+    aImplKOI8UToCharTabEx,
-+    KOI8UCHAR_START, KOI8UCHAR_END,
-+    NOTABCHAR_START, NOTABCHAR_END,
-+    KOI8UTOCHARTABEX_COUNT
-+};
-+
-+/* ----------------------------------------------------------------------- */
-+
-+static ImplTextEncodingData const aImplKOI8UTextEncodingData
-+    = { { &aImplKOI8UByteCvtData,
-+          ImplCharToUnicode,
-+          ImplUnicodeToChar,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL,
-+          NULL },
-+        RTL_TEXTENCODING_KOI8_U,
-+        1,
-+        1,
-+        1,
-+        204,
-+        "koi8-u",
-+        "koi8-u",
-+        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
-+    /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
--- a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
+++ b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c
@ -1,37 +0,0 @@
--- sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
-+++ sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
-@@ -532,6 +532,7 @@
-     static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
-     {
-         { "r", RTL_TEXTENCODING_KOI8_R },
-+        { "u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -695,6 +695,10 @@
-     /* characters. The function search for the first equal string in */
-     /* the table. In this table are only the most used mime types. */
-     /* Sort order: important */
-+
-+    if (pMimeCharset == NULL)
-+	pMimeCharset = "usascii";
-+
-     static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
-     {
-         { "usascii", RTL_TEXTENCODING_ASCII_US },
-@@ -741,6 +742,7 @@
-         { "windows1256", RTL_TEXTENCODING_MS_1256 },
-         { "windows1257", RTL_TEXTENCODING_MS_1257 },
-         { "windows1258", RTL_TEXTENCODING_MS_1258 },
-+        { "koi8u", RTL_TEXTENCODING_KOI8_U },
-         { NULL, RTL_TEXTENCODING_DONTKNOW }
-     };
- 
-@@ -815,6 +817,7 @@
-         { "iso10646us", RTL_TEXTENCODING_ASCII_US },
-         { "iso646irv", RTL_TEXTENCODING_ASCII_US },
-         { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
-+        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
-         { "ibm437", RTL_TEXTENCODING_IBM_437 },
-         { "cp437", RTL_TEXTENCODING_IBM_437 },
-         { "437", RTL_TEXTENCODING_IBM_437 },
--- a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c
+++ b/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c
@ -1,12 +0,0 @@
--- sal/textenc/textenc.c.orig	Mon Feb 24 17:46:29 2003
-+++ sal/textenc/textenc.c	Tue Feb 25 16:51:28 2003
-@@ -254,7 +254,8 @@
-             &aImplJISX0212TextEncodingData, /* JIS_X_0212 */
-             &aImplMS1361TextEncodingData, /* MS_1361 */
-             &aImplGb18030TextEncodingData, /* GB_18030 */
-            &aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */
-+            &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
-+            &aImplKOI8UTextEncodingData }; /* KOI8_U */
-     OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW
-                && nEncoding <= RTL_TEXTENCODING_UNICODE,
-                "specification violation");
--- a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
@ -1,29 +0,0 @@
--- sal/workben/makefile.mk.orig	Tue May 15 14:11:20 2001
-+++ sal/workben/makefile.mk	Sun Mar 10 23:46:59 2002
-@@ -113,7 +113,7 @@
- 
- .IF "$(TESTAPP)" == "salstattest"
- 
-	CFLAGS+= /DUSE_SAL_STATIC
-+	CFLAGS+= -DUSE_SAL_STATIC
- 
- 	OBJFILES=	$(OBJ)$/salstattest.obj
- 
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- 
- CXXFILES=	tgetpwnam.cxx
- OBJFILES=	$(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN=	$(SLB)$/sal.lib
- 
-.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd | freebsd)
- .ENDIF # tgetpwname
- 
- # --- Targets ------------------------------------------------------
--- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
+++ b/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map
@ -1,31 +0,0 @@
--- /dev/null	Thu Jun  6 20:06:24 2002
-+++ salhelper/source/gcc2_freebsd_intel.map	Thu Jun  6 20:02:18 2002
-@@ -0,0 +1,28 @@
-+SALHLP_1_0 {
-+global:
-+GetVersionInfo;
-+_._Q28salhelper18ORealDynamicLoader;
-+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4;
-+__tfQ29salhelper18ORealDynamicLoader;
-+__tiQ29salhelper18ORealDynamicLoader;
-+__vt_Q29salhelper18ORealDynamicLoader;
-+_fini;
-+_init;
-+acquire__Q29salhelper18ORealDynamicLoader;
-+getApi__CQ29salhelper18ORealDynamicLoader;
-+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2;
-+release__Q29salhelper18ORealDynamicLoader;
-+_._Q29salhelper21SimpleReferenceObject;
-+__Q29salhelper21SimpleReferenceObject;
-+__dl__Q29salhelper21SimpleReferenceObjectPv;
-+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t;
-+__nw__Q29salhelper21SimpleReferenceObjectUi;
-+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t;
-+__tfQ29salhelper21SimpleReferenceObject;
-+__tiQ29salhelper21SimpleReferenceObject;
-+__vt_Q29salhelper21SimpleReferenceObject;
-+acquire__Q29salhelper21SimpleReferenceObject;
-+release__Q29salhelper21SimpleReferenceObject;
-+local:
-+*;
-+};
--- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
+++ b/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map
@ -1,34 +0,0 @@
--- /dev/null	Thu Jun  6 20:06:34 2002
-+++ salhelper/source/gcc3_freebsd_intel.map	Thu Jun  6 20:02:29 2002
-@@ -0,0 +1,31 @@
-+UDK_3_0_0 {
-+	global:
-+GetVersionInfo;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_;
-+_ZN9salhelper18ORealDynamicLoader7acquireEv;
-+_ZN9salhelper18ORealDynamicLoader7releaseEv;
-+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_;
-+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_;
-+_ZN9salhelper18ORealDynamicLoaderD0Ev;
-+_ZN9salhelper18ORealDynamicLoaderD1Ev;
-+_ZN9salhelper18ORealDynamicLoaderD2Ev;
-+_ZN9salhelper21SimpleReferenceObjectD0Ev;
-+_ZN9salhelper21SimpleReferenceObjectD1Ev;
-+_ZN9salhelper21SimpleReferenceObjectD2Ev;
-+_ZN9salhelper21SimpleReferenceObjectdlEPv;
-+_ZN9salhelper21SimpleReferenceObjectnwEj;
-+_ZNK9salhelper18ORealDynamicLoader6getApiEv;
-+_ZTVN9salhelper18ORealDynamicLoaderE;
-+_ZTVN9salhelper21SimpleReferenceObjectE;
-+__bss_start;
-+_edata;
-+_end;
-+_fini;
-+_init;
-+component_getDescriptionFunc;
-+	local:
-+		*;
-+};
-+
--- a/Show More
+++ b/Show More