First step to make this port working. Configure works and all patches

apply now. There are still some compile errors to fix. As you may see the patchnames are very long, but that makes maintaining patches a lot easier.
author: Martin Blapp <mbr@FreeBSD.org> 2002-10-18 22:41:42 +0000
committer: Martin Blapp <mbr@FreeBSD.org> 2002-10-18 22:41:42 +0000
commit: 5f6e7f6949fe1fba17b53a04af5b465f19b9b17d (patch)
tree: 336b116c7090225344e575c81b023f12aef39c5b /editors/openoffice.org-2-devel
parent: * add 2 missing man pages (diff)
179 files changed, 2246 insertions, 6483 deletions
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 612c5bb7d2fd..f372ca18c6e4 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -6,81 +6,289 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	642
-CATEGORIES=	editors
-MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
-		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
-		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
-EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
+PORTVERSION=	643
+CATEGORIES+=	editors
+MASTER_SITES+=	http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
+		http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,developer/%SUBDIR%,misc/openoffice/&,} \
+		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
+		http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \
+		http://people.freebsd.org/~mbr/ooo/:moz
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+DISTFILES+=	oo_${PORTVERSION}_src.tar.bz2 \
+		gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz
+.if defined(L10NHELP)
+DISTFILES+=	${L10NHELP:S/$/:help/}
+.endif
 
-MAINTAINER=	openoffice@FreeBSD.org
+SORT?=	/usr/bin/sort
+FIND?=	/usr/bin/find
+CUT?=	/usr/bin/cut
+AWK?=	/usr/bin/awk
+GREP?=	/usr/bin/grep
+MOUNT?=	/sbin/mount
+ZIP?=	${PREFIX}/bin/zip
+UNZIP?=	${PREFIX}/bin/unzip
+TCSH?=	/bin/tcsh
+
+.include <bsd.port.pre.mk>
 
-# OO needs DISPLAY to be set and working
-RESTRICTED=	"No automated build possible"
+PROCFS!=		${MOUNT} | ${GREP} ^procfs | ${AWK} '{print $1}'
+INSTALLATION_BASEDIR=	OpenOffice.org1.0
+DIST_SUBDIR=		openoffice
+DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
+#
+# configuration for language specific slave ports
+#
+.if !defined(LANG_EXT)
+LANG_EXT=01
+.else
+#
+# Add pkg-comment and pkg-descr if available
+#
+.if exists(${.CURDIR}/pkg-comment)
+COMMENT=	${.CURDIR}/pkg-comment
+.endif
+.if exists(${.CURDIR}/pkg-descr)
+DESCR=	${.CURDIR}/pkg-descr
+.endif
+#
+# Set prefix and suffix
+#
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=	${LANG_PKGNAME}-
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX=	-${LANG_SUFFIX}
+.endif
+.endif # if defined(LANG_PKGNAME)
+#
+# LANG_CONFIGURE_ARG is missing for the german port
+#
+.if defined(LANG_EXT) && ${LANG_EXT}!=49
+CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
+.endif
+.endif
+
+.if ${OSVERSION} < 500000
+#
+# OO build is broken with the system gcc on STABLE.
+#
+USE_GCC=3.1
+.else
+.endif
+
+.if ${OSVERSION} > 500000
+#
+# OO is still broken with the system gcc on CURRENT.
+#
+.if defined(USE_GCC) && ${USE_GCC} == 3.2
+BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+CC=		gcc32
+CXX=		g++32
+.endif
+.endif
+
+EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
+
+MAINTAINER=	openoffice@FreeBSD.org
+.if !defined(USE_GCC)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295
+.endif
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
-
-BROKEN=		'Work in progress -- does not build yet till the end'
+BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+.if !defined(DISPLAY)
+BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+.endif
 
-USE_XLIB=	yes
+USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
+
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
+EXTRACT_REST=	gpc231.tar.Z
 
-GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
-WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
+WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
+LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
+LD_PATH=	${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/
+.if defined(WITH_DEBUG)
+CFLAGS+=	-g
+.if ${WITH_DEBUG} == 2
+BUILD=		dmake debug="true"
+.else
+BUILD=		dmake
+.endif
+.else
+BUILD=		dmake strip="true"
+.endif
 
-CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX} \
-			--with-jdk-home=${JDK13DIR} \
-			--with-os-version=${OSVERSION}
+.if !defined(DISPLAY)
+DISPLAYHACK=localhost:1001
+.endif
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-			PTHREAD_LIBS=${PTHREAD_LIBS} \
-			CC=gcc295 \
-			CXX=g++295
+			PTHREAD_LIBS=${PTHREAD_LIBS}
 
-MAKE_ENV=		CC=${CC} CFLAGS=${CFLAGS}
+CONFIGURE_ARGS+=	--with-jdk-home=${JDK13DIR} \
+			--with-os-version=${OSVERSION} \
+			--with-ant-home=${LOCALBASE}/jakarta-ant-1.5.1
 
-.include <bsd.port.pre.mk>
+.if !defined(USE_GCC)
+CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX}
+.endif
+
+.if defined(WITH_DEBUG)
+.if ${WITH_DEBUG} == 2
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+.endif
+
+.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
+CONFIGURE_ARGS+=	--enable-gcc3
+.endif
+
+.if ${OSVERSION} > 500000 && !defined(USE_GCC)
+CONFIGURE_ARGS+=	--enable-gcc3
+.endif
 
 pre-fetch:
-.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
-	@ ${ECHO}
-	@ ${ECHO} Openoffice requires gcc 2.95.2 or better
-	@ ${ECHO}
-	@ ${FALSE}
+	@${ECHO}
+	@${ECHO} "REQUIREMENTS:"
+.if ${PROCFS}
+	@${ECHO}
+	@${ECHO} Check if procfs is running: YES
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${ECHO}
+	@${ECHO} OpenOffice setup still needs a running procfs, which may
+	@${ECHO} not be activated. Please read the procfs\(5\) manpage and
+	@${ECHO} ensure the the following line is in /etc/fstab:
+	@${ECHO}
+	@${ECHO} proc /proc procfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+.endif
+.if !defined(USE_GCC) || !defined(WITH_DEBUG)
+	@${ECHO}
+	@${ECHO} "OPTIONS:"
+.endif
+.if !defined(USE_GCC)
+	@${ECHO}
+	@${ECHO} "You can compile OO with different"
+	@${ECHO} "gcc compiler versions:"
+	@${ECHO}
+	@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
+	@${ECHO} "to compile openoffice with your"
+	@${ECHO} "prefered compiler."
+.endif
+.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 ${OSVERSION} < 500031
+.if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
-	@${ECHO} OS-VERSION ${OSVERSION}
+	@${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} Openoffice depends on OS-Fixes which are
-	@${ECHO} not yet available.
+	@${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
+.if ${OSVERSION} < 450002
+	@${ECHO}
+	@${ECHO} "OS-VERSION ${OSVERSION} too low"
+	@${ECHO}
+	@${ECHO} "OO need some important libc_r and"
+	@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
+	@${ECHO} "RELEASE or 4.6 STABLE."
 	@${FALSE}
 .endif
-
-pre-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
-	@ ${ECHO}
-	@ ${ECHO} Can\'t open display:
-	@ ${ECHO} Please check your DISPLAY variable.
-	@ ${ECHO}
-	@ ${FALSE}
+	@${ECHO}
+	@${ECHO} "NOTICE:"
+	@${ECHO}
+	@${ECHO} "To build Openoffice, you should have a lot"
+.if defined(WITH_DEBUG)
+	@${ECHO} "of free diskspace (~ 8GB)."
+.else
+	@${ECHO} "of free diskspace (~ 4GB)."
+.endif
+	@${ECHO}
+.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
+    (${OSVERSION} < 500000 && !defined(USE_GCC))
+	@${ECHO} "KERNEL CONFIGURATION:"
+	@${ECHO}
+	@${ECHO} "Openoffice needs a larger stack- and"
+	@${ECHO} "datasize to build. Check your limit"
+	@${ECHO} "settings and and put this in /boot/loader.conf"
+	@${ECHO} "if neccessary:"
+	@${ECHO}
+	@${ECHO} "kern.maxdsiz=\"1073741824\""
+	@${ECHO} "kern.maxssiz=\"268435456\""
+.endif
+	@${ECHO}
+	@${ECHO} "REQUIRED SYSTEM PATCHES:"
+	@${ECHO}
+	@${ECHO} "OO.org can crash if you enter a non existing path"
+	@${ECHO} "or URL in the location bar. To fix these crashes"
+	@${ECHO} "you need a uncommitted system patch for rtld:"
+	@${ECHO}
+	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
+	@${ECHO}
+.if ${OSVERSION} < 460001
+	@${ECHO}
+	@${ECHO} "OO setup is broken on STABLE < 4.6"
+	@${ECHO} "including 4.6 RELEASE."
+	@${ECHO} "You'll need a system patch to solve"
+	@${ECHO} "this problem:"
+	@${ECHO}
+	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
+	@${ECHO}
+.endif
+.if ${OSVERSION} < 460002
+	@${ECHO}
+	@${ECHO} "OO.org soffice binary can deadlock. You can work around"
+	@${ECHO} "this problem with this patch:"
+	@${ECHO}
+	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
+	@${ECHO}
+.endif
+.if ${OSVERSION} < 500000
+	@${ECHO}
+	@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
+	@${ECHO} "this problem with this patch:"
+	@${ECHO}
+	@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
+	@${ECHO}
+.endif
+.if !exists(/usr/include/langinfo.h)
+	@${ECHO}
+	@${ECHO} "langinfo.h is missing !"
+	@${ECHO}
+	@${ECHO} "Please upgrade to 4.6 RELEASE or"
+	@${ECHO} "4.6 STABLE."
+	@${ECHO}
+	@${FALSE}
 .endif
 
 post-extract:
@@ -92,22 +300,221 @@ post-extract:
 			exit 1; \
 		fi \
 	done
-	${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
-	${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
-	${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
+	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
+	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
+	@${MAKE} extract-mozilla
+	@-${RM} ${WRKSRC}/../moz/zipped/*.zip
+.if defined(L10NHELP)
+	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
+	@${MKDIR} ${WRKDIR}/L10NHELP
+	@cd ${WRKDIR}/L10NHELP && \
+	    ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
+.endif
 
 post-patch:
+	@${MAKE} patch-mozilla
+.if defined(WITH_TTF_BYTECODE_ENABLED)
+	@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
+		${ECHO_MSG} "===>  Applying additional TTF bytecode patches for ${PKGNAME}" ; \
+		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+			${ECHO_MSG} "===>   Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
+		fi; \
+		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype::patch ; \
+	fi
+.endif
+.if defined(WITH_DEBUG)
+	@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
+		${ECHO_MSG} "===>  Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
+		PATCHES_APPLIED="" ; \
+		for i in ${PATCHDIR}/debugpatch-*; do \
+			case $$i in \
+				*.orig|*.rej|*~) \
+					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
+					;; \
+				*) \
+					if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+						${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
+					fi; \
+					if ${PATCH} ${PATCH_ARGS} < $$i ; then \
+						PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
+					else \
+						${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
+						if [ x"$$PATCHES_APPLIED" != x"" ]; then \
+							${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
+						fi; \
+						${FALSE} ; \
+					fi; \
+					;; \
+			esac; \
+		done; \
+	fi;
+.endif
+	@${ECHO_MSG} "===>  Find old malloc.h defines and fix them in ${PKGNAME} source"
 	@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
 
+extract-mozilla:
+.if ! exists(${WRKDIR}/mozilla/Makefile)
+	@${ECHO_MSG} "===>  Extracting mozilla sub project"
+	@${MKDIR} ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+.endif
+	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
+
+patch-mozilla:
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
+		${WRKDIR}/mozilla/files/
+	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
+
+build-mozilla:
+.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
+	@${ECHO_MSG} "===>  Building mozilla sub project"
+.if defined(WITH_DEBUG)
+	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
+	@${SED} -e 's|--disable-debug||' \
+		-e 's|--disable-cpp-rtti||' \
+		-e 's|--enable-strip||' \
+		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
+.endif
+.if defined(USE_GCC)
+.if ${USE_GCC} == 3.1
+	@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
+.else
+	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
+.endif
+.else
+	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
+.endif
+	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
+	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
+	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
+.endif
+
+install-mozilla:
+.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIinc.zip)
+	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
+	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
+	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
+.endif
+
+register-mozilla:
+.if exists(${WRKDIR}/mozilla-runtime)
+	@${RM} -rf ${WRKDIR}/mozilla-runtime
+.endif
+	@${MKDIR} ${WRKDIR}/mozilla-runtime
+	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
+	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
+	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
+	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
+	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
+		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
+	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
+		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
+	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
+	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
+		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
+
+mozilla:
+	@${MAKE} extract-mozilla
+	@${MAKE} patch-mozilla
+	@${MAKE} build-mozilla
+	@${MAKE} register-mozilla
+	@${MAKE} install-mozilla
+
 do-build:
+.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIinc.zip)
+	@${MAKE} mozilla
+.endif
+.if exists(${WRKDIR}/.Xvfb.pid)
+	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
+	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.endif
+.if !defined(DISPLAY)
+	#
+	# This is a UGLY hack to not have to specify a X-Display.
+	#
+	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+	@sleep 5
+.endif
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+.if defined(L10NHELP)
+	@${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck 
+	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck
+.endif
+.if !defined(DISPLAY)
+	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
+		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
+	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.else
+	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
+		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
+.endif
+.if defined(LANG_PKGNAME)
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
-		tcsh -c 'source FreeBSDEnv.Set && dmake'
+		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANGEXT}'
+.endif
+
+pre-install:
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
+	   > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
 
 do-install:
-	@cd ${WRKSRC}/.. && ./setup -r:oo_setup.resp
+.if !defined(DISPLAY)
+	#
+	# UGLY hack to not have to specify a X-Display.
+	#
+	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+	@sleep 5
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
+		TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+	@-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill
+	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.else
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
+		TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
+		${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
+.endif
+
+install-user:
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
+
+post-install:
+	@${ECHO_MSG} "===>  Add wrapper scripts";
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/openoffice-wrapper \
+	   > ${WRKDIR}/openoffice
+	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
+	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
+	@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
+	@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
+	@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
+	@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}
+
+package-rename:
+	@${ECHO_MSG} "===>   Rename package for OO.org mirror upload";
+.if defined(LANG_SUFFIX)
+	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
+	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
+.else
+	@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
+	    ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 81e3a3a4781e..dd30c26961d7 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,3 +1,9 @@
-MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
-MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
+MD5 (openoffice/oo_643_src.tar.bz2) = 53c3a72acab3af71fae8c169d5224c21
+MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
+MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
+MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
+MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
+MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
+MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-setup2::mow::source::loader::loader.c b/editors/openoffice.org-2-devel/files/debugpatch-setup2::mow::source::loader::loader.c
new file mode 100644
index 000000000000..96c651ce22c8
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/debugpatch-setup2::mow::source::loader::loader.c
@@ -0,0 +1,21 @@
+--- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
++++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
+@@ -902,6 +902,7 @@
+ 
+ void KillSetupDir()
+ {
++#if 0
+     DIR* pDir = opendir( strTmpPath );
+     struct dirent* pFile;
+ 
+@@ -915,6 +916,10 @@
+ 
+     chdir( strInitPath );
+     rmdir( strTmpPath );
++#else
++	fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
++	strTmpPath);
++#endif
+ }
+ 
+ void makeSymLink( char* s )
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-2-devel/files/debugpatch-solenv::inc::unxfbsdi.mk
new file mode 100644
index 000000000000..52bd2b3d58d6
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/debugpatch-solenv::inc::unxfbsdi.mk
@@ -0,0 +1,18 @@
+--- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
++++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
+@@ -25,12 +25,12 @@
+ .ENDIF
+ 
+ # flags for C and C++ Compiler
+-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
+ CFLAGS+=-I/usr/X11R6/include
+ 
+ # flags for the C++ Compiler
+-CFLAGSCC=-pipe
+-CFLAGSCXX=-pipe -fno-for-scope -fpermissive
++CFLAGSCC=-g -ggdb -pipe
++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+ 
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions
diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp
new file mode 100644
index 000000000000..8eeeb11bd95e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/oo_setup.resp
@@ -0,0 +1,7 @@
+[Environment]
+InstallationMode = INSTALL_NETWORK
+InstallationType = STANDARD
+DestinationPath = %%PREFIX%%/OpenOffice.org-643
+
+[Java]
+JavaSupport = preinstalled_or_none
diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper
new file mode 100644
index 000000000000..17aa55ae8162
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/openoffice-wrapper
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.1 2002-10-18 22:41:29 mbr Exp $
+
+oopath=%%PREFIX%%/OpenOffice.org1.0/program/
+program=`echo $0 | sed -e 's|.*-||'`
+
+case $program in
+$0)
+	exec $oopath/soffice "$@"
+	;;
+	*)
+	exec $oopath/$program "$@"
+	;;
+esac
diff --git a/editors/openoffice.org-2-devel/files/optpatch-freetype::patch b/editors/openoffice.org-2-devel/files/optpatch-freetype::patch
new file mode 100644
index 000000000000..b426a8fb7fcc
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/optpatch-freetype::patch
@@ -0,0 +1,208 @@
+Index: files/patch-freetype::patch
+===================================================================
+RCS file: files/patch-freetype::patch
+diff -N files/patch-freetype::patch
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ files/patch-freetype::patch	4 Aug 2002 15:27:42 -0000
+@@ -0,0 +1,201 @@
++diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
++--- ../freetype/freetype-2.0.5.patch	Fri Apr  5 21:07:34 2002
+++++ ../freetype/freetype-2.0.5.patch	Sat Mar  9 18:04:17 2002
++@@ -1,118 +1,79 @@
++-*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 14 00:44:33 2000
++---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Nov  7 16:11:47 2001
++-***************
++-*** 63,69 ****
++-  #   ANSI compliance.
++-  #
++-  ifndef CFLAGS
++-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
++-  endif
++-  
++-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
++---- 63,69 ----
++-  #   ANSI compliance.
++-  #
++-  ifndef CFLAGS
++-!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
++-  endif
++-  
++-  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
++-*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 19:36:17 2001
++---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Nov  7 16:11:47 2001
++-***************
++-*** 631,637 ****
++-      if test "$build_old_libs" = yes; then
++-        if test "$pic_mode" != yes; then
++-  	# Don't build PIC code
++-! 	command="$base_compile $srcfile"
++-        else
++-  	# All platforms use -DPIC, to notify preprocessed assembler code.
++-  	command="$base_compile $srcfile $pic_flag -DPIC"
++---- 631,637 ----
++-      if test "$build_old_libs" = yes; then
++-        if test "$pic_mode" != yes; then
++-  	# Don't build PIC code
++-! 	command="$base_compile $srcfile -DPIC $pic_flag"
++-        else
++-  	# All platforms use -DPIC, to notify preprocessed assembler code.
++-  	command="$base_compile $srcfile $pic_flag -DPIC"
++-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 18:25:21 2001
++---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Nov  7 16:11:47 2001
++-***************
++-*** 1,7 ****
++---- 1,9 ----
++-  FT_USE_MODULE(autohint_module_class)
++-  FT_USE_MODULE(cff_driver_class)
++-  FT_USE_MODULE(t1cid_driver_class)
++-+ /*
++-  FT_USE_MODULE(pcf_driver_class)
++-+ */
++-  FT_USE_MODULE(psaux_module_class)
++-  FT_USE_MODULE(psnames_module_class)
++-  FT_USE_MODULE(ft_raster1_renderer_class)
++-***************
++-*** 9,12 ****
++---- 11,16 ----
++-  FT_USE_MODULE(ft_smooth_renderer_class)
++-  FT_USE_MODULE(tt_driver_class)
++-  FT_USE_MODULE(t1_driver_class)
++-+ /*
++-  FT_USE_MODULE(winfnt_driver_class)
++-+ */
++-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 10:50:45 2001
++---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Nov  7 16:11:47 2001
++-***************
++-*** 70,76 ****
++---- 70,79 ----
++-    /*   All convenience functions are declared as such in their             */
++-    /*   documentation.                                                      */
++-    /*                                                                       */
++-+ /*
++-  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
++-+ */
++-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
++-  
++-  
++-    /*************************************************************************/
++-***************
++-*** 108,116 ****
++-    /*   use a vector `plotter' format that isn't supported when this        */
++-    /*   macro is undefined.                                                 */
++-    /*                                                                       */
++-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++-  
++-- 
++-    /*************************************************************************/
++-    /*                                                                       */
++-    /* Glyph Postscript Names handling                                       */
++---- 111,121 ----
++-    /*   use a vector `plotter' format that isn't supported when this        */
++-    /*   macro is undefined.                                                 */
++-    /*                                                                       */
++-+ /*
++-  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++-+ */
++-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++-  
++-    /*************************************************************************/
++-    /*                                                                       */
++-    /* Glyph Postscript Names handling                                       */
++-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig	Mon Jan  7 14:21:35 2002
++---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Mon Jan  7 14:21:40 2002
++-***************
++-*** 2251,2257 ****
++-  	  ;;
++-  
++-  	irix)
++-! 	  major=`expr $current - $age + 1`
++-  	  verstring="sgi$major.$revision"
++-  
++-  	  # Add in all the interfaces that we are compatible with.
++---- 2251,2257 ----
++-  	  ;;
++-  
++-  	irix)
++-! 	  major=`expr $current - $age`
++-  	  verstring="sgi$major.$revision"
++-  
++-  	  # Add in all the interfaces that we are compatible with.
+++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
+++--- misc/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:47:57 2001
++++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Thu Dec 27 14:49:17 2001
+++@@ -63,7 +63,7 @@
+++ #   ANSI compliance.
+++ #
+++ ifndef CFLAGS
+++-  CFLAGS := /nologo /c /Ox /G5 /W3 /WX
++++  CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
+++ endif
+++ 
+++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
+++--- misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:47:56 2001
++++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Thu Dec 27 14:49:17 2001
+++@@ -631,7 +631,7 @@
+++     if test "$build_old_libs" = yes; then
+++       if test "$pic_mode" != yes; then
+++ 	# Don't build PIC code
+++-	command="$base_compile $srcfile"
++++	command="$base_compile $srcfile -DPIC $pic_flag"
+++       else
+++ 	# All platforms use -DPIC, to notify preprocessed assembler code.
+++ 	command="$base_compile $srcfile $pic_flag -DPIC"
+++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
+++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:47:57 2001
++++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Thu Dec 27 14:49:17 2001
+++@@ -1,7 +1,9 @@
+++ FT_USE_MODULE(autohint_module_class)
+++ FT_USE_MODULE(cff_driver_class)
+++ FT_USE_MODULE(t1cid_driver_class)
++++/*
+++ FT_USE_MODULE(pcf_driver_class)
++++*/
+++ FT_USE_MODULE(psaux_module_class)
+++ FT_USE_MODULE(psnames_module_class)
+++ FT_USE_MODULE(ft_raster1_renderer_class)
+++@@ -9,4 +11,6 @@
+++ FT_USE_MODULE(ft_smooth_renderer_class)
+++ FT_USE_MODULE(tt_driver_class)
+++ FT_USE_MODULE(t1_driver_class)
++++/*
+++ FT_USE_MODULE(winfnt_driver_class)
++++*/
+++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
+++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:47:57 2001
++++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Thu Dec 27 14:51:15 2001
+++@@ -70,7 +70,10 @@
+++   /*   All convenience functions are declared as such in their             */
+++   /*   documentation.                                                      */
+++   /*                                                                       */
++++/*
+++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
++++*/
++++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+++ 
+++ 
+++   /*************************************************************************/
+++@@ -108,8 +111,10 @@
+++   /*   use a vector `plotter' format that isn't supported when this        */
+++   /*   macro is undefined.                                                 */
+++   /*                                                                       */
++++/*
+++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+++-
++++*/
++++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+++ 
+++   /*************************************************************************/
+++   /*                                                                       */
+++@@ -338,7 +343,7 @@
+++   /* By undefining this, you will only compile the code necessary to load  */
+++   /* TrueType glyphs without hinting.                                      */
+++   /*                                                                       */
+++-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+++ 
+++ 
+++   /*************************************************************************/
diff --git a/editors/openoffice.org-2-devel/files/optpatch-vcl::util::makefile.pmk b/editors/openoffice.org-2-devel/files/optpatch-vcl::util::makefile.pmk
new file mode 100644
index 000000000000..41341ff0b4e8
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/optpatch-vcl::util::makefile.pmk
@@ -0,0 +1,11 @@
+--- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
++++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
+@@ -64,7 +64,7 @@
+ PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
+ PDBTARGET=vcl
+ 
+-.IF "$(OS)" != "MACOSX"
++.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ .IF "$(remote)" != ""
+ USE_BUILTIN_RASTERIZER=true
+ .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-berkeleydb::db-3.2.9.patch b/editors/openoffice.org-2-devel/files/patch-berkeleydb::db-3.2.9.patch
deleted file mode 100644
index 50c2f44a704e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-berkeleydb::db-3.2.9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Mon Jun 11 16:09:22 2001
-+++ ../berkeleydb/db-3.2.9.patch	Tue Mar  5 17:13:09 2002
-@@ -43,3 +43,39 @@
-   
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/configure.orig	Sat Nov 24 14:56:48 2001
-++++ misc/build/db-3.2.9/dist/configure	Sat Nov 24 14:57:32 2001
-+@@ -995,6 +995,7 @@
-+ 	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
-+ 	   LIBS="-lsocket -lsvipc $LIBS";;
-++freebsd*)   optimize_def="-O";;
-+ osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ *qnx)	   cat >> confdefs.h <<\EOF
-+ #define HAVE_QNX 1
-+@@ -1795,6 +1796,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd solaris linux genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,12 @@
-+ 
-+   freebsd*)
-+     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
-++    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
-+     ;;
-+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges::prj::build.lst b/editors/openoffice.org-2-devel/files/patch-bridges::prj::build.lst
deleted file mode 100644
index d9af910f9803..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges::prj::build.lst
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../bridges/prj/build.lst.orig	Tue Oct 30 17:28:35 2001
-+++ ../bridges/prj/build.lst	Mon Mar  4 21:43:05 2002
-@@ -13,5 +13,7 @@
- br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-	u	br_cc50soli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_solaris_sparc			nmake	-	u	br_gccsols br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc2_freebsd_intel	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\prot_uno					nmake	-	all	br_pruno br_unotypes NULL
- br	bridges\source\java_uno					nmake	-	all	br_java_uno br_rcon NULL
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel b/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj
index a9f6d1da7a96..95874155c7db 100644
--- a/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel
+++ b/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj
@@ -1,13 +1,14 @@
---- /dev/null	Mon Mar  4 21:22:00 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:26:06 2002
-@@ -0,0 +1,614 @@
+diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx
+--- /dev/null	Thu Jan  1 01:00:00 1970
++++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx	Tue Jun  4 10:49:43 2002
+@@ -0,0 +1,615 @@
 +/*************************************************************************
 + *
 + *  $RCSfile: cpp2uno.cxx,v $
 + *
-+ *  $Revision: 1.8 $
++ *  $Revision: 1.1 $
 + *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
++ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
 + *
 + *  The Contents of this file are made available subject to the terms of
 + *  either of the following licenses
@@ -66,7 +67,7 @@
 +//  #define TRACE(x) OSL_TRACE(x)
 +#define TRACE(x)
 +
-+#include <malloc.h>
++#include <stdlib.h>
 +#if STLPORT_VERSION<321
 +#include <list.h>
 +#include <map.h>
@@ -543,10 +544,10 @@
 +	}
 +
 +	int nSize = aComplexReturn.size();
-+	char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) );
++	char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) );
 +	pBuffer->m_pVTable = (void*)pSpace;
 +	
-+	char * pCode	= pSpace + ((nSize+2)*sizeof(void *));
++	char * pCode	= pSpace + (2*(nSize+1)*sizeof(void *));
 +	void ** pvft	= (void **)pSpace;
 +	pvft[0] = NULL;
 +	pvft[1] = NULL;
@@ -555,7 +556,8 @@
 +	for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos )
 +	{
 +		unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20);
-+		pvft[nPos+2] = codeSnip;
++		pvft[(nPos << 1) + 2 ] = NULL;
++		pvft[(nPos << 1) + 3 ] = codeSnip;
 +		
 +		// mov $nPos, %eax
 +		*codeSnip++ = 0xb8;
@@ -615,16 +617,17 @@
 +	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
 +}
 +
---- /dev/null	Mon Mar  4 21:22:00 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx	Mon Mar  4 21:26:08 2002
+diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx
+--- /dev/null	Thu Jan  1 01:00:00 1970
++++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx	Tue Jun  4 10:49:44 2002
 @@ -0,0 +1,365 @@
 +/*************************************************************************
 + *
 + *  $RCSfile: except.cxx,v $
 + *
-+ *  $Revision: 1.11 $
++ *  $Revision: 1.1 $
 + *
-+ *  last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $
++ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
 + *
 + *  The Contents of this file are made available subject to the terms of
 + *  either of the following licenses
@@ -955,7 +958,7 @@
 +	}
 +	
 +	__cp_push_exception( pCppExc, pRTTI, deleteException );
-+	__throw();
++	__sjthrow();
 +}
 +
 +void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno )
@@ -983,16 +986,17 @@
 +
 +}
 +
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx	Mon Mar  4 21:26:09 2002
+diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx
+--- /dev/null	Thu Jan  1 01:00:00 1970
++++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx	Tue Jun  4 10:49:36 2002
 @@ -0,0 +1,153 @@
 +/*************************************************************************
 + *
 + *  $RCSfile: gcc2_freebsd_intel.hxx,v $
 + *
-+ *  $Revision: 1.1.1.1 $
++ *  $Revision: 1.1 $
 + *
-+ *  last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $
++ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
 + *
 + *  The Contents of this file are made available subject to the terms of
 + *  either of the following licenses
@@ -1124,7 +1128,7 @@
 +
 +extern "C" {
 +	void __cp_push_exception( void*, void*, void(*)(void*, int) );
-+	void __throw();
++	void __sjthrow(void) __attribute__ ((__noreturn__));
 +}
 +
 +//##################################################################################################
@@ -1139,16 +1143,17 @@
 +
 +} 
 +
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	Mon Mar  4 21:26:41 2002
+diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk
+--- /dev/null	Thu Jan  1 01:00:00 1970
++++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk	Tue Jun  4 12:20:58 2002
 @@ -0,0 +1,109 @@
 +#*************************************************************************
 +#
 +#   $RCSfile: makefile.mk,v $
 +#
-+#   $Revision: 1.5 $
++#   $Revision: 1.1 $
 +#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
++#   last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
 +#
 +#   The Contents of this file are made available subject to the terms of
 +#   either of the following licenses
@@ -1220,7 +1225,7 @@
 +
 +# --- Files --------------------------------------------------------
 +
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
++.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj"
 +
 +CFLAGSNOOPT=-O0
 +NOOPTFILES=$(SLO)$/uno2cpp.obj
@@ -1251,16 +1256,17 @@
 +
 +.INCLUDE :  target.mk
 +
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:26:11 2002
-@@ -0,0 +1,463 @@
+diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx
+--- /dev/null	Thu Jan  1 01:00:00 1970
++++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx	Tue Jun  4 10:49:44 2002
+@@ -0,0 +1,473 @@
 +/*************************************************************************
 + *
 + *  $RCSfile: uno2cpp.cxx,v $
 + *
-+ *  $Revision: 1.8 $
++ *  $Revision: 1.1 $
 + *
-+ *  last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $
++ *  last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $
 + *
 + *  The Contents of this file are made available subject to the terms of
 + *  either of the following licenses
@@ -1315,7 +1321,7 @@
 + *
 + ************************************************************************/
 +
-+#include <malloc.h>
++#include <stdlib.h>
 +#ifndef _RTL_ALLOC_H_
 +#include <rtl/alloc.h>
 +#endif
@@ -1344,7 +1350,8 @@
 +									  void * pRegisterReturn,
 +									  typelib_TypeClass eReturnType,
 +									  sal_Int32 * pStackLongs,
-+									  sal_Int32 nStackLongs )
++									  sal_Int32 nStackLongs,
++									  sal_Int32 nThisOffset )
 +{
 +	// parameter list is mixed list of * and values
 +	// reference parameters are pointers
@@ -1376,14 +1383,18 @@
 +		"mov  %2, %%edx\n\t"
 +		"mov  0(%%edx), %%edx\n\t"
 +		"mov  %3, %%eax\n\t"
-+		"add  $2, %%eax\n\t" // first two table entries are reserved
-+		"shl  $2, %%eax\n\t"
++		"add  $1, %%eax\n\t" // first entry is reserved
++		"shl  $3, %%eax\n\t"
 +		"add  %%eax, %%edx\n\t"
-+		"mov  0(%%edx), %%edx\n\t"
++		"mov %4, %%eax\n\t"
++		"movswl (%%edx), %%ecx\n\t"
++                "add  %%esp, %%eax\n\t"
++                "add  %%ecx, (%%eax)\n\t"
++		"mov  4(%%edx), %%edx\n\t"
 +		"call *%%edx\n\t"
 +		// save return registers
-+ 		"mov  %%eax, %4\n\t"
-+ 		"mov  %%edx, %5\n\t"
++ 		"mov  %%eax, %5\n\t"
++ 		"mov  %%edx, %6\n\t"
 +		// cleanup stack
 + 		"mov  %0, %%eax\n\t"
 + 		"shl  $2, %%eax\n\t"
@@ -1391,7 +1402,8 @@
 +		"popl %%eax\n\t"
 +		"popl %%ecx\n\t"
 +		"popl %%edx\n\t"
-+		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) );
++		: : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
++                    "m"(nThisOffset), "m"(eax), "m"(edx) );
 +	switch( eReturnType )
 +	{
 +		case typelib_TypeClass_HYPER:
@@ -1443,6 +1455,8 @@
 +	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
 +	
 +	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
++
++        sal_Int32 nThisOffset = 0;
 +	
 +	if (pReturnTypeDescr)
 +	{
@@ -1456,7 +1470,8 @@
 +			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
 +												? alloca( pReturnTypeDescr->nSize )
 +												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
++			pCppStack  += sizeof(void *);
++                        nThisOffset = sizeof(void *);
 +		}
 +	}
 +	// push this
@@ -1534,7 +1549,8 @@
 +		callVirtualMethod(
 +			pThis->pCppI, nVtableCall,
 +			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
++			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32),
++			nThisOffset);
 +		// NO exception occured...
 +		*ppUnoExc = 0;
 +		
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel b/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel
deleted file mode 100644
index 20b13ea25cb2..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel
+++ /dev/null
@@ -1,1608 +0,0 @@
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,594 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: cpp2uno.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <hash_map>
-+
-+#include <rtl/alloc.h>
-+#include <osl/mutex.hxx>
-+
-+#include <uno/data.h>
-+#include <typelib/typedescription.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+//==================================================================================================
-+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp2uno_call(
-+	cppu_cppInterfaceProxy * pThis,
-+	const typelib_TypeDescription * pMemberTypeDescr,
-+	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	// pCallStack: ret, [return ptr], this, params
-+	char * pCppStack = (char *)(pCallStack +1);
-+
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	if (pReturnTypeRef)
-+		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	
-+	void * pUnoReturn = 0;
-+	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pUnoReturn = pRegisterReturn; // direct way for simple types
-+		}
-+		else // complex return via ptr (pCppReturn)
-+		{
-+			pCppReturn = *(void **)pCppStack;
-+			pCppStack += sizeof(void *);
-+			
-+			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-+						  ? alloca( pReturnTypeDescr->nSize )
-+						  : pCppReturn); // direct way
-+		}
-+	}
-+	// pop this
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// parameters
-+	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-+	void ** pCppArgs = pUnoArgs + nParams;
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-+		{
-+			pCppArgs[nPos] = pCppStack;
-+			pUnoArgs[nPos] = pCppStack;
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			pCppArgs[nPos] = *(void **)pCppStack;
-+
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// uno out is unconstructed mem!
-+				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-+				pTempIndizes[nTempIndizes] = nPos;
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+										*(void **)pCppStack, pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				pUnoArgs[nPos] = *(void **)pCppStack;
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+	
-+	// ExceptionHolder
-+	uno_Any aUnoExc; // Any will be constructed by callee
-+	uno_Any * pUnoExc = &aUnoExc;
-+
-+	// invoke uno dispatch call
-+	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-+	
-+	// in case an exception occured...
-+	if (pUnoExc)
-+	{
-+		// destruct temporary in/inout params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn) // is in/inout => was constructed
-+				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+		
-+		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-+		// is here for dummy
-+		return typelib_TypeClass_VOID;
-+	}
-+	else // else no exception occured...
-+	{
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bOut) // inout/out
-+			{
-+				// convert and assign
-+				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+			}
-+			// destroy temp uno param
-+			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return
-+		if (pCppReturn) // has complex return
-+		{
-+			if (pUnoReturn != pCppReturn) // needs reconversion
-+			{
-+				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-+										&pThis->pBridge->aUno2Cpp );
-+				// destroy temp uno return
-+				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-+			}
-+			// complex return ptr is set to eax
-+			*(void **)pRegisterReturn = pCppReturn;
-+		}
-+		if (pReturnTypeDescr)
-+		{
-+			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+			return eRet;
-+		}
-+		else
-+			return typelib_TypeClass_VOID;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+static typelib_TypeClass cpp_mediate(
-+	sal_Int32 nVtableCall,
-+	void ** pCallStack,
-+	sal_Int64 * pRegisterReturn /* space for register return */ )
-+{
-+	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-+	
-+	// pCallStack: ret adr, [ret *], this, params
-+	// _this_ ptr is patched cppu_XInterfaceProxy object
-+	cppu_cppInterfaceProxy * pCppI = NULL;
-+	if( nVtableCall & 0x80000000 )
-+	{
-+		nVtableCall &= 0x7fffffff;
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-+	}
-+	else
-+    {
-+		pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-+    }
-+    
-+	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-+	
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("illegal vtable index!"),
-+            (XInterface *)pCppI );
-+	}
-+	
-+	// determine called method
-+	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-+	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-+
-+	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-+    
-+	typelib_TypeClass eRet;
-+	switch (aMemberDescr.get()->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-+		{
-+			// is GET method
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-+				0, 0, // no params
-+				pCallStack, pRegisterReturn );
-+		}
-+		else
-+		{
-+			// is SET method
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+			
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				0, // indicates void return
-+				1, &aParam,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// is METHOD
-+		switch (nVtableCall)
-+		{
-+		case 1: // acquire()
-+			pCppI->acquireProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 2: // release()
-+			pCppI->releaseProxy(); // non virtual call!
-+			eRet = typelib_TypeClass_VOID;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                XInterface * pInterface = 0;
-+                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-+                    pCppI->pBridge->pCppEnv,
-+                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-+                        &pInterface, pTD, cpp_acquire );
-+                    pInterface->release();
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *(void **)pRegisterReturn = pCallStack[1];
-+                    eRet = typelib_TypeClass_ANY;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			eRet = cpp2uno_call(
-+				pCppI, aMemberDescr.get(),
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-+				pCallStack, pRegisterReturn );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		throw RuntimeException(
-+            OUString::createFromAscii("no member description found!"),
-+            (XInterface *)pCppI );
-+		// is here for dummy
-+		eRet = typelib_TypeClass_VOID;
-+	}
-+	}
-+
-+	return eRet;
-+}
-+
-+//==================================================================================================
-+/**
-+ * is called on incoming vtable calls
-+ * (called by asm snippets)
-+ */
-+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-+
-+void cpp_vtable_call( int nTableEntry, void** pCallStack )
-+{
-+	volatile long nRegReturn[2];
-+	typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-+    
-+	switch( aType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			__asm__( "movl %1, %%edx\n\t"
-+					 "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			__asm__( "flds %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "flds %0\n"
-+					 : : "m"(*(float *)nRegReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			__asm__( "fldl %0\n\t"
-+					 "fstp %%st(0)\n\t"
-+					 "fldl %0\n"
-+					 : : "m"(*(double *)nRegReturn) );
-+			break;
-+// 		case typelib_TypeClass_UNSIGNED_SHORT:
-+// 		case typelib_TypeClass_SHORT:
-+// 			__asm__( "movswl %0, %%eax\n"
-+// 					 : : "m"(nRegReturn) );
-+// 		break;
-+		default:
-+			__asm__( "movl %0, %%eax\n"
-+					 : : "m"(nRegReturn[0]) );
-+			break;
-+	}
-+}
-+
-+
-+//==================================================================================================
-+class MediateClassData
-+{
-+    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-+	t_classdata_map m_map;
-+	Mutex m_mutex;
-+    
-+public:
-+	void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-+    
-+	inline MediateClassData() SAL_THROW( () )
-+        {}
-+	~MediateClassData() SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+MediateClassData::~MediateClassData() SAL_THROW( () )
-+{
-+	OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-+	
-+	for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-+	{
-+		::rtl_freeMemory( iPos->second );
-+	}
-+}
-+//--------------------------------------------------------------------------------------------------
-+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-+{
-+    if (! simple_ret_type)
-+        vtable_pos |= 0x80000000;
-+    OSL_ASSERT( sizeof (long) == 4 );
-+    // mov $nPos, %eax
-+    *code++ = 0xb8;
-+    *(long *)code = vtable_pos;
-+    code += sizeof (long);
-+    // mov %esp, %edx
-+    *code++ = 0x89;
-+    *code++ = 0xe2;
-+    // jmp cpp_vtable_call
-+    *code++ = 0xe9;
-+    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-+}
-+//__________________________________________________________________________________________________
-+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-+{
-+    void * buffer;
-+    
-+    // avoiding locked counts
-+    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-+    {
-+	MutexGuard aGuard( m_mutex );
-+	t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-+	if (iFind == m_map.end())
-+    {
-+        // create new vtable
-+        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-+        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-+        
-+        ::std::pair< t_classdata_map::iterator, bool > insertion(
-+            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-+        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-+        
-+        void ** slots = (void **)buffer;
-+        *slots++ = 0;
-+        *slots++ = 0; // rtti
-+        char * code = (char *)(slots + nSlots);
-+        
-+        sal_uInt32 vtable_pos = 0;
-+        sal_Int32 nAllMembers = pTD->nAllMembers;
-+        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-+        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-+        {
-+            typelib_TypeDescription * pTD = 0;
-+            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-+            OSL_ASSERT( pTD );
-+            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-+                // get method
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-+                {
-+                    // set method
-+                    *slots++ = code;
-+                    codeSnippet( code, vtable_pos++, true );
-+                    code += 20;
-+                }
-+            }
-+            else
-+            {
-+                bool simple_ret = cppu_isSimpleType(
-+                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-+                *slots++ = code;
-+                codeSnippet( code, vtable_pos++, simple_ret );
-+                code += 20;
-+            }
-+            TYPELIB_DANGER_RELEASE( pTD );
-+        }
-+        OSL_ASSERT( vtable_pos == nSlots );
-+    }
-+    else
-+    {
-+        buffer = iFind->second;
-+    }
-+    }
-+    
-+    return ((void **)buffer +2);
-+}
-+
-+//==================================================================================================
-+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-+	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-+{
-+	static MediateClassData * s_pMediateClassData = 0;
-+	if (! s_pMediateClassData)
-+	{
-+		MutexGuard aGuard( Mutex::getGlobalMutex() );
-+		if (! s_pMediateClassData)
-+		{
-+#ifdef LEAK_STATIC_DATA
-+			s_pMediateClassData = new MediateClassData();
-+#else
-+			static MediateClassData s_aMediateClassData;
-+			s_pMediateClassData = &s_aMediateClassData;
-+#endif
-+		}
-+	}
-+	*(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-+}
-+
-+}
-+
-+extern "C"
-+{
-+//##################################################################################################
-+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-+	SAL_THROW_EXTERN_C()
-+{
-+	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-+        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-+        pCppEnv );
-+}
-+//##################################################################################################
-+void SAL_CALL uno_ext_getMapping(
-+	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-+	SAL_THROW_EXTERN_C()
-+{
-+	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-+        ppMapping, pFrom, pTo );
-+}
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,317 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: except.cxx,v $
-+ *
-+ *  $Revision: 1.6 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#include <cxxabi.h>
-+#include <hash_map>
-+
-+#include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <osl/diagnose.h>
-+#include <osl/mutex.hxx>
-+
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <typelib/typedescription.hxx>
-+#include <uno/any2.h>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::std;
-+using namespace ::osl;
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::__cxxabiv1;
-+
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+    
-+void dummy_can_throw_anything( char const * )
-+{
-+}
-+
-+//==================================================================================================
-+static OUString toUNOname( char const * p ) SAL_THROW( () )
-+{
-+#ifdef DEBUG
-+    char const * start = p;
-+#endif
-+    
-+    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-+    
-+	OUStringBuffer buf( 64 );
-+    OSL_ASSERT( 'N' == *p );
-+    ++p; // skip N
-+    
-+    while ('E' != *p)
-+    {
-+        // read chars count
-+        long n = (*p++ - '0');
-+        while ('0' <= *p && '9' >= *p)
-+        {
-+            n *= 10;
-+            n += (*p++ - '0');
-+        }
-+        buf.appendAscii( p, n );
-+        p += n;
-+        if ('E' != *p)
-+            buf.append( (sal_Unicode)'.' );
-+    }
-+    
-+#ifdef DEBUG
-+    OUString ret( buf.makeStringAndClear() );
-+    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-+    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-+    return ret;
-+#else
-+    return buf.makeStringAndClear();
-+#endif
-+}
-+
-+//==================================================================================================
-+class RTTI
-+{
-+    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-+    
-+    Mutex m_mutex;
-+	t_rtti_map m_rttis;
-+    t_rtti_map m_generatedRttis;
-+
-+    void * m_hApp;
-+    
-+public:
-+    RTTI() SAL_THROW( () );
-+    ~RTTI() SAL_THROW( () );
-+    
-+    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-+};
-+//__________________________________________________________________________________________________
-+RTTI::RTTI() SAL_THROW( () )
-+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-+{
-+}
-+//__________________________________________________________________________________________________
-+RTTI::~RTTI() SAL_THROW( () )
-+{
-+    dlclose( m_hApp );
-+}
-+
-+//__________________________________________________________________________________________________
-+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-+{
-+    type_info * rtti;
-+    
-+    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-+    
-+    MutexGuard guard( m_mutex );
-+    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+    if (iFind == m_rttis.end())
-+    {
-+        // RTTI symbol
-+        OStringBuffer buf( 64 );
-+        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-+        sal_Int32 index = 0;
-+        do
-+        {
-+            OUString token( unoName.getToken( 0, '.', index ) );
-+            buf.append( token.getLength() );
-+            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-+            buf.append( c_token );
-+        }
-+        while (index >= 0);
-+        buf.append( 'E' );
-+        
-+        OString symName( buf.makeStringAndClear() );
-+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-+
-+        if (rtti)
-+        {
-+            pair< t_rtti_map::iterator, bool > insertion(
-+                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-+        }
-+        else
-+        {
-+            // try to lookup the symbol in the generated rtti map
-+            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-+            if (iFind == m_generatedRttis.end())
-+            {
-+                // we must generate it !
-+                // symbol and rtti-name is nearly identical,
-+                // the symbol is prefixed with _ZTI
-+                char const * rttiName = symName.getStr() +4;
-+#ifdef DEBUG
-+                fprintf( stderr,"generated rtti for %s\n", rttiName );
-+#endif
-+                if (pTypeDescr->pBaseTypeDescription)
-+                {
-+                    // ensure availability of base
-+                    type_info * base_rtti = getRTTI(
-+                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-+                    rtti = new __si_class_type_info(
-+                        strdup( rttiName ), (__class_type_info *)base_rtti );
-+                }
-+                else
-+                {
-+                    // this class has no base class
-+                    rtti = new __class_type_info( strdup( rttiName ) );
-+                }
-+                
-+                pair< t_rtti_map::iterator, bool > insertion(
-+                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-+                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-+            }
-+            else // taking already generated rtti
-+            {
-+                rtti = iFind->second;
-+            }
-+        }
-+    }
-+    else
-+    {
-+        rtti = iFind->second;
-+    }
-+    
-+    return rtti;
-+}
-+
-+//--------------------------------------------------------------------------------------------------
-+static void deleteException( void * pExc )
-+{
-+    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-+    typelib_TypeDescription * pTD = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-+    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-+    if (pTD)
-+    {
-+		::uno_destructData( pExc, pTD, cpp_release );
-+		::typelib_typedescription_release( pTD );
-+	}
-+}
-+
-+//==================================================================================================
-+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-+{
-+    void * pCppExc;
-+    type_info * rtti;
-+
-+    {
-+    // construct cpp exception object
-+	typelib_TypeDescription * pTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-+    OSL_ASSERT( pTypeDescr );
-+    if (! pTypeDescr)
-+        terminate();
-+    
-+	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-+	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-+	
-+	// destruct uno exception
-+	::uno_any_destruct( pUnoExc, 0 );
-+    // avoiding locked counts
-+    static RTTI * s_rtti = 0;
-+    if (! s_rtti)
-+    {
-+        MutexGuard guard( Mutex::getGlobalMutex() );
-+        if (! s_rtti)
-+        {
-+#ifdef LEAK_STATIC_DATA
-+            s_rtti = new RTTI();
-+#else
-+            static RTTI rtti_data;
-+            s_rtti = &rtti_data;
-+#endif
-+        }
-+    }
-+	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-+    TYPELIB_DANGER_RELEASE( pTypeDescr );
-+    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-+    if (! rtti)
-+        terminate();
-+    }
-+    
-+	__cxa_throw( pCppExc, rtti, deleteException );
-+}
-+
-+//==================================================================================================
-+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
-+{
-+    OSL_ENSURE( header, "### no exception header!!!" );
-+    if (! header)
-+        terminate();
-+    
-+	typelib_TypeDescription * pExcTypeDescr = 0;
-+    OUString unoName( toUNOname( header->exceptionType->name() ) );
-+	::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
-+    if (! pExcTypeDescr)
-+        terminate();
-+    
-+    // construct uno exception any
-+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-+    ::typelib_typedescription_release( pExcTypeDescr );
-+}
-+
-+}
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	Mon Mar  4 21:24:53 2002
-@@ -0,0 +1,112 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=bridges
-+TARGET=gcc3_uno
-+LIBTARGET=no
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  svpre.mk
-+.INCLUDE :  settings.mk
-+.INCLUDE :  sv.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+
-+.IF "$(cppu_no_leak)" == ""
-+CFLAGS += -DLEAK_STATIC_DATA
-+.ENDIF
-+
-+CFLAGSNOOPT=-O0
-+
-+SLOFILES= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1TARGET= $(TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB=i$(TARGET)
-+SHL1VERSIONMAP=..$/..$/bridge_exports.map
-+
-+SHL1OBJS= \
-+	$(SLO)$/except.obj		\
-+	$(SLO)$/cpp2uno.obj		\
-+	$(SLO)$/uno2cpp.obj
-+
-+SHL1STDLIBS= \
-+	$(CPPULIB)			\
-+	$(SALLIB)
-+
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: share.hxx,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-+
-+struct _Unwind_Exception
-+{
-+    unsigned exception_class __attribute__((__mode__(__DI__)));
-+    void * exception_cleanup;
-+    unsigned private_1 __attribute__((__mode__(__word__)));
-+    unsigned private_2 __attribute__((__mode__(__word__)));
-+} __attribute__((__aligned__));
-+
-+struct __cxa_exception
-+{ 
-+    ::std::type_info *exceptionType;
-+    void (*exceptionDestructor)(void *); 
-+    
-+    ::std::unexpected_handler unexpectedHandler;
-+    ::std::terminate_handler terminateHandler;
-+    
-+    __cxa_exception *nextException;
-+    
-+    int handlerCount;
-+    
-+    int handlerSwitchValue;
-+    const unsigned char *actionRecord;
-+    const unsigned char *languageSpecificData;
-+    void *catchTemp;
-+    void *adjustedPtr;
-+    
-+    _Unwind_Exception unwindHeader;
-+};    
-+
-+extern "C" void *__cxa_allocate_exception(
-+    std::size_t thrown_size ) throw();
-+extern "C" void __cxa_throw (
-+    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-+
-+struct __cxa_eh_globals
-+{
-+    __cxa_exception *caughtExceptions;
-+    unsigned int uncaughtExceptions;
-+};
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+
-+// -----
-+
-+//==================================================================================================
-+void raiseException(
-+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-+//==================================================================================================
-+void fillUnoException(
-+    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-+}
---- /dev/null	Mon Mar  4 21:33:00 2002
-+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx	Mon Mar  4 21:23:27 2002
-@@ -0,0 +1,450 @@
-+/*************************************************************************
-+ *
-+ *  $RCSfile: uno2cpp.cxx,v $
-+ *
-+ *  $Revision: 1.3 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $
-+ *
-+ *  The Contents of this file are made available subject to the terms of
-+ *  either of the following licenses
-+ *
-+ *         - GNU Lesser General Public License Version 2.1
-+ *         - Sun Industry Standards Source License Version 1.1
-+ *
-+ *  Sun Microsystems Inc., October, 2000
-+ *
-+ *  GNU Lesser General Public License Version 2.1
-+ *  =============================================
-+ *  Copyright 2000 by Sun Microsystems, Inc.
-+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *  MA  02111-1307  USA
-+ *
-+ *
-+ *  Sun Industry Standards Source License Version 1.1
-+ *  =================================================
-+ *  The contents of this file are subject to the Sun Industry Standards
-+ *  Source License Version 1.1 (the "License"); You may not use this file
-+ *  except in compliance with the License. You may obtain a copy of the
-+ *  License at http://www.openoffice.org/license.html.
-+ *
-+ *  Software provided under this License is provided on an "AS IS" basis,
-+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ *  See the License for the specific provisions governing your rights and
-+ *  obligations concerning the Software.
-+ *
-+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ *  Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ *  All Rights Reserved.
-+ *
-+ *  Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <malloc.h>
-+#include <rtl/alloc.h>
-+
-+#include <uno/data.h>
-+#include <bridges/cpp_uno/bridge.hxx>
-+#include <bridges/cpp_uno/type_misc.hxx>
-+
-+#include "share.hxx"
-+
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
-+
-+void dummy_can_throw_anything( char const * );
-+
-+//==================================================================================================
-+static void callVirtualMethod(
-+    void * pThis,
-+    sal_Int32 nVtableIndex,
-+    void * pRegisterReturn,
-+    typelib_TypeClass eReturnType,
-+    sal_Int32 * pStackLongs,
-+    sal_Int32 nStackLongs )
-+{
-+	// parameter list is mixed list of * and values
-+	// reference parameters are pointers
-+    
-+	OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-+	OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-+	OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-+    
-+    // never called
-+    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-+    
-+	volatile long edx = 0, eax = 0; // for register returns
-+	asm volatile (
-+		// copy values
-+		"mov   %0, %%eax\n\t"
-+		"mov   %%eax, %%edx\n\t"
-+		"dec   %%edx\n\t"
-+		"shl   $2, %%edx\n\t"
-+		"add   %1, %%edx\n"
-+		"Lcopy:\n\t"
-+		"pushl 0(%%edx)\n\t"
-+		"sub   $4, %%edx\n\t"
-+		"dec   %%eax\n\t"
-+		"jne   Lcopy\n\t"
-+		// do the actual call
-+		"mov   %2, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"mov   %3, %%eax\n\t"
-+		"shl   $2, %%eax\n\t"
-+		"add   %%eax, %%edx\n\t"
-+		"mov   0(%%edx), %%edx\n\t"
-+		"call  *%%edx\n\t"
-+		// save return registers
-+ 		"mov   %%eax, %4\n\t"
-+ 		"mov   %%edx, %5\n\t"
-+		// cleanup stack
-+ 		"mov   %0, %%eax\n\t"
-+ 		"shl   $2, %%eax\n\t"
-+ 		"add   %%eax, %%esp\n\t"
-+		:
-+        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
-+        : "eax", "edx" );
-+    
-+	switch( eReturnType )
-+	{
-+		case typelib_TypeClass_HYPER:
-+		case typelib_TypeClass_UNSIGNED_HYPER:
-+			((long*)pRegisterReturn)[1] = edx;
-+		case typelib_TypeClass_LONG:
-+		case typelib_TypeClass_UNSIGNED_LONG:
-+		case typelib_TypeClass_CHAR:
-+		case typelib_TypeClass_ENUM:
-+			((long*)pRegisterReturn)[0] = eax;
-+			break;
-+		case typelib_TypeClass_SHORT:
-+		case typelib_TypeClass_UNSIGNED_SHORT:
-+			*(unsigned short*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_BOOLEAN:
-+		case typelib_TypeClass_BYTE:
-+			*(unsigned char*)pRegisterReturn = eax;
-+			break;
-+		case typelib_TypeClass_FLOAT:
-+			asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+		case typelib_TypeClass_DOUBLE:
-+			asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-+			break;
-+	}
-+}
-+
-+//================================================================================================== 
-+static void cpp_call(
-+	cppu_unoInterfaceProxy * pThis,
-+	sal_Int32 nVtableCall,
-+	typelib_TypeDescriptionReference * pReturnTypeRef,
-+	sal_Int32 nParams, typelib_MethodParameter * pParams,
-+	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-+{
-+  	// max space for: [complex ret ptr], values|ptr ...
-+  	char * pCppStack		=
-+  		(char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-+  	char * pCppStackStart	= pCppStack;
-+	
-+	// return
-+	typelib_TypeDescription * pReturnTypeDescr = 0;
-+	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-+	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-+	
-+	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-+	
-+	if (pReturnTypeDescr)
-+	{
-+		if (cppu_isSimpleType( pReturnTypeDescr ))
-+		{
-+			pCppReturn = pUnoReturn; // direct way for simple types
-+		}
-+		else
-+		{
-+			// complex return via ptr
-+			pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-+												? alloca( pReturnTypeDescr->nSize )
-+												: pUnoReturn); // direct way
-+			pCppStack += sizeof(void *);
-+		}
-+	}
-+	// push this
-+	*(void**)pCppStack = pThis->pCppI;
-+	pCppStack += sizeof( void* );
-+
-+	// stack space
-+	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-+	// args
-+	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-+	// indizes of values this have to be converted (interface conversion cpp<=>uno)
-+	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-+	// type descriptions for reconversions
-+	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-+	
-+	sal_Int32 nTempIndizes   = 0;
-+	
-+	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-+	{
-+		const typelib_MethodParameter & rParam = pParams[nPos];
-+		typelib_TypeDescription * pParamTypeDescr = 0;
-+		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-+		
-+		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-+		{
-+			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-+									&pThis->pBridge->aUno2Cpp );
-+			
-+			switch (pParamTypeDescr->eTypeClass)
-+			{
-+			case typelib_TypeClass_HYPER:
-+			case typelib_TypeClass_UNSIGNED_HYPER:
-+			case typelib_TypeClass_DOUBLE:
-+				pCppStack += sizeof(sal_Int32); // extra long
-+			}
-+			// no longer needed
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		else // ptr to complex value | ref
-+		{
-+			if (! rParam.bIn) // is pure out
-+			{
-+				// cpp out is constructed mem, uno out is not!
-+				uno_constructData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pParamTypeDescr );
-+				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			// is in/inout
-+			else if (cppu_relatesToInterface( pParamTypeDescr ))
-+			{
-+				uno_copyAndConvertData(
-+					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-+					pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-+				
-+				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-+				// will be released at reconversion
-+				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-+			}
-+			else // direct way
-+			{
-+				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-+				// no longer needed
-+				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+			}
-+		}
-+		pCppStack += sizeof(sal_Int32); // standard parameter length
-+	}
-+
-+	try
-+	{
-+		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-+		callVirtualMethod(
-+			pThis->pCppI, nVtableCall,
-+			pCppReturn, pReturnTypeDescr->eTypeClass,
-+			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-+		// NO exception occured...
-+		*ppUnoExc = 0;
-+		
-+		// reconvert temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-+			
-+			if (pParams[nIndex].bIn)
-+			{
-+				if (pParams[nIndex].bOut) // inout
-+				{
-+					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-+					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+											&pThis->pBridge->aCpp2Uno );
-+				}
-+			}
-+			else // pure out
-+			{
-+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-+										&pThis->pBridge->aCpp2Uno );
-+			}
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-+			
-+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-+		}
-+		// return value
-+		if (pCppReturn && pUnoReturn != pCppReturn)
-+		{
-+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-+									&pThis->pBridge->aCpp2Uno );
-+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-+		}
-+	}
-+ 	catch (...)
-+ 	{
-+  		// fill uno exception
-+		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-+        
-+		// temporary params
-+		for ( ; nTempIndizes--; )
-+		{
-+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-+			// destroy temp cpp param => cpp: every param was constructed
-+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-+		}
-+		// return type
-+		if (pReturnTypeDescr)
-+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-+	}
-+}
-+
-+
-+//==================================================================================================
-+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-+{
-+	// is my surrogate
-+	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+	
-+	switch (pMemberDescr->eTypeClass)
-+	{
-+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		if (pReturn)
-+		{
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-+				0, 0, // no params
-+				pReturn, pArgs, ppException );
-+		}
-+		else
-+		{
-+			// is SET
-+			typelib_MethodParameter aParam;
-+			aParam.pTypeRef =
-+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-+			aParam.bIn		= sal_True;
-+			aParam.bOut		= sal_False;
-+
-+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-+			typelib_typedescriptionreference_new(
-+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-+			
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall +1, // get, then set method
-+				pReturnTypeRef,
-+				1, &aParam,
-+				pReturn, pArgs, ppException );
-+			
-+			typelib_typedescriptionreference_release( pReturnTypeRef );
-+		}
-+		
-+		break;
-+	}
-+	case typelib_TypeClass_INTERFACE_METHOD:
-+	{
-+		// determine vtable call index
-+		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-+		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-+		
-+		sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-+		OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-+		
-+		switch (nVtableCall)
-+		{
-+			// standard calls
-+		case 1: // acquire uno interface
-+			(*pUnoI->acquire)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 2: // release uno interface
-+			(*pUnoI->release)( pUnoI );
-+			*ppException = 0;
-+			break;
-+		case 0: // queryInterface() opt
-+		{
-+			typelib_TypeDescription * pTD = 0;
-+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-+			if (pTD)
-+			{
-+                uno_Interface * pInterface = 0;
-+                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-+                    pThis->pBridge->pUnoEnv,
-+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-+			
-+                if (pInterface)
-+                {
-+                    ::uno_any_construct(
-+                        reinterpret_cast< uno_Any * >( pReturn ),
-+                        &pInterface, pTD, 0 );
-+                    (*pInterface->release)( pInterface );
-+                    TYPELIB_DANGER_RELEASE( pTD );
-+                    *ppException = 0;
-+                    break;
-+                }
-+                TYPELIB_DANGER_RELEASE( pTD );
-+            }
-+		} // else perform queryInterface()
-+		default:
-+			// dependent dispatch
-+			cpp_call(
-+				pThis, nVtableCall,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-+				pReturn, pArgs, ppException );
-+		}
-+		break;
-+	}
-+	default:
-+	{
-+		::com::sun::star::uno::RuntimeException aExc(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-+		
-+		Type const & rExcType = ::getCppuType( &aExc );
-+		// binary identical null reference
-+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-+	}
-+	}
-+}
-+
-+}
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-bridges::source::prot_uno::makefile.mk b/editors/openoffice.org-2-devel/files/patch-bridges::source::prot_uno::makefile.mk
deleted file mode 100644
index 595ea6cb5ac9..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-bridges::source::prot_uno::makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../bridges/source/prot_uno/makefile.mk.orig	Fri Oct 26 09:22:57 2001
-+++ ../bridges/source/prot_uno/makefile.mk	Wed Mar  6 15:45:09 2002
-@@ -88,8 +88,8 @@
- SHL1VERSIONMAP=..$/bridge_exports.map
- 
- SHL1STDLIBS= \
--	$(CPPULIB)		\
--	$(SALLIB)
-+	$(SALLIB) \
-+	$(CPPULIB)
- 
- DEF1NAME=$(SHL1TARGET)
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-chaos::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-chaos::util::makefile.mk
deleted file mode 100644
index 77dcd12cd410..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-chaos::util::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../chaos/util/makefile.mk.orig	Sat Mar  2 18:09:33 2002
-+++ ../chaos/util/makefile.mk	Sat Mar  2 18:09:18 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
diff --git a/editors/openoffice.org-2-devel/files/patch-comphelper::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-comphelper::util::makefile.mk
deleted file mode 100644
index 9bca1b144e8f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-comphelper::util::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../comphelper/util/makefile.mk.orig	Tue Jan  1 14:08:53 2002
-+++ ../comphelper/util/makefile.mk
-@@ -85,11 +85,11 @@
- 
- SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
- SHL1STDLIBS=\
-+	$(SALLIB)					\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(VOSLIB)					\
- 	$(OSLLIB)					\
--	$(SALLIB)					\
- 	$(CPPRTLLIB)
- 
- SHL1DEPN=
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office::configure.in b/editors/openoffice.org-2-devel/files/patch-config_office::configure.in
deleted file mode 100644
index 432ada6ddb57..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-config_office::configure.in
+++ /dev/null
@@ -1,86 +0,0 @@
---- ../config_office/configure.in.orig	Tue Feb 19 16:42:08 2002
-+++ ../config_office/configure.in	Wed Mar 13 20:26:19 2002
-@@ -121,6 +121,12 @@
- 
-                           Usage: --enable-check-only=yes
- ],,)
-+AC_ARG_WITH(os-version,
-+[  --with-os-version       For FreeBSD users, use this option option to build OpenOffice
-+                          with the correct OSVERSION.
-+
-+                          Usage: --with-os-version=<OSVERSION>
-+],,)
- dnl ===================================================================
- dnl Message.
- dnl ===================================================================
-@@ -245,13 +251,13 @@
- 
-    if test $GCC; then
-       AC_MSG_CHECKING([the GNU gcc compiler version])
--      _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
-+      _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
-       if test "$_gcc_releasetype" = "egcs"; then
-          AC_MSG_WARN([found egcs- version,  use (stable=gcc-) version of the compiler])
-          AC_MSG_WARN([found egcs- version,  use (stable=gcc-) version of the compiler]) >> warn
--         _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
-+         _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
-       else
--         _gcc_version=`$GCC --version`
-+         _gcc_version=`$CC --version`
-       fi
-       _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
-       if test -n "$enable_gcc3"; then 
-@@ -264,13 +270,13 @@
-            AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-            COMPATH="NO_GCC"
-         else
--           _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-+           _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-            if test "$_gcc_middle" = "false"; then
-               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-               COMPATH="NO_GCC"
-            else
--              _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-+              _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-               if test "$_gcc_minor" = "false"; then
-                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-@@ -335,7 +341,8 @@
-                   fi
-                else
- 		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
--                  _gcc_include_path="/usr/include/g++"
-+                 _gcc_include_path="/usr"
-+                 _gxx_include_path="/usr/include/g++"
- 		else
-                   AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
-                   AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
-@@ -779,6 +786,10 @@
-    fi
-    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-+      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-+         _jdk_minor="true"
-+      fi
-    fi
-    if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
-       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -1129,6 +1140,7 @@
- echo "\$with_lang="$with_lang
- echo "\$with_asm_home="$with_asm_home
- echo "\$with_unzip_home="$with_unzip_home
-+echo "\$with_os_version="$with_os_version
- echo "\$MINGWIN32="$WITH_MINGWIN
- echo "\$USE_GCC3="$USE_GCC3
- echo
-@@ -1136,7 +1148,7 @@
- 
- # Executing the set_soenv script to setup the environment variables.
- if test -z "$enable_check_only"; then
--   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $USE_GCC3
-+   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX
- else
-    echo
-    echo Test Complete
diff --git a/editors/openoffice.org-2-devel/files/patch-configmgr::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-configmgr::util::makefile.mk
deleted file mode 100644
index b0738b38b234..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-configmgr::util::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../configmgr/util/makefile.mk.orig	Sat Mar  2 20:36:09 2002
-+++ ../configmgr/util/makefile.mk	Sat Mar  2 20:36:24 2002
-@@ -73,7 +73,7 @@
- # --- Library -----------------------------------
- 
- SHL1TARGET=	$(CFGMGR_TARGET)$(CFGMGR_MAJOR)
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP= $(TARGET).$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP= $(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::adabas::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::adabas::makefile.mk
deleted file mode 100644
index 22ec11c35540..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::adabas::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../connectivity/source/drivers/adabas/makefile.mk.orig	Sat Mar  2 20:39:00 2002
-+++ ../connectivity/source/drivers/adabas/makefile.mk	Sat Mar  2 20:38:16 2002
-@@ -104,9 +104,9 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
--.ELSE      
-+.ELSE
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
- .ENDIF
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::calc::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::calc::makefile.mk
deleted file mode 100644
index 9141439c02cb..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::calc::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/calc/makefile.mk.orig	Sat Mar  2 20:42:07 2002
-+++ ../connectivity/source/drivers/calc/makefile.mk	Sat Mar  2 20:41:59 2002
-@@ -91,7 +91,7 @@
- 	$(SLO)$/Cservices.obj			\
- 	$(SLO)$/CDriver.obj
- 
--.IF "$(OS)"!="MACOSX"
-+.IF "$(OS)"!="MACOSX" || "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
- .ENDIF
- # --- Library -----------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::dbase::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::dbase::makefile.mk
deleted file mode 100644
index 74b9c46489ac..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::dbase::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/dbase/makefile.mk.orig	Sat Mar  2 20:45:45 2002
-+++ ../connectivity/source/drivers/dbase/makefile.mk	Sat Mar  2 20:45:27 2002
-@@ -117,7 +117,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::file::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::file::makefile.mk
deleted file mode 100644
index 3bf23f9b6a5d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::file::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/file/makefile.mk.orig	Sat Mar  2 20:47:37 2002
-+++ ../connectivity/source/drivers/file/makefile.mk	Sat Mar  2 20:48:04 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::flat::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::flat::makefile.mk
deleted file mode 100644
index bbabd50cc0f1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::flat::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/flat/makefile.mk.orig	Sat Mar  2 20:51:31 2002
-+++ ../connectivity/source/drivers/flat/makefile.mk	Sat Mar  2 20:51:56 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::jdbc::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::jdbc::makefile.mk
deleted file mode 100644
index 397cc6777421..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::jdbc::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../connectivity/source/drivers/jdbc/makefile.mk.orig	Sat Mar  2 20:54:27 2002
-+++ ../connectivity/source/drivers/jdbc/makefile.mk	Sat Mar  2 20:54:52 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk
deleted file mode 100644
index f301dffa2c0d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../connectivity/source/drivers/mozab/makefile.mk.orig	Mon Dec  3 17:20:59 2001
-+++ ../connectivity/source/drivers/mozab/makefile.mk	Sun Mar  3 17:26:52 2002
-@@ -107,7 +107,9 @@
- 
- # --- MOZAB BASE Library -----------------------------------
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-+.ENDIF
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
-@@ -158,7 +160,9 @@
- 
- # --- MOZAB BASE Library -----------------------------------
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL2VERSIONMAP= $(TARGET2).map
-+.ENDIF
- SHL2TARGET=	$(TARGET2)$(MOZAB_MAJOR)
- SHL2OBJS=$(SLO2FILES)
- SHL2STDLIBS=\
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
new file mode 100644
index 000000000000..3601766ee561
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
@@ -0,0 +1,54 @@
+--- ../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
diff --git a/editors/openoffice.org-2-devel/files/patch-mozaddressbook::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk
index 3a34e92f0e55..b63d2a25f184 100644
--- a/editors/openoffice.org-2-devel/files/patch-mozaddressbook::makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk
@@ -1,12 +1,12 @@
---- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig	Sat Mar  2 20:58:59 2002
-+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk	Sat Mar  2 20:59:41 2002
-@@ -134,7 +134,9 @@
+--- ../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"
+-.IF "$(OS)"!="FREEBSD"
  SHL1VERSIONMAP= $(TARGET).map
-+.ENDIF
+-.ENDIF
  # --- Library -----------------------------------
  
  SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::manager::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::manager::makefile.mk
deleted file mode 100644
index 497370af0fd1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::manager::makefile.mk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../connectivity/source/manager/makefile.mk.orig	Tue Jan  1 14:09:00 2002
-+++ ../connectivity/source/manager/makefile.mk
-@@ -92,11 +92,11 @@
- .ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
-+	$(SALLIB)					\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(VOSLIB)					\
--	$(OSLLIB)					\
--	$(SALLIB)
-+	$(OSLLIB)					
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-connectivity::source::parse::makefile.mk b/editors/openoffice.org-2-devel/files/patch-connectivity::source::parse::makefile.mk
deleted file mode 100644
index 7000bf23cc00..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-connectivity::source::parse::makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../connectivity/source/parse/makefile.mk.orig	Wed Mar  6 10:39:52 2002
-+++ ../connectivity/source/parse/makefile.mk	Wed Mar  6 10:40:07 2002
-@@ -95,6 +95,7 @@
- 	+flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l
- 
- $(MISC)$/sqlbison.cxx: sqlbison.y
-+	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx.h sqlbison.y
- 	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
- 	-$(MKDIR) $(OUT)$/inc$/connectivity
- 	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
diff --git a/editors/openoffice.org-2-devel/files/patch-cosv::source::strings::streamstr.cxx b/editors/openoffice.org-2-devel/files/patch-cosv::source::strings::streamstr.cxx
new file mode 100644
index 000000000000..5bdb940ec43b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cosv::source::strings::streamstr.cxx
@@ -0,0 +1,11 @@
+--- ../cosv/source/strings/streamstr.cxx.orig	Tue Aug 13 14:29:52 2002
++++ ../cosv/source/strings/streamstr.cxx	Fri Oct 18 20:20:41 2002
+@@ -65,7 +65,7 @@
+ // NOT FULLY DECLARED SERVICES
+ #include <string.h>
+ #include <stdio.h>
+-#if defined(WNT) || defined(LINUX) || defined(MACOSX)
++#if defined(WNT) || defined(LINUX) || defined(MACOSX) || defined(FREEBSD)
+ #include <stdarg.h>
+ #else
+ #include <sys/varargs.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::inc::cppu::macros.hxx b/editors/openoffice.org-2-devel/files/patch-cppu::inc::cppu::macros.hxx
new file mode 100644
index 000000000000..dad8a1f99a5c
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppu::inc::cppu::macros.hxx
@@ -0,0 +1,11 @@
+--- ../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 )
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice.org-2-devel/files/patch-cppu::inc::uno::lbnames.h
new file mode 100644
index 000000000000..cb43c2d165e9
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppu::inc::uno::lbnames.h
@@ -0,0 +1,11 @@
+--- ../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."
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::prj::build.lst b/editors/openoffice.org-2-devel/files/patch-cppu::prj::build.lst
deleted file mode 100644
index 78fd210a1193..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppu::prj::build.lst
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::source::uno::data.cxx b/editors/openoffice.org-2-devel/files/patch-cppu::source::uno::data.cxx
new file mode 100644
index 000000000000..9c0e34bfb60b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppu::source::uno::data.cxx
@@ -0,0 +1,20 @@
+--- ../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(); }
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::test::alignment::diagnose.h b/editors/openoffice.org-2-devel/files/patch-cppu::test::alignment::diagnose.h
new file mode 100644
index 000000000000..2a6650400a1e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppu::test::alignment::diagnose.h
@@ -0,0 +1,11 @@
+--- ../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
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppu::util::makefile.mk
deleted file mode 100644
index 0157a34167b5..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppu::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../cppu/util/makefile.mk.orig	Fri Nov  9 10:14:31 2001
-+++ ../cppu/util/makefile.mk	Mon Mar 11 13:35:07 2002
-@@ -89,7 +89,9 @@
- SHL1IMPLIB=i$(TARGET)
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=$(TARGET).map
-+.ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk
deleted file mode 100644
index 59b78a3fd844..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../cppuhelper/source/makefile.mk.orig	Thu Mar  7 16:37:48 2002
-+++ ../cppuhelper/source/makefile.mk	Thu Mar  7 16:37:55 2002
-@@ -149,8 +149,8 @@
- SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
- 
- SHL1STDLIBS= \
--		$(CPPULIB)		\
--		$(SALLIB)
-+		$(SALLIB)		\
-+		$(CPPULIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
-@@ -173,6 +173,10 @@
- SHL1VERSIONMAP=gcc2_linux_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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-cpputools::source::registercomponent::makefile.mk b/editors/openoffice.org-2-devel/files/patch-cpputools::source::registercomponent::makefile.mk
new file mode 100644
index 000000000000..8134445349f1
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cpputools::source::registercomponent::makefile.mk
@@ -0,0 +1,10 @@
+--- ../cpputools/source/registercomponent/makefile.mk.orig	Mon Apr 22 22:46:11 2002
++++ ../cpputools/source/registercomponent/makefile.mk	Mon Apr 22 22:46:44 2002
+@@ -104,6 +104,7 @@
+ 
+ APP1STDLIBS=\
+ 			$(SALLIB) \
++			$(TOOLSLIB) \
+ 			$(CPPULIB)	\
+ 			$(CPPUHELPERLIB)
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-desktop::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-desktop::util::makefile.mk
new file mode 100644
index 000000000000..8ceb57682cc7
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-desktop::util::makefile.mk
@@ -0,0 +1,20 @@
+--- ../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
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-dmake::unix::linux::gnu::make.sh b/editors/openoffice.org-2-devel/files/patch-dmake::unix::linux::gnu::make.sh
deleted file mode 100644
index d60afa8e32e8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-dmake::unix::linux::gnu::make.sh
+++ /dev/null
@@ -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 \
diff --git a/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::X11_selection.cxx b/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::X11_selection.cxx
new file mode 100644
index 000000000000..77df99f679ab
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::X11_selection.cxx
@@ -0,0 +1,11 @@
+--- ../dtrans/source/X11/X11_selection.cxx.orig	Wed Jul 31 22:43:56 2002
++++ ../dtrans/source/X11/X11_selection.cxx	Fri Oct 18 20:16:37 2002
+@@ -66,7 +66,7 @@
+ #include <X11/keysym.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+-#ifdef LINUX
++#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
+ #include <sys/poll.h>
+ #else
+ #include <poll.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::makefile.mk b/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::makefile.mk
deleted file mode 100644
index fa2c7a4b769c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-dtrans::source::X11::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../dtrans/source/X11/makefile.mk.orig	Sat Mar  2 21:11:32 2002
-+++ ../dtrans/source/X11/makefile.mk	Sat Mar  2 21:12:34 2002
-@@ -111,7 +111,8 @@
- APP1STDLIBS=\
- 		$(CPPULIB)			\
- 		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(SALLIB) \
-+		-lX11
- 
- .ENDIF		# "$(OS)"=="MACOSX"
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-eventattacher::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-eventattacher::source::makefile.mk
deleted file mode 100644
index b09408500c2d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-eventattacher::source::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../eventattacher/source/makefile.mk.orig	Tue Jan  1 14:09:28 2002
-+++ ../eventattacher/source/makefile.mk
-@@ -110,10 +110,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
- 		$(CPPUHELPERLIB)				\
--		$(VOSLIB)					\
--		$(SALLIB)
-+		$(VOSLIB)					
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-extensions::source::plugin::unx::makefile.mk b/editors/openoffice.org-2-devel/files/patch-extensions::source::plugin::unx::makefile.mk
deleted file mode 100644
index 4535235d6bec..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-extensions::source::plugin::unx::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../extensions/source/plugin/unx/makefile.mk.orig	Mon Mar 11 01:34:07 2002
-+++ ../extensions/source/plugin/unx/makefile.mk	Mon Mar 11 10:21:01 2002
-@@ -91,7 +91,11 @@
- .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
- APP1STDLIBS+=-lXm -lXt -lX11 -ldl
- .ELSE
-+IF "$(OS)"=="FREEBSD"
-+APP1STDLIBS+=-lXaw -lXt -lX11
-+.ELSE
- APP1STDLIBS+=-lXaw -lXt -lX11 -ldl
-+.ENDIF
- .ENDIF
- 
- APP1DEF=	$(MISC)$/$(TARGET).def
diff --git a/editors/openoffice.org-2-devel/files/patch-external::dt::dtpatch.sh b/editors/openoffice.org-2-devel/files/patch-external::dt::dtpatch.sh
deleted file mode 100644
index e5122bcb45c1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external::dt::dtpatch.sh
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-external::expat::expatpatch.sh b/editors/openoffice.org-2-devel/files/patch-external::expat::expatpatch.sh
deleted file mode 100644
index ce07edcfffd8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external::expat::expatpatch.sh
+++ /dev/null
@@ -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`
diff --git a/editors/openoffice.org-2-devel/files/patch-external::jpeg::jpegpatch.sh b/editors/openoffice.org-2-devel/files/patch-external::jpeg::jpegpatch.sh
deleted file mode 100644
index 4fb55f5d70d0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external::jpeg::jpegpatch.sh
+++ /dev/null
@@ -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/
diff --git a/editors/openoffice.org-2-devel/files/patch-external::neon::md5.c.pat b/editors/openoffice.org-2-devel/files/patch-external::neon::md5.c.pat
new file mode 100644
index 000000000000..46c5e062128e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-external::neon::md5.c.pat
@@ -0,0 +1,112 @@
+--- /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]);
diff --git a/editors/openoffice.org-2-devel/files/patch-external::npsdk::npsdkpatch.sh b/editors/openoffice.org-2-devel/files/patch-external::npsdk::npsdkpatch.sh
deleted file mode 100644
index 49a3056831dd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external::npsdk::npsdkpatch.sh
+++ /dev/null
@@ -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
- 
- #
diff --git a/editors/openoffice.org-2-devel/files/patch-external::zlib::zlibpatch.sh b/editors/openoffice.org-2-devel/files/patch-external::zlib::zlibpatch.sh
deleted file mode 100644
index 04d96c6ad70f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-external::zlib::zlibpatch.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../external/zlib/zlibpatch.sh.orig	Wed Mar 13 16:51:46 2002
-+++ ../external/zlib/zlibpatch.sh	Wed Mar 13 16:52:02 2002
-@@ -111,7 +111,7 @@
- 
-   for PNAME in `cat flist.pat`
-   do
--      patch -i pat/$PNAME.pat $PNAME
-+      patch < pat/$PNAME.pat $PNAME
-   done
- 
-   cp -rf zlib-1.1.3/* rtufiles/
diff --git a/editors/openoffice.org-2-devel/files/patch-freetype::makefile.mk b/editors/openoffice.org-2-devel/files/patch-freetype::makefile.mk
deleted file mode 100644
index 1e5e5bf12c6b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-freetype::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../freetype/makefile.mk.orig	Tue Mar  5 15:43:54 2002
-+++ ../freetype/makefile.mk	Tue Mar  5 15:43:56 2002
-@@ -90,7 +90,7 @@
- .IF "$(GUI)"=="UNX"
- OUT2LIB= \
- 	objs$/.libs$/libfreetype.a \
--	objs$/.libs$/libfreetype.so.6*
-+	objs$/.libs$/libfreetype.so.7
- 	
- .ENDIF			# "$(GUI)"=="UNX"
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-devel/files/patch-gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index 66b7dfe1f73d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	2001/11/01 13:26:23	1.2
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx	2002/03/03 19:43:31
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !defined(FREEBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- /* 
diff --git a/editors/openoffice.org-2-devel/files/patch-i18n::inc::collator.hxx b/editors/openoffice.org-2-devel/files/patch-i18n::inc::collator.hxx
deleted file mode 100644
index f336ca1fb6cd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i18n::inc::collator.hxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../i18n/inc/collator.hxx.orig	Tue Mar 12 08:24:59 2002
-+++ ../i18n/inc/collator.hxx	Tue Mar 12 08:25:55 2002
-@@ -80,7 +80,9 @@
- 
- #ifndef WIN32
- #ifndef MACOSX
-+#ifndef FREEBSD
- #include <alloca.h>
-+#endif
- #endif
- #endif
- #include <tools/string.hxx>
diff --git a/editors/openoffice.org-2-devel/files/patch-i18npool::inc::collatorImpl.hxx b/editors/openoffice.org-2-devel/files/patch-i18npool::inc::collatorImpl.hxx
new file mode 100644
index 000000000000..47d4ee627fc9
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i18npool::inc::collatorImpl.hxx
@@ -0,0 +1,11 @@
+--- ../i18npool/inc/collatorImpl.hxx.orig	Fri Oct 18 19:35:02 2002
++++ ../i18npool/inc/collatorImpl.hxx	Fri Oct 18 19:35:26 2002
+@@ -71,7 +71,7 @@
+ #include <cppuhelper/implbase2.hxx>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ 
+-#if !defined( WIN32 ) && !defined( MACOSX )
++#if !defined( WIN32 ) && !defined( MACOSX ) && !defined( FREEBSD)
+ #include <alloca.h>
+ #endif
+ #include <tools/list.hxx>
diff --git a/editors/openoffice.org-2-devel/files/patch-idl::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-idl::util::makefile.mk
new file mode 100644
index 000000000000..2543593dd210
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-idl::util::makefile.mk
@@ -0,0 +1,11 @@
+--- ../idl/util/makefile.mk.orig	Sun Jul 21 00:02:37 2002
++++ ../idl/util/makefile.mk	Sun Jul 21 00:02:39 2002
+@@ -110,7 +110,7 @@
+ .ENDIF
+ .ENDIF
+ 
+-.IF "$(OS)"=="LINUX"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+ APP1STDLIBS+=-lcrypt
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-idlc::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-idlc::source::makefile.mk
deleted file mode 100644
index 780425770b86..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-idlc::source::makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../idlc/source/makefile.mk.orig	Wed Mar  6 10:25:35 2002
-+++ ../idlc/source/makefile.mk	Wed Mar  6 10:25:53 2002
-@@ -147,6 +147,7 @@
- 	+flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll
- 
- $(MISC)$/parser.cxx: parser.yy
-+	+bison -v -d -o$(MISC)$/parser.cxx.h parser.yy
- 	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
- 	+$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h
- # with line statements (for debugging)
diff --git a/editors/openoffice.org-2-devel/files/patch-inet::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-inet::util::makefile.mk
deleted file mode 100644
index cbbeb2e86e5e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-inet::util::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../util/makefile.mk.orig	Sat Mar  2 21:17:20 2002
-+++ ../inet/util/makefile.mk	Sat Mar  2 21:17:42 2002
-@@ -116,7 +116,7 @@
- 
- SHL1TARGET=		$(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=		$(TARGET)
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=	$(TARGET).$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-javaunohelper::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-javaunohelper::source::makefile.mk
deleted file mode 100644
index 7f2cd2f1d220..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-javaunohelper::source::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../javaunohelper/source/makefile.mk.orig	Tue Jan  1 14:10:20 2002
-+++ ../javaunohelper/source/makefile.mk
-@@ -110,9 +110,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-moz::prj::d.lst b/editors/openoffice.org-2-devel/files/patch-moz::prj::d.lst
new file mode 100644
index 000000000000..d65f2df6cf3b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-moz::prj::d.lst
@@ -0,0 +1,34 @@
+--- ../moz/prj/d.lst	Sat May 18 16:06:23 2002
++++ ../moz/prj/d.lst	Sat May 18 16:16:33 2002
+@@ -43,6 +43,7 @@
+ mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul
+ mkdir: %_DEST%\inc%_EXT%\mozilla\ldap
+ mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap
++mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr
+ mkdir: %_DEST%\inc%_EXT%\mozilla\locale
+ mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk
+ mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews
+@@ -71,6 +72,7 @@
+ mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private
+ mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm
+ mkdir: %_DEST%\inc%_EXT%\mozilla\oji
++mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete
+ mkdir: %_DEST%\inc%_EXT%\mozilla\plugin
+ mkdir: %_DEST%\inc%_EXT%\mozilla\png
+ mkdir: %_DEST%\inc%_EXT%\mozilla\pref
+@@ -158,6 +160,7 @@
+ ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul
+ ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap
+ ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap
++..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr
+ ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale
+ ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk
+ ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews
+@@ -186,6 +189,7 @@
+ ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private
+ ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm
+ ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji
++..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete
+ ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin
+ ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png
+ ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref
diff --git a/editors/openoffice.org-2-devel/files/patch-mozillasrc::makefile.mk b/editors/openoffice.org-2-devel/files/patch-mozillasrc::makefile.mk
deleted file mode 100644
index 27086ca55940..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-mozillasrc::makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Fri Mar 15 19:10:28 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Fri Mar 15 19:11:45 2002
-@@ -152,6 +152,10 @@
-             -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
-+.IF "$(OS)" == "FREEBSD"
-+CFLAGSCXX += \
-+            -fno-rtti
-+.ENDIF
- .ENDIF
- 
- SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
diff --git a/editors/openoffice.org-2-devel/files/patch-nas:nas-1.4.1.patch b/editors/openoffice.org-2-devel/files/patch-nas:nas-1.4.1.patch
deleted file mode 100644
index 6f2635c639f7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-nas:nas-1.4.1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../nas/nas-1.4.1.patch.orig	Wed Mar  6 02:24:32 2002
-+++ ../nas/nas-1.4.1.patch	Wed Mar  6 02:27:00 2002
-@@ -143,3 +143,14 @@
-   InstallMultiple($(HEADERS),$(INCDIR))
-   #if ProjectX >= 5
-   InstallNonExecFile(AuErrorDB,$(LIBDIR))
-+--- 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
diff --git a/editors/openoffice.org-2-devel/files/patch-odk::pack::unzip_udk::makefile.mk b/editors/openoffice.org-2-devel/files/patch-odk::pack::unzip_udk::makefile.mk
deleted file mode 100644
index f3b6e9ba1f0e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-odk::pack::unzip_udk::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../odk/pack/unzip_udk/makefile.mk.orig	Tue Mar  5 15:35:31 2002
-+++ ../odk/pack/unzip_udk/makefile.mk	Tue Mar  5 15:36:15 2002
-@@ -30,7 +30,7 @@
- .IF "$(GUI)"=="WNT"
- 	unzip -q -d . $(UDKNAME)
- .ELSE
--	gzip -df < $(UDKNAME).tar.gz | tar -xvf -
-+	tar -xzf $(UDKNAME).tar.gz
- .ENDIF
- 	+-$(RENAME) $(UDKNAME) 		$(ODKNAME)
- 	+rm -f $(ODKNAME)$/settings$/dk.mk
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi::com::sun::star::setup::OSType.idl b/editors/openoffice.org-2-devel/files/patch-offapi::com::sun::star::setup::OSType.idl
new file mode 100644
index 000000000000..3fee562c6d38
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-offapi::com::sun::star::setup::OSType.idl
@@ -0,0 +1,12 @@
+--- ../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
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi::util::makefile.pmk b/editors/openoffice.org-2-devel/files/patch-offapi::util::makefile.pmk
deleted file mode 100644
index 5cdbb1b4aa4a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-offapi::util::makefile.pmk
+++ /dev/null
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-package::inc::HashMaps.hxx b/editors/openoffice.org-2-devel/files/patch-package::inc::HashMaps.hxx
new file mode 100644
index 000000000000..35052d291ef7
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-package::inc::HashMaps.hxx
@@ -0,0 +1,20 @@
+--- ../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;
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-package::inc::ZipPackageFolder.hxx b/editors/openoffice.org-2-devel/files/patch-package::inc::ZipPackageFolder.hxx
new file mode 100644
index 000000000000..014c61403380
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-package::inc::ZipPackageFolder.hxx
@@ -0,0 +1,11 @@
+--- ../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()
diff --git a/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ContentInfo.hxx b/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ContentInfo.hxx
new file mode 100644
index 000000000000..c4bf35e79f64
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ContentInfo.hxx
@@ -0,0 +1,34 @@
+--- ../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();
diff --git a/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx b/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx
new file mode 100644
index 000000000000..bb504c834eef
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx
@@ -0,0 +1,41 @@
+--- ../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 );
diff --git a/editors/openoffice.org-2-devel/files/patch-package::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-package::util::makefile.mk
deleted file mode 100644
index 2bf58cecdb01..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-package::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../package/util/makefile.mk.orig	Sat Mar  2 22:06:28 2002
-+++ ../package/util/makefile.mk	Sat Mar  2 22:06:31 2002
-@@ -88,7 +88,9 @@
- 
- SHL1TARGET=$(TARGET)$(MAJOR_VERSION)
- SHL1IMPLIB=i$(TARGET)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map
-+.ENDIF
- 
- SHL1STDLIBS=\
- 	$(CPPULIB)		\
diff --git a/editors/openoffice.org-2-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx b/editors/openoffice.org-2-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx
deleted file mode 100644
index 5ebff3ce7d3e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../psprint/source/printer/printerinfomanager.cxx.orig	Sat Mar  2 22:16:34 2002
-+++ ../psprint/source/printer/printerinfomanager.cxx	Sat Mar  2 22:16:12 2002
-@@ -883,7 +883,7 @@
- 
- static const struct SystemCommandParameters aParms[] =
- {
--#ifdef LINUX
-+#ifdef LINUX || defined(FREEBSD) || defined(NETBSD)
-     { "/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 }
diff --git a/editors/openoffice.org-2-devel/files/patch-product::inc::scp::udk_basefiles.scp b/editors/openoffice.org-2-devel/files/patch-product::inc::scp::udk_basefiles.scp
new file mode 100644
index 000000000000..7b55cc064156
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-product::inc::scp::udk_basefiles.scp
@@ -0,0 +1,18 @@
+--- ../product/inc/scp/udk_basefiles.scp.orig	Fri Jun  7 20:15:12 2002
++++ ../product/inc/scp/udk_basefiles.scp	Tue Jul 16 15:26:15 2002
+@@ -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 ( LINUX ))
+ #if ( defined( _gcc3 ) && defined( C300 ) )
+ 
+ File gid_File_Lib_gcc
+@@ -42,6 +43,7 @@
+     Name        = STRING(libstdc++.so.3);
+     Styles      = (NETWORK,RELATIVE);
+ End
++#endif
+ #endif
+ #endif
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-product::settings::settings.mk b/editors/openoffice.org-2-devel/files/patch-product::settings::settings.mk
new file mode 100644
index 000000000000..9773406f4ed2
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-product::settings::settings.mk
@@ -0,0 +1,26 @@
+--- ../product/settings/settings.mk.orig	Wed May 29 00:16:16 2002
++++ ../product/settings/settings.mk	Wed May 29 00:18:00 2002
+@@ -83,9 +83,8 @@
+ 
+ OS=SOLARIS
+ PS=/
+-CC=CC
+-LINK=CC
+-LIB=CC
++LINK=$(CC)
++LIB=$(CC)
+ ECHO=@echo
+ MKDIR=mkdir -p
+ CAT=cat
+@@ -136,9 +135,8 @@
+ OS=LINUX
+ PLATFORM=linux
+ PS=/
+-CC=gcc
+-LINK=gcc
+-LIB=gcc
++LINK=$(CC)
++LIB=$(CC)
+ ECHO=@echo
+ MKDIR=mkdir -p
+ CAT=cat
diff --git a/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk
deleted file mode 100644
index 1df961f90223..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
---- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
-@@ -115,13 +115,26 @@
- STLPORTLIBNAME=stlport_vc6.dll
- ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/w9xucwrp.dll
-+.ELIF "$(OS)"=="FREEBSD"
-+###########
-+# FREEBSD
-+###########
-+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
-+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
-+DESTDIRDLL=$(DESTDIRLIB)
-+STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=$(COMNAME)_uno
- .ENDIF
- 
- STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
- .IF "$(STLPORT4)" != ""
- # in OOo build environment
- .IF "($STLPORT4)" != "NO_STLPORT4"
-+.IF "$(OS)" != "FREEBSD"
- STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
-+.ELSE
-+STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
-+.ENDIF
- .ELSE	
- STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
- .ENDIF
-@@ -367,8 +380,8 @@
- 	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
- 
- $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
--	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
--	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
-+	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
-+	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
- 
- 
- #---------------------------------------------------------
-@@ -379,7 +392,7 @@
- #
- #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
- #	-rm -f $@
--#	+ln -s libstdc++.so.3.0.1 $@
-+#	+ln -fs libstdc++.so.3.0.1 $@
- 
- $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
-@@ -387,7 +400,7 @@
- 
- $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
--	+ln -s libgcc_s.so.1 $@
-+	+ln -fs libgcc_s.so.1 $@
- #-------------------------------------------------------------
- 
- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice.org-2-devel/files/patch-psprint::source::printer::printerinfomanager.cxx b/editors/openoffice.org-2-devel/files/patch-psprint::source::printer::printerinfomanager.cxx
new file mode 100644
index 000000000000..0880976d0815
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-psprint::source::printer::printerinfomanager.cxx
@@ -0,0 +1,11 @@
+--- ../psprint/source/printer/printerinfomanager.cxx.orig	Wed Oct 16 00:02:09 2002
++++ ../psprint/source/printer/printerinfomanager.cxx	Fri Oct 18 20:02:54 2002
+@@ -883,7 +883,7 @@
+ 
+ static const struct SystemCommandParameters aParms[] =
+ {
+-#ifdef LINUX
++#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 }
diff --git a/editors/openoffice.org-2-devel/files/patch-psprint::source::printergfx::psheader.ps b/editors/openoffice.org-2-devel/files/patch-psprint::source::printergfx::psheader.ps
new file mode 100644
index 000000000000..2118d0fe6c93
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-psprint::source::printergfx::psheader.ps
@@ -0,0 +1,13 @@
+--- ../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
diff --git a/editors/openoffice.org-2-devel/files/patch-psprint::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-psprint::util::makefile.mk
deleted file mode 100644
index faa0b78f18b1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-psprint::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../psprint/util/makefile.mk.orig	Sat Mar  2 22:24:38 2002
-+++ ../psprint/util/makefile.mk	Sat Mar  2 22:25:27 2002
-@@ -91,7 +91,9 @@
- .IF "$(OS)"=="SOLARIS"
- SHL1VERSIONMAP=libpsp_solaris.map
- .ELSE   # should work for all gcc/binutils based linker (ld)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=libpsp_linux.map
-+.ENDIF
- .ENDIF
- SHL1STDLIBS=$(UNOTOOLSLIB)		\
- 			$(TOOLSLIB) 		\
diff --git a/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx
deleted file mode 100644
index fad069f83f14..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-registry::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-registry::util::makefile.mk
deleted file mode 100644
index f1970ad5e6a1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-registry::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../registry/util/makefile.mk.orig	Sat Mar  2 22:28:13 2002
-+++ ../registry/util/makefile.mk	Sat Mar  2 22:28:07 2002
-@@ -95,7 +95,9 @@
- 	$(STORELIB) \
- 	$(LIBCIMT)
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=	$(TARGET).map
-+.ENDIF
- 
- SHL1LIBS= $(LIB1TARGET)	
- SHL1DEPN= $(LIB1TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk b/editors/openoffice.org-2-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk
deleted file mode 100644
index 72e5a97234f4..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../remotebridges/source/unourl_resolver/makefile.mk.orig	Tue Jan  1 14:11:01 2002
-+++ ../remotebridges/source/unourl_resolver/makefile.mk
-@@ -102,9 +102,9 @@
- SHL1VERSIONMAP=	$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp.h b/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp.h
deleted file mode 100644
index 417ab33ba52f..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp.h
+++ /dev/null
@@ -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              */
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp3.c b/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp3.c
new file mode 100644
index 000000000000..f74de7504d2e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-rsc::source::rscpp::cpp3.c
@@ -0,0 +1,12 @@
+--- ../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
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-rscpp::cpp.h b/editors/openoffice.org-2-devel/files/patch-rscpp::cpp.h
deleted file mode 100644
index 751623885bbd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-rscpp::cpp.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../rscpp/cpp.h.orig	Fri Mar  1 00:15:54 2002
-+++ ../rscpp/cpp.h	Fri Mar  1 00:15:56 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              */
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch
deleted file mode 100644
index 3b44b26ac6c7..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../sablot/Sablot-0.52.patch.orig	Mon Oct 29 19:18:40 2001
-+++ ../sablot/Sablot-0.52.patch	Tue Mar  5 18:16:07 2002
-@@ -3,7 +3,7 @@
- ***************
- *** 1 ****
- ! dummy
----- 1,147 ----
-+--- 1,157 ----
- ! #*************************************************************************
- ! #
- ! #   $RCSfile: makefile.mk,v $
-@@ -85,12 +85,22 @@
- ! CFLAGS+=     -DHAVE_IEEEFP_H
- ! .ENDIF
- ! 
--! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- ! CFLAGS+=      -DHAVE_UNISTD_H
- ! .ENDIF
- ! 
- ! .IF "$(GUI)"=="UNX"
-+!
-+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+! .IF "$(OS)"=="FREEBSD"
-+! CFLAGS+=	-DHAVE_SYS_TIME_H
-+! .ELSE
-+! CFLAGS+=	-DHAVE_SYS_TIMEB_H
-+! .ENDIF
-+! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELSE
- ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
-+! .ENDIF
- ! .ENDIF
- ! 
- ! CFLAGS+=	-I$(SOLARINCDIR)$/external$/expat
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::file.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::file.c
deleted file mode 100644
index ade5f14b7946..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::file.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- ../sal/osl/unx/file.c.orig	Thu Oct  4 15:09:21 2001
-+++ ../sal/osl/unx/file.c
-@@ -123,11 +123,16 @@
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
- 
--#elif defined(NETBSD)
-+#elif defined(NETBSD) || defined(FREEBSD)
-+#include <sys/param.h>
-+#include <sys/ucred.h>
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ctype.h>
--static const sal_Char* MOUNTTAB="/etc/mtab"; 
-+#define  HAVE_STATFS_H
-+/* No mounting table on *BSD
-+ * This information is stored only in the kernel. */
-+/* static const sal_Char* MOUNTTAB="/etc/mtab"; */
- 
- #elif defined(IRIX)
- #include <mntent.h>
-@@ -137,7 +142,7 @@
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
- 
--#elif defined(MACOSX) || defined(FREEBSD)
-+#elif defined(MACOSX) 
- #include <ufs/ufs/quota.h>
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
-@@ -4224,10 +4229,20 @@
-     mntfile = fopen(MOUNTTAB,"r");
- #endif /* SOLARIS */
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+    struct statfs *mntbufp;
-+    int mntentries,i;
-+    mntentries = getmntinfo(&mntbufp,MNT_WAIT);
- 
-     buffer[0] = '\0';
-     
-+    if(mntentries == 0)
-+#else    
-+
-+    buffer[0] = '\0';
-+
-     if ( mntfile == 0 )
-+#endif
-     {
-         nRet=errno;
- #ifdef DEBUG_OSL_FILE
-@@ -4286,7 +4301,21 @@
-     }
- #endif /* SOLARIS */
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+    i=0;
-+    while ( i < mntentries )
-+    {
-+       if ( strcmp(mntbufp[i].f_mntonname,buffer) == 0 )
-+       {
-+           *bMountPoint=sal_True;
-+           return osl_File_E_None;
-+       }
-+       i++;
-+    }
-+#endif
-+#if ! ( defined(NETBSD) || defined(FREEBSD) )
-     fclose(mntfile);
-+#endif
-     *bMountPoint=sal_False;
-     return osl_File_E_None;
- }
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::interlck.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::interlck.c
new file mode 100644
index 000000000000..60ea1f414d1a
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::interlck.c
@@ -0,0 +1,30 @@
+--- ../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");
+ }
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::nlsupport.c
deleted file mode 100644
index 29b4de4eb78b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::nlsupport.c
+++ /dev/null
@@ -1,88 +0,0 @@
---- ../sal/osl/unx/nlsupport.c.orig	Sat Mar  9 00:51:17 2002
-+++ ../sal/osl/unx/nlsupport.c	Sat Mar  9 01:54:43 2002
-@@ -63,11 +63,17 @@
- #include <osl/diagnose.h>
- #include <osl/process.h>
- 
--#if defined(LINUX) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
- #include <pthread.h>
- #include <locale.h>
-+#if defined(FREEBSD)
-+#if OSVERSION > 500000
- #include <langinfo.h>
- #endif
-+#else
-+#include <langinfo.h>
-+#endif
-+#endif
- 
- /*****************************************************************************/
- /* typedefs
-@@ -242,7 +248,7 @@
-     return NULL;
- }
-         
--#if defined(LINUX) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -296,7 +302,7 @@
- /* XXX MS-874 is an extension to tis620, so this is not
-  * really equivalent */
- 
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
- 
- const _pair _nl_language_list[] = {
-     { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
-@@ -477,7 +483,7 @@
-     { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
- };
- 
--#endif /* ifdef LINUX */
-+#endif /* ifdef LINUX || NETBSD || FREEBSD */
- 
- static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
- 
-@@ -516,7 +522,13 @@
-     }
-         
-     /* get the charset as indicated by the LC_CTYPE locale */
-+#if defined(NETBSD) || defined(FREEBSD)
-+#if !defined(CODESET) 
-+    codeset = NULL;
-+#else
-     codeset = nl_langinfo( CODESET );
-+#endif
-+#endif
- 
-     if ( codeset != NULL )
-     {
-@@ -595,7 +607,7 @@
-     return ret;
- }
- 
--#elif defined(MACOSX) /* ifdef LINUX || SOLARIS */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD || FREEBSD */
- 
- /*
-  * FIXME: the MacOS X implemetation is missing
-@@ -628,7 +640,7 @@
-     return 0;
- }
- 
--#else /* ifdef LINUX || SOLARIS || MACOSX */
-+#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
- 
- /*
-  * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -844,6 +856,6 @@
-     return 0;
- }
- 
--#endif /* ifdef LINUX || SOLARIS || MACOSX*/
-+#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
- 
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::pipe.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::pipe.c
deleted file mode 100644
index 6802487470a2..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::pipe.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../sal/osl/unx/pipe.c.orig	Tue May 29 07:38:32 2001
-+++ ../sal/osl/unx/pipe.c
-@@ -264,7 +264,11 @@
-     
- 	addr.sun_family = AF_UNIX;
- 	strcpy(addr.sun_path, name);
-+#if defined(FREEBSD)
-+        len = SUN_LEN(&addr);
-+#else
- 	len = sizeof(addr.sun_family) + strlen(addr.sun_path);
-+#endif
- 
- 	if ( Options & osl_Pipe_CREATE )
- 	{			
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::process.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::process.c
deleted file mode 100644
index 9d7ffa6686d3..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::process.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/osl/unx/process.c.orig	Sat Mar  2 22:33:17 2002
-+++ ../sal/osl/unx/process.c	Sat Mar  2 22:33:58 2002
-@@ -834,7 +834,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=");
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::security.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::security.c
new file mode 100644
index 000000000000..0cc321dcd544
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::security.c
@@ -0,0 +1,11 @@
+--- ../sal/osl/unx/security.c.orig	Sat Jul 20 22:53:31 2002
++++ ../sal/osl/unx/security.c	Sat Jul 20 22:52:39 2002
+@@ -739,7 +739,7 @@
+ 	}
+ 
+ 
+-#elif (LINUX && (GLIBC >= 2))
++#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD))
+ 	
+ 	struct passwd	*pPasswd; 
+ 	
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::socket.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::socket.c
deleted file mode 100644
index 19d390cf08eb..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::socket.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../sal/osl/unx/socket.c.orig	Fri Jun 22 16:22:14 2001
-+++ ../sal/osl/unx/socket.c	Sun Mar 10 23:33:56 2002
-@@ -82,7 +82,7 @@
- #undef HAVE_POLL_H
- #endif
- 
--#if defined(LINUX) || defined (IRIX)
-+#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! */
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.c b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.c
deleted file mode 100644
index b0b93119f983..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- ../sal/osl/unx/system.c.orig	Wed Feb 28 13:08:45 2001
-+++ ../sal/osl/unx/system.c
-@@ -126,6 +126,73 @@
-   	return res;
- }
- 
-+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;
-@@ -449,3 +516,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
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.h b/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.h
deleted file mode 100644
index 85de2700b284..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::osl::unx::system.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../sal/osl/unx/system.h.orig	Mon Mar 11 01:41:13 2002
-+++ ../sal/osl/unx/system.h	Mon Mar 11 01:41:25 2002
-@@ -216,10 +216,7 @@
- #   elif BYTE_ORDER == PDP_ENDIAN
- #   	define _PDP_ENDIAN
- #   endif
--#   define  sched_yield() 				pthread_yield()
--#   define  pthread_testcancel()
- #	define  NO_PTHREAD_RTL
--#	define  NO_PTHREAD_PRIORITY
- #	define  CMD_ARG_PRG					__progname		
- #	define  CMD_ARG_ENV					environ
- #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c b/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c
deleted file mode 100644
index 91a5289d6636..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::rtl::source::strtmpl.c
+++ /dev/null
@@ -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') )
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::textenc::tencinfo.c b/editors/openoffice.org-2-devel/files/patch-sal::textenc::tencinfo.c
new file mode 100644
index 000000000000..7cf80c18d0a0
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sal::textenc::tencinfo.c
@@ -0,0 +1,13 @@
+--- ../sal/textenc/tencinfo.c.orig	Wed Jul 31 11:44:35 2002
++++ ../sal/textenc/tencinfo.c	Wed Jul 31 11:45:47 2002
+@@ -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 },
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sal::util::makefile.mk
deleted file mode 100644
index 41b798faabfb..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sal/util/makefile.mk.orig	Tue Mar  5 21:36:23 2002
-+++ ../sal/util/makefile.mk	Tue Mar  5 21:36:44 2002
-@@ -113,7 +113,9 @@
- SHL1TARGET= $(TARGET)
- SHL1IMPLIB= i$(TARGET)
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=	$(TARGET).map
-+.ENDIF
- 
- .IF "$(GUI)"=="WNT"
- .IF "$(COM)"!="GCC"
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::workben::getlocaleinfotest.cxx b/editors/openoffice.org-2-devel/files/patch-sal::workben::getlocaleinfotest.cxx
deleted file mode 100644
index ef5bf2488496..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::workben::getlocaleinfotest.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sal/workben/getlocaleinfotest.cxx	Sun Mar 10 23:42:26 2002
-+++ ../sal/workben/getlocaleinfotest.cxx	Sun Mar 10 23:42:45 2002
-@@ -63,7 +63,7 @@
- #include <osl/nlsupport.h>
- #include <rtl/ustring.hxx>
- 
--int _cdecl main( int argc, char * argv[] )
-+int main( int argc, char * argv[] )
- {
-     rtl::OUString lang = rtl::OUString::createFromAscii( "de" );
-     rtl::OUString country = rtl::OUString::createFromAscii( "DE" );
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk
deleted file mode 100644
index 369935e31d66..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk
+++ /dev/null
@@ -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 ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map b/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map
new file mode 100644
index 000000000000..1ffacf889bc6
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map
@@ -0,0 +1,31 @@
+--- /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:
++*;
++};
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map b/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map
new file mode 100644
index 000000000000..823cff316ec7
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map
@@ -0,0 +1,34 @@
+--- /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:
++		*;
++};
++
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-salhelper::source::makefile.mk
deleted file mode 100644
index cb4fbc1f1570..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-salhelper::source::makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../salhelper/source/makefile.mk.orig	Wed Nov 14 14:19:21 2001
-+++ ../salhelper/source/makefile.mk	Sun Mar  3 17:58:15 2002
-@@ -109,6 +109,10 @@
- SHL1VERSIONMAP=lngi.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
- 
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-salhelper::test::rtti::makefile.mk b/editors/openoffice.org-2-devel/files/patch-salhelper::test::rtti::makefile.mk
new file mode 100644
index 000000000000..70f25048a24a
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-salhelper::test::rtti::makefile.mk
@@ -0,0 +1,13 @@
+--- ../salhelper/test/rtti/makefile.mk.orig	Sat Jul 20 23:11:56 2002
++++ ../salhelper/test/rtti/makefile.mk	Sat Jul 20 23:12:01 2002
+@@ -116,6 +116,10 @@
+ SHL1VERSIONMAP=	sols.map
+ .ELIF "$(OS)$(CPU)"=="LINUXI"
+ SHL1VERSIONMAP= lngi.map
++.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
++SHL1VERSIONMAP= gcc2_freebsd_intel.map
++.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
++SHL1VERSIONMAP= gcc3_freebsd_intel.map
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-sax::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sax::util::makefile.mk
deleted file mode 100644
index e6f307ea4a03..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sax::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sax/util/makefile.mk.old	Sun Mar  3 01:33:10 2002
-+++ ../sax/util/makefile.mk	Sun Mar  3 01:33:03 2002
-@@ -82,7 +82,9 @@
- 			$(EXPAT3RDLIB)
- 
- SHL1LIBS=		$(SLB)$/expatwrap.lib 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=		$(SOLARENV)$/src$/component.map
-+.ENDIF
- SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
- DEF1NAME=		$(SHL1TARGET)
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sc::source::core::data::cell.cxx b/editors/openoffice.org-2-devel/files/patch-sc::source::core::data::cell.cxx
new file mode 100644
index 000000000000..529f67a3e35f
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sc::source::core::data::cell.cxx
@@ -0,0 +1,11 @@
+--- ../sc/source/core/data/cell.cxx.orig	Sun Jul 21 00:39:25 2002
++++ ../sc/source/core/data/cell.cxx	Sun Jul 21 00:39:26 2002
+@@ -75,7 +75,7 @@
+ #include <mac_end.h>
+ #endif
+ 
+-#ifdef SOLARIS
++#if defined (SOLARIS) || defined (FREEBSD)
+ #include <ieeefp.h>
+ #elif ( defined ( LINUX ) && ( GLIBC < 2 ) )
+ #include <i386/ieeefp.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-sc::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sc::util::makefile.mk
deleted file mode 100644
index d075b7901044..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sc::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sc/util/makefile.mk.orig	Sun Mar  3 01:35:09 2002
-+++ ../sc/util/makefile.mk	Sun Mar  3 01:34:53 2002
-@@ -105,7 +105,9 @@
- # --- StarClac DLL
- 
- SHL1TARGET= sc$(UPD)$(DLLPOSTFIX)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= sc.map
-+.ENDIF
- SHL1IMPLIB= sci
- 
- SHL1STDLIBS=        \
diff --git a/editors/openoffice.org-2-devel/files/patch-sch::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sch::util::makefile.mk
deleted file mode 100644
index 33ee8a8172f1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sch::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sch/util/makefile.mk.orig	Sun Mar  3 01:37:53 2002
-+++ ../sch/util/makefile.mk	Sun Mar  3 01:38:16 2002
-@@ -111,7 +111,9 @@
- 
- 
- SHL1TARGET= sch$(UPD)$(DLLPOSTFIX)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= sch.map
-+.ENDIF
- .IF "$(GUI)" == "WNT" || "$(GUI)" == "WIN"
- SHL1RES=	$(RCTARGET)
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-scp::source::player::player.scp b/editors/openoffice.org-2-devel/files/patch-scp::source::player::player.scp
new file mode 100644
index 000000000000..2f8daab35cdd
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-scp::source::player::player.scp
@@ -0,0 +1,20 @@
+--- ../scp/source/player/player.scp.orig	Sun Jul 21 00:30:27 2002
++++ ../scp/source/player/player.scp	Sun Jul 21 00:30:28 2002
+@@ -62,7 +62,7 @@
+ // directories
+ ////////////////////////
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(FREEBSD)
+ 
+ Directory GID_DIR_KDE2
+     ParentID        = PREDEFINED_HOMEDIR;
+@@ -701,7 +701,7 @@
+         Name = "gnomeappplayer.zip";
+ End
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(FREEBSD)
+ 
+ File GID_FILE_EXTRA_KDEAPPPLAYER
+         Dir             = GID_DIR_KDE2_SHARE_APPLNK_STAR;
diff --git a/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::searchcache b/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::searchcache
new file mode 100644
index 000000000000..593e9eabf5bc
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::searchcache
@@ -0,0 +1,34 @@
+Index: files/patch-scptools::source::linker::searchcache
+===================================================================
+RCS file: files/patch-scptools::source::linker::searchcache
+diff -N files/patch-scptools::source::linker::searchcache
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ files/patch-scptools::source::linker::searchcache	4 Aug 2002 15:28:04 -0000
+@@ -0,0 +1,27 @@
++--- ../scptools/source/linker/searchcache.hxx.orig	Fri Aug  2 22:53:46 2002
+++++ ../scptools/source/linker/searchcache.hxx	Fri Aug  2 22:54:50 2002
++@@ -72,11 +72,11 @@
++ //	types
++ ///////////////////////////////////////////////////////////////////////////////
++ 
++-DECLARE_LIST( FileList, ByteString* )
+++DECLARE_LIST( SCacheFileList, ByteString* )
++ struct Include
++ {
++ 	ByteString	aBaseDir;
++-	FileList	aFileLst;
+++	SCacheFileList	aFileLst;
++ };
++ DECLARE_LIST( IncludeList, Include* )
++ 
++--- ../scptools/source/linker/searchcache.cxx.orig	Fri Aug  2 22:53:35 2002
+++++ ../scptools/source/linker/searchcache.cxx	Fri Aug  2 22:55:14 2002
++@@ -218,7 +218,7 @@
++ 		rPath += aDelim;
++ }
++ 
++-void ScanFileList( const ByteString& rPath, FileList& rLst )
+++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst )
++ {
++ 	Dir aFiles( rPath, FSYS_KIND_FILE );
++ 	for( USHORT i = 0; i < aFiles.Count(); ++i )
diff --git a/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::ziplst.cxx b/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::ziplst.cxx
new file mode 100644
index 000000000000..83b84631542e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-scptools::source::linker::ziplst.cxx
@@ -0,0 +1,19 @@
+--- ../scptools/source/linker/ziplst.cxx.orig	Sun Jul 21 00:32:40 2002
++++ ../scptools/source/linker/ziplst.cxx	Sun Jul 21 00:32:43 2002
+@@ -278,6 +278,7 @@
+ #define OS_SOLI			"solia"
+ #define OS_WINDOWS		"windows"
+ #define OS_LINUX		"linux"
++#define OS_FREEBSD		"freebsd"
+ #define OS_OS2			"os2"
+ 
+ ByteString _OS2Alpha( const ByteString& rStr )
+@@ -290,6 +291,8 @@
+ 		return OS_SOLI;
+ 	else if( rStr.CompareIgnoreCaseToAscii("unxlngi",7) == COMPARE_EQUAL )
+ 		return OS_LINUX;
++	else if( rStr.CompareIgnoreCaseToAscii("unxfbsdi",7) == COMPARE_EQUAL )
++		return OS_FREEBSD;
+ 	else if( rStr.CompareIgnoreCaseToAscii("os2icci",7) == COMPARE_EQUAL )
+ 		return OS_OS2;
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-sd::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sd::util::makefile.mk
deleted file mode 100644
index 51f4b7f461a8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-sd::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sd/util/makefile.mk.orig	Sun Mar  3 01:39:39 2002
-+++ ../sd/util/makefile.mk	Sun Mar  3 01:40:09 2002
-@@ -108,7 +108,9 @@
- # --- StarDraw DLL
- 
- SHL1TARGET= sd$(UPD)$(DLLPOSTFIX)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= sd.map
-+.ENDIF
- SHL1IMPLIB= sdi
- SHL1STDLIBS=        \
- 	$(SCHLIB) \
diff --git a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
deleted file mode 100644
index bb2dccced07b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-set_soenv.1
+++ /dev/null
@@ -1,149 +0,0 @@
---- set_soenv.1.orig	Wed Feb 27 10:46:41 2002
-+++ set_soenv.1	Wed Mar 13 19:13:01 2002
-@@ -40,7 +40,7 @@
- #
- # Set this value equal to the corresponding amount of
- # command line arguments. 
--my $numArgs = 19;
-+my $numArgs = 24;
- # Determining the amount of arguments in the call.
- my $numEnter = $#ARGV + 1;
- if ( $numEnter != $numArgs ) 
-@@ -66,14 +66,15 @@
- my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $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, 
--     $TF_CFGDATA, $TF_SVDATA,
-+     $TF_CFGDATA, $TF_SVDATA, $CC, $CXX,
-      $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, 
-      $USE_XPRINT, $BUILD_SOSL_RELEASE );
- #
- # Platform dependent constant values.
- my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, 
--     $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
--     $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
-+     $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
-+     $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS,
-+     $PTHREAD_LIBS );
- #
- #-------------------------------------------
- # IIc. Declaring the environment variables.
-@@ -145,6 +146,8 @@
- $STLPORT4	= $ARGV [ 12 ];     # Location of STLport4
- $MINGWIN32	= $ARGV [ 17 ];     # use MINGWIN32
- $USE_GCC3	= $ARGV [ 18 ];     # use gcc3 (only for unxlngi4 at the moment)
-+$CC		= $ARGV [ 22 ];     # get cc from environment
-+$CXX		= $ARGV [ 23 ];     # use c++ from environment
- #
- #---------------------------------------------------------------
- # IIIb. Initialising the variables for the system commands, etc.
-@@ -303,7 +306,7 @@
-    $PROSWITCH      = "-DPRODUCT";
-    $XPVERSION      = "3";
-    $SOLAR_JAVA	   = "TRUE"; 
--      $XPVERSION      = "3";
-+   $XPVERSION      = "3";
- } 
- elsif ( $platform eq "$FreeBSD" ) 
- {     print "Setting FreeBSD specific values... ";
-@@ -326,6 +329,9 @@
-       $PATH_SEPERATOR = $ps;
-       $PROSWITCH      = "-DPRODUCT";
-       $XPVERSION      = "3";
-+      $OSVERSION      = $ARGV[ 19 ];
-+      $PTHREAD_CFLAGS = $ARGV[ 20 ];
-+      $PTHREAD_LIBS   = $ARGV[ 21 ];
- } 
- elsif ( $platform eq "$Linux" ) 
- {
-@@ -889,15 +895,16 @@
-                         $D.$COM.
- 			$D.$CVER.
-                         $D.$GVER.
--                        $D."_PTHREADS".
-                         $D.$OS.
-                         $D.$CPUNAME;
- if  ($platform eq "$FreeBSD")
--{  $SOLARDEF         .= $D."X86";
-+{  $SOLARDEF         .= $D."X86".
-+                        $D."OSVERSION=$OSVERSION".
-+			" ".$PTHREAD_CFLAGS;
- }
- $SOLARDEF            .= $D."_REENTRANT".
-                         $D."_POSIX_PTHREAD_SEMANTICS";
--if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64"))
-+if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
- {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
- }
- $SOLARDEF            .= $D."SUPD=$UPD".
-@@ -990,7 +997,7 @@
-                         $ps.$USR.$LIB.
-                         $ps.$USR_LOCAL.$BIN;
- }
--elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
-+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
- {  $PATH              = $cur_dir.
-                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
-                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -1004,6 +1011,22 @@
-                         $ps.$USR.$BIN.$ds."X11".
-                         $ps.$USR.$LIB;
- }
-+elsif ($platform eq "$FreeBSD")
-+{  $PATH              = $cur_dir.
-+                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
-+                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-+                        $ps.'$SOLARENV'.$BIN.
-+                        $ps.'$JAVA_HOME'.$BIN.
-+			$ps.$USR_LOCAL.$BIN.
-+			$ps.$USR_LOCAL.$ds."sbin";
-+
-+   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
-+
-+   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$ds."X11R6".$ds."bin".
-+                        $ps.$USR.$LIB;
-+}
-+
- elsif ($platform eq "$Winnt")
- {  $COMPATH_ROOT      = $COMPATH;
-    $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1107,21 +1130,14 @@
- 	$SOLARINC            .= $I.$USR.$INCLUDE;
- }
- $SOLARINC	     .= $STLPORT_stlport;
--if ($platform eq "$Linux")
--{
--# This simply adds an include path, so even cases that break the FHS work
--$SOLARINC            .= $STLPORT_inc_stlport;
--}
-+
- if ($platform eq "$Solaris")
- {
- $SOLARINC            .= '/SC5 ';
--}
--# Platform dependent include path at the top of this list of include paths
--if ($platform eq "$Solaris") 
--{  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
-+$SOLARINC            .= $I.'$COMPATH'.$ds."include";
- }
- 
--if ($platform eq "$Linux")
-+if (($platform eq "$Linux") || ($platform eq "$FreeBSD"))
- {
- # This simply adds an include path, so even cases that break the FHS work
- $SOLARINC            .= $STLPORT_inc_stlport;
-@@ -1311,8 +1327,13 @@
- ToFile( "GLIBC",             $GLIBC,             "e" );
- ToFile( "GUIBASE",           $GUIBASE,           "e" );
- ToFile( "GUIENV",            $GUIENV,            "e" );
-+ToFile( "CC",                $CC,                "e" );
-+ToFile( "CXX",               $CXX,               "e" );
- ToFile( "GVER",              $GVER,              "e" );
- ToFile( "OS",                $OS,                "e" );
-+ToFile( "OSVERSION",         $OSVERSION,         "e" );
-+ToFile( "PTHREAD_CFLAGS",    $PTHREAD_CFLAGS,    "e" );
-+ToFile( "PTHREAD_LIBS",      $PTHREAD_LIBS,      "e" );
- ToFile( "OUTPATH",           $OUTPATH,           "e" );
- ToFile( "INPATH",            $INPATH,            "e" );
- ToFile( "GVERDIR",           $GVERDIR,           "e" );
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::inc::fields.hxx b/editors/openoffice.org-2-devel/files/patch-setup2::inc::fields.hxx
new file mode 100644
index 000000000000..d56e12f2abf4
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-setup2::inc::fields.hxx
@@ -0,0 +1,10 @@
+--- ../setup2/inc/fields.hxx.orig	Sun Jul 21 00:19:07 2002
++++ ../setup2/inc/fields.hxx	Sun Jul 21 00:19:12 2002
+@@ -104,6 +104,7 @@
+ extern char const VALUE_YES_IF_HPUX_HP9000[];
+ extern char const VALUE_YES_IF_AIX_RS6000[];
+ extern char const VALUE_YES_IF_LINUX_X86[];
++extern char const VALUE_YES_IF_FREEBSD_X86[];
+ extern char const VALUE_KEEP_OLD_VERSION[];
+ extern char const VALUE_NETWORK[];
+ extern char const VALUE_NO[];
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::loader.c b/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::loader.c
deleted file mode 100644
index 572d8ebcc690..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::loader.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../setup2/mow/source/loader/loader.c.orig	Sun Mar  3 01:41:47 2002
-+++ ../setup2/mow/source/loader/loader.c	Sun Mar  3 01:42:19 2002
-@@ -603,6 +603,14 @@
- "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
- "    export LD_LIBRARY_PATH\n" \
- "    ;;\n" \
-+"  FreeBSD)\n" \
-+"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
-+"    export LD_LIBRARY_PATH\n" \
-+"    ;;\n" \
-+"  NetBSD)\n" \
-+"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
-+"    export LD_LIBRARY_PATH\n" \
-+"    ;;\n" \
- "      *)\n" \
- "    ;;\n" \
- "esac\n" \
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::makefile.mk b/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::makefile.mk
deleted file mode 100644
index 007c0f69b6f9..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2::mow::source::loader::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../setup2/mow/source/loader/makefile.mk.orig	Sun Mar  3 01:45:18 2002
-+++ ../setup2/mow/source/loader/makefile.mk	Sun Mar  3 01:45:22 2002
-@@ -85,7 +85,7 @@
- APP1NOSAL=TRUE
- APP1TARGET= $(TARGET)
- APP1OBJS=  $(OBJFILES)
--APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
-+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
- 
- .ENDIF			# "$(OS)"=="MACOSX"
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::patch::makefile.mk b/editors/openoffice.org-2-devel/files/patch-setup2::patch::makefile.mk
new file mode 100644
index 000000000000..53846a8bdfc9
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-setup2::patch::makefile.mk
@@ -0,0 +1,11 @@
+--- ../setup2/patch/makefile.mk.orig	Sun Jul 21 00:21:46 2002
++++ ../setup2/patch/makefile.mk	Sun Jul 21 00:21:52 2002
+@@ -92,7 +92,7 @@
+ .IF "$(OS)"=="SOLARIS"
+ 	STATIC_LIBS+= -Bdynamic -lnsl -lsocket -lposix4
+ .ENDIF
+-.IF "$(OS)"=="LINUX"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+ 	STATIC_LIBS+= -Bdynamic -lcrypt
+ .ENDIF
+ .ELSE
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::script::setupserver b/editors/openoffice.org-2-devel/files/patch-setup2::script::setupserver
deleted file mode 100644
index 07f3c3f8b23e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2::script::setupserver
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../setup2/script/setupserver.orig	Sat Mar  2 17:57:36 2002
-+++ ../setup2/script/setupserver	Sat Mar  2 17:58:43 2002
-@@ -234,6 +234,8 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	NetBSD) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
-   	*)      test=/usr/bin/test ;;
- esac
- sd_cwd="`pwd`"
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::source::compiler::decltor.cxx b/editors/openoffice.org-2-devel/files/patch-setup2::source::compiler::decltor.cxx
new file mode 100644
index 000000000000..98f6ad2f7567
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-setup2::source::compiler::decltor.cxx
@@ -0,0 +1,20 @@
+--- ../setup2/source/compiler/decltor.cxx.orig	Sun Jul 21 00:25:00 2002
++++ ../setup2/source/compiler/decltor.cxx	Sun Jul 21 00:24:06 2002
+@@ -304,6 +304,7 @@
+ 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG ||
+ 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG ||
+ 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX ||
++			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD ||
+ 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP ||
+ 			m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO;
+ }
+--- ../setup2/source/compiler/fields.cxx.orig	Sun Jul 21 00:25:42 2002
++++ ../setup2/source/compiler/fields.cxx	Sun Jul 21 00:25:45 2002
+@@ -105,6 +105,7 @@
+ char const VALUE_YES_IF_HPUX_HP9000[]	= "YES_IF_HPUX_HP9000";
+ char const VALUE_YES_IF_AIX_RS6000[]	= "YES_IF_AIX_RS6000";
+ char const VALUE_YES_IF_LINUX_X86[]		= "YES_IF_LINUX_X86";
++char const VALUE_YES_IF_FREEBSD_X86[]		= "YES_IF_FREEBSD_X86";
+ char const VALUE_KEEP_OLD_VERSION[]     = "KEEP_OLD_VERSION";
+ char const VALUE_NETWORK[]              = "NETWORK";
+ char const VALUE_NO[]               	= "NO";
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx b/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx
new file mode 100644
index 000000000000..ac0b39a6aa47
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx
@@ -0,0 +1,11 @@
+--- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig	Sat Jul 20 23:33:50 2002
++++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx	Sat Jul 20 23:34:00 2002
+@@ -154,7 +154,7 @@
+ 
+ #if defined (OS2)
+ 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) );
+-#elif defined (LINUX)
++#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD)
+ 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) );
+ #elif defined (SOLARIS)
+ 	maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) );
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh
deleted file mode 100644
index d98230af5a69..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh	Sat Mar  2 18:01:19 2002
-+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh	Sat Mar  2 18:02:12 2002
-@@ -65,6 +65,8 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
-+	NetBSD) test=/bin/test     ;;
-+	FreeBSD) test=/bin/test    ;;
- 	*)      test=/usr/bin/test ;;
- esac
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-setup2::source::service::interface.cxx b/editors/openoffice.org-2-devel/files/patch-setup2::source::service::interface.cxx
new file mode 100644
index 000000000000..8e478e17971d
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-setup2::source::service::interface.cxx
@@ -0,0 +1,35 @@
+--- ../setup2/source/service/interface.cxx.orig	Sat Jul 20 23:29:33 2002
++++ ../setup2/source/service/interface.cxx	Sat Jul 20 23:30:02 2002
+@@ -126,6 +126,8 @@
+ 		aExtension = "UNIX_SOLIG";
+ 	else if( eType == OSType_UNIX_LINUX )
+ 		aExtension = "UNIX_LINUX";
++	else if( eType == OSType_UNIX_LINUX )
++		aExtension = "UNIX_FREEBSD";
+ 	else if( eType == OSType_UNIX_HP )
+ 		aExtension = "UNIX_HP";
+ 	else if( eType == OSType_UNIX_SCO )
+@@ -238,6 +240,7 @@
+ 	readOSConfiguration( OSType_UNIX_SOLSG );
+ 	readOSConfiguration( OSType_UNIX_SOLIG );
+ 	readOSConfiguration( OSType_UNIX_LINUX );
++	readOSConfiguration( OSType_UNIX_FREEBSD );
+ 	readOSConfiguration( OSType_UNIX_HP );
+ 	readOSConfiguration( OSType_UNIX_SCO );
+ 	fprintf( stdout, "\n" );
+@@ -577,6 +580,7 @@
+ 			case OSType_UNIX_SOLSG:
+ 			case OSType_UNIX_SOLIG:
+ 			case OSType_UNIX_LINUX:
++			case OSType_UNIX_FREEBSD:
+ 			case OSType_UNIX_HP:
+ 			case OSType_UNIX_SCO:
+ 				return ByteString(UNX_README_FILE_NAME);
+@@ -599,6 +603,7 @@
+ 			case OSType_UNIX_SOLSG:
+ 			case OSType_UNIX_SOLIG:
+ 			case OSType_UNIX_LINUX:
++			case OSType_UNIX_FREEBSD:
+ 			case OSType_UNIX_HP:
+ 			case OSType_UNIX_SCO:
+ 				return ByteString(UNX_LICENSE_FILE_NAME);
diff --git a/editors/openoffice.org-2-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx b/editors/openoffice.org-2-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx
new file mode 100644
index 000000000000..154fcd10850b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx
@@ -0,0 +1,11 @@
+--- ../sfx2/source/appl/officeacceptthread.cxx.orig	Thu Oct 11 15:39:58 2001
++++ ../sfx2/source/appl/officeacceptthread.cxx	Fri Oct 18 23:35:14 2002
+@@ -126,7 +126,7 @@
+ #if defined (SOLARIS)
+ 				int status;
+ 				nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG);
+-#elif defined(LINUX)
++#elif defined(LINUX) || defined (FREEBSD)
+ 				nRet = kill(aProcessInfo.Ident, 0);
+ #endif
+ #if defined (UNX)
diff --git a/editors/openoffice.org-2-devel/files/patch-shell::source::cmdmail::makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell::source::cmdmail::makefile.mk
deleted file mode 100644
index 0476285c802e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell::source::cmdmail::makefile.mk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../shell/source/cmdmail/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/cmdmail/makefile.mk
-@@ -81,9 +81,10 @@
- 			
- SHL1TARGET=$(TARGET)
- 
--SHL1STDLIBS=$(CPPULIB)\
--			$(CPPUHELPERLIB)\
--			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-shell::source::proxysettings::makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell::source::proxysettings::makefile.mk
deleted file mode 100644
index e83cf7c9d7a1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell::source::proxysettings::makefile.mk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../shell/source/proxysettings/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/proxysettings/makefile.mk
-@@ -85,9 +85,10 @@
- 
- SHL1TARGET=$(TARGET)
- 
--SHL1STDLIBS=$(CPPULIB)\
--			$(CPPUHELPERLIB)\
--			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-shell::source::unix::exec::makefile.mk b/editors/openoffice.org-2-devel/files/patch-shell::source::unix::exec::makefile.mk
deleted file mode 100644
index 0b7712ee35f8..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-shell::source::unix::exec::makefile.mk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../shell/source/unix/exec/makefile.mk.orig	Tue Jan  1 14:11:38 2002
-+++ ../shell/source/unix/exec/makefile.mk
-@@ -79,9 +79,10 @@
- 						
- SHL1TARGET=$(TARGET)
- 
--SHL1STDLIBS=$(CPPULIB)\
--			$(CPPUHELPERLIB)\
--			$(SALLIB)
-+SHL1STDLIBS=\
-+			$(SALLIB)\
-+			$(CPPULIB)\
-+			$(CPPUHELPERLIB)
- 
- SHL1LIBS=
- 		
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::bin::addsym.awk b/editors/openoffice.org-2-devel/files/patch-solenv::bin::addsym.awk
new file mode 100644
index 000000000000..d4b9daeb8a48
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv::bin::addsym.awk
@@ -0,0 +1,10 @@
+--- ../solenv/bin/addsym.awk.kan	Sat Jul 27 10:10:19 2002
++++ ../solenv/bin/addsym.awk	Thu Jul 25 14:49:30 2002
+@@ -62,6 +62,7 @@
+ BEGIN { global_found = "false" }
+ /[ \t]*local:/ { global_found = "false" }
+ global_found == "true"  { 
++    print "\t\tGetVersionInfo;"
+     print "\t\t_ZTS*;"
+     print "\t\t_ZTI*;"
+     global_found = "false" }
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::bin::mapgen.pl b/editors/openoffice.org-2-devel/files/patch-solenv::bin::mapgen.pl
new file mode 100644
index 000000000000..71ebdb934120
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv::bin::mapgen.pl
@@ -0,0 +1,21 @@
+--- ../solenv/bin/mapgen.pl.orig	Sat Jul 20 22:30:21 2002
++++ ../solenv/bin/mapgen.pl	Sat Jul 20 22:31:31 2002
+@@ -112,7 +112,7 @@
+ 
+ if ($ENV{OS} eq 'SOLARIS') {
+ 	&gen_sol;
+-} elsif ($ENV{OS} eq 'LINUX') {
++} elsif ($ENV{OS} eq 'LINUX' || $ENV{OS} eq 'FREEBSD') {
+ 	&gen_lnx;
+ } else {
+ 	&print_error ('Environment not set!!');
+@@ -169,7 +169,8 @@
+ 		s/\n//;
+ 		$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
+ 		$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
+-		last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/)));
++		$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
++		last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/) || (/^# FREEBSD #$/)));
+ 		next if (!$_ || /^#/);
+ 		push(@filters, $_);
+ 	};
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::_tg_shl.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::_tg_shl.mk
deleted file mode 100644
index 6ba3a56a92b3..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::_tg_shl.mk
+++ /dev/null
@@ -1,282 +0,0 @@
---- ../solenv/inc/_tg_shl.mk.orig	Thu Mar 14 17:43:40 2002
-+++ ../solenv/inc/_tg_shl.mk	Thu Mar 14 17:44:11 2002
-@@ -349,22 +349,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -786,22 +786,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -1223,22 +1223,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -1660,22 +1660,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -2097,22 +2097,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -2534,22 +2534,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -2971,22 +2971,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -3408,22 +3408,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -3845,22 +3845,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
-@@ -4282,22 +4282,22 @@
- .IF "$(UPDATER)"=="YES"
- .IF "$(OS)"=="SOLARIS"
- .IF "$(COM)"=="GCC"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE		
--		$(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF		
- .ENDIF
- .IF "$(OS)"=="MACOSX"
--		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@echo "------------------------------"
- 		@echo "Updating static data member initializations"
- 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
- .ENDIF
- .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
--		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF
- .IF "$(OS)"=="IRIX"
--		$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+		$(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- 		@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
- 		@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
- .ENDIF			# "$(OS)"=="IRIX"
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::pstrules.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::pstrules.mk
deleted file mode 100644
index 6c8e958c188a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::pstrules.mk
+++ /dev/null
@@ -1,141 +0,0 @@
---- ../solenv/inc/pstrules.mk.orig	Thu Mar 14 17:40:59 2002
-+++ ../solenv/inc/pstrules.mk	Thu Mar 14 17:41:44 2002
-@@ -80,15 +80,15 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- .IF "$(COM)"=="BLC"
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ENDIF
- .ENDIF
- 
-@@ -108,15 +108,15 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- .IF "$(COM)"=="BLC"
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ENDIF
- .ENDIF
- 
-@@ -142,15 +142,15 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- .IF "$(COM)"=="BLC"
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ENDIF
- .ENDIF
- 
-@@ -159,23 +159,23 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE
- .IF "$(GUI)"=="MAC"
- 	@$(RM) $@
--	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
-+	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
- .ELSE
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
- 	@+echo.
- .IF "$(COM)"=="GCC"
--	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
-+	$(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
- .ELSE
--	$(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
-+	$(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
- .ENDIF
- 	$(SEMADEBUG)
- .ENDIF
-@@ -195,15 +195,15 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- .IF "$(COM)"=="BLC"
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ENDIF
- .ENDIF
- 
-@@ -212,19 +212,19 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- .IF "$(GUI)"=="MAC"
- 	@$(RM) $@
--	$(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
-+	$(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
- .IF "$(COM)"=="GCC"
--	   $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
-+	   $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
- .ELSE
- 	   +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
--	   $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
-+	   $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
- .ENDIF
- .ENDIF
- .ENDIF
-@@ -246,7 +246,7 @@
- 	@echo Making: $@
- 	@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
- .IF "$(GUI)"=="OS2"
--	$(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
-+	$(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
- .ENDIF
- .IF "$(GUI)"=="WNT"
- 	cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::rules.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::rules.mk
deleted file mode 100644
index 181a71307149..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::rules.mk
+++ /dev/null
@@ -1,212 +0,0 @@
---- ../solenv/inc/rules.mk.orig	Thu Mar 14 17:31:43 2002
-+++ ../solenv/inc/rules.mk	Thu Mar 14 17:38:38 2002
-@@ -78,16 +78,16 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
- 	@+echo.
- .IF "$(COM)"=="GCC"
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
- .ELSE
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
- .ENDIF
- .ENDIF
- 
-@@ -98,16 +98,16 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
- 	@+echo.
- .IF "$(COM)"=="GCC"
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
- .ELSE
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
- .ENDIF
- .ENDIF
- 
-@@ -122,17 +122,17 @@
- .ENDIF
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE			# "$(GUI)"=="UNX"
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
- 	@+echo.
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
- .ENDIF			# "$(GUI)"=="UNX"
- 
- $(SLO)$/%.obj : %.cpp
-@@ -140,17 +140,17 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
- 	@+echo.
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
- .ENDIF
- 
- $(SLO)$/%.obj : $(MISC)$/%.cxx
-@@ -158,16 +158,16 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
- 	@+echo.
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
- .ENDIF
- 
- $(OBJ)$/%.obj : $(MISC)$/%.cxx
-@@ -175,16 +175,16 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
- 	@+echo.
--	$(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
-+	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
- .ENDIF
- 
- $(OBJ)$/%.obj : %.c
-@@ -192,20 +192,20 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
--	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ENDIF
- .ELSE
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
- 	@+echo.
- .IF "$(COM)"=="GCC"
--	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
-+	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
- .ELSE
- 	+-@echo Cflags: $(CFLAGS)
--	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
-+	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
- .ENDIF
- 	$(SEMADEBUG)
- .ENDIF
-@@ -215,13 +215,13 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
-+	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
- 	@+echo.
--	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
-+	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
- 	$(SEMADEBUG)
- .ENDIF
- 
-@@ -230,16 +230,16 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
-+	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
--	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
-+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
- 	@+echo.
- .IF "$(COM)"=="GCC"
--	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
-+	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
- .ELSE
--	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
-+	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
- .ENDIF
- 	$(SEMADEBUG)
- .ENDIF
-@@ -249,14 +249,14 @@
- 	@echo Making: $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
-+	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
- 	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
- .ELSE
- 	@+if exist $@ $(RM) /q $@ >& nul
- .IF "$(COM)"=="GCC"
--	   $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
-+	   $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
- .ELSE
--	   $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
-+	   $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
- .ENDIF
- .ENDIF
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::settings.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::settings.mk
deleted file mode 100644
index eed08efc26f0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::settings.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../solenv/inc/settings.mk.orig	Wed Mar 13 20:44:42 2002
-+++ ../solenv/inc/settings.mk	Wed Mar 13 20:45:05 2002
-@@ -173,7 +173,6 @@
- CDEFSOPT=
- HDEFS=
- 
--CC=
- .IF "$(add_cflags)"!=""
- ENVCFLAGS+=$(add_cflags)
- .ENDIF
-@@ -271,8 +270,6 @@
- AS=
- BC=
- COBOL=
--CPP=
--CXX=
- FOR=
- PASCAL=
- 
-@@ -1499,4 +1496,3 @@
- .INCLUDE : $(MISC)$/$(COMP9TYPELIST).mk
- $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
--
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk
deleted file mode 100644
index 80392c839dbd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk
+++ /dev/null
@@ -1,5 +0,0 @@
---- /dev/null	Mon Mar 11 14:55:01 2002
-+++ ../solenv/inc/startup/FREEBSD/macros.mk	Mon Mar 11 14:54:59 2002
-@@ -0,0 +1,2 @@
-+
-+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::target.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::target.mk
deleted file mode 100644
index b08beb4e9cfc..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::target.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../solenv/inc/target.mk.orig	Wed Mar  6 00:11:40 2002
-+++ ../solenv/inc/target.mk	Wed Mar  6 00:11:52 2002
-@@ -2766,7 +2766,7 @@
- $(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
- .ENDIF
- 
--$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
-+$(INCCOM)$/_version.h :
- .IF "$(GUI)"=="UNX"
- 		@+echo "#define" _BUILD \"$(BUILD)\"	> $@
- 		@+echo "#define" _UPD \"$(UPD)\"		>> $@
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk
deleted file mode 100644
index 039af7d70871..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../solenv/inc/tg_ext.mk.orig	Wed Nov 14 13:59:42 2001
-+++ ../solenv/inc/tg_ext.mk	Mon Mar  4 17:30:39 2002
-@@ -107,7 +107,7 @@
- 	
- $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
- 	@+-$(RM) $@
--	@+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV)
-+	@+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV)
- 	@+$(COPY) $(mktmp $(UNPACKCMD)) $@
- 
- $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
-@@ -148,7 +148,11 @@
- .IF "$(BSCLIENT)"=="TRUE"
- 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
- .ELSE           # "$(BSCLIENT)"!=""
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-+.ELSE
- 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-+.ENDIF          # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- .ENDIF          # "$(BSCLIENT)"!=""
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_moz.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_moz.mk
new file mode 100644
index 000000000000..255a41f92281
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_moz.mk
@@ -0,0 +1,17 @@
+--- ../solenv/inc/tg_moz.mk.orig	Sat Jul 20 23:57:37 2002
++++ ../solenv/inc/tg_moz.mk	Sat Jul 20 23:57:55 2002
+@@ -36,6 +36,14 @@
+ CPUCFG=_linux.cfg
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++CPUCFG=_freebsd.cfg
++.ENDIF
++
++.IF "$(OS)"=="NETBSD"
++CPUCFG=_netbsd.cfg
++.ENDIF
++
+ .IF "$(GEN_PRCPUCFG)"!=""
+ $(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) 
+ 	@+$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_shl.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_shl.mk
deleted file mode 100644
index 958b4abba555..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_shl.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../solenv/inc/tg_shl.mk.orig	Wed Mar 13 20:40:10 2002
-+++ ../solenv/inc/tg_shl.mk	Wed Mar 13 20:41:10 2002
-@@ -319,9 +319,9 @@
- .IF "$(GUI)" == "WNT"
- .IF "$(UPDATER)"=="YES"
- .IF "$(COM)"=="GCC"
--			gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ELSE
--			cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
-+			$(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- .ENDIF			# "$(COM)"=="GCC"
- .ENDIF			# "$(UPDATER)"=="YES"
- .IF "$(SHL$(TNR)DEFAULTRES)"!=""
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_yxx.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_yxx.mk
deleted file mode 100644
index 0b99a3553cad..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_yxx.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../solenv/inc/tg_yxx.mk.orig	Wed Sep 20 16:43:18 2000
-+++ ../solenv/inc/tg_yxx.mk	Wed Mar  6 10:47:24 2002
-@@ -4,7 +4,9 @@
- 	@echo ------------------------------
- 	@echo Making: $@
- #.IF "$(GUI)"!="UNX"
-+	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET).h $(YACCFILES)
- 	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
-+	$(BISON) -o $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
- #.ELSE
- #	$(BISON) $(YACCFLAGS) $(YACCFILES)
- #	mv y.tab.c $(INCCOM)/rscyacc.yxx
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::unxfbsdi.mk
deleted file mode 100644
index 05fd35ffb049..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-solenv::inc::unxfbsdi.mk
+++ /dev/null
@@ -1,209 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Wed Oct 24 19:21:47 2001
-+++ ../solenv/inc/unxfbsdi.mk	Thu Mar 14 17:26:41 2002
-@@ -1,84 +1,139 @@
--
- # mak file fuer unxfbsdi
- 
--ASM=
--AFLAGS=
-+ASM=gcc
-+AFLAGS=-x assembler-with-cpp -c $(CDEFS)
- 
- SOLAR_JAVA=TRUE
- JAVAFLAGSDEBUG=-g
- 
-+# filter for supressing verbose messages from linker
-+# not needed at the moment
- LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
- 
-+# options for C and C++ Compiler
-+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION)
-+CDEFS+=$(PTHREAD_CFLAGS)
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# flags for C and C++ Compiler
-+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-I/usr/X11R6/include
-+
-+# flags for the C++ Compiler
-+CFLAGSCC=-pipe
-+CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions
-+
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# Compiler flags for compiling static object in single threaded
-+# environment with graphical user interface
-+CFLAGSOBJGUIST=-fPIC
-+
-+# Compiler flags for compiling static object in single threaded
-+# environment with character user interface
-+CFLAGSOBJCUIST=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with graphical user interface
-+CFLAGSOBJGUIMT=-fPIC
- 
--cc=				gcc
--CC=				g++
--CDEFS+=			-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
--CDEFS+=			-D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
--CFLAGS+= -w -c $(INCLUDE)
--CFLAGS+= -I/usr/X11R6/include
--CFLAGSCC= -pipe
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive
--CFLAGSEXCEPTIONS= -fexceptions
--CFLAGS_NO_EXCEPTIONS= -fno-exceptions
--CFLAGSOBJGUIST= -fPIC
--CFLAGSOBJCUIST= -fPIC
--CFLAGSOBJGUIMT= -fPIC
--CFLAGSOBJCUIMT= -fPIC
--CFLAGSSLOGUIMT=	-fPIC
--CFLAGSSLOCUIMT=	-fPIC
--CFLAGSPROF=     -pg
--CFLAGSDEBUG=	-g
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
-+CFLAGSOBJCUIMT=-fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with graphical user interface
-+CFLAGSSLOGUIMT=-fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with character user interface
-+CFLAGSSLOCUIMT=-fPIC
-+
-+# Compiler flags for profiling
-+CFLAGSPROF=-pg
-+
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
- CFLAGSDBGUTIL=
--CFLAGSOPT= -O2
--CFLAGSNOOPT= -O
--CFLAGSOUTOBJ= -o
--
--STATIC=	-Wl,-Bstatic
--DYNAMIC= -Wl,-Bdynamic
--
--#THREADLIB= -pthread
--LINK= gcc
--# -v -nostdlib
-+
-+# Compiler flags to enable optimizations
-+# -02 is broken for FreeBSD
-+CFLAGSOPT=-O
-+
-+# Compiler flags to disable optimizations
-+# -0 is broken for STLport
-+CFLAGSNOOPT=-O0
-+
-+# Compiler flags for the output path
-+CFLAGSOUTOBJ=-o
-+
-+# switches for dynamic and static linking
-+STATIC=-Wl,-Bstatic
-+DYNAMIC=-Wl,-Bdynamic
-+
-+LINK=gcc
- LINKFLAGS=
-+
-+# linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic
- LINKFLAGSAPPCUI= -Wl,-export-dynamic
--LINKFLAGSSHLGUI= -shared
--LINKFLAGSSHLCUI= -shared
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared -Wl,-export-dynamic
-+LINKFLAGSSHLCUI= -shared -Wl,-export-dynamic
- LINKFLAGSTACK=
- LINKFLAGSPROF=
- LINKFLAGSDEBUG=-g
--LINKFLAGSOPT=
-+LINKFLAGSOPT=-O
- 
- .IF "$(NO_BSYMBOLIC)"==""
- .IF "$(PRJNAME)" != "envtest"
--LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
--LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
-+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
- .ENDIF
- .ENDIF
- 
- LINKVERSIONMAPFLAG=-Wl,--version-script
- 
-+# Sequence of libs does matter !
- STDLIBCPP=-lstdc++
- 
--# _SYSLIBS= -L/usr/lib -lm
--# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
--# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIST=-lXaw -lXt -lX11 -lm
-+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+
-+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
-+# default objectfilenames to lin
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
- 
--STDLIBCUIST=-lm
--STDLIBGUIST=-lX11 -lm
--STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
--STDLIBCUIMT=-pthread -lm -lstlport_gcc
--STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
--STDSHLCUIMT=-pthread -lm -lstlport_gcc
--
--LIBMGR=			ar
--LIBFLAGS=		-r
--LIBEXT=			.a
-+LIBMGR=ar
-+LIBFLAGS=-r
-+LIBEXT=.a
- 
- IMPLIB=
- IMPLIBFLAGS=
-@@ -87,12 +142,12 @@
- MAPSYMFLAGS=
- 
- RC=irc
--RCFLAGS=		-fo$@ $(RCFILES)
-+RCFLAGS=-fo$@ $(RCFILES)
- RCLINK=
- RCLINKFLAGS=
- RCSETVERSION=
- 
--DLLPOSTFIX=		fi
--DLLPRE=			lib
--DLLPOST=		.so
--LDUMP=
-+# platform specific identifier for shared libs
-+DLLPOSTFIX=fi
-+DLLPRE=lib
-+DLLPOST=.so
diff --git a/editors/openoffice.org-2-devel/files/patch-soltools::mkdepend::main.c b/editors/openoffice.org-2-devel/files/patch-soltools::mkdepend::main.c
deleted file mode 100644
index a478fc59e21d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-soltools::mkdepend::main.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../soltools/mkdepend/main.c.orig	Mon Mar 11 20:09:35 2002
-+++ ../soltools/mkdepend/main.c	Mon Mar 11 17:25:55 2002
-@@ -27,6 +27,11 @@
- 
- */
- 
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#endif
-+
- #include "def.h"
- #ifdef hpux
- #define sigvec sigvector
diff --git a/editors/openoffice.org-2-devel/files/patch-starmath::util:makefile.mk b/editors/openoffice.org-2-devel/files/patch-starmath::util:makefile.mk
deleted file mode 100644
index a1945318706e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-starmath::util:makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../starmath/util/makefile.mk.orig	Tue Mar  5 21:44:02 2002
-+++ ../starmath/util/makefile.mk	Tue Mar  5 21:44:22 2002
-@@ -84,7 +84,9 @@
-     $(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)$/sfx.srs
- 
- SHL1TARGET= sm$(UPD)$(DLLPOSTFIX)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= sm.map
-+.ENDIF
- .IF "$(GUI)" == "WNT"
- SHL1RES=	$(RCTARGET)
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-stlport::STLport-4.5.patch b/editors/openoffice.org-2-devel/files/patch-stlport::STLport-4.5.patch
new file mode 100644
index 000000000000..2a34de03f4b1
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-stlport::STLport-4.5.patch
@@ -0,0 +1,113 @@
+--- ../stlport/STLport-4.5.patch.orig	Mon Jan 14 18:33:17 2002
++++ ../stlport/STLport-4.5.patch	Tue May 28 23:55:42 2002
+@@ -174,3 +174,110 @@
+   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
+   public:
+     __Named_exception(const string& __str) 
++--- misc/STLport-4.5/src/gcc-freebsd.mak	Sun Jul 29 05:36:25 2001
+++++ misc/build/STLport-4.5/src/gcc-freebsd.mak	Tue May 28 23:04:27 2002
++@@ -5,8 +5,8 @@
++ #
++ # compiler
++ #
++-CC = gcc -pthread
++-CXX = c++ -pthread -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++ 
++ #
++ # Basename for libraries
++@@ -19,7 +19,7 @@
++ #
++ LINK=ar cr
++ # 2.95 flag
++-DYN_LINK=c++ -pthread -fexceptions -shared -o
+++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
++ 
++ OBJEXT=o
++ DYNEXT=so
++@@ -41,8 +41,8 @@
++ 
++ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
++ 
++-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
++-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
+++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
++ 
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
++--- /dev/null	Tue May 28 22:55:00 2002
+++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	Tue May 28 22:38:52 2002
++@@ -0,0 +1,59 @@
+++#
+++# Note : this makefile is for gcc-3 !
+++#
+++
+++#
+++# compiler
+++#
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+++
+++#
+++# Basename for libraries
+++#
+++LIB_BASENAME = libstlport_gcc
+++
+++#
+++# guts for common stuff
+++#
+++#
+++LINK=ar cr
+++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
+++
+++OBJEXT=o
+++DYNEXT=so
+++STEXT=a
+++RM=rm -rf
+++PATH_SEP=/
+++MKDIR=mkdir -p
+++COMP=GCC-FREEBSD
+++INSTALL_STEP = install_unix 
+++
+++all:  all_dynamic all_static symbolic_links 
+++
+++include common_macros.mak
+++
+++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+++
+++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+++
+++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
+++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
+++
+++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+++
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++
+++include common_percent_rules.mak
+++include common_rules.mak
+++
+++
+++#install: all
+++#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+++
+++#%.s: %.cpp
+++#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+++
+++
++--- misc/STLport-4.5/stlport/cwchar.orig	Tue May 28 22:51:31 2002
+++++ misc/build/STLport-4.5/stlport/cwchar	Tue May 28 22:55:33 2002
++@@ -21,6 +21,9 @@
++ #  include <stl/_prolog.h>
++ # endif
++ 
+++#ifdef __FreeBSD__
+++# include <../wchar.h>
+++#endif
++ # include <stl/_cwchar.h>
++ 
++ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
diff --git a/editors/openoffice.org-2-devel/files/patch-stlport::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stlport::makefile.mk
new file mode 100644
index 000000000000..b81900222e97
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-stlport::makefile.mk
@@ -0,0 +1,29 @@
+--- ../stlport/makefile.mk.orig	Tue Aug 27 19:26:10 2002
++++ ../stlport/makefile.mk	Fri Oct 18 22:33:22 2002
+@@ -107,16 +107,26 @@
+ 
+ .IF "$(COM)"=="GCC"
+ .IF "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++BUILD_FLAGS=-f gcc-3.0-freebsd.mak
++.ELSE
+ BUILD_FLAGS=-f gcc-3.0.mak
++.ENDIF
+ .ELSE # "$(COMID)"=="gcc3"
+ # MacOS X/Darwin need a special makefile
+ .IF "$(OS)"=="MACOSX"
+     BUILD_FLAGS=-f gcc-apple-macosx.mak
++.ELSE IF "$(OS)"=="FREEBSD"
++    BUILD_FLAGS=-f gcc-freebsd.mak
+ .ELSE # "$(OS)"=="MACOSX"
+     BUILD_FLAGS=-f gcc.mak
+ .ENDIF # "$(OS)"=="MACOSX"
+ .ENDIF # "$(COMID)"=="gcc3"
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=gmake
++.ELSE
+ BUILD_ACTION=make
++.ENDIF
+ .ENDIF
+ 
+ .IF "$(COM)"=="C52"
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::corereflection::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::corereflection::makefile.mk
deleted file mode 100644
index 4b319b08d401..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::corereflection::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/corereflection/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/corereflection/makefile.mk
-@@ -87,9 +87,9 @@
- SHL1TARGET=	$(TARGET)
- SHL1VERSIONMAP=	$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::defaultregistry::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::defaultregistry::makefile.mk
deleted file mode 100644
index 4cae0476415a..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::defaultregistry::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/defaultregistry/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/defaultregistry/makefile.mk
-@@ -84,9 +84,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)					\
- 		$(CPPULIB)					\
--		$(CPPUHELPERLIB)				\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=	$(TARGET).map
- SHL1DEPN=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::implreg.cxx b/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::implreg.cxx
deleted file mode 100644
index 925e924b1605..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::implreg.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../stoc/source/implementationregistration/implreg.cxx.orig	Mon Mar 11 20:08:04 2002
-+++ ../stoc/source/implementationregistration/implreg.cxx	Mon Mar 11 19:55:02 2002
-@@ -192,7 +192,7 @@
-         tmpPath = buf.makeStringAndClear();
-     }
-     // I am the only one to own tmpPath here, so the cast is tolerateable.
--    OSL_VERIFY( tmpPath.getStr() == mktemp( (sal_Char * ) tmpPath.getStr() ) );
-+    OSL_VERIFY( (sal_Char * ) tmpPath.getStr() == (sal_Char * ) mktemp( (sal_Char * ) tmpPath.getStr() ) );
- 	return OStringToOUString( tmpPath, osl_getThreadTextEncoding());
- }
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::makefile.mk
deleted file mode 100644
index 0051043b7ecb..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::implementationregistration::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/implementationregistration/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/implementationregistration/makefile.mk
-@@ -85,9 +85,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::inspect::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::inspect::makefile.mk
deleted file mode 100644
index c7cd85253c11..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::inspect::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/inspect/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/inspect/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation::makefile.mk
deleted file mode 100644
index 9ac2072a5612..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/invocation/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/invocation/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk
deleted file mode 100644
index 8853ad39a90e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/invocation_adapterfactory/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/invocation_adapterfactory/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS=	\
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=	$(TARGET).map
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::javaloader::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::javaloader::makefile.mk
deleted file mode 100644
index af0fb9af619c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::javaloader::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javaloader/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javaloader/makefile.mk
-@@ -83,9 +83,10 @@
- SHL1TARGET= $(TARGET)
- 
- SHL1STDLIBS=\
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
--		$(CPPULIB)			\
--		$(SALLIB)
-+		$(CPPULIB)
-+
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=		
- SHL1IMPLIB=		i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::javavm::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::javavm::makefile.mk
deleted file mode 100644
index f97af0ea270d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::javavm::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/javavm/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/javavm/makefile.mk
-@@ -91,10 +91,10 @@
- SHL1TARGET= $(TARGET)
- SHL1VERSIONMAP=$(TARGET).map
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPUHELPERLIB) 	\
- 		$(CPPULIB)	    	\
--		$(UNOLIB)	    	\
--		$(SALLIB)
-+		$(UNOLIB)
- 
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS += advapi32.lib
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::loader::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::loader::makefile.mk
deleted file mode 100644
index 5a08ee5937b6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::loader::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/loader/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/loader/makefile.mk
-@@ -83,9 +83,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- SHL1DEPN=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::namingservice::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::namingservice::makefile.mk
deleted file mode 100644
index e573081bc21d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::namingservice::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/namingservice/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/namingservice/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1VERSIONMAP=$(TARGET).map
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::proxy_factory::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::proxy_factory::makefile.mk
deleted file mode 100644
index 9110b2f50cd1..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::proxy_factory::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/proxy_factory/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/proxy_factory/makefile.mk
-@@ -85,9 +85,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+	$(SALLIB)		\
- 	$(CPPULIB)		\
--	$(CPPUHELPERLIB)	\
--	$(SALLIB)
-+	$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk
deleted file mode 100644
index 9d974d1c0d10..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/registry_tdprovider/makefile.mk.orig	Tue Jan  1 14:12:02 2002
-+++ ../stoc/source/registry_tdprovider/makefile.mk
-@@ -88,10 +88,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS=	\
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)	\
--		$(SALHELPERLIB) 	\
--		$(SALLIB)
-+		$(SALHELPERLIB) 
- 
- SHL1DEPN=
- SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::servicemanager::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::servicemanager::makefile.mk
deleted file mode 100644
index 746776d54759..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::servicemanager::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/servicemanager/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/servicemanager/makefile.mk
-@@ -84,9 +84,9 @@
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::tdmanager::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::tdmanager::makefile.mk
deleted file mode 100644
index 76403fdde841..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::tdmanager::makefile.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../stoc/source/tdmanager/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/tdmanager/makefile.mk
-@@ -83,9 +83,10 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
-+
- SHL1VERSIONMAP=$(TARGET).map
- 
- SHL1DEPN=
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc::source::typeconv::makefile.mk b/editors/openoffice.org-2-devel/files/patch-stoc::source::typeconv::makefile.mk
deleted file mode 100644
index dc647f89a166..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-stoc::source::typeconv::makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../stoc/source/typeconv/makefile.mk.orig	Tue Jan  1 14:12:03 2002
-+++ ../stoc/source/typeconv/makefile.mk
-@@ -82,9 +82,9 @@
- SHL1TARGET=	$(TARGET)
- 
- SHL1STDLIBS= \
-+		$(SALLIB)		\
- 		$(CPPULIB)		\
--		$(CPPUHELPERLIB)	\
--		$(SALLIB)
-+		$(CPPUHELPERLIB)
- 
- SHL1DEPN=
- SHL1VERSIONMAP=	$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-store::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-store::util::makefile.mk
deleted file mode 100644
index 842ef8ae49c0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-store::util::makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../store/util/makefile.mk.orig	Tue Mar  5 21:47:39 2002
-+++ ../store/util/makefile.mk	Tue Mar  5 21:47:59 2002
-@@ -88,7 +88,7 @@
- 
- SHL1TARGET= 	$(TARGET)
- SHL1IMPLIB= 	istore
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=	$(TARGET).$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	$(TARGET).map
diff --git a/editors/openoffice.org-2-devel/files/patch-svx::source::dialog::graphctl.cxx b/editors/openoffice.org-2-devel/files/patch-svx::source::dialog::graphctl.cxx
deleted file mode 100644
index a6a31d0c9621..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-svx::source::dialog::graphctl.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../svx/source/dialog/graphctl.cxx	2001/08/16 15:41:29	1.6
-+++ ../svx/source/dialog/graphctl.cxx	2002/03/03 19:41:13
-@@ -62,12 +62,12 @@
- #if defined( OS2 ) || defined( WIN ) || defined( UNX ) || defined( WNT )
- #include <stdlib.h>			//wegen fcvt
- #endif
--#if defined(MAC) || defined(NETBSD)
--#if defined(NETBSD)
-+#if defined(MAC) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(NETBSD) || defined(FREEBSD)
- extern "C" {
- #endif
- char *fcvt(double value, int ndigit, int *decpt, int *sign);
--#if defined(NETBSD)
-+#if defined(NETBSD) || defined(FREEBSD)
- }
- #endif
- #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-svx::source::fmcomp::makefile.mk b/editors/openoffice.org-2-devel/files/patch-svx::source::fmcomp::makefile.mk
new file mode 100644
index 000000000000..b16030080c0d
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-svx::source::fmcomp::makefile.mk
@@ -0,0 +1,12 @@
+--- ../svx/source/fmcomp/makefile.mk.orig	Sun May 19 14:22:34 2002
++++ ../svx/source/fmcomp/makefile.mk	Sun May 19 14:27:48 2002
+@@ -74,6 +74,9 @@
+ .INCLUDE :  sv.mk
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
++CFLAGS += -g
++CFLAGSCC += -g
++
+ # --- Files --------------------------------------------------------
+ 
+ CXXFILES= \
diff --git a/editors/openoffice.org-2-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx
new file mode 100644
index 000000000000..6dc462a10d24
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx
@@ -0,0 +1,11 @@
+--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig	Wed Aug 28 14:10:06 2002
++++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx	Fri Oct 18 22:45:43 2002
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
+-#ifndef MACOSX
++#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
+ #include <alloca.h>
+ #endif
+ #include <string.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-sysui::tools::lngconv::lngconv.cxx b/editors/openoffice.org-2-devel/files/patch-sysui::tools::lngconv::lngconv.cxx
new file mode 100644
index 000000000000..732f77fcb482
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sysui::tools::lngconv::lngconv.cxx
@@ -0,0 +1,11 @@
+--- ../sysui/tools/lngconv/lngconv.cxx.orig	Sat Jul 20 23:14:29 2002
++++ ../sysui/tools/lngconv/lngconv.cxx	Sat Jul 20 23:14:34 2002
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-#if defined( LINUX ) || defined (SOLARIS)
++#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
+ #include <locale.h>
+ #include <langinfo.h>
+ #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-tools::bootstrp::makefile.mk b/editors/openoffice.org-2-devel/files/patch-tools::bootstrp::makefile.mk
deleted file mode 100644
index b188641846f0..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-tools::bootstrp::makefile.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../tools/bootstrp/makefile.mk.orig	Tue Jan  1 14:12:19 2002
-+++ ../tools/bootstrp/makefile.mk
-@@ -83,6 +83,15 @@
- 	@echo No bootstrp for Mac OS
- .ELSE	# "$(OS)"=="MACOS"
- 
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR 
-+	@echo ""
-+$(LB)$/libgcc_pic.a:
-+	-objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a
-+$(LB)$/libgcc.a:
-+	objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a
-+.ENDIF
-+
- OBJFILES=                       \
- 	$(OBJ)$/sstring.obj     \
- 	$(OBJ)$/appdef.obj      \
-@@ -172,3 +181,4 @@
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-+
diff --git a/editors/openoffice.org-2-devel/files/patch-tools::inc::inetdef.hxx b/editors/openoffice.org-2-devel/files/patch-tools::inc::inetdef.hxx
new file mode 100644
index 000000000000..a9e02c684019
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-tools::inc::inetdef.hxx
@@ -0,0 +1,11 @@
+--- ../tools/inc/inetdef.hxx.orig	Sun Jul 21 00:59:36 2002
++++ ../tools/inc/inetdef.hxx	Sun Jul 21 00:59:38 2002
+@@ -90,6 +90,8 @@
+ #define TOOLS_INETDEF_OS "NETBSD Sparc"
+ #elif defined LINUX && defined X86
+ #define TOOLS_INETDEF_OS "Linux"
++#elif defined FREEBSD && defined X86
++#define TOOLS_INETDEF_OS "FreeBSD"
+ #elif defined SINIX
+ #define TOOLS_INETDEF_OS "SINIX"
+ #elif defined IRIX
diff --git a/editors/openoffice.org-2-devel/files/patch-tools::inc:solar.h b/editors/openoffice.org-2-devel/files/patch-tools::inc:solar.h
deleted file mode 100644
index 61e190e5e5bf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-tools::inc:solar.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../tools/inc/solar.h	2001/10/12 15:11:03	1.23
-+++ ../tools/inc/solar.h	2002/03/03 19:44:00
-@@ -108,7 +108,7 @@
- #endif
- typedef short				INT16;
- typedef unsigned short		UINT16;
--#if defined LINUX || defined SCO || defined IRIX || (defined _MSC_VER && _MSC_VER >1200)
-+#if defined LINUX || defined SCO || defined IRIX || (defined _MSC_VER && _MSC_VER >1200) || defined FREEBSD
- typedef signed char 		INT8;
- #else
- 
-@@ -149,7 +149,7 @@
- 
- /*** misc. macros to leverage platform and compiler differences ********/
- 
--#if (defined ALPHA && !defined WNT) || defined IRIX || defined SOLARIS || defined HPUX || defined NETBSD
-+#if (defined ALPHA && !defined WNT) || defined IRIX || defined SOLARIS || defined HPUX || defined NETBSD || defined FREEBSD
- #define __DELETE(n) delete[]
- #else
- #define __DELETE(n) delete[n]
diff --git a/editors/openoffice.org-2-devel/files/patch-tools::source::string::charset.cxx b/editors/openoffice.org-2-devel/files/patch-tools::source::string::charset.cxx
deleted file mode 100644
index ebee79ce414b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-tools::source::string::charset.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../tools/source/string/charset.cxx.orig	Sun Mar 10 23:55:47 2002
-+++ ../tools/source/string/charset.cxx	Mon Mar 11 00:00:56 2002
-@@ -64,12 +64,14 @@
- #elif defined( OS2 )
- #define INCL_DOSNLS
- #include <svpm.h>
--#elif defined(LINUX) || defined(SOLARIS)
-+#elif defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
- #include <stdio.h>
- #include <stdlib.h>
- #include <strings.h>
- #include <locale.h>
-+#if !defined(FREEBSD) || OSVERSION > 500000
- #include <langinfo.h>
-+#endif
- #ifndef _TOOLS_LANG_HXX
- #include <lang.hxx>
- #endif
-@@ -126,7 +128,7 @@
- 
- // -----------------------------------------------------------------------
- 
--#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
- 
- // check if there is a charset qualifier at the end of the given locale string
- // e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what
-@@ -707,7 +709,7 @@
- #ifdef UNX
-         CharSet nTextEncoding;
- 
--#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
-         nTextEncoding = GetSystemCharSetFromEnvironment();
-         if (nTextEncoding == RTL_TEXTENCODING_DONTKNOW)
-             nTextEncoding = GetSystemCharSetFromSystemLanguage();
diff --git a/editors/openoffice.org-2-devel/files/patch-tools::source::string::tstring.cxx b/editors/openoffice.org-2-devel/files/patch-tools::source::string::tstring.cxx
new file mode 100644
index 000000000000..12bd6bd0b244
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-tools::source::string::tstring.cxx
@@ -0,0 +1,22 @@
+--- ../tools/source/string/tstring.cxx.orig	Sat Aug 10 12:53:42 2002
++++ ../tools/source/string/tstring.cxx	Sat Aug 10 12:54:16 2002
+@@ -103,6 +103,9 @@
+ xub_StrLen ImplStringLen( const sal_Char* pStr )
+ {
+ 	const sal_Char* pTempStr = pStr;
++
++	if (pStr == NULL)
++		return(0);
+ 	while( *pTempStr )
+ 		pTempStr++;
+ 	return (xub_StrLen)(pTempStr-pStr);
+@@ -113,6 +116,9 @@
+ xub_StrLen ImplStringLen( const sal_Unicode* pStr )
+ {
+ 	const sal_Unicode* pTempStr = pStr;
++
++	if (pStr == NULL)
++		return(0);
+ 	while( *pTempStr )
+ 		pTempStr++;
+ 	return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice.org-2-devel/files/patch-ucb::source::ucp::webdav::makefile.mk b/editors/openoffice.org-2-devel/files/patch-ucb::source::ucp::webdav::makefile.mk
new file mode 100644
index 000000000000..4b505c6571d8
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-ucb::source::ucp::webdav::makefile.mk
@@ -0,0 +1,11 @@
+--- ../ucb/source/ucp/webdav/makefile.mk.orig	Wed Jun 12 01:04:43 2002
++++ ../ucb/source/ucp/webdav/makefile.mk	Wed Jun 12 01:04:53 2002
+@@ -120,7 +120,7 @@
+ 
+ SHL1TARGET=$(TARGET)$(UCP_VERSION)
+ SHL1IMPLIB=i$(TARGET)
+-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
++.IF "$(OS)"=="MACOSX"
+ .ELSE
+ SHL1VERSIONMAP=exports.map
+ .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-unoil::com::sun::star::document::makefile.mk b/editors/openoffice.org-2-devel/files/patch-unoil::com::sun::star::document::makefile.mk
new file mode 100644
index 000000000000..63b73d0e107c
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-unoil::com::sun::star::document::makefile.mk
@@ -0,0 +1,10 @@
+--- ../unoil/com/sun/star/document/makefile.mk.orig	Wed Sep 11 11:51:49 2002
++++ ../unoil/com/sun/star/document/makefile.mk	Wed Sep 11 11:52:08 2002
+@@ -64,6 +64,7 @@
+ PRJ		= ..$/..$/..$/..
+ TARGET	= unoil_document
+ PACKAGE	= com$/sun$/star$/document
++GENJAVAFILES = $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
+ 
+ # --- Settings -----------------------------------------------------
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-unoil::makefile.pmk b/editors/openoffice.org-2-devel/files/patch-unoil::makefile.pmk
new file mode 100644
index 000000000000..7febdabf7b4b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-unoil::makefile.pmk
@@ -0,0 +1,13 @@
+--- ../unoil/makefile.pmk.orig	Fri Aug 31 18:04:43 2001
++++ ../unoil/makefile.pmk	Thu Sep 12 12:17:50 2002
+@@ -74,8 +74,8 @@
+ JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
+ .ENDIF          # "$(L10N_framework)"==""
+ 
+-GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
+-GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
++GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
++GENCLASSFILES	+= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
+ 
+ # --- Targets ------------------------------------------------------
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-unzip::source::file_io.c b/editors/openoffice.org-2-devel/files/patch-unzip::source::file_io.c
deleted file mode 100644
index 0430ff41b6a9..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-unzip::source::file_io.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../unzip/source/file_io.c.orig	Tue Mar  5 18:32:38 2002
-+++ ../unzip/source/file_io.c	Tue Mar  5 18:40:50 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -860,8 +860,11 @@
- /*  extern char *_TZ;   no longer used? */
- #else /* !AMIGA */
- #   define YRBASE  1970
--#ifdef BSD
--#ifndef __386BSD__
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif */ FREEBSD */
-+#if defined BSD || defined FREEBSD
-+#if !defined __386BSD__ && !defined FREEBSD
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-@@ -932,8 +935,8 @@
- 	/* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */
- 	m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss;
- 
--#if defined BSD && ! defined MACOSX && ! defined NETBSD
--#ifndef __386BSD__
-+#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD
-+#if !defined __386BSD__ && !defined FREEBSD
- 	ftime(&tbp);
- 	m_time += tbp.timezone * 60L;
- #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-unzip::source::misc.c b/editors/openoffice.org-2-devel/files/patch-unzip::source::misc.c
deleted file mode 100644
index 38cc972f0bce..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-unzip::source::misc.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../unzip/source/misc.c.orig	Tue Mar  5 18:52:16 2002
-+++ ../unzip/source/misc.c	Tue Mar  5 18:53:03 2002
-@@ -301,8 +301,8 @@
-     int yr, mo, dy, hh, mm, ss, leap;
-     long m_time, days=0;
- #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__))
--#if (defined(BSD) || defined(MTS))
--#ifndef __386BSD__
-+#if (defined(BSD) || defined(MTS) || defined(FREEBSD))
-+#if !defined __386BSD__ && !defined FREEBSD
-     static struct timeb tbp;
- #endif /* __386BSD__ */
- #else /* !(BSD || MTS) */
-@@ -340,8 +340,8 @@
-       /* - 1;   MS-DOS times always rounded up to nearest even second */
- 
- #if (!defined(MACOS) && !defined(__GO32__))
--#if (defined(BSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
--#ifndef __386BSD__
-+#if (defined(BSD) || defined(FREEBSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
-+#if !defined __386BSD__ && !defined FREEBSD
-     ftime(&tbp);
-     m_time += tbp.timezone * 60L;
- #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::osssound.cxx b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::osssound.cxx
new file mode 100644
index 000000000000..af681e020472
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::osssound.cxx
@@ -0,0 +1,14 @@
+--- ../vcl/unx/source/app/osssound.cxx.orig	Sun Jul 21 10:20:34 2002
++++ ../vcl/unx/source/app/osssound.cxx	Sun Jul 21 10:21:28 2002
+@@ -72,7 +72,11 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef LINUX
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+ #include <errno.h>
+ 
+ #ifdef _USE_NAMESPACE
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::rptpsound.cxx b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::rptpsound.cxx
new file mode 100644
index 000000000000..fca5510022f9
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::rptpsound.cxx
@@ -0,0 +1,13 @@
+--- ../vcl/unx/source/app/rptpsound.cxx.orig	Wed Oct 24 18:32:21 2001
++++ ../vcl/unx/source/app/rptpsound.cxx	Sun Jun  2 22:01:07 2002
+@@ -78,6 +78,10 @@
+ extern "C" int usleep(unsigned int);
+ #endif
+ 
++#ifdef FREEBSD
++#include <unistd.h>
++#endif
++
+ #ifdef _USE_NAMESPACE
+ using namespace vcl_sal;
+ using namespace vos;
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::saldata.cxx b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::saldata.cxx
new file mode 100644
index 000000000000..c292a93a8313
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::saldata.cxx
@@ -0,0 +1,14 @@
+--- ../vcl/unx/source/app/saldata.cxx.orig	Sun Jun  2 22:07:34 2002
++++ ../vcl/unx/source/app/saldata.cxx	Sun Jun  2 22:08:22 2002
+@@ -78,6 +78,11 @@
+ #ifdef AIX
+ #include <strings.h>
+ #endif
++#ifdef FREEBSD
++#include <sys/types.h>
++#include <sys/time.h>
++#include <unistd.h>
++#endif
+ 
+ #ifndef _VOS_MUTEX_HXX
+ #include <vos/mutex.hxx>
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::vsound.hxx b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::vsound.hxx
new file mode 100644
index 000000000000..028e7c9d64c1
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl::unx::source::app::vsound.hxx
@@ -0,0 +1,20 @@
+--- ../vcl/unx/source/app/vsound.hxx.orig	Sun Jul 21 00:10:24 2002
++++ ../vcl/unx/source/app/vsound.hxx	Sun Jul 21 00:10:27 2002
+@@ -61,7 +61,7 @@
+ #ifndef _VCL_VSOUND_HXX
+ #define _VCL_VSOUND_HXX
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(FREEBSD)
+ #define USE_OSS
+ #endif
+ 
+@@ -69,7 +69,7 @@
+ #define USE_DEVAUDIO
+ #endif
+ 
+-#if defined LINUX || defined SOLARIS
++#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
+ #define USE_NAS
+ #endif
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl::util::makefile.mk
new file mode 100644
index 000000000000..1ea13157ce57
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl::util::makefile.mk
@@ -0,0 +1,14 @@
+--- ../vcl/util/makefile.mk.orig	Sun Jul 21 00:12:09 2002
++++ ../vcl/util/makefile.mk	Sun Jul 21 00:12:11 2002
+@@ -293,9 +293,9 @@
+ .ENDIF          # "$(OS)"=="MACOSX"
+ .ENDIF          # "$(OS)"=="SOLARIS"
+ 
+-.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+ SHL1STDLIBS += -laudio
+-.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
++.ENDIF          # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+ 
+ .ENDIF          # "$(GUI)"=="UNX"
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-xmlhelp::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-xmlhelp::util::makefile.mk
deleted file mode 100644
index 4f7d0984c32d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-xmlhelp::util::makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../xmlhelp/util/makefile.mk.orig	Sun Mar  3 01:49:15 2002
-+++ ../xmlhelp/util/makefile.mk	Sun Mar  3 01:49:19 2002
-@@ -94,7 +94,9 @@
- SHL1TARGET=$(TARGET)$(UCP_VERSION)
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
- SHL1IMPLIB=i$(TARGET)
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=exports.map
-+.ENDIF
- 
- # Add additional libs here.
- SHL1STDLIBS=                     \
diff --git a/editors/openoffice.org-2-devel/files/zipmoz.sh b/editors/openoffice.org-2-devel/files/zipmoz.sh
new file mode 100644
index 000000000000..43a4591f3430
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/zipmoz.sh
@@ -0,0 +1,164 @@
+#!/bin/sh -f
+
+RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
+		components/libmork.so components/libmozldap.so \
+		components/libnecko.so components/libprofile.so \
+		components/librdf.so components/libstrres.so \
+		components/libunicharutil.so components/libuconv.so \
+		components/libucvcn.so components/libucvibm.so \
+		components/libucvja.so components/libucvko.so \
+		components/libucvlatin.so components/libucvtw.so \
+		components/libucvtw2.so components/liburiloader.so \
+		components/libvcard.so components/libxpconnect.so \
+		components/libpref.so components/libchrome.so libmozjs.so \
+		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
+		libplds4.so libxpcom.so libmozz.so component.reg \
+		components/necko_dns.xpt components/xpcom_xpti.xpt \
+		components/xpcom_threads.xpt components/xpcom_io.xpt \
+		components/xpcom_ds.xpt components/xpcom_components.xpt \
+		components/xpcom_base.xpt components/xpti.dat \
+		defaults/pref/all.js defaults/pref/config.js \
+		defaults/pref/editor.js defaults/pref/initpref.js \
+		defaults/pref/inspector.js defaults/pref/mailnews.js \
+		defaults/pref/security-prefs.js defaults/pref/unix.js \
+		defaults/pref/xpinstall.js"
+
+LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
+		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
+
+INC_FILES="include/"
+INC_FILES2="public/"
+
+if [ $# -lt 2 -o $# -gt 3 ] ; then
+	echo 
+	echo usage: $0 mozilla_dist target [target_dir]
+	echo
+	echo where:
+	echo
+	echo "mozilla_dist points to the mozilla distribution"
+	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
+	echo "target_dir is the directory to place the zips"
+	exit 1
+fi
+
+MOZ_DIST=$1
+TARGET=$2
+if [ "w$3" != "w" ]; then
+	TARGET_DIR=$3
+else
+	if [ "w$TARGET_DIR" == "w" ]; then
+		TARGET_DIR=
+	fi
+fi
+
+ZIP_TARGET=$TARGET_DIR
+if [ -z "$ZIP_TARGET" ] ; then
+	ZIP_TARGET=../
+fi
+
+# just to remember the current working directory
+STARTING_DIR=`pwd`
+
+echo
+echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
+
+# Create the directories
+[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
+[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
+[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
+[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
+[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
+[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
+[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
+[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
+
+# Copy the files
+echo
+echo --- copying files
+echo
+
+for i in $RUNTIME_FILES; do
+	if [ ! -f $MOZ_DIST/bin/$i ]; then
+		echo $MOZ_DIST/bin/$i does not exist, check your distribution
+	else
+		if [ `echo $i | grep component` ]; then
+			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
+		elif [ `echo $i | grep defaults` ]; then
+			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
+		else
+			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
+		fi
+	fi
+done
+
+for i in $LIB_FILES; do
+	if [ ! -f $MOZ_DIST/$i ]; then
+		echo $MOZ_DIST/$i does not exist, check your distribution
+	else
+		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
+	fi
+done
+
+for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
+	if [ ! -d $i ]; then 
+		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
+	fi
+done
+
+for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
+        if [ ! -d $i ]; then
+		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
+	fi
+done
+
+for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
+        if [ ! -d $i ]; then
+		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
+	fi
+done
+
+for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
+        if [ ! -d $i ]; then
+		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
+	fi
+done
+
+# delete old zips
+
+[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
+[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
+[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
+
+# zip the runtime files
+
+echo
+echo --- creating ${TARGET}runtime.zip
+echo
+
+cd $TARGET_DIR/$TARGET/runtime
+find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
+
+# zip the lib files
+echo 
+echo --- creating ${TARGET}lib.zip
+echo 
+
+cd $TARGET_DIR/$TARGET/lib
+find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
+
+# zip the inc files
+echo
+echo --- creating ${TARGET}inc.zip
+echo
+
+cd $TARGET_DIR/$TARGET/inc
+find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
+
+# remove dirs
+cd $STARTING_DIR
+rm -rf $TARGET_DIR/$TARGET
+
+echo
+echo --- done
+echo
+
diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message
index 840dc3b80e04..1dc749f301c2 100644
--- a/editors/openoffice.org-2-devel/pkg-message
+++ b/editors/openoffice.org-2-devel/pkg-message
@@ -1,15 +1,73 @@
-OpenOffice Build 641 Personal Install How-To
+OpenOffice.org Build 643 Personal Install How-To
 
-Written by:	Matthias Rauch <mrauch@netbsd.org>
-		Martin Blapp <mbr@freebsd.org>
+Written by:	Martin Blapp <mbr@freebsd.org>
 
-OpenOffice has now been installed in ${PREFIX}/OpenOffice.org641.
+OpenOffice.org will soon been installed in
+${PREFIX}/OpenOffice.org-643/
 
-Once that is done exit X11 and run it again as the user
-that you usually use. Then run "make install-user" and do
-a standard workstation Thereafter, OpenOffice can be started using the
-${PREFIX}/bin/soffice command.
+Warning:
+--------
 
-Please note that this software should be considered alpha quality
-at the moment, i.e. take extra care when using it in production
-environments.
+This port is experimental. Do not use it for production.
+
+
+1 User installation
+-------------------
+
+1.1 OO.org installed from the ports collection
+
+Once this is done you have to run "make install-user" as the
+user you like to use OO.org and choose a standard workstation
+installation.
+
+1.2 OO.org installed as package
+
+First check if procfs is running. OO.org setup does depend on
+procfs and does crash without it. This dependency will be
+removed in future, but at the moment it is needed.
+Please read the procfs(5) manpage and ensure the the following
+line is in /etc/fstab:
+
+proc /proc procfs rw 0 0
+
+If you have just installed OO.org as package, there is no
+"make install-user" option available. Instead you'll have
+to run as the user you like to use OO.org:
+
+"${PREFIX}/bin/openoffice-setup" and choose a standard workstation
+installation.
+
+2 JDK-Installation
+------------------
+
+If OO.org asks you to choose the Java JDK during
+"make install-user", you must choose the linux jdk1.3.1.
+Native FreeBSD jdk1.3.1 does not work yet with FreeBSD
+OO.org does ignore it.
+
+3 Start OO.org
+--------------
+
+There are some wrappers installed for fast startup.
+Add "${PREFIX}/bin/" to your PATH and you will be able
+to use them.
+
+${PREFIX}/bin/openoffice
+${PREFIX}/bin/openoffice-sagenda
+${PREFIX}/bin/openoffice-scalc
+${PREFIX}/bin/openoffice-sdraw
+${PREFIX}/bin/openoffice-setup
+${PREFIX}/bin/openoffice-sfax
+${PREFIX}/bin/openoffice-simpress
+${PREFIX}/bin/openoffice-spadmin
+${PREFIX}/bin/openoffice-sweb
+${PREFIX}/bin/openoffice-swriter
+
+4 Setup problems
+----------------
+
+If the setup complains about a missing file "setup.ins",
+it's time to upgrade your FreeBSD system to the lastest
+version. You will encounter this bug only if your OS is
+older than FreeBSD 4.7-RELEASE. 4.6-RELEASE and
+4.6.2-RELEASE are still affected.
diff --git a/editors/openoffice.org-2-devel/pkg-plist b/editors/openoffice.org-2-devel/pkg-plist
index b3561e66eeb7..28bd78453b52 100644
--- a/editors/openoffice.org-2-devel/pkg-plist
+++ b/editors/openoffice.org-2-devel/pkg-plist
@@ -1,1676 +1 @@
-bin/soffice
-OpenOffice.org641/setup
-OpenOffice.org641/spadmin
-OpenOffice.org641/LICENSE.html
-OpenOffice.org641/README.html
-OpenOffice.org641/README
-OpenOffice.org641/LICENSE
-OpenOffice.org641/program/setup.log
-OpenOffice.org641/program/filter/libicg641bi.so
-OpenOffice.org641/program/filter/libeme641bi.so
-OpenOffice.org641/program/filter/libemp641bi.so
-OpenOffice.org641/program/filter/libipd641bi.so
-OpenOffice.org641/program/filter/libitg641bi.so
-OpenOffice.org641/program/filter/libeps641bi.so
-OpenOffice.org641/program/filter/libips641bi.so
-OpenOffice.org641/program/filter/libexp641bi.so
-OpenOffice.org641/program/filter/libepb641bi.so
-OpenOffice.org641/program/filter/libepg641bi.so
-OpenOffice.org641/program/filter/libepp641bi.so
-OpenOffice.org641/program/filter/libipb641bi.so
-OpenOffice.org641/program/filter/libera641bi.so
-OpenOffice.org641/program/filter/libira641bi.so
-OpenOffice.org641/program/filter/libegi641bi.so
-OpenOffice.org641/program/filter/libidx641bi.so
-OpenOffice.org641/program/filter/libicd641bi.so
-OpenOffice.org641/program/filter/libept641bi.so
-OpenOffice.org641/program/filter/libipt641bi.so
-OpenOffice.org641/program/filter/libime641bi.so
-OpenOffice.org641/program/filter/libipx641bi.so
-OpenOffice.org641/program/filter/libepn641bi.so
-OpenOffice.org641/program/filter/libiti641bi.so
-OpenOffice.org641/program/filter/libeti641bi.so
-OpenOffice.org641/program/classes/sandbox.jar
-OpenOffice.org641/program/classes/jurt.jar
-OpenOffice.org641/program/classes/xt.jar
-OpenOffice.org641/program/classes/db.jar
-OpenOffice.org641/program/classes/juh.jar
-OpenOffice.org641/program/classes/unoil.jar
-OpenOffice.org641/program/classes/jut.jar
-OpenOffice.org641/program/classes/ridl.jar
-OpenOffice.org641/program/classes/jaxp.jar
-OpenOffice.org641/program/classes/java_uno.jar
-OpenOffice.org641/program/classes/parser.jar
-OpenOffice.org641/program/classes/classes.jar
-OpenOffice.org641/program/resource/cnt64101.res
-OpenOffice.org641/program/resource/wwz64101.res
-OpenOffice.org641/program/resource/pcr64101.res
-OpenOffice.org641/program/resource/bib64101.res
-OpenOffice.org641/program/resource/dkt64101.res
-OpenOffice.org641/program/resource/basctl64101.res
-OpenOffice.org641/program/resource/abp64101.res
-OpenOffice.org641/program/resource/lgd64101.res
-OpenOffice.org641/program/resource/eur64101.res
-OpenOffice.org641/program/resource/epb64101.res
-OpenOffice.org641/program/resource/epg64101.res
-OpenOffice.org641/program/resource/epp64101.res
-OpenOffice.org641/program/resource/imp64101.res
-OpenOffice.org641/program/resource/oic64101.res
-OpenOffice.org641/program/resource/ofa64101.res
-OpenOffice.org641/program/resource/vcl64101.res
-OpenOffice.org641/program/resource/fwk64101.res
-OpenOffice.org641/program/resource/set64101.res
-OpenOffice.org641/program/resource/frm64101.res
-OpenOffice.org641/program/resource/gal64101.res
-OpenOffice.org641/program/resource/svs64101.res
-OpenOffice.org641/program/resource/dba64101.res
-OpenOffice.org641/program/resource/dbi64101.res
-OpenOffice.org641/program/resource/dbp64101.res
-OpenOffice.org641/program/resource/dbu64101.res
-OpenOffice.org641/program/resource/dbw64101.res
-OpenOffice.org641/program/resource/ooo64101.res
-OpenOffice.org641/program/resource/svt64101.res
-OpenOffice.org641/program/resource/svx64101.res
-OpenOffice.org641/program/resource/spa64101.res
-OpenOffice.org641/program/resource/sd64101.res
-OpenOffice.org641/program/resource/tpl64101.res
-OpenOffice.org641/program/resource/sw64101.res
-OpenOffice.org641/program/resource/tplx64101.res
-OpenOffice.org641/program/resource/jvm64101.res
-OpenOffice.org641/program/resource/uui64101.res
-OpenOffice.org641/program/resource/cal64101.res
-OpenOffice.org641/program/resource/sfx64101.res
-OpenOffice.org641/program/resource/sch64101.res
-OpenOffice.org641/program/resource/san64101.res
-OpenOffice.org641/program/resource/sc64101.res
-OpenOffice.org641/program/resource/sm64101.res
-OpenOffice.org641/program/resource/date64101.res
-OpenOffice.org641/program/resource/analysis64101.res
-OpenOffice.org641/program/resource/eps64101.res
-OpenOffice.org641/program/resource/egi64101.res
-OpenOffice.org641/program/resource/ept64101.res
-OpenOffice.org641/program/resource/eme64101.res
-OpenOffice.org641/program/resource/epn64101.res
-OpenOffice.org641/program/resource/iso64101.res
-OpenOffice.org641/program/addin/source/xrot.c
-OpenOffice.org641/program/addin/source/xlang.h
-OpenOffice.org641/program/addin/source/rot13.hrc
-OpenOffice.org641/program/addin/source/addin.h
-OpenOffice.org641/program/addin/source/xdfa.c
-OpenOffice.org641/program/addin/source/dfa.hrc
-OpenOffice.org641/program/libctl641bi.so
-OpenOffice.org641/program/libimpreg.so
-OpenOffice.org641/program/libjava_uno.so
-OpenOffice.org641/program/libdbi641bi.so
-OpenOffice.org641/program/libdbp641bi.so
-OpenOffice.org641/program/libdbtools2.so
-OpenOffice.org641/program/libdbu641bi.so
-OpenOffice.org641/program/libvos2GCC.so
-OpenOffice.org641/program/libproxyset.so
-OpenOffice.org641/program/libsmgr.so
-OpenOffice.org641/program/libmozab2.so
-OpenOffice.org641/program/libtcv.so
-OpenOffice.org641/program/liburp_uno.so
-OpenOffice.org641/program/libstm.so
-OpenOffice.org641/program/libstore.so.3.0.0
-OpenOffice.org641/program/libstore.so.3
-OpenOffice.org641/program/libspa641bi.so
-OpenOffice.org641/program/libmcnttype.so
-OpenOffice.org641/program/spadmin.bin
-OpenOffice.org641/program/libabp641bi.so
-OpenOffice.org641/program/libinvadp.so
-OpenOffice.org641/program/libsvl641bi.so
-OpenOffice.org641/program/libsvx641bi.so
-OpenOffice.org641/program/libmig641bi.so
-OpenOffice.org641/program/jvmsetup.bin
-OpenOffice.org641/program/libtdmgr.so
-OpenOffice.org641/program/libnamingservice.so
-OpenOffice.org641/program/libacceptor.so
-OpenOffice.org641/program/open_office_ani.bmp
-OpenOffice.org641/program/libconnectr.so
-OpenOffice.org641/program/libsrtrs1.so
-OpenOffice.org641/program/sopatchlevel.sh
-OpenOffice.org641/program/libdb_cxx-3.2.so
-OpenOffice.org641/program/calc_o.bmp
-OpenOffice.org641/program/nswrapper
-OpenOffice.org641/program/libjen.so
-OpenOffice.org641/program/libdefreg.so
-OpenOffice.org641/program/librmcxt.so.3.0.0
-OpenOffice.org641/program/librmcxt.so.3
-OpenOffice.org641/program/setup.bin
-OpenOffice.org641/program/setup
-OpenOffice.org641/program/libdbase641bi.so
-OpenOffice.org641/program/libbib641bi.so
-OpenOffice.org641/program/liblng641bi.so
-OpenOffice.org641/program/libfileacc.so
-OpenOffice.org641/program/libucpchelp1.so
-OpenOffice.org641/program/libreg.so.3.0.0
-OpenOffice.org641/program/libreg.so.3
-OpenOffice.org641/program/libcfgmgr2.so
-OpenOffice.org641/program/libinsp.so
-OpenOffice.org641/program/libcnt641bi.so
-OpenOffice.org641/program/libres641bi.so
-OpenOffice.org641/program/setup_services.rdb
-OpenOffice.org641/program/libsalhelper3GCC.so
-OpenOffice.org641/program/libtl641bi.so
-OpenOffice.org641/program/libjvm641bi.so
-OpenOffice.org641/program/libcmdmail.so
-OpenOffice.org641/program/libgcc2_uno.so
-OpenOffice.org641/program/libi18npool641bi.so
-OpenOffice.org641/program/libevtatt.so
-OpenOffice.org641/program/libsimreg.so
-OpenOffice.org641/program/libfile641bi.so
-OpenOffice.org641/program/libucb1.so
-OpenOffice.org641/program/libucpfpx641bi.so
-OpenOffice.org641/program/libsax.so
-OpenOffice.org641/program/allgemein_o.bmp
-OpenOffice.org641/program/writer_o.bmp
-OpenOffice.org641/program/libsbl641bi.so
-OpenOffice.org641/program/draw_o.bmp
-OpenOffice.org641/program/ende_o.bmp
-OpenOffice.org641/program/libbrdgfctr.so
-OpenOffice.org641/program/libsch641bi.so
-OpenOffice.org641/program/libscn641bi.so
-OpenOffice.org641/program/libproxyfac.so
-OpenOffice.org641/program/liblocaledata_ascii.so
-OpenOffice.org641/program/libzip641bi.so
-OpenOffice.org641/program/libset641bi.so
-OpenOffice.org641/program/libsfx641bi.so
-OpenOffice.org641/program/libcached1.so
-OpenOffice.org641/program/liblocaledata_CJK.so
-OpenOffice.org641/program/libucphier1.so
-OpenOffice.org641/program/jvmsetup
-OpenOffice.org641/program/libinv.so
-OpenOffice.org641/program/libsal.so.3.0.0
-OpenOffice.org641/program/libsal.so.3
-OpenOffice.org641/program/libmozabdrv2.so
-OpenOffice.org641/program/libucpfile1.so
-OpenOffice.org641/program/libpk641bi.so
-OpenOffice.org641/program/libpl641bi.so
-OpenOffice.org641/program/soffice
-OpenOffice.org641/program/spadmin
-OpenOffice.org641/program/libsyssh.so
-OpenOffice.org641/program/libxcr641bi.so
-OpenOffice.org641/program/libbasctl641bi.so
-OpenOffice.org641/program/libsdbc2.so
-OpenOffice.org641/program/libucpdav1.so
-OpenOffice.org641/program/libwrp641bi.so
-OpenOffice.org641/program/libjavaloader.so
-OpenOffice.org641/program/libtplx641bi.so
-OpenOffice.org641/program/libadabas2.so
-OpenOffice.org641/program/libsot641bi.so
-OpenOffice.org641/program/libj641bi_g.so
-OpenOffice.org641/program/libsw641bi.so
-OpenOffice.org641/program/libtk641bi.so
-OpenOffice.org641/program/libcpld.so
-OpenOffice.org641/program/impress_o.bmp
-OpenOffice.org641/program/libsb641bi.so
-OpenOffice.org641/program/javaldx
-OpenOffice.org641/program/libsd641bi.so
-OpenOffice.org641/program/libsvt641bi.so
-OpenOffice.org641/program/libso641bi.so
-OpenOffice.org641/program/libcppu.so.3.0.0
-OpenOffice.org641/program/libcppu.so.3
-OpenOffice.org641/program/libi18n641bi.so
-OpenOffice.org641/program/libucbhelper1GCC.so
-OpenOffice.org641/program/libtinstrm.so
-OpenOffice.org641/program/libpsp641bi.so
-OpenOffice.org641/program/libdb_java-3.2.so
-OpenOffice.org641/program/libuuresolver.so
-OpenOffice.org641/program/libpcr641bi.so
-OpenOffice.org641/program/libcppuhelper3GCC.so
-OpenOffice.org641/program/libstlport_gcc.so.0
-OpenOffice.org641/program/libgo641bi.so
-OpenOffice.org641/program/libjdbc2.so
-OpenOffice.org641/program/libflat641bi.so
-OpenOffice.org641/program/setup_types.rdb
-OpenOffice.org641/program/libodbcbase2.so
-OpenOffice.org641/program/libcomphelp2.so
-OpenOffice.org641/program/libxo641bi.so
-OpenOffice.org641/program/libstlport2_gcc.so
-OpenOffice.org641/program/libtvhlp1.so
-OpenOffice.org641/program/libxmx641bi.so
-OpenOffice.org641/program/libni641bi.so
-OpenOffice.org641/program/libutl641bi.so
-OpenOffice.org641/program/libcorefl.so
-OpenOffice.org641/program/libuui641bi.so
-OpenOffice.org641/program/libodbc2.so
-OpenOffice.org641/program/libvcl641bi.so
-OpenOffice.org641/program/libtoutstrm.so
-OpenOffice.org641/program/libimr641bi.so
-OpenOffice.org641/program/libpackage2.so
-OpenOffice.org641/program/components/libabsyncsvc.so
-OpenOffice.org641/program/components/libaddrbook.so
-OpenOffice.org641/program/components/libmork.so
-OpenOffice.org641/program/components/libmozldap.so
-OpenOffice.org641/program/components/libnecko.so
-OpenOffice.org641/program/components/libprofile.so
-OpenOffice.org641/program/components/librdf.so
-OpenOffice.org641/program/components/libstrres.so
-OpenOffice.org641/program/components/libunicharutil.so
-OpenOffice.org641/program/components/libuconv.so
-OpenOffice.org641/program/components/libucvcn.so
-OpenOffice.org641/program/components/libucvibm.so
-OpenOffice.org641/program/components/libucvja.so
-OpenOffice.org641/program/components/libucvko.so
-OpenOffice.org641/program/components/libucvlatin.so
-OpenOffice.org641/program/components/libucvtw.so
-OpenOffice.org641/program/components/libucvtw2.so
-OpenOffice.org641/program/components/liburiloader.so
-OpenOffice.org641/program/components/libvcard.so
-OpenOffice.org641/program/components/libxpconnect.so
-OpenOffice.org641/program/components/libpref.so
-OpenOffice.org641/program/libmozjs.so
-OpenOffice.org641/program/libmsgbaseutil.so
-OpenOffice.org641/program/libldap40.so
-OpenOffice.org641/program/libnspr4.so
-OpenOffice.org641/program/liblber40.so
-OpenOffice.org641/program/libplc4.so
-OpenOffice.org641/program/libplds4.so
-OpenOffice.org641/program/libxpcom.so
-OpenOffice.org641/program/libdba641bi.so
-OpenOffice.org641/program/librdbtdp.so
-OpenOffice.org641/program/liboic641bi.so
-OpenOffice.org641/program/libofa641bi.so
-OpenOffice.org641/program/open_office_org_logo.bmp
-OpenOffice.org641/program/libfrm641bi.so
-OpenOffice.org641/program/libfwe641bi.so
-OpenOffice.org641/program/libdtransX11641bi.so
-OpenOffice.org641/program/libfwi641bi.so
-OpenOffice.org641/program/libfwk641bi.so
-OpenOffice.org641/program/libfwl641bi.so
-OpenOffice.org641/program/libdb-3.2.so
-OpenOffice.org641/program/soffice.bin
-OpenOffice.org641/program/libdbpool2.so
-OpenOffice.org641/program/applicat.rdb
-OpenOffice.org641/program/libremotebridge.so
-OpenOffice.org641/program/libucppkg1.so
-OpenOffice.org641/program/swriter
-OpenOffice.org641/program/smaster
-OpenOffice.org641/program/sweb
-OpenOffice.org641/program/libcalc641bi.so
-OpenOffice.org641/program/scalc
-OpenOffice.org641/program/simpress
-OpenOffice.org641/program/libsc641bi.so
-OpenOffice.org641/program/libdate641bi.so
-OpenOffice.org641/program/libanalysis641bi.so
-OpenOffice.org641/program/sdraw
-OpenOffice.org641/program/smath
-OpenOffice.org641/program/libsm641bi.so
-OpenOffice.org641/program/libsvg641bi.so
-OpenOffice.org641/program/liblth641bi.so
-OpenOffice.org641/program/libspell641bi.so
-OpenOffice.org641/program/bootstraprc
-OpenOffice.org641/program/jvmsetuprc
-OpenOffice.org641/program/setuprc
-OpenOffice.org641/program/sofficerc
-OpenOffice.org641/program/instdb.ins
-OpenOffice.org641/share/template/english/wizard/bitmap/Arrange_1.gif
-OpenOffice.org641/share/template/english/wizard/bitmap/Arrange_2.gif
-OpenOffice.org641/share/template/english/wizard/bitmap/Arrange_3.gif
-OpenOffice.org641/share/template/english/wizard/bitmap/Arrange_4.gif
-OpenOffice.org641/share/template/english/wizard/bitmap/Arrange_5.gif
-OpenOffice.org641/share/template/english/wizard/bitmap/FormWizard_1.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/FormWizard_2.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/Import_1.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/Import_3.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/Import_4.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/MS-Import_2-1.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/MS-Import_2-2.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/MS-Import_2-3.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/XML-Import_2-1.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/XML-Import_2-2.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/XML-Import_2-3.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/XML-Import_2-4.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/brd.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/cancel_down.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/cancel_up.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/denmark.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/down.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/end.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/euro_1.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/euro_2.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/euro_3.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/france.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/italia.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/nedland.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/okay_down.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/okay_up.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/polska.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/portugal.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/russia.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/spain.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/sweden.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/up.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/usa.bmp
-OpenOffice.org641/share/template/english/wizard/bitmap/webwizard.bmp
-OpenOffice.org641/share/template/english/wizard/styles/black_white.stc
-OpenOffice.org641/share/template/english/wizard/styles/blackberry.stc
-OpenOffice.org641/share/template/english/wizard/styles/default.stc
-OpenOffice.org641/share/template/english/wizard/styles/diner.stc
-OpenOffice.org641/share/template/english/wizard/styles/fall.stc
-OpenOffice.org641/share/template/english/wizard/styles/glacier.stc
-OpenOffice.org641/share/template/english/wizard/styles/green_grapes.stc
-OpenOffice.org641/share/template/english/wizard/styles/jeans.stc
-OpenOffice.org641/share/template/english/wizard/styles/marine.stc
-OpenOffice.org641/share/template/english/wizard/styles/millennium.stc
-OpenOffice.org641/share/template/english/wizard/styles/nature.stc
-OpenOffice.org641/share/template/english/wizard/styles/neon.stc
-OpenOffice.org641/share/template/english/wizard/styles/night.stc
-OpenOffice.org641/share/template/english/wizard/styles/nostalgic.stc
-OpenOffice.org641/share/template/english/wizard/styles/pastell.stc
-OpenOffice.org641/share/template/english/wizard/styles/pool.stc
-OpenOffice.org641/share/template/english/wizard/styles/pumpkin.stc
-OpenOffice.org641/share/template/english/wizard/styles/sunstyle.stc
-OpenOffice.org641/share/template/english/wizard/styles/xos.stc
-OpenOffice.org641/share/template/english/wizard/web/cnt-album.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-bilingual.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-chapters.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-empty.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-fixonecol.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-fixtwocol.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-formcontact.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-formcustomer.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-formfix.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-formvar.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-list.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-onepic.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-standard.stw
-OpenOffice.org641/share/template/english/wizard/web/cnt-twotitles.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-banana.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-blkjeans.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-blue.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-blueblock.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-bluejeans.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-fieryred.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-hightech.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-mint.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-music.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-nostalg.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-orange.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-petrol.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-seventies.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-standard.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-strwbryice.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-sun.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-tracks.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-turquoise.stw
-OpenOffice.org641/share/template/english/wizard/web/stl-wetblue.stw
-OpenOffice.org641/share/template/english/wizard/wizbrf1.stw
-OpenOffice.org641/share/template/english/wizard/wizbrf2.stw
-OpenOffice.org641/share/template/english/wizard/wizbrf3.stw
-OpenOffice.org641/share/template/english/wizard/wizfax1.stw
-OpenOffice.org641/share/template/english/wizard/wizfax2.stw
-OpenOffice.org641/share/template/english/wizard/wizfax3.stw
-OpenOffice.org641/share/template/english/wizard/wizmem1.stw
-OpenOffice.org641/share/template/english/wizard/wizmem2.stw
-OpenOffice.org641/share/template/english/wizard/wizmem3.stw
-OpenOffice.org641/share/template/english/wizard/wizagn1.stw
-OpenOffice.org641/share/template/english/wizard/wizagn2.stw
-OpenOffice.org641/share/template/english/wizard/wizagn3.stw
-OpenOffice.org641/share/template/english/internal/html.stw
-OpenOffice.org641/share/template/english/internal/idxexample.sxw
-OpenOffice.org641/share/template/english/internal/url_transfer.htm
-OpenOffice.org641/share/dtd/officedocument/1_0/Manifest.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/script.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/statusbar.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/settings.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/nmspace.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/datastyl.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/table.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/drawing.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/event.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/accelerator.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/office.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/office.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/toolbar.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/style.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/dtypes.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/text.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/module.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/meta.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/dialog.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/chart.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/libraries.dtd
-OpenOffice.org641/share/dtd/officedocument/1_0/form.mod
-OpenOffice.org641/share/dtd/officedocument/1_0/menubar.dtd
-OpenOffice.org641/share/dtd/math/1_01/w3c_ipr_software_notice.html
-OpenOffice.org641/share/dtd/math/1_01/math.dtd
-OpenOffice.org641/share/config/webcast/savepic.asp
-OpenOffice.org641/share/config/webcast/common.pl
-OpenOffice.org641/share/config/webcast/webcast.asp
-OpenOffice.org641/share/config/webcast/show.asp
-OpenOffice.org641/share/config/webcast/poll.pl
-OpenOffice.org641/share/config/webcast/webcast.pl
-OpenOffice.org641/share/config/webcast/common.inc
-OpenOffice.org641/share/config/webcast/editpic.asp
-OpenOffice.org641/share/config/webcast/poll.asp
-OpenOffice.org641/share/config/webcast/edit.asp
-OpenOffice.org641/share/config/webcast/editpic.pl
-OpenOffice.org641/share/config/webcast/edit.pl
-OpenOffice.org641/share/config/webcast/index.pl
-OpenOffice.org641/share/config/webcast/show.pl
-OpenOffice.org641/share/config/webcast/savepic.pl
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/SFX.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Labels.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Impress.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Java.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Chart.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Draw.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Calc.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Linguistic.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Writer.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Common.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/TypeDetection.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/UI.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/DataAccess.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Math.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/Views.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Office/WriterWeb.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/ucb/Configuration.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/ucb/Store.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/ucb/Hierarchy.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Inet.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/UserProfile.xml
-OpenOffice.org641/share/config/registry/instance/org/openoffice/Setup.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Java.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Views.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/TypeDetection.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/WriterWeb.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Calc.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Labels.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Chart.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Writer.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/UI.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Linguistic.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Common.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Impress.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Math.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/DataAccess.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Office/Draw.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/ucb/Configuration.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/ucb/Store.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/ucb/Hierarchy.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Setup.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/UserProfile.xml
-OpenOffice.org641/share/config/registry/template/org/openoffice/Inet.xml
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/SFX.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Labels.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Impress.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Java.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Chart.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Draw.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Calc.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Linguistic.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Writer.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Common.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/TypeDetection.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/UI.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/DataAccess.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Math.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/Views.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office/WriterWeb.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/ucb/Configuration.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/ucb/Store.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/ucb/Hierarchy.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Inet.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/UserProfile.dat
-OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Setup.dat
-OpenOffice.org641/share/config/symbol/sc00000.bmp
-OpenOffice.org641/share/config/symbol/sc05300.bmp
-OpenOffice.org641/share/config/symbol/sc05302.bmp
-OpenOffice.org641/share/config/symbol/sc05325.bmp
-OpenOffice.org641/share/config/symbol/sc05331.bmp
-OpenOffice.org641/share/config/symbol/sc05338.bmp
-OpenOffice.org641/share/config/symbol/sc05339.bmp
-OpenOffice.org641/share/config/symbol/sc05361.bmp
-OpenOffice.org641/share/config/symbol/sc05362.bmp
-OpenOffice.org641/share/config/symbol/sc05363.bmp
-OpenOffice.org641/share/config/symbol/sc05364.bmp
-OpenOffice.org641/share/config/symbol/sc05365.bmp
-OpenOffice.org641/share/config/symbol/sc05366.bmp
-OpenOffice.org641/share/config/symbol/sc05367.bmp
-OpenOffice.org641/share/config/symbol/sc05368.bmp
-OpenOffice.org641/share/config/symbol/sc05369.bmp
-OpenOffice.org641/share/config/symbol/sc05370.bmp
-OpenOffice.org641/share/config/symbol/sc05371.bmp
-OpenOffice.org641/share/config/symbol/sc05373.bmp
-OpenOffice.org641/share/config/symbol/sc05374.bmp
-OpenOffice.org641/share/config/symbol/sc05375.bmp
-OpenOffice.org641/share/config/symbol/sc05377.bmp
-OpenOffice.org641/share/config/symbol/sc05381.bmp
-OpenOffice.org641/share/config/symbol/sc05382.bmp
-OpenOffice.org641/share/config/symbol/sc05383.bmp
-OpenOffice.org641/share/config/symbol/sc05384.bmp
-OpenOffice.org641/share/config/symbol/sc05386.bmp
-OpenOffice.org641/share/config/symbol/sc05387.bmp
-OpenOffice.org641/share/config/symbol/sc05401.bmp
-OpenOffice.org641/share/config/symbol/sc05402.bmp
-OpenOffice.org641/share/config/symbol/sc05410.bmp
-OpenOffice.org641/share/config/symbol/sc05411.bmp
-OpenOffice.org641/share/config/symbol/sc05412.bmp
-OpenOffice.org641/share/config/symbol/sc05413.bmp
-OpenOffice.org641/share/config/symbol/sc05414.bmp
-OpenOffice.org641/share/config/symbol/sc05415.bmp
-OpenOffice.org641/share/config/symbol/sc05500.bmp
-OpenOffice.org641/share/config/symbol/sc05501.bmp
-OpenOffice.org641/share/config/symbol/sc05502.bmp
-OpenOffice.org641/share/config/symbol/sc05503.bmp
-OpenOffice.org641/share/config/symbol/sc05504.bmp
-OpenOffice.org641/share/config/symbol/sc05505.bmp
-OpenOffice.org641/share/config/symbol/sc05508.bmp
-OpenOffice.org641/share/config/symbol/sc05509.bmp
-OpenOffice.org641/share/config/symbol/sc05532.bmp
-OpenOffice.org641/share/config/symbol/sc05533.bmp
-OpenOffice.org641/share/config/symbol/sc05535.bmp
-OpenOffice.org641/share/config/symbol/sc05537.bmp
-OpenOffice.org641/share/config/symbol/sc05538.bmp
-OpenOffice.org641/share/config/symbol/sc05539.bmp
-OpenOffice.org641/share/config/symbol/sc05552.bmp
-OpenOffice.org641/share/config/symbol/sc05555.bmp
-OpenOffice.org641/share/config/symbol/sc05556.bmp
-OpenOffice.org641/share/config/symbol/sc05561.bmp
-OpenOffice.org641/share/config/symbol/sc05563.bmp
-OpenOffice.org641/share/config/symbol/sc05595.bmp
-OpenOffice.org641/share/config/symbol/sc05596.bmp
-OpenOffice.org641/share/config/symbol/sc05624.bmp
-OpenOffice.org641/share/config/symbol/sc05646.bmp
-OpenOffice.org641/share/config/symbol/sc05647.bmp
-OpenOffice.org641/share/config/symbol/sc05648.bmp
-OpenOffice.org641/share/config/symbol/sc05649.bmp
-OpenOffice.org641/share/config/symbol/sc05650.bmp
-OpenOffice.org641/share/config/symbol/sc05651.bmp
-OpenOffice.org641/share/config/symbol/sc05672.bmp
-OpenOffice.org641/share/config/symbol/sc05673.bmp
-OpenOffice.org641/share/config/symbol/sc05675.bmp
-OpenOffice.org641/share/config/symbol/sc05694.bmp
-OpenOffice.org641/share/config/symbol/sc05700.bmp
-OpenOffice.org641/share/config/symbol/sc05701.bmp
-OpenOffice.org641/share/config/symbol/sc05702.bmp
-OpenOffice.org641/share/config/symbol/sc05710.bmp
-OpenOffice.org641/share/config/symbol/sc05711.bmp
-OpenOffice.org641/share/config/symbol/sc05712.bmp
-OpenOffice.org641/share/config/symbol/sc05713.bmp
-OpenOffice.org641/share/config/symbol/sc05723.bmp
-OpenOffice.org641/share/config/symbol/sc05800.bmp
-OpenOffice.org641/share/config/symbol/sc05801.bmp
-OpenOffice.org641/share/config/symbol/sc05802.bmp
-OpenOffice.org641/share/config/symbol/sc05904.bmp
-OpenOffice.org641/share/config/symbol/sc05905.bmp
-OpenOffice.org641/share/config/symbol/sc05906.bmp
-OpenOffice.org641/share/config/symbol/sc05951.bmp
-OpenOffice.org641/share/config/symbol/sc05952.bmp
-OpenOffice.org641/share/config/symbol/sc05953.bmp
-OpenOffice.org641/share/config/symbol/sc05954.bmp
-OpenOffice.org641/share/config/symbol/sc05955.bmp
-OpenOffice.org641/share/config/symbol/sc05956.bmp
-OpenOffice.org641/share/config/symbol/sc05957.bmp
-OpenOffice.org641/share/config/symbol/sc05958.bmp
-OpenOffice.org641/share/config/symbol/sc05959.bmp
-OpenOffice.org641/share/config/symbol/sc05960.bmp
-OpenOffice.org641/share/config/symbol/sc05961.bmp
-OpenOffice.org641/share/config/symbol/sc05962.bmp
-OpenOffice.org641/share/config/symbol/sc05963.bmp
-OpenOffice.org641/share/config/symbol/sc06300.bmp
-OpenOffice.org641/share/config/symbol/sc06301.bmp
-OpenOffice.org641/share/config/symbol/sc06302.bmp
-OpenOffice.org641/share/config/symbol/sc06303.bmp
-OpenOffice.org641/share/config/symbol/sc06304.bmp
-OpenOffice.org641/share/config/symbol/sc06305.bmp
-OpenOffice.org641/share/config/symbol/sc06306.bmp
-OpenOffice.org641/share/config/symbol/sc06308.bmp
-OpenOffice.org641/share/config/symbol/sc06309.bmp
-OpenOffice.org641/share/config/symbol/sc06312.bmp
-OpenOffice.org641/share/config/symbol/sc06313.bmp
-OpenOffice.org641/share/config/symbol/sc06314.bmp
-OpenOffice.org641/share/config/symbol/sc06315.bmp
-OpenOffice.org641/share/config/symbol/sc06318.bmp
-OpenOffice.org641/share/config/symbol/sc06330.bmp
-OpenOffice.org641/share/config/symbol/sc06331.bmp
-OpenOffice.org641/share/config/symbol/sc06332.bmp
-OpenOffice.org641/share/config/symbol/sc06333.bmp
-OpenOffice.org641/share/config/symbol/sc06334.bmp
-OpenOffice.org641/share/config/symbol/sc06335.bmp
-OpenOffice.org641/share/config/symbol/sc06336.bmp
-OpenOffice.org641/share/config/symbol/sc06337.bmp
-OpenOffice.org641/share/config/symbol/sc06338.bmp
-OpenOffice.org641/share/config/symbol/sc06339.bmp
-OpenOffice.org641/share/config/symbol/sc06350.bmp
-OpenOffice.org641/share/config/symbol/sc06351.bmp
-OpenOffice.org641/share/config/symbol/sc06352.bmp
-OpenOffice.org641/share/config/symbol/sc06353.bmp
-OpenOffice.org641/share/config/symbol/sc06354.bmp
-OpenOffice.org641/share/config/symbol/sc06355.bmp
-OpenOffice.org641/share/config/symbol/sc06356.bmp
-OpenOffice.org641/share/config/symbol/sc06357.bmp
-OpenOffice.org641/share/config/symbol/sc06362.bmp
-OpenOffice.org641/share/config/symbol/sc06363.bmp
-OpenOffice.org641/share/config/symbol/sc06364.bmp
-OpenOffice.org641/share/config/symbol/sc06370.bmp
-OpenOffice.org641/share/config/symbol/sc06377.bmp
-OpenOffice.org641/share/config/symbol/sc06379.bmp
-OpenOffice.org641/share/config/symbol/sc06384.bmp
-OpenOffice.org641/share/config/symbol/sc06522.bmp
-OpenOffice.org641/share/config/symbol/sc10000.bmp
-OpenOffice.org641/share/config/symbol/sc10006.bmp
-OpenOffice.org641/share/config/symbol/sc10007.bmp
-OpenOffice.org641/share/config/symbol/sc10008.bmp
-OpenOffice.org641/share/config/symbol/sc10009.bmp
-OpenOffice.org641/share/config/symbol/sc10010.bmp
-OpenOffice.org641/share/config/symbol/sc10012.bmp
-OpenOffice.org641/share/config/symbol/sc10013.bmp
-OpenOffice.org641/share/config/symbol/sc10014.bmp
-OpenOffice.org641/share/config/symbol/sc10015.bmp
-OpenOffice.org641/share/config/symbol/sc10016.bmp
-OpenOffice.org641/share/config/symbol/sc10017.bmp
-OpenOffice.org641/share/config/symbol/sc10028.bmp
-OpenOffice.org641/share/config/symbol/sc10029.bmp
-OpenOffice.org641/share/config/symbol/sc10030.bmp
-OpenOffice.org641/share/config/symbol/sc10031.bmp
-OpenOffice.org641/share/config/symbol/sc10035.bmp
-OpenOffice.org641/share/config/symbol/sc10036.bmp
-OpenOffice.org641/share/config/symbol/sc10045.bmp
-OpenOffice.org641/share/config/symbol/sc10050.bmp
-OpenOffice.org641/share/config/symbol/sc10055.bmp
-OpenOffice.org641/share/config/symbol/sc10087.bmp
-OpenOffice.org641/share/config/symbol/sc10096.bmp
-OpenOffice.org641/share/config/symbol/sc10097.bmp
-OpenOffice.org641/share/config/symbol/sc10098.bmp
-OpenOffice.org641/share/config/symbol/sc10099.bmp
-OpenOffice.org641/share/config/symbol/sc10100.bmp
-OpenOffice.org641/share/config/symbol/sc10101.bmp
-OpenOffice.org641/share/config/symbol/sc10102.bmp
-OpenOffice.org641/share/config/symbol/sc10103.bmp
-OpenOffice.org641/share/config/symbol/sc10104.bmp
-OpenOffice.org641/share/config/symbol/sc10105.bmp
-OpenOffice.org641/share/config/symbol/sc10106.bmp
-OpenOffice.org641/share/config/symbol/sc10109.bmp
-OpenOffice.org641/share/config/symbol/sc10110.bmp
-OpenOffice.org641/share/config/symbol/sc10112.bmp
-OpenOffice.org641/share/config/symbol/sc10114.bmp
-OpenOffice.org641/share/config/symbol/sc10115.bmp
-OpenOffice.org641/share/config/symbol/sc10116.bmp
-OpenOffice.org641/share/config/symbol/sc10117.bmp
-OpenOffice.org641/share/config/symbol/sc10118.bmp
-OpenOffice.org641/share/config/symbol/sc10119.bmp
-OpenOffice.org641/share/config/symbol/sc10120.bmp
-OpenOffice.org641/share/config/symbol/sc10121.bmp
-OpenOffice.org641/share/config/symbol/sc10122.bmp
-OpenOffice.org641/share/config/symbol/sc10123.bmp
-OpenOffice.org641/share/config/symbol/sc10124.bmp
-OpenOffice.org641/share/config/symbol/sc10125.bmp
-OpenOffice.org641/share/config/symbol/sc10126.bmp
-OpenOffice.org641/share/config/symbol/sc10127.bmp
-OpenOffice.org641/share/config/symbol/sc10128.bmp
-OpenOffice.org641/share/config/symbol/sc10129.bmp
-OpenOffice.org641/share/config/symbol/sc10130.bmp
-OpenOffice.org641/share/config/symbol/sc10131.bmp
-OpenOffice.org641/share/config/symbol/sc10132.bmp
-OpenOffice.org641/share/config/symbol/sc10133.bmp
-OpenOffice.org641/share/config/symbol/sc10134.bmp
-OpenOffice.org641/share/config/symbol/sc10135.bmp
-OpenOffice.org641/share/config/symbol/sc10136.bmp
-OpenOffice.org641/share/config/symbol/sc10137.bmp
-OpenOffice.org641/share/config/symbol/sc10138.bmp
-OpenOffice.org641/share/config/symbol/sc10139.bmp
-OpenOffice.org641/share/config/symbol/sc10140.bmp
-OpenOffice.org641/share/config/symbol/sc10141.bmp
-OpenOffice.org641/share/config/symbol/sc10142.bmp
-OpenOffice.org641/share/config/symbol/sc10143.bmp
-OpenOffice.org641/share/config/symbol/sc10144.bmp
-OpenOffice.org641/share/config/symbol/sc10145.bmp
-OpenOffice.org641/share/config/symbol/sc10146.bmp
-OpenOffice.org641/share/config/symbol/sc10147.bmp
-OpenOffice.org641/share/config/symbol/sc10148.bmp
-OpenOffice.org641/share/config/symbol/sc10150.bmp
-OpenOffice.org641/share/config/symbol/sc10151.bmp
-OpenOffice.org641/share/config/symbol/sc10152.bmp
-OpenOffice.org641/share/config/symbol/sc10153.bmp
-OpenOffice.org641/share/config/symbol/sc10154.bmp
-OpenOffice.org641/share/config/symbol/sc10155.bmp
-OpenOffice.org641/share/config/symbol/sc10156.bmp
-OpenOffice.org641/share/config/symbol/sc10157.bmp
-OpenOffice.org641/share/config/symbol/sc10158.bmp
-OpenOffice.org641/share/config/symbol/sc10159.bmp
-OpenOffice.org641/share/config/symbol/sc10160.bmp
-OpenOffice.org641/share/config/symbol/sc10161.bmp
-OpenOffice.org641/share/config/symbol/sc10162.bmp
-OpenOffice.org641/share/config/symbol/sc10163.bmp
-OpenOffice.org641/share/config/symbol/sc10164.bmp
-OpenOffice.org641/share/config/symbol/sc10185.bmp
-OpenOffice.org641/share/config/symbol/sc10186.bmp
-OpenOffice.org641/share/config/symbol/sc10187.bmp
-OpenOffice.org641/share/config/symbol/sc10188.bmp
-OpenOffice.org641/share/config/symbol/sc10189.bmp
-OpenOffice.org641/share/config/symbol/sc10190.bmp
-OpenOffice.org641/share/config/symbol/sc10191.bmp
-OpenOffice.org641/share/config/symbol/sc10192.bmp
-OpenOffice.org641/share/config/symbol/sc10193.bmp
-OpenOffice.org641/share/config/symbol/sc10194.bmp
-OpenOffice.org641/share/config/symbol/sc10195.bmp
-OpenOffice.org641/share/config/symbol/sc10196.bmp
-OpenOffice.org641/share/config/symbol/sc10197.bmp
-OpenOffice.org641/share/config/symbol/sc10199.bmp
-OpenOffice.org641/share/config/symbol/sc10200.bmp
-OpenOffice.org641/share/config/symbol/sc10201.bmp
-OpenOffice.org641/share/config/symbol/sc10217.bmp
-OpenOffice.org641/share/config/symbol/sc10223.bmp
-OpenOffice.org641/share/config/symbol/sc10224.bmp
-OpenOffice.org641/share/config/symbol/sc10231.bmp
-OpenOffice.org641/share/config/symbol/sc10232.bmp
-OpenOffice.org641/share/config/symbol/sc10233.bmp
-OpenOffice.org641/share/config/symbol/sc10240.bmp
-OpenOffice.org641/share/config/symbol/sc10241.bmp
-OpenOffice.org641/share/config/symbol/sc10242.bmp
-OpenOffice.org641/share/config/symbol/sc10243.bmp
-OpenOffice.org641/share/config/symbol/sc10244.bmp
-OpenOffice.org641/share/config/symbol/sc10253.bmp
-OpenOffice.org641/share/config/symbol/sc10254.bmp
-OpenOffice.org641/share/config/symbol/sc10255.bmp
-OpenOffice.org641/share/config/symbol/sc10256.bmp
-OpenOffice.org641/share/config/symbol/sc10282.bmp
-OpenOffice.org641/share/config/symbol/sc10283.bmp
-OpenOffice.org641/share/config/symbol/sc10286.bmp
-OpenOffice.org641/share/config/symbol/sc10287.bmp
-OpenOffice.org641/share/config/symbol/sc10294.bmp
-OpenOffice.org641/share/config/symbol/sc10295.bmp
-OpenOffice.org641/share/config/symbol/sc10296.bmp
-OpenOffice.org641/share/config/symbol/sc10297.bmp
-OpenOffice.org641/share/config/symbol/sc10301.bmp
-OpenOffice.org641/share/config/symbol/sc10350.bmp
-OpenOffice.org641/share/config/symbol/sc10360.bmp
-OpenOffice.org641/share/config/symbol/sc10366.bmp
-OpenOffice.org641/share/config/symbol/sc10371.bmp
-OpenOffice.org641/share/config/symbol/sc10375.bmp
-OpenOffice.org641/share/config/symbol/sc10376.bmp
-OpenOffice.org641/share/config/symbol/sc10378.bmp
-OpenOffice.org641/share/config/symbol/sc10379.bmp
-OpenOffice.org641/share/config/symbol/sc10380.bmp
-OpenOffice.org641/share/config/symbol/sc10381.bmp
-OpenOffice.org641/share/config/symbol/sc10382.bmp
-OpenOffice.org641/share/config/symbol/sc10383.bmp
-OpenOffice.org641/share/config/symbol/sc10384.bmp
-OpenOffice.org641/share/config/symbol/sc10385.bmp
-OpenOffice.org641/share/config/symbol/sc10386.bmp
-OpenOffice.org641/share/config/symbol/sc10387.bmp
-OpenOffice.org641/share/config/symbol/sc10388.bmp
-OpenOffice.org641/share/config/symbol/sc10389.bmp
-OpenOffice.org641/share/config/symbol/sc10390.bmp
-OpenOffice.org641/share/config/symbol/sc10391.bmp
-OpenOffice.org641/share/config/symbol/sc10393.bmp
-OpenOffice.org641/share/config/symbol/sc10394.bmp
-OpenOffice.org641/share/config/symbol/sc10395.bmp
-OpenOffice.org641/share/config/symbol/sc10396.bmp
-OpenOffice.org641/share/config/symbol/sc10397.bmp
-OpenOffice.org641/share/config/symbol/sc10398.bmp
-OpenOffice.org641/share/config/symbol/sc10399.bmp
-OpenOffice.org641/share/config/symbol/sc10401.bmp
-OpenOffice.org641/share/config/symbol/sc10402.bmp
-OpenOffice.org641/share/config/symbol/sc10403.bmp
-OpenOffice.org641/share/config/symbol/sc10434.bmp
-OpenOffice.org641/share/config/symbol/sc10458.bmp
-OpenOffice.org641/share/config/symbol/sc10461.bmp
-OpenOffice.org641/share/config/symbol/sc10462.bmp
-OpenOffice.org641/share/config/symbol/sc10463.bmp
-OpenOffice.org641/share/config/symbol/sc10464.bmp
-OpenOffice.org641/share/config/symbol/sc10465.bmp
-OpenOffice.org641/share/config/symbol/sc10503.bmp
-OpenOffice.org641/share/config/symbol/sc12021.bmp
-OpenOffice.org641/share/config/symbol/sc12201.bmp
-OpenOffice.org641/share/config/symbol/sc12202.bmp
-OpenOffice.org641/share/config/symbol/sc12203.bmp
-OpenOffice.org641/share/config/symbol/sc12204.bmp
-OpenOffice.org641/share/config/symbol/sc12212.bmp
-OpenOffice.org641/share/config/symbol/sc12221.bmp
-OpenOffice.org641/share/config/symbol/sc12222.bmp
-OpenOffice.org641/share/config/symbol/sc12223.bmp
-OpenOffice.org641/share/config/symbol/sc12224.bmp
-OpenOffice.org641/share/config/symbol/sc12225.bmp
-OpenOffice.org641/share/config/symbol/sc12226.bmp
-OpenOffice.org641/share/config/symbol/sc12227.bmp
-OpenOffice.org641/share/config/symbol/sc12228.bmp
-OpenOffice.org641/share/config/symbol/sc12229.bmp
-OpenOffice.org641/share/config/symbol/sc12230.bmp
-OpenOffice.org641/share/config/symbol/sc12231.bmp
-OpenOffice.org641/share/config/symbol/sc12232.bmp
-OpenOffice.org641/share/config/symbol/sc12234.bmp
-OpenOffice.org641/share/config/symbol/sc14780.bmp
-OpenOffice.org641/share/config/symbol/sc14781.bmp
-OpenOffice.org641/share/config/symbol/sc14785.bmp
-OpenOffice.org641/share/config/symbol/sc14786.bmp
-OpenOffice.org641/share/config/symbol/sc21050.bmp
-OpenOffice.org641/share/config/symbol/sc21051.bmp
-OpenOffice.org641/share/config/symbol/sc21060.bmp
-OpenOffice.org641/share/config/symbol/sc21061.bmp
-OpenOffice.org641/share/config/symbol/sc21062.bmp
-OpenOffice.org641/share/config/symbol/sc21070.bmp
-OpenOffice.org641/share/config/symbol/sc21080.bmp
-OpenOffice.org641/share/config/symbol/sc21100.bmp
-OpenOffice.org641/share/config/symbol/sc21101.bmp
-OpenOffice.org641/share/config/symbol/sc21102.bmp
-OpenOffice.org641/share/config/symbol/sc21103.bmp
-OpenOffice.org641/share/config/symbol/sc21104.bmp
-OpenOffice.org641/share/config/symbol/sc21105.bmp
-OpenOffice.org641/share/config/symbol/sc21110.bmp
-OpenOffice.org641/share/config/symbol/sc21111.bmp
-OpenOffice.org641/share/config/symbol/sc21120.bmp
-OpenOffice.org641/share/config/symbol/sc21121.bmp
-OpenOffice.org641/share/config/symbol/sc21130.bmp
-OpenOffice.org641/share/config/symbol/sc21140.bmp
-OpenOffice.org641/share/config/symbol/sc21141.bmp
-OpenOffice.org641/share/config/symbol/sc21142.bmp
-OpenOffice.org641/share/config/symbol/sc21150.bmp
-OpenOffice.org641/share/config/symbol/sc21160.bmp
-OpenOffice.org641/share/config/symbol/sc21170.bmp
-OpenOffice.org641/share/config/symbol/sc21180.bmp
-OpenOffice.org641/share/config/symbol/sc21190.bmp
-OpenOffice.org641/share/config/symbol/sc21200.bmp
-OpenOffice.org641/share/config/symbol/sc21210.bmp
-OpenOffice.org641/share/config/symbol/sc21220.bmp
-OpenOffice.org641/share/config/symbol/sc21230.bmp
-OpenOffice.org641/share/config/symbol/sc21240.bmp
-OpenOffice.org641/share/config/symbol/sc21250.bmp
-OpenOffice.org641/share/config/symbol/sc27030.bmp
-OpenOffice.org641/share/config/symbol/sc27065.bmp
-OpenOffice.org641/share/config/symbol/sc27066.bmp
-OpenOffice.org641/share/config/symbol/sc27067.bmp
-OpenOffice.org641/share/config/symbol/sc30000.bmp
-OpenOffice.org641/share/config/symbol/sc30002.bmp
-OpenOffice.org641/share/config/symbol/sc30003.bmp
-OpenOffice.org641/share/config/symbol/sc30004.bmp
-OpenOffice.org641/share/config/symbol/sc30005.bmp
-OpenOffice.org641/share/config/symbol/sc30007.bmp
-OpenOffice.org641/share/config/symbol/sc30008.bmp
-OpenOffice.org641/share/config/symbol/sc30009.bmp
-OpenOffice.org641/share/config/symbol/sc30010.bmp
-OpenOffice.org641/share/config/symbol/sc30011.bmp
-OpenOffice.org641/share/config/symbol/sc30012.bmp
-OpenOffice.org641/share/config/symbol/sc30770.bmp
-OpenOffice.org641/share/config/symbol/sc30773.bmp
-OpenOffice.org641/share/config/symbol/sc30774.bmp
-OpenOffice.org641/share/config/symbol/sc30782.bmp
-OpenOffice.org641/share/config/symbol/sc6377.bmp
-OpenOffice.org641/share/config/symbol/scbullet.bmp
-OpenOffice.org641/share/config/symbol/scnumb.bmp
-OpenOffice.org641/share/config/symbol/sco161.bmp
-OpenOffice.org641/share/config/symbol/sco261.bmp
-OpenOffice.org641/share/config/symbol/sco262.bmp
-OpenOffice.org641/share/config/symbol/sortd.bmp
-OpenOffice.org641/share/config/symbol/sortu.bmp
-OpenOffice.org641/share/config/symbol/u_high.bmp
-OpenOffice.org641/share/config/symbol/u_low.bmp
-OpenOffice.org641/share/config/symbol/u_normal.bmp
-OpenOffice.org641/share/config/psetup.xpm
-OpenOffice.org641/share/config/psetupl.xpm
-OpenOffice.org641/share/fonts/truetype/fonts.dir
-OpenOffice.org641/share/fonts/truetype/opens___.ttf
-OpenOffice.org641/share/fonts/truetype/fonts_dir.global
-OpenOffice.org641/share/basic/FormWizard/DlgFormDB.xdl
-OpenOffice.org641/share/basic/FormWizard/DBMeta.xba
-OpenOffice.org641/share/basic/FormWizard/FormWizard.xba
-OpenOffice.org641/share/basic/FormWizard/Language.xba
-OpenOffice.org641/share/basic/FormWizard/Layouter.xba
-OpenOffice.org641/share/basic/FormWizard/develop.xba
-OpenOffice.org641/share/basic/FormWizard/tools.xba
-OpenOffice.org641/share/basic/Schedule/DlgCalendar.xdl
-OpenOffice.org641/share/basic/Schedule/BankHoliday.xba
-OpenOffice.org641/share/basic/Schedule/CalendarMain.xba
-OpenOffice.org641/share/basic/Schedule/CreateTable.xba
-OpenOffice.org641/share/basic/Schedule/DlgControl.xba
-OpenOffice.org641/share/basic/Schedule/HolidayDanmark.xba
-OpenOffice.org641/share/basic/Schedule/HolidayFrance.xba
-OpenOffice.org641/share/basic/Schedule/HolidayGerman.xba
-OpenOffice.org641/share/basic/Schedule/HolidayItalia.xba
-OpenOffice.org641/share/basic/Schedule/HolidayNetherlands.xba
-OpenOffice.org641/share/basic/Schedule/HolidayPoland.xba
-OpenOffice.org641/share/basic/Schedule/HolidayPortugal.xba
-OpenOffice.org641/share/basic/Schedule/HolidayRussia.xba
-OpenOffice.org641/share/basic/Schedule/HolidaySpain.xba
-OpenOffice.org641/share/basic/Schedule/HolidaySweden.xba
-OpenOffice.org641/share/basic/Schedule/HolidayUSA.xba
-OpenOffice.org641/share/basic/Schedule/Language.xba
-OpenOffice.org641/share/basic/Schedule/OwnEvents.xba
-OpenOffice.org641/share/basic/Template/DialogStyles.xdl
-OpenOffice.org641/share/basic/Template/DlgGreeting.xdl
-OpenOffice.org641/share/basic/Template/TemplateDialog.xdl
-OpenOffice.org641/share/basic/Template/Autotext.xba
-OpenOffice.org641/share/basic/Template/Correspondence.xba
-OpenOffice.org641/share/basic/Template/Greeting.xba
-OpenOffice.org641/share/basic/Template/ModuleAgenda.xba
-OpenOffice.org641/share/basic/Template/Samples.xba
-OpenOffice.org641/share/basic/Gimmicks/ReadFolderDlg.xdl
-OpenOffice.org641/share/basic/Gimmicks/UserfieldDlg.xdl
-OpenOffice.org641/share/basic/Gimmicks/AutoText.xba
-OpenOffice.org641/share/basic/Gimmicks/ChangeAllChars.xba
-OpenOffice.org641/share/basic/Gimmicks/GetTexts.xba
-OpenOffice.org641/share/basic/Gimmicks/ReadDir.xba
-OpenOffice.org641/share/basic/Gimmicks/Userfields.xba
-OpenOffice.org641/share/basic/Tools/Debug.xba
-OpenOffice.org641/share/basic/Tools/Listbox.xba
-OpenOffice.org641/share/basic/Tools/Misc.xba
-OpenOffice.org641/share/basic/Tools/ModuleControls.xba
-OpenOffice.org641/share/basic/Tools/Strings.xba
-OpenOffice.org641/share/basic/Tools/UCB.xba
-OpenOffice.org641/share/basic/WebWizard/WebWzrd.xdl
-OpenOffice.org641/share/basic/WebWizard/Bullets.xba
-OpenOffice.org641/share/basic/WebWizard/Common.xba
-OpenOffice.org641/share/basic/WebWizard/HtmlAutoPilotBasic.xba
-OpenOffice.org641/share/basic/WebWizard/Language.xba
-OpenOffice.org641/share/basic/ImportWizard/ImportDialog.xdl
-OpenOffice.org641/share/basic/ImportWizard/API.xba
-OpenOffice.org641/share/basic/ImportWizard/DialogModul.xba
-OpenOffice.org641/share/basic/ImportWizard/FilesModul.xba
-OpenOffice.org641/share/basic/ImportWizard/Language.xba
-OpenOffice.org641/share/basic/ImportWizard/Main.xba
-OpenOffice.org641/share/basic/Euro/DlgConvert.xdl
-OpenOffice.org641/share/basic/Euro/DlgPassword.xdl
-OpenOffice.org641/share/basic/Euro/AutoPilotRun.xba
-OpenOffice.org641/share/basic/Euro/Common.xba
-OpenOffice.org641/share/basic/Euro/ConvertRun.xba
-OpenOffice.org641/share/basic/Euro/Hard.xba
-OpenOffice.org641/share/basic/Euro/Init.xba
-OpenOffice.org641/share/basic/Euro/Protect.xba
-OpenOffice.org641/share/basic/Euro/Soft.xba
-OpenOffice.org641/share/basic/Euro/Writer.xba
-OpenOffice.org641/share/gallery/htmlexpo/bludown.gif
-OpenOffice.org641/share/gallery/htmlexpo/blufirs.gif
-OpenOffice.org641/share/gallery/htmlexpo/blufirs_.gif
-OpenOffice.org641/share/gallery/htmlexpo/blulast.gif
-OpenOffice.org641/share/gallery/htmlexpo/blulast_.gif
-OpenOffice.org641/share/gallery/htmlexpo/blunav.gif
-OpenOffice.org641/share/gallery/htmlexpo/blunext.gif
-OpenOffice.org641/share/gallery/htmlexpo/blunext_.gif
-OpenOffice.org641/share/gallery/htmlexpo/bluprev.gif
-OpenOffice.org641/share/gallery/htmlexpo/bluprev_.gif
-OpenOffice.org641/share/gallery/htmlexpo/blutext.gif
-OpenOffice.org641/share/gallery/htmlexpo/bluup.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubdown.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubfirs.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubfirs_.gif
-OpenOffice.org641/share/gallery/htmlexpo/cublast.gif
-OpenOffice.org641/share/gallery/htmlexpo/cublast_.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubnav.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubnext.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubnext_.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubprev.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubprev_.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubtext.gif
-OpenOffice.org641/share/gallery/htmlexpo/cubup.gif
-OpenOffice.org641/share/gallery/htmlexpo/gredown.gif
-OpenOffice.org641/share/gallery/htmlexpo/grefirs.gif
-OpenOffice.org641/share/gallery/htmlexpo/grefirs_.gif
-OpenOffice.org641/share/gallery/htmlexpo/grelast.gif
-OpenOffice.org641/share/gallery/htmlexpo/grelast_.gif
-OpenOffice.org641/share/gallery/htmlexpo/grenav.gif
-OpenOffice.org641/share/gallery/htmlexpo/grenext.gif
-OpenOffice.org641/share/gallery/htmlexpo/grenext_.gif
-OpenOffice.org641/share/gallery/htmlexpo/greprev.gif
-OpenOffice.org641/share/gallery/htmlexpo/greprev_.gif
-OpenOffice.org641/share/gallery/htmlexpo/gretext.gif
-OpenOffice.org641/share/gallery/htmlexpo/greup.gif
-OpenOffice.org641/share/gallery/htmlexpo/simdown.gif
-OpenOffice.org641/share/gallery/htmlexpo/simfirs.gif
-OpenOffice.org641/share/gallery/htmlexpo/simfirs_.gif
-OpenOffice.org641/share/gallery/htmlexpo/simlast.gif
-OpenOffice.org641/share/gallery/htmlexpo/simlast_.gif
-OpenOffice.org641/share/gallery/htmlexpo/simnav.gif
-OpenOffice.org641/share/gallery/htmlexpo/simnext.gif
-OpenOffice.org641/share/gallery/htmlexpo/simnext_.gif
-OpenOffice.org641/share/gallery/htmlexpo/simprev.gif
-OpenOffice.org641/share/gallery/htmlexpo/simprev_.gif
-OpenOffice.org641/share/gallery/htmlexpo/simtext.gif
-OpenOffice.org641/share/gallery/htmlexpo/simup.gif
-OpenOffice.org641/share/gallery/htmlexpo/sologo.gif
-OpenOffice.org641/share/gallery/www-back/aqua.jpg
-OpenOffice.org641/share/gallery/www-back/bathroom.jpg
-OpenOffice.org641/share/gallery/www-back/blocks.jpg
-OpenOffice.org641/share/gallery/www-back/blow_green.jpg
-OpenOffice.org641/share/gallery/www-back/blueblop.jpg
-OpenOffice.org641/share/gallery/www-back/bulging.jpg
-OpenOffice.org641/share/gallery/www-back/canvas_blue.jpg
-OpenOffice.org641/share/gallery/www-back/cheese.jpg
-OpenOffice.org641/share/gallery/www-back/chocolate.jpg
-OpenOffice.org641/share/gallery/www-back/citrus.jpg
-OpenOffice.org641/share/gallery/www-back/confetti.jpg
-OpenOffice.org641/share/gallery/www-back/daisy.jpg
-OpenOffice.org641/share/gallery/www-back/fluffy-grey.jpg
-OpenOffice.org641/share/gallery/www-back/fluffy.jpg
-OpenOffice.org641/share/gallery/www-back/fuzzy-blue.jpg
-OpenOffice.org641/share/gallery/www-back/fuzzy-darkgrey.jpg
-OpenOffice.org641/share/gallery/www-back/fuzzy-grey.jpg
-OpenOffice.org641/share/gallery/www-back/fuzzy-lightgrey.jpg
-OpenOffice.org641/share/gallery/www-back/fuzzy_light.jpg
-OpenOffice.org641/share/gallery/www-back/gregre.gif
-OpenOffice.org641/share/gallery/www-back/grey.gif
-OpenOffice.org641/share/gallery/www-back/grypaws.gif
-OpenOffice.org641/share/gallery/www-back/ice-blue.jpg
-OpenOffice.org641/share/gallery/www-back/ice-light.jpg
-OpenOffice.org641/share/gallery/www-back/imitation_leather.jpg
-OpenOffice.org641/share/gallery/www-back/interstices.jpg
-OpenOffice.org641/share/gallery/www-back/jeans.jpg
-OpenOffice.org641/share/gallery/www-back/jeansblk.jpg
-OpenOffice.org641/share/gallery/www-back/lawn-artificial.jpg
-OpenOffice.org641/share/gallery/www-back/lawn.jpg
-OpenOffice.org641/share/gallery/www-back/lightblue-wet.jpg
-OpenOffice.org641/share/gallery/www-back/linen-fine.jpg
-OpenOffice.org641/share/gallery/www-back/lino-green.jpg
-OpenOffice.org641/share/gallery/www-back/liquid-blue.jpg
-OpenOffice.org641/share/gallery/www-back/marble.jpg
-OpenOffice.org641/share/gallery/www-back/marble_dark.jpg
-OpenOffice.org641/share/gallery/www-back/mazes.jpg
-OpenOffice.org641/share/gallery/www-back/mint.gif
-OpenOffice.org641/share/gallery/www-back/notes.gif
-OpenOffice.org641/share/gallery/www-back/pattern.jpg
-OpenOffice.org641/share/gallery/www-back/pebble-light.jpg
-OpenOffice.org641/share/gallery/www-back/pink.gif
-OpenOffice.org641/share/gallery/www-back/pool.jpg
-OpenOffice.org641/share/gallery/www-back/popcorn.jpg
-OpenOffice.org641/share/gallery/www-back/purple.jpg
-OpenOffice.org641/share/gallery/www-back/reddark.jpg
-OpenOffice.org641/share/gallery/www-back/rings-green.jpg
-OpenOffice.org641/share/gallery/www-back/rings-orange.jpg
-OpenOffice.org641/share/gallery/www-back/roses.jpg
-OpenOffice.org641/share/gallery/www-back/sand-light.jpg
-OpenOffice.org641/share/gallery/www-back/sand.jpg
-OpenOffice.org641/share/gallery/www-back/sky.jpg
-OpenOffice.org641/share/gallery/www-back/soft-structure_grey.jpg
-OpenOffice.org641/share/gallery/www-back/space.jpg
-OpenOffice.org641/share/gallery/www-back/stone-dark.jpg
-OpenOffice.org641/share/gallery/www-back/stone.jpg
-OpenOffice.org641/share/gallery/www-back/structure.jpg
-OpenOffice.org641/share/gallery/www-back/structure_darkgreen.gif
-OpenOffice.org641/share/gallery/www-back/structure_green.jpg
-OpenOffice.org641/share/gallery/www-back/wall-grey.jpg
-OpenOffice.org641/share/gallery/www-back/wet-turquoise.jpg
-OpenOffice.org641/share/gallery/www-back/wood.jpg
-OpenOffice.org641/share/gallery/bullets/blkpearl.gif
-OpenOffice.org641/share/gallery/bullets/bluarrow.gif
-OpenOffice.org641/share/gallery/bullets/bluball.gif
-OpenOffice.org641/share/gallery/bullets/bludiamd.gif
-OpenOffice.org641/share/gallery/bullets/bluered.gif
-OpenOffice.org641/share/gallery/bullets/blusqare.gif
-OpenOffice.org641/share/gallery/bullets/blustar.gif
-OpenOffice.org641/share/gallery/bullets/coffee_1.gif
-OpenOffice.org641/share/gallery/bullets/coffee_2.gif
-OpenOffice.org641/share/gallery/bullets/coffee_3.gif
-OpenOffice.org641/share/gallery/bullets/coffee_4.gif
-OpenOffice.org641/share/gallery/bullets/coffee_5.gif
-OpenOffice.org641/share/gallery/bullets/con-blue.gif
-OpenOffice.org641/share/gallery/bullets/con-cyan.gif
-OpenOffice.org641/share/gallery/bullets/con-green.gif
-OpenOffice.org641/share/gallery/bullets/con-lilac.gif
-OpenOffice.org641/share/gallery/bullets/con-oran.gif
-OpenOffice.org641/share/gallery/bullets/con-pink.gif
-OpenOffice.org641/share/gallery/bullets/con-red.gif
-OpenOffice.org641/share/gallery/bullets/con-yellow.gif
-OpenOffice.org641/share/gallery/bullets/corner_1.gif
-OpenOffice.org641/share/gallery/bullets/corner_2.gif
-OpenOffice.org641/share/gallery/bullets/corner_3.gif
-OpenOffice.org641/share/gallery/bullets/corner_4.gif
-OpenOffice.org641/share/gallery/bullets/darkball.gif
-OpenOffice.org641/share/gallery/bullets/darkblue.gif
-OpenOffice.org641/share/gallery/bullets/gldpearl.gif
-OpenOffice.org641/share/gallery/bullets/golfball.gif
-OpenOffice.org641/share/gallery/bullets/grnarrow.gif
-OpenOffice.org641/share/gallery/bullets/grnball.gif
-OpenOffice.org641/share/gallery/bullets/grndiamd.gif
-OpenOffice.org641/share/gallery/bullets/grnpearl.gif
-OpenOffice.org641/share/gallery/bullets/grnsqare.gif
-OpenOffice.org641/share/gallery/bullets/grnstar.gif
-OpenOffice.org641/share/gallery/bullets/gryarrow.gif
-OpenOffice.org641/share/gallery/bullets/gryball.gif
-OpenOffice.org641/share/gallery/bullets/grydiamd.gif
-OpenOffice.org641/share/gallery/bullets/grysqare.gif
-OpenOffice.org641/share/gallery/bullets/grystar.gif
-OpenOffice.org641/share/gallery/bullets/orgarrow.gif
-OpenOffice.org641/share/gallery/bullets/orgball.gif
-OpenOffice.org641/share/gallery/bullets/orgdiamd.gif
-OpenOffice.org641/share/gallery/bullets/orgsqare.gif
-OpenOffice.org641/share/gallery/bullets/orgstar.gif
-OpenOffice.org641/share/gallery/bullets/pebble_1.gif
-OpenOffice.org641/share/gallery/bullets/pebble_2.gif
-OpenOffice.org641/share/gallery/bullets/pebble_3.gif
-OpenOffice.org641/share/gallery/bullets/poliball.gif
-OpenOffice.org641/share/gallery/bullets/popcorn_1.gif
-OpenOffice.org641/share/gallery/bullets/popcorn_2.gif
-OpenOffice.org641/share/gallery/bullets/rainbow.gif
-OpenOffice.org641/share/gallery/bullets/redarrow.gif
-OpenOffice.org641/share/gallery/bullets/redball.gif
-OpenOffice.org641/share/gallery/bullets/reddiamd.gif
-OpenOffice.org641/share/gallery/bullets/redsqare.gif
-OpenOffice.org641/share/gallery/bullets/redstar.gif
-OpenOffice.org641/share/gallery/bullets/whtpearl.gif
-OpenOffice.org641/share/gallery/bullets/ylwarrow.gif
-OpenOffice.org641/share/gallery/bullets/ylwball.gif
-OpenOffice.org641/share/gallery/bullets/ylwdiamd.gif
-OpenOffice.org641/share/gallery/bullets/ylwsqare.gif
-OpenOffice.org641/share/gallery/bullets/ylwstar.gif
-OpenOffice.org641/share/gallery/rulers/blkballs.gif
-OpenOffice.org641/share/gallery/rulers/blurulr1.gif
-OpenOffice.org641/share/gallery/rulers/blurulr2.gif
-OpenOffice.org641/share/gallery/rulers/blurulr3.gif
-OpenOffice.org641/share/gallery/rulers/blurulr4.gif
-OpenOffice.org641/share/gallery/rulers/blurulr5.gif
-OpenOffice.org641/share/gallery/rulers/blurulr6.gif
-OpenOffice.org641/share/gallery/rulers/gldballs.gif
-OpenOffice.org641/share/gallery/rulers/grnballs.gif
-OpenOffice.org641/share/gallery/rulers/grnrulr1.gif
-OpenOffice.org641/share/gallery/rulers/grnrulr2.gif
-OpenOffice.org641/share/gallery/rulers/grnrulr3.gif
-OpenOffice.org641/share/gallery/rulers/grnrulr4.gif
-OpenOffice.org641/share/gallery/rulers/gryrulr1.gif
-OpenOffice.org641/share/gallery/rulers/gryrulr2.gif
-OpenOffice.org641/share/gallery/rulers/gryrulr3.gif
-OpenOffice.org641/share/gallery/rulers/orgrulr1.gif
-OpenOffice.org641/share/gallery/rulers/redrulr1.gif
-OpenOffice.org641/share/gallery/rulers/redrulr2.gif
-OpenOffice.org641/share/gallery/rulers/redrulr3.gif
-OpenOffice.org641/share/gallery/rulers/redrulr4.gif
-OpenOffice.org641/share/gallery/rulers/redrulr5.gif
-OpenOffice.org641/share/gallery/rulers/striped.gif
-OpenOffice.org641/share/gallery/rulers/whtballs.gif
-OpenOffice.org641/share/gallery/rulers/ylwrulr1.gif
-OpenOffice.org641/share/gallery/sounds/apert.wav
-OpenOffice.org641/share/gallery/sounds/apert2.wav
-OpenOffice.org641/share/gallery/sounds/applause.wav
-OpenOffice.org641/share/gallery/sounds/beam.wav
-OpenOffice.org641/share/gallery/sounds/beam2.wav
-OpenOffice.org641/share/gallery/sounds/cow.wav
-OpenOffice.org641/share/gallery/sounds/curve.wav
-OpenOffice.org641/share/gallery/sounds/drama.wav
-OpenOffice.org641/share/gallery/sounds/explos.wav
-OpenOffice.org641/share/gallery/sounds/falling.wav
-OpenOffice.org641/share/gallery/sounds/glasses.wav
-OpenOffice.org641/share/gallery/sounds/gong.wav
-OpenOffice.org641/share/gallery/sounds/horse.wav
-OpenOffice.org641/share/gallery/sounds/kling.wav
-OpenOffice.org641/share/gallery/sounds/kongas.wav
-OpenOffice.org641/share/gallery/sounds/laser.wav
-OpenOffice.org641/share/gallery/sounds/left.wav
-OpenOffice.org641/share/gallery/sounds/nature1.wav
-OpenOffice.org641/share/gallery/sounds/nature2.wav
-OpenOffice.org641/share/gallery/sounds/ok.wav
-OpenOffice.org641/share/gallery/sounds/pluck.wav
-OpenOffice.org641/share/gallery/sounds/roll.wav
-OpenOffice.org641/share/gallery/sounds/romans.wav
-OpenOffice.org641/share/gallery/sounds/soft.wav
-OpenOffice.org641/share/gallery/sounds/space.wav
-OpenOffice.org641/share/gallery/sounds/space2.wav
-OpenOffice.org641/share/gallery/sounds/space3.wav
-OpenOffice.org641/share/gallery/sounds/sparcle.wav
-OpenOffice.org641/share/gallery/sounds/strom.wav
-OpenOffice.org641/share/gallery/sounds/theetone.wav
-OpenOffice.org641/share/gallery/sounds/top.wav
-OpenOffice.org641/share/gallery/sounds/train.wav
-OpenOffice.org641/share/gallery/sounds/untie.wav
-OpenOffice.org641/share/gallery/sounds/ups.wav
-OpenOffice.org641/share/gallery/sounds/wallewal.wav
-OpenOffice.org641/share/gallery/sg1.sdg
-OpenOffice.org641/share/gallery/sg1.sdv
-OpenOffice.org641/share/gallery/sg1.thm
-OpenOffice.org641/share/gallery/sg16.sdg
-OpenOffice.org641/share/gallery/sg16.sdv
-OpenOffice.org641/share/gallery/sg16.thm
-OpenOffice.org641/share/gallery/sg2.sdg
-OpenOffice.org641/share/gallery/sg2.sdv
-OpenOffice.org641/share/gallery/sg2.thm
-OpenOffice.org641/share/gallery/sg24.sdg
-OpenOffice.org641/share/gallery/sg24.sdv
-OpenOffice.org641/share/gallery/sg24.thm
-OpenOffice.org641/share/gallery/sg25.sdg
-OpenOffice.org641/share/gallery/sg25.sdv
-OpenOffice.org641/share/gallery/sg25.thm
-OpenOffice.org641/share/gallery/sg3.sdg
-OpenOffice.org641/share/gallery/sg3.sdv
-OpenOffice.org641/share/gallery/sg3.thm
-OpenOffice.org641/share/gallery/sg9.sdg
-OpenOffice.org641/share/gallery/sg9.sdv
-OpenOffice.org641/share/gallery/sg9.thm
-OpenOffice.org641/share/wordbook/english/soffice.dic
-OpenOffice.org641/share/wordbook/english/sun.dic
-OpenOffice.org641/share/wordbook/english/th_en_US.dat
-OpenOffice.org641/share/wordbook/english/th_en_US.idx
-OpenOffice.org641/share/wordbook/english/en_US.aff
-OpenOffice.org641/share/wordbook/english/en_US.dic
-OpenOffice.org641/share/autotext/english/standard.bau
-OpenOffice.org641/share/autotext/english/template.bau
-OpenOffice.org641/share/autotext/english/crdbus50.bau
-OpenOffice.org641/share/autotext/english/crdbus54.bau
-OpenOffice.org641/share/psprint/fontmetric/AGaramond-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/AvantGarde-Book.afm
-OpenOffice.org641/share/psprint/fontmetric/AvantGarde-BookOblique.afm
-OpenOffice.org641/share/psprint/fontmetric/AvantGarde-Demi.afm
-OpenOffice.org641/share/psprint/fontmetric/AvantGarde-DemiOblique.afm
-OpenOffice.org641/share/psprint/fontmetric/Bookman-Demi.afm
-OpenOffice.org641/share/psprint/fontmetric/Bookman-DemiItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/Bookman-Light.afm
-OpenOffice.org641/share/psprint/fontmetric/Bookman-LightItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/Courier-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/Courier-BoldOblique.afm
-OpenOffice.org641/share/psprint/fontmetric/Courier-Oblique.afm
-OpenOffice.org641/share/psprint/fontmetric/Courier.afm
-OpenOffice.org641/share/psprint/fontmetric/GothicBBB-Medium-83pv-RKSJ-H.afm
-OpenOffice.org641/share/psprint/fontmetric/GothicBBB-Medium.Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/Helvetica.afm
-OpenOffice.org641/share/psprint/fontmetric/Helvetica-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/Helvetica-BoldOblique.afm
-OpenOffice.org641/share/psprint/fontmetric/Helvetica-Oblique.afm
-OpenOffice.org641/share/psprint/fontmetric/NewBaskerville-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/NewBaskerville-BoldItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/NewBaskerville-Italic.afm
-OpenOffice.org641/share/psprint/fontmetric/NewBaskerville-Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/NewCenturySchlbk-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/NewCenturySchlbk-BoldItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/NewCenturySchlbk-Italic.afm
-OpenOffice.org641/share/psprint/fontmetric/NewCenturySchlbk-Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/Palatino-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/Palatino-BoldItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/Palatino-Italic.afm
-OpenOffice.org641/share/psprint/fontmetric/Palatino-Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/Ryumin-Light-83pv-RKSJ-H.afm
-OpenOffice.org641/share/psprint/fontmetric/Ryumin-Light.Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/Symbol.afm
-OpenOffice.org641/share/psprint/fontmetric/Times-Bold.afm
-OpenOffice.org641/share/psprint/fontmetric/Times-BoldItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/Times-Italic.afm
-OpenOffice.org641/share/psprint/fontmetric/Times-Roman.afm
-OpenOffice.org641/share/psprint/fontmetric/Windsor.afm
-OpenOffice.org641/share/psprint/fontmetric/ZapfChancery-MediumItalic.afm
-OpenOffice.org641/share/psprint/fontmetric/ZapfDingbats.afm
-OpenOffice.org641/share/psprint/fontmetric/builtincache
-OpenOffice.org641/share/psprint/driver/ADISTILL.PS
-OpenOffice.org641/share/psprint/driver/APLW3101.PS
-OpenOffice.org641/share/psprint/driver/APLW3201.PS
-OpenOffice.org641/share/psprint/driver/APLW3601.PS
-OpenOffice.org641/share/psprint/driver/APLW6101.PS
-OpenOffice.org641/share/psprint/driver/APLW8101.PS
-OpenOffice.org641/share/psprint/driver/APLW81F1.PS
-OpenOffice.org641/share/psprint/driver/APLWBGR1.PS
-OpenOffice.org641/share/psprint/driver/APLWCOB1.PS
-OpenOffice.org641/share/psprint/driver/APLWCSB1.PS
-OpenOffice.org641/share/psprint/driver/APLWGRF1.PS
-OpenOffice.org641/share/psprint/driver/APLWGRI1.PS
-OpenOffice.org641/share/psprint/driver/APLWGRJ1.PS
-OpenOffice.org641/share/psprint/driver/APLWIIF2.PS
-OpenOffice.org641/share/psprint/driver/APLWIIG2.PS
-OpenOffice.org641/share/psprint/driver/APLWLOT1.PS
-OpenOffice.org641/share/psprint/driver/APL_IIF1.PS
-OpenOffice.org641/share/psprint/driver/APL_IIG1.PS
-OpenOffice.org641/share/psprint/driver/APL_NTR1.PS
-OpenOffice.org641/share/psprint/driver/APNT518_.PS
-OpenOffice.org641/share/psprint/driver/APNTX501.PS
-OpenOffice.org641/share/psprint/driver/APNTXJ1_.PS
-OpenOffice.org641/share/psprint/driver/APPL_230.PS
-OpenOffice.org641/share/psprint/driver/APPL_380.PS
-OpenOffice.org641/share/psprint/driver/APPL_422.PS
-OpenOffice.org641/share/psprint/driver/APTOLLD1.PS
-OpenOffice.org641/share/psprint/driver/APTOLLW1.PS
-OpenOffice.org641/share/psprint/driver/CAECOGR1.PS
-OpenOffice.org641/share/psprint/driver/DC1152_1.PS
-OpenOffice.org641/share/psprint/driver/EFAX3010.PS
-OpenOffice.org641/share/psprint/driver/EFAX4010.PS
-OpenOffice.org641/share/psprint/driver/EFAX5010.PS
-OpenOffice.org641/share/psprint/driver/EFAX7010.PS
-OpenOffice.org641/share/psprint/driver/EFMX3010.PS
-OpenOffice.org641/share/psprint/driver/EFMX5010.PS
-OpenOffice.org641/share/psprint/driver/EFMX7010.PS
-OpenOffice.org641/share/psprint/driver/EFXJK1F3.PS
-OpenOffice.org641/share/psprint/driver/EFXJK2F3.PS
-OpenOffice.org641/share/psprint/driver/EFXJK303.PS
-OpenOffice.org641/share/psprint/driver/EFXJK3F3.PS
-OpenOffice.org641/share/psprint/driver/EP_08001.PS
-OpenOffice.org641/share/psprint/driver/EP_15201.PS
-OpenOffice.org641/share/psprint/driver/EP_30001.PS
-OpenOffice.org641/share/psprint/driver/EP_50001.PS
-OpenOffice.org641/share/psprint/driver/EP_82F21.PS
-OpenOffice.org641/share/psprint/driver/EP_82F51.PS
-OpenOffice.org641/share/psprint/driver/EP_P0701.PS
-OpenOffice.org641/share/psprint/driver/EP_P1201.PS
-OpenOffice.org641/share/psprint/driver/EP_STPH1.PS
-OpenOffice.org641/share/psprint/driver/GENERIC.PS
-OpenOffice.org641/share/psprint/driver/HP1200C1.PS
-OpenOffice.org641/share/psprint/driver/HP2500C1.PS
-OpenOffice.org641/share/psprint/driver/HP3SI52_.PS
-OpenOffice.org641/share/psprint/driver/HP3SIL21.PS
-OpenOffice.org641/share/psprint/driver/HP4M3_V1.PS
-OpenOffice.org641/share/psprint/driver/HP4M6_V1.PS
-OpenOffice.org641/share/psprint/driver/HP4ML_V1.PS
-OpenOffice.org641/share/psprint/driver/HP4MP3_1.PS
-OpenOffice.org641/share/psprint/driver/HP4MP6_1.PS
-OpenOffice.org641/share/psprint/driver/HP4PLUS3.PS
-OpenOffice.org641/share/psprint/driver/HP4PLUS6.PS
-OpenOffice.org641/share/psprint/driver/HP4SI3_1.PS
-OpenOffice.org641/share/psprint/driver/HP4SI6_1.PS
-OpenOffice.org641/share/psprint/driver/HPIID52_.PS
-OpenOffice.org641/share/psprint/driver/HPIII52_.PS
-OpenOffice.org641/share/psprint/driver/HPIIP52_.PS
-OpenOffice.org641/share/psprint/driver/HPLJ3D1_.PS
-OpenOffice.org641/share/psprint/driver/HPLJ3P1_.PS
-OpenOffice.org641/share/psprint/driver/HPLJ4MV1.PS
-OpenOffice.org641/share/psprint/driver/HPLJ5M_4.PS
-OpenOffice.org641/share/psprint/driver/HPLJ5P_1.PS
-OpenOffice.org641/share/psprint/driver/HPLJ5SI1.PS
-OpenOffice.org641/share/psprint/driver/HPLJ5SIM.PS
-OpenOffice.org641/share/psprint/driver/HPLJ__31.PS
-OpenOffice.org641/share/psprint/driver/HP_3D52_.PS
-OpenOffice.org641/share/psprint/driver/HP_3P52_.PS
-OpenOffice.org641/share/psprint/driver/HP__CLJ1.PS
-OpenOffice.org641/share/psprint/driver/KD8650P1.PS
-OpenOffice.org641/share/psprint/driver/KD92P001.PS
-OpenOffice.org641/share/psprint/driver/KDH00001.PS
-OpenOffice.org641/share/psprint/driver/KDH00002.PS
-OpenOffice.org641/share/psprint/driver/L10__425.PS
-OpenOffice.org641/share/psprint/driver/L20__471.PS
-OpenOffice.org641/share/psprint/driver/L20__493.PS
-OpenOffice.org641/share/psprint/driver/L30__471.PS
-OpenOffice.org641/share/psprint/driver/L30__493.PS
-OpenOffice.org641/share/psprint/driver/L333_523.PS
-OpenOffice.org641/share/psprint/driver/L33__523.PS
-OpenOffice.org641/share/psprint/driver/L50__493.PS
-OpenOffice.org641/share/psprint/driver/L533_523.PS
-OpenOffice.org641/share/psprint/driver/L53__523.PS
-OpenOffice.org641/share/psprint/driver/LEX4039P.PS
-OpenOffice.org641/share/psprint/driver/LEX4079P.PS
-OpenOffice.org641/share/psprint/driver/LEXOPTR_.PS
-OpenOffice.org641/share/psprint/driver/LHCFLRJ5.PS
-OpenOffice.org641/share/psprint/driver/LHCOFLC5.PS
-OpenOffice.org641/share/psprint/driver/LHCOFLR5.PS
-OpenOffice.org641/share/psprint/driver/LHGUBEH3.PS
-OpenOffice.org641/share/psprint/driver/LHGUBHJ4.PS
-OpenOffice.org641/share/psprint/driver/LHHERHJ4.PS
-OpenOffice.org641/share/psprint/driver/LHHERIJ4.PS
-OpenOffice.org641/share/psprint/driver/LHHERKH3.PS
-OpenOffice.org641/share/psprint/driver/LHHERKI4.PS
-OpenOffice.org641/share/psprint/driver/LHHKPHJ7.PS
-OpenOffice.org641/share/psprint/driver/LHHKPIJ7.PS
-OpenOffice.org641/share/psprint/driver/LHHRKPH7.PS
-OpenOffice.org641/share/psprint/driver/LHHRKPI7.PS
-OpenOffice.org641/share/psprint/driver/LHQUSHJ4.PS
-OpenOffice.org641/share/psprint/driver/LHQUSIJ4.PS
-OpenOffice.org641/share/psprint/driver/LHQUSRH3.PS
-OpenOffice.org641/share/psprint/driver/LHQUSRI3.PS
-OpenOffice.org641/share/psprint/driver/LHSIGHJ4.PS
-OpenOffice.org641/share/psprint/driver/LHSIGIJ4.PS
-OpenOffice.org641/share/psprint/driver/LHSIGNH3.PS
-OpenOffice.org641/share/psprint/driver/LHSIGNI3.PS
-OpenOffice.org641/share/psprint/driver/LOPC1200.PS
-OpenOffice.org641/share/psprint/driver/LOPC40.PS
-OpenOffice.org641/share/psprint/driver/LOPC45.PS
-OpenOffice.org641/share/psprint/driver/LOPE310.PS
-OpenOffice.org641/share/psprint/driver/LOPM410.PS
-OpenOffice.org641/share/psprint/driver/LOPS1255.PS
-OpenOffice.org641/share/psprint/driver/LOPS1625.PS
-OpenOffice.org641/share/psprint/driver/LOPS1855.PS
-OpenOffice.org641/share/psprint/driver/LOPS2455.PS
-OpenOffice.org641/share/psprint/driver/LOPS3455.PS
-OpenOffice.org641/share/psprint/driver/LOPT610.PS
-OpenOffice.org641/share/psprint/driver/LOPT612.PS
-OpenOffice.org641/share/psprint/driver/LOPT614.PS
-OpenOffice.org641/share/psprint/driver/LOPT616.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAC.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAEP.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAK.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAN.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAP.PS
-OpenOffice.org641/share/psprint/driver/LOPTRAS.PS
-OpenOffice.org641/share/psprint/driver/LOPTRASC.PS
-OpenOffice.org641/share/psprint/driver/LOPW810.PS
-OpenOffice.org641/share/psprint/driver/LOS1255P.PS
-OpenOffice.org641/share/psprint/driver/LOS1625P.PS
-OpenOffice.org641/share/psprint/driver/LOS1855P.PS
-OpenOffice.org641/share/psprint/driver/LOS2455P.PS
-OpenOffice.org641/share/psprint/driver/LOS3455P.PS
-OpenOffice.org641/share/psprint/driver/LWNT_518.PS
-OpenOffice.org641/share/psprint/driver/SGENPRT.PS
-OpenOffice.org641/share/psprint/driver/SNSPREC1.PS
-OpenOffice.org641/share/psprint/driver/TK300PJ1.PS
-OpenOffice.org641/share/psprint/driver/TK300XJ1.PS
-OpenOffice.org641/share/psprint/driver/TK350171.PS
-OpenOffice.org641/share/psprint/driver/TK350172.PS
-OpenOffice.org641/share/psprint/driver/TK350691.PS
-OpenOffice.org641/share/psprint/driver/TK350692.PS
-OpenOffice.org641/share/psprint/driver/TK350PJ2.PS
-OpenOffice.org641/share/psprint/driver/TK360J21.PS
-OpenOffice.org641/share/psprint/driver/TK360J51.PS
-OpenOffice.org641/share/psprint/driver/TK360J71.PS
-OpenOffice.org641/share/psprint/driver/TK450PJ1.PS
-OpenOffice.org641/share/psprint/driver/TK550171.PS
-OpenOffice.org641/share/psprint/driver/TK550391.PS
-OpenOffice.org641/share/psprint/driver/TK550PJ1.PS
-OpenOffice.org641/share/psprint/driver/TKP350J2.PS
-OpenOffice.org641/share/psprint/driver/TKP360P1.PS
-OpenOffice.org641/share/psprint/driver/TKP380J1.PS
-OpenOffice.org641/share/psprint/driver/TKP380P1.PS
-OpenOffice.org641/share/psprint/driver/TKP450J1.PS
-OpenOffice.org641/share/psprint/driver/TKP450P1.PS
-OpenOffice.org641/share/psprint/driver/TKP550J1.PS
-OpenOffice.org641/share/psprint/driver/TKP600J1.PS
-OpenOffice.org641/share/psprint/driver/TKPH3801.PS
-OpenOffice.org641/share/psprint/driver/TKPH4501.PS
-OpenOffice.org641/share/psprint/driver/TKPH6001.PS
-OpenOffice.org641/share/psprint/driver/XRD61354.PS
-OpenOffice.org641/share/psprint/driver/XRD61801.PS
-OpenOffice.org641/share/psprint/driver/XRN17000.PS
-OpenOffice.org641/share/psprint/driver/XRN24320.PS
-OpenOffice.org641/share/psprint/driver/XR_DC230.PS
-OpenOffice.org641/share/psprint/psprint.conf
-OpenOffice.org641/share/autocorr/acor1033.dat
-OpenOffice.org641/user/autotext/english/mytexts.bau
-OpenOffice.org641/user/database/biblio/biblio.dbf
-OpenOffice.org641/user/gallery/sg100.sdv
-OpenOffice.org641/user/gallery/sg100.thm
-OpenOffice.org641/user/gallery/sg30.sdv
-OpenOffice.org641/user/gallery/sg30.thm
-OpenOffice.org641/user/config/arrowhd.soe
-OpenOffice.org641/user/config/classic.sog
-OpenOffice.org641/user/config/hatching.soh
-OpenOffice.org641/user/config/modern.sog
-OpenOffice.org641/user/config/palette.soc
-OpenOffice.org641/user/config/styles.sod
-OpenOffice.org641/user/config/autotbl.fmt
-OpenOffice.org641/user/config/dbtitle.rdb
-OpenOffice.org641/user/config/cmyk.soc
-OpenOffice.org641/user/config/gallery.soc
-OpenOffice.org641/user/config/html.soc
-OpenOffice.org641/user/config/standard.sob
-OpenOffice.org641/user/config/standard.soc
-OpenOffice.org641/user/config/standard.sod
-OpenOffice.org641/user/config/standard.soe
-OpenOffice.org641/user/config/standard.sog
-OpenOffice.org641/user/config/standard.soh
-OpenOffice.org641/user/config/sun-color.soc
-OpenOffice.org641/user/config/web.soc
-OpenOffice.org641/user/basic/dialogs.xli
-OpenOffice.org641/user/basic/script.xli
-OpenOffice.org641/help/en/sbasic.cfg
-OpenOffice.org641/help/en/sbasic.db
-OpenOffice.org641/help/en/sbasic.ht
-OpenOffice.org641/help/en/sbasic.idx/CONTEXTS
-OpenOffice.org641/help/en/sbasic.idx/DICTIONARY
-OpenOffice.org641/help/en/sbasic.idx/DOCS
-OpenOffice.org641/help/en/sbasic.idx/DOCS.TAB
-OpenOffice.org641/help/en/sbasic.idx/EDGE
-OpenOffice.org641/help/en/sbasic.idx/LINKNAMES
-OpenOffice.org641/help/en/sbasic.idx/OFFSETS
-OpenOffice.org641/help/en/sbasic.idx/POSITIONS
-OpenOffice.org641/help/en/sbasic.idx/SCHEMA
-OpenOffice.org641/help/en/sbasic.jar
-OpenOffice.org641/help/en/sbasic.key
-OpenOffice.org641/help/en/common.jar
-OpenOffice.org641/help/en/custom.css
-OpenOffice.org641/help/en/err.html
-OpenOffice.org641/help/en/picture.db
-OpenOffice.org641/help/en/picture.jar
-OpenOffice.org641/help/en/treeview.xml
-OpenOffice.org641/help/en/schart.jar
-OpenOffice.org641/help/en/swriter.cfg
-OpenOffice.org641/help/en/swriter.db
-OpenOffice.org641/help/en/swriter.ht
-OpenOffice.org641/help/en/swriter.idx/CONTEXTS
-OpenOffice.org641/help/en/swriter.idx/DICTIONARY
-OpenOffice.org641/help/en/swriter.idx/DOCS
-OpenOffice.org641/help/en/swriter.idx/DOCS.TAB
-OpenOffice.org641/help/en/swriter.idx/EDGE
-OpenOffice.org641/help/en/swriter.idx/LINKNAMES
-OpenOffice.org641/help/en/swriter.idx/OFFSETS
-OpenOffice.org641/help/en/swriter.idx/POSITIONS
-OpenOffice.org641/help/en/swriter.idx/SCHEMA
-OpenOffice.org641/help/en/swriter.jar
-OpenOffice.org641/help/en/swriter.key
-OpenOffice.org641/help/en/scalc.cfg
-OpenOffice.org641/help/en/scalc.db
-OpenOffice.org641/help/en/scalc.ht
-OpenOffice.org641/help/en/scalc.idx/CONTEXTS
-OpenOffice.org641/help/en/scalc.idx/DICTIONARY
-OpenOffice.org641/help/en/scalc.idx/DOCS
-OpenOffice.org641/help/en/scalc.idx/DOCS.TAB
-OpenOffice.org641/help/en/scalc.idx/EDGE
-OpenOffice.org641/help/en/scalc.idx/LINKNAMES
-OpenOffice.org641/help/en/scalc.idx/OFFSETS
-OpenOffice.org641/help/en/scalc.idx/POSITIONS
-OpenOffice.org641/help/en/scalc.idx/SCHEMA
-OpenOffice.org641/help/en/scalc.jar
-OpenOffice.org641/help/en/scalc.key
-OpenOffice.org641/help/en/simpress.cfg
-OpenOffice.org641/help/en/simpress.db
-OpenOffice.org641/help/en/simpress.ht
-OpenOffice.org641/help/en/simpress.idx/CONTEXTS
-OpenOffice.org641/help/en/simpress.idx/DICTIONARY
-OpenOffice.org641/help/en/simpress.idx/DOCS
-OpenOffice.org641/help/en/simpress.idx/DOCS.TAB
-OpenOffice.org641/help/en/simpress.idx/EDGE
-OpenOffice.org641/help/en/simpress.idx/LINKNAMES
-OpenOffice.org641/help/en/simpress.idx/OFFSETS
-OpenOffice.org641/help/en/simpress.idx/POSITIONS
-OpenOffice.org641/help/en/simpress.idx/SCHEMA
-OpenOffice.org641/help/en/simpress.jar
-OpenOffice.org641/help/en/simpress.key
-OpenOffice.org641/help/en/sdraw.cfg
-OpenOffice.org641/help/en/sdraw.db
-OpenOffice.org641/help/en/sdraw.ht
-OpenOffice.org641/help/en/sdraw.idx/CONTEXTS
-OpenOffice.org641/help/en/sdraw.idx/DICTIONARY
-OpenOffice.org641/help/en/sdraw.idx/DOCS
-OpenOffice.org641/help/en/sdraw.idx/DOCS.TAB
-OpenOffice.org641/help/en/sdraw.idx/EDGE
-OpenOffice.org641/help/en/sdraw.idx/LINKNAMES
-OpenOffice.org641/help/en/sdraw.idx/OFFSETS
-OpenOffice.org641/help/en/sdraw.idx/POSITIONS
-OpenOffice.org641/help/en/sdraw.idx/SCHEMA
-OpenOffice.org641/help/en/sdraw.jar
-OpenOffice.org641/help/en/sdraw.key
-OpenOffice.org641/help/en/smath.cfg
-OpenOffice.org641/help/en/smath.db
-OpenOffice.org641/help/en/smath.ht
-OpenOffice.org641/help/en/smath.idx/CONTEXTS
-OpenOffice.org641/help/en/smath.idx/DICTIONARY
-OpenOffice.org641/help/en/smath.idx/DOCS
-OpenOffice.org641/help/en/smath.idx/DOCS.TAB
-OpenOffice.org641/help/en/smath.idx/EDGE
-OpenOffice.org641/help/en/smath.idx/LINKNAMES
-OpenOffice.org641/help/en/smath.idx/OFFSETS
-OpenOffice.org641/help/en/smath.idx/POSITIONS
-OpenOffice.org641/help/en/smath.idx/SCHEMA
-OpenOffice.org641/help/en/smath.jar
-OpenOffice.org641/help/en/smath.key
-OpenOffice.org641/help/main_transform.xsl
-OpenOffice.org641/help/custom.css
-@comment DIRS
-@dirrm OpenOffice.org641/user/wordbook
-@dirrm OpenOffice.org641/user/template
-@dirrm OpenOffice.org641/user/temp
-@dirrm OpenOffice.org641/user/store
-@dirrm OpenOffice.org641/user/psprint/fontmetric
-@dirrm OpenOffice.org641/user/psprint/driver
-@dirrm OpenOffice.org641/user/psprint
-@dirrm OpenOffice.org641/user/plugin
-@dirrm OpenOffice.org641/user/gallery
-@dirrm OpenOffice.org641/user/database/biblio
-@dirrm OpenOffice.org641/user/database
-@dirrm OpenOffice.org641/user/config/registry/instance/org/openoffice/ucb
-@dirrm OpenOffice.org641/user/config/registry/instance/org/openoffice/Office
-@dirrm OpenOffice.org641/user/config/registry/instance/org/openoffice
-@dirrm OpenOffice.org641/user/config/registry/instance/org
-@dirrm OpenOffice.org641/user/config/registry/instance
-@dirrm OpenOffice.org641/user/config/registry
-@dirrm OpenOffice.org641/user/config
-@dirrm OpenOffice.org641/user/basic
-@dirrm OpenOffice.org641/user/backup
-@dirrm OpenOffice.org641/user/autotext/english
-@dirrm OpenOffice.org641/user/autotext
-@dirrm OpenOffice.org641/user/autocorr
-@dirrm OpenOffice.org641/user
-@dirrm OpenOffice.org641/share/wordbook/english
-@dirrm OpenOffice.org641/share/wordbook
-@dirrm OpenOffice.org641/share/template/english/wizard/web
-@dirrm OpenOffice.org641/share/template/english/wizard/styles
-@dirrm OpenOffice.org641/share/template/english/wizard/bitmap
-@dirrm OpenOffice.org641/share/template/english/wizard
-@dirrm OpenOffice.org641/share/template/english/internal
-@dirrm OpenOffice.org641/share/template/english
-@dirrm OpenOffice.org641/share/template
-@dirrm OpenOffice.org641/share/psprint/fontmetric
-@dirrm OpenOffice.org641/share/psprint/driver
-@dirrm OpenOffice.org641/share/psprint
-@dirrm OpenOffice.org641/share/gallery/www-back
-@dirrm OpenOffice.org641/share/gallery/sounds
-@dirrm OpenOffice.org641/share/gallery/rulers
-@dirrm OpenOffice.org641/share/gallery/htmlexpo
-@dirrm OpenOffice.org641/share/gallery/bullets
-@dirrm OpenOffice.org641/share/gallery
-@dirrm OpenOffice.org641/share/fonts/truetype
-@dirrm OpenOffice.org641/share/fonts
-@dirrm OpenOffice.org641/share/dtd/officedocument/1_0
-@dirrm OpenOffice.org641/share/dtd/officedocument
-@dirrm OpenOffice.org641/share/dtd/math/1_01
-@dirrm OpenOffice.org641/share/dtd/math
-@dirrm OpenOffice.org641/share/dtd
-@dirrm OpenOffice.org641/share/config/webcast
-@dirrm OpenOffice.org641/share/config/symbol
-@dirrm OpenOffice.org641/share/config/registry/template/org/openoffice/ucb
-@dirrm OpenOffice.org641/share/config/registry/template/org/openoffice/Office
-@dirrm OpenOffice.org641/share/config/registry/template/org/openoffice
-@dirrm OpenOffice.org641/share/config/registry/template/org
-@dirrm OpenOffice.org641/share/config/registry/template
-@dirrm OpenOffice.org641/share/config/registry/instance/org/openoffice/ucb
-@dirrm OpenOffice.org641/share/config/registry/instance/org/openoffice/Office
-@dirrm OpenOffice.org641/share/config/registry/instance/org/openoffice
-@dirrm OpenOffice.org641/share/config/registry/instance/org
-@dirrm OpenOffice.org641/share/config/registry/instance
-@dirrm OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/ucb
-@dirrm OpenOffice.org641/share/config/registry/cache/instance/org/openoffice/Office
-@dirrm OpenOffice.org641/share/config/registry/cache/instance/org/openoffice
-@dirrm OpenOffice.org641/share/config/registry/cache/instance/org
-@dirrm OpenOffice.org641/share/config/registry/cache/instance
-@dirrm OpenOffice.org641/share/config/registry/cache
-@dirrm OpenOffice.org641/share/config/registry
-@dirrm OpenOffice.org641/share/config
-@dirrm OpenOffice.org641/share/basic/WebWizard
-@dirrm OpenOffice.org641/share/basic/Tools
-@dirrm OpenOffice.org641/share/basic/Template
-@dirrm OpenOffice.org641/share/basic/Schedule
-@dirrm OpenOffice.org641/share/basic/ImportWizard
-@dirrm OpenOffice.org641/share/basic/Gimmicks
-@dirrm OpenOffice.org641/share/basic/FormWizard
-@dirrm OpenOffice.org641/share/basic/Euro
-@dirrm OpenOffice.org641/share/basic
-@dirrm OpenOffice.org641/share/autotext/english
-@dirrm OpenOffice.org641/share/autotext
-@dirrm OpenOffice.org641/share/autocorr
-@dirrm OpenOffice.org641/share
-@dirrm OpenOffice.org641/program/resource
-@dirrm OpenOffice.org641/program/filter
-@dirrm OpenOffice.org641/program/components
-@dirrm OpenOffice.org641/program/classes
-@dirrm OpenOffice.org641/program/addin/source
-@dirrm OpenOffice.org641/program/addin
-@dirrm OpenOffice.org641/program
-@dirrm OpenOffice.org641/help/en/swriter.idx
-@dirrm OpenOffice.org641/help/en/smath.idx
-@dirrm OpenOffice.org641/help/en/simpress.idx
-@dirrm OpenOffice.org641/help/en/sdraw.idx
-@dirrm OpenOffice.org641/help/en/scalc.idx
-@dirrm OpenOffice.org641/help/en/sbasic.idx
-@dirrm OpenOffice.org641/help/en
-@dirrm OpenOffice.org641/help
-@dirrm OpenOffice.org641
+# Dummy file, do not delete. Package list is generated automatically.
author	Martin Blapp <mbr@FreeBSD.org>	2002-10-18 22:41:42 +0000
committer	Martin Blapp <mbr@FreeBSD.org>	2002-10-18 22:41:42 +0000
commit	5f6e7f6949fe1fba17b53a04af5b465f19b9b17d (patch)
tree	336b116c7090225344e575c81b023f12aef39c5b /editors/openoffice.org-2-devel
parent	* add 2 missing man pages (diff)