diff options
Diffstat (limited to 'editors/openoffice.org-3-RC')
108 files changed, 0 insertions, 3595 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile deleted file mode 100644 index 6f740924c399..000000000000 --- a/editors/openoffice.org-3-RC/Makefile +++ /dev/null @@ -1,580 +0,0 @@ -# New ports collection makefile for: OpenOffice -# Date created: 28 Februar 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME= openoffice -PORTVERSION= 644 -CATEGORIES+= editors -MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ - 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 - -BROKEN= "Does not build" - -SORT?= /usr/bin/sort -FIND?= /usr/bin/find -CUT?= /usr/bin/cut -AWK?= /usr/bin/awk -GREP?= /usr/bin/grep -ZIP?= ${PREFIX}/bin/zip -UNZIP?= ${PREFIX}/bin/unzip -ANT?= ${LOCALBASE}/bin/ant -TCSH?= /bin/tcsh -PASTE?= /usr/bin/paste - -.include <bsd.port.pre.mk> - -INSTALLATION_BASEDIR= OpenOffice.org-${PORTVERSION} -BUILD_NR= 644 -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-descr and pkg-message if available -# -.if exists(${.CURDIR}/pkg-descr) -DESCR= ${.CURDIR}/pkg-descr -.endif -.if exists(${.CURDIR}/pkg-message) -PKGMESSAGE= ${.CURDIR}/pkg-message -.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) -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS -.endif -.endif - -.if !defined (LANG) && !defined(USE_LANG) -USE_LANG= en_US.ISO8859-15 -LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII -.else -.if !defined(USE_LANG) -USE_LANG= ${LANG} -.endif -.endif - -LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -` - -.if ${OSVERSION} < 500000 -# -# OO build is broken with the system gcc on STABLE. -# -BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 -CC= gcc32 -CXX= g++32 -USE_GCC=3.2 -.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(COMMENT) -COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -.endif -#.if !defined(USE_GCC) -#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -#.endif -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries -.if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer -.endif -.if !defined(WITH_BSD_JDK) -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14 -.else -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 -.endif - -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 - -.if !defined(WITH_BSD_JDK) -JDKDIR?= ${LOCALBASE}/linux-sun-jdk1.4.1 -.else -JDKDIR?= ${LOCALBASE}/jdk1.4.1 -.endif -JAVAVM= ${JDKDIR}/bin/java - -GNU_CONFIGURE= yes -USE_AUTOCONF= yes -WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office -LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ -.if defined(WITH_DEBUG) -CFLAGS+= -g -.if ${WITH_DEBUG} == 2 -BUILD= dmake debug="true" -.else -BUILD= dmake -.endif -.else -BUILD= dmake strip="true" -.endif - -.if !defined(DISPLAY) -DISPLAYHACK=localhost:1001 -.endif - -CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} - -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} \ - --with-os-version=${OSVERSION} \ - --with-ant-home=${LOCALBASE} - -#.if !defined(USE_GCC) -#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} -#.endif - -.if !defined(WITH_BSD_JDK) -CONFIGURE_ARGS+= --enable-linuxjdk=yes -.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: - @${ECHO} -.if !defined(LANG) - @${ECHO} "REQUIREMENTS:" - @${ECHO} - @${ECHO} "OO requires that the ENV variable LANG" - @${ECHO} "is set to a proper value. Dependent on" - @${ECHO} "which language port you use, OO does" - @${ECHO} "automatically set LANG to a suitable" - @${ECHO} "value. You can change this with:" - @${ECHO} - @${ECHO} "USE_LANG=\"prefered language\"" - @${ECHO} - @${ECHO} "and set a different language" - @${ECHO} "like:" - @${ECHO} - @${ECHO} "${LANG_SORTED}" - @${ECHO} - @${ECHO} "Your current setting is:" - @${ECHO} - @${ECHO} "USE_LANG=${USE_LANG}" - @${ECHO} - @${ECHO} -.endif - @${ECHO} "OPTIONS:" -.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.2" - @${ECHO} "to compile openoffice with your" - @${ECHO} "prefered compiler." -.endif -.if !defined(WITH_BSD_JDK) - @${ECHO} - @${ECHO} "If you like to use the native BSD" - @${ECHO} "JDK for the build system, you can use" - @${ECHO} "WITH_BSD_JDK=TRUE to disable the" - @${ECHO} "usage of the linux-JDK and linux dependency." - @${ECHO} -.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 !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" - @${ECHO} "if you like to use the Freetype library to" - @${ECHO} "render TTF fonts. Normally the TTF lib is" - @${ECHO} "not used to render fonts." - @${ECHO} - @${ECHO} "If you have licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479" - @${ECHO} "you can enable this option to get better" - @${ECHO} "quality of glyphs at small bitmap sizes." - @${ECHO} -.endif -.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 - @${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} -.if ${OSVERSION} < 460002 - @${ECHO} "REQUIRED SYSTEM PATCHES:" - @${ECHO} -.endif -.if ${OSVERSION} < 500000 - @${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} -.endif -.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: - @for file in ${EXTRACT_REST}; do \ - if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \ - ${EXTRACT_BEFORE_ARGS_R} \ - ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \ - then \ - exit 1; \ - fi \ - done - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - @${MAKE} extract-mozilla - @-${RM} -f ${WRKSRC}/../moz/zipped/*.zip - @${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl -.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-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${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) - @cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX="" -.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: - @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ - -register-mozilla: -.if exists(${WRKDIR}/mozilla-runtime) - @${RM} -rf ${WRKDIR}/mozilla-runtime -.endif - @${MKDIR} ${WRKDIR}/mozilla-runtime - @cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip - @cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip - @${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/ - @-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg - @cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \ - && export LD_LIBRARY_PATH=.:./lib && ./regxpcom - @${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \ - ${WRKDIR}/mozilla-runtime/components/xptitemp.dat - @${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom - @cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \ - | ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@ - -mozilla: - @${MAKE} extract-mozilla - @${MAKE} patch-mozilla - @${MAKE} build-mozilla - @${MAKE} register-mozilla - @${MAKE} install-mozilla - -do-build: -.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) -.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) -.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) - @${MAKE} mozilla -.endif -.endif -.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/${BUILD_NR}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck -.endif -.if !defined(DISPLAY) - @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' - @-${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 && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}' -.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: -.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"; - @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice - @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice - @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice - @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR} - @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 - -update: - @${MAKE} fetch - @${MAKE} extract - @cd ${WRKSRC}/.. && for dir in *; do \ - if [ -d $$dir ]; then \ - cd $$dir; cvs update -d; cd ..; \ - fi \ - done - -.include <bsd.port.post.mk> diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo deleted file mode 100644 index ec9d6788f104..000000000000 --- a/editors/openoffice.org-3-RC/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -MD5 (openoffice/oo_644_src.tar.bz2) = 814bcc72db72f98c270cb398e0d24ac9 -MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a -MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1 -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-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c deleted file mode 100644 index 96c651ce22c8..000000000000 --- a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../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-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 52bd2b3d58d6..000000000000 --- a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../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-3-RC/files/oo_setup.resp b/editors/openoffice.org-3-RC/files/oo_setup.resp deleted file mode 100644 index 8eeeb11bd95e..000000000000 --- a/editors/openoffice.org-3-RC/files/oo_setup.resp +++ /dev/null @@ -1,7 +0,0 @@ -[Environment] -InstallationMode = INSTALL_NETWORK -InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-643 - -[Java] -JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper deleted file mode 100644 index b3b6a4ba2df6..000000000000 --- a/editors/openoffice.org-3-RC/files/openoffice-wrapper +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $ - -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` - -if [ ! $LANG ]; then - export LANG=%%LANG%% -fi - -case $program in -$0) - exec $oopath/soffice "$@" - ;; - *) - exec $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-3-RC/files/optpatch-freetype+patch b/editors/openoffice.org-3-RC/files/optpatch-freetype+patch deleted file mode 100644 index b426a8fb7fcc..000000000000 --- a/editors/openoffice.org-3-RC/files/optpatch-freetype+patch +++ /dev/null @@ -1,208 +0,0 @@ -Index: files/patch-freetype::patch -=================================================================== -RCS file: files/patch-freetype::patch -diff -N files/patch-freetype::patch ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ files/patch-freetype::patch 4 Aug 2002 15:27:42 -0000 -@@ -0,0 +1,201 @@ -+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch -+--- ../freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 -++++ ../freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 -+@@ -1,118 +1,79 @@ -+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 -+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 63,69 **** -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+---- 63,69 ---- -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 631,637 **** -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+---- 631,637 ---- -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile -DPIC $pic_flag" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 1,7 **** -+---- 1,9 ---- -+- FT_USE_MODULE(autohint_module_class) -+- FT_USE_MODULE(cff_driver_class) -+- FT_USE_MODULE(t1cid_driver_class) -+-+ /* -+- FT_USE_MODULE(pcf_driver_class) -+-+ */ -+- FT_USE_MODULE(psaux_module_class) -+- FT_USE_MODULE(psnames_module_class) -+- FT_USE_MODULE(ft_raster1_renderer_class) -+-*************** -+-*** 9,12 **** -+---- 11,16 ---- -+- FT_USE_MODULE(ft_smooth_renderer_class) -+- FT_USE_MODULE(tt_driver_class) -+- FT_USE_MODULE(t1_driver_class) -+-+ /* -+- FT_USE_MODULE(winfnt_driver_class) -+-+ */ -+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 70,76 **** -+---- 70,79 ---- -+- /* All convenience functions are declared as such in their */ -+- /* documentation. */ -+- /* */ -+-+ /* -+- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+-+ */ -+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+- -+- -+- /*************************************************************************/ -+-*************** -+-*** 108,116 **** -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+-- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+---- 111,121 ---- -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+-+ /* -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+-+ */ -+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 -+-*************** -+-*** 2251,2257 **** -+- ;; -+- -+- irix) -+-! major=`expr $current - $age + 1` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -+---- 2251,2257 ---- -+- ;; -+- -+- irix) -+-! major=`expr $current - $age` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk -++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 -++@@ -63,7 +63,7 @@ -++ # ANSI compliance. -++ # -++ ifndef CFLAGS -++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -++ endif -++ -++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh -++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 -+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 -++@@ -631,7 +631,7 @@ -++ if test "$build_old_libs" = yes; then -++ if test "$pic_mode" != yes; then -++ # Don't build PIC code -++- command="$base_compile $srcfile" -+++ command="$base_compile $srcfile -DPIC $pic_flag" -++ else -++ # All platforms use -DPIC, to notify preprocessed assembler code. -++ command="$base_compile $srcfile $pic_flag -DPIC" -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h -++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 -++@@ -1,7 +1,9 @@ -++ FT_USE_MODULE(autohint_module_class) -++ FT_USE_MODULE(cff_driver_class) -++ FT_USE_MODULE(t1cid_driver_class) -+++/* -++ FT_USE_MODULE(pcf_driver_class) -+++*/ -++ FT_USE_MODULE(psaux_module_class) -++ FT_USE_MODULE(psnames_module_class) -++ FT_USE_MODULE(ft_raster1_renderer_class) -++@@ -9,4 +11,6 @@ -++ FT_USE_MODULE(ft_smooth_renderer_class) -++ FT_USE_MODULE(tt_driver_class) -++ FT_USE_MODULE(t1_driver_class) -+++/* -++ FT_USE_MODULE(winfnt_driver_class) -+++*/ -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h -++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 -++@@ -70,7 +70,10 @@ -++ /* All convenience functions are declared as such in their */ -++ /* documentation. */ -++ /* */ -+++/* -++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+++*/ -+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -++ -++ -++ /*************************************************************************/ -++@@ -108,8 +111,10 @@ -++ /* use a vector `plotter' format that isn't supported when this */ -++ /* macro is undefined. */ -++ /* */ -+++/* -++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++- -+++*/ -+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++ -++ /*************************************************************************/ -++ /* */ -++@@ -338,7 +343,7 @@ -++ /* By undefining this, you will only compile the code necessary to load */ -++ /* TrueType glyphs without hinting. */ -++ /* */ -++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -++ -++ -++ /*************************************************************************/ diff --git a/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk deleted file mode 100644 index 41341ff0b4e8..000000000000 --- a/editors/openoffice.org-3-RC/files/optpatch-vcl+util+makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../vcl/util/makefile.pmk.orig Mon Aug 5 01:39:41 2002 -+++ ../vcl/util/makefile.pmk Mon Aug 5 01:40:03 2002 -@@ -64,7 +64,7 @@ - PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch - PDBTARGET=vcl - --.IF "$(OS)" != "MACOSX" -+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD" - .IF "$(remote)" != "" - USE_BUILTIN_RASTERIZER=true - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch deleted file mode 100644 index 078685f3b516..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-berkeleydb+db-3.2.9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Wed Mar 12 08:23:51 2003 -+++ ../berkeleydb/db-3.2.9.patch Wed Mar 12 08:23:59 2003 -@@ -4,7 +4,7 @@ - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; --+ freebsd*) JINCSUBDIRS="freebsd genunix";; -++ freebsd*) JINCSUBDIRS="linux freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac - diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst deleted file mode 100644 index fee3d847c5e6..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+prj+build.lst +++ /dev/null @@ -1,11 +0,0 @@ ---- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001 -+++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002 -@@ -13,5 +13,8 @@ - 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\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\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-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index 99b8c566fb61..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,102 +0,0 @@ ---- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx Tue Mar 11 18:14:16 2003 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Tue Mar 11 18:15:40 2003 -@@ -253,6 +253,13 @@ - //================================================================================================== - void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) - { -+#if defined DEBUG -+ OString cstr( -+ OUStringToOString( -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); -+#endif - void * pCppExc; - type_info * rtti; - -@@ -262,7 +269,12 @@ - TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); - OSL_ASSERT( pTypeDescr ); - if (! pTypeDescr) -- terminate(); -+ { -+ throw RuntimeException( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ Reference< XInterface >() ); -+ } - - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); - ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -@@ -288,29 +300,59 @@ - TYPELIB_DANGER_RELEASE( pTypeDescr ); - OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); - if (! rtti) -- terminate(); -+ { -+ throw RuntimeException( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ Reference< XInterface >() ); -+ } - } - - __cxa_throw( pCppExc, rtti, deleteException ); - } - - //================================================================================================== --void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) -+void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) - { -- OSL_ENSURE( header, "### no exception header!!!" ); - if (! header) -- terminate(); -+ { -+ RuntimeException aRE( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), -+ Reference< XInterface >() ); -+ Type const & rType = ::getCppuType( &aRE ); -+ uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); -+#if defined _DEBUG -+ OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); -+ OSL_ENSURE( 0, cstr.getStr() ); -+#endif -+ return; -+ } - - 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 ); -+#if defined DEBUG -+ OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); -+#endif -+ typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -+ if (0 == pExcTypeDescr) -+ { -+ RuntimeException aRE( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, -+ Reference< XInterface >() ); -+ Type const & rType = ::getCppuType( &aRE ); -+ uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); -+#if defined _DEBUG -+ OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); -+ OSL_ENSURE( 0, cstr.getStr() ); -+#endif -+ } -+ else -+ { -+ // construct uno exception any -+ uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -+ typelib_typedescription_release( pExcTypeDescr ); -+ } - } - - } diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx deleted file mode 100644 index 4622b7fe21c4..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+source+jni_uno+jni_uno2java.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../bridges/source/jni_uno/jni_uno2java.cxx.orig Tue Mar 11 12:35:07 2003 -+++ ../bridges/source/jni_uno/jni_uno2java.cxx Tue Mar 11 12:35:29 2003 -@@ -62,7 +62,9 @@ - #if defined _MSC_VER - #include <malloc.h> - #else -+#if !defined( FREEBSD) - #include <alloca.h> -+#endif - #endif - - #include "rtl/ustrbuf.hxx" diff --git a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk deleted file mode 100644 index f2d3092c2ddf..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../comphelper/util/makefile.mk.orig Fri Feb 14 15:40:49 2003 -+++ ../comphelper/util/makefile.mk Wed Mar 5 20:43:02 2003 -@@ -86,10 +86,10 @@ - - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)$(COMID) - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ -- $(VOSLIB) \ -- $(SALLIB) -+ $(VOSLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(COMPHLP_TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in deleted file mode 100644 index a45332fcbec0..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in +++ /dev/null @@ -1,66 +0,0 @@ ---- configure.in.orig Thu Feb 20 15:49:32 2003 -+++ configure.in Wed Mar 5 21:22:34 2003 -@@ -95,6 +95,12 @@ - - Usage: --enable-macos9 - ],,) -+AC_ARG_ENABLE(linuxjdk, -+[ --enable-linuxjdk Use this option option if you like to use -+ the linux-jdk instead of the native jdk. -+ -+ Usage: --enable-linuxjdk -+],,) - AC_ARG_WITH(lang, - [ --with-lang Use this option to build OpenOffice.org with - additional language support. US English is always -@@ -556,8 +562,19 @@ - fi - - dnl =================================================================== --dnl Set the gxx include directories -+dnl Set the gcc/gxx include directories - dnl =================================================================== -+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then -+if test "$GXX" = "yes"; then -+ if test -n "$enable_gcc3"; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" -+ fi -+ _gcc_include_path=".." -+ _gxx_include_path="$_gcc_include_path/$_gccincname1" -+fi -+else - if test "$GXX" = "yes"; then - _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` - if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then -@@ -566,7 +583,7 @@ - dnl This is the original code... - dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include - fi -- -+fi - - dnl =================================================================== - dnl Extra checking for the SUN OS compiler -@@ -1232,7 +1249,11 @@ - if test -n "$enable_debug"; then - ENABLE_DEBUG="TRUE" - else -- ENABLE_DEBUG="FALSE" -+fi -+if test -n "$enable_linuxjdk"; then -+ USE_LINUXJDK="TRUE" -+else -+ USE_LINUXJDK="FALSE" - fi - - dnl =================================================================== -@@ -1278,6 +1299,7 @@ - AC_SUBST(PTHREAD_CFLAGS) - AC_SUBST(PTHREAD_LIBS) - AC_SUBST(ENABLE_DEBUG) -+AC_SUBST(USE_LINUXJDK) - - AC_OUTPUT([set_soenv]) - diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in deleted file mode 100644 index 9ea6b11bdab2..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,44 +0,0 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 -@@ -52,7 +52,7 @@ - #------------------------------------------------- - # - # Platform independent constant values. --my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", -+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", "GER", - "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, -@@ -88,7 +88,7 @@ - $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, - $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS, - $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, -- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG ); -+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK ); - # - #------------------------------------------- - # IId. Declaring the aliases. -@@ -140,7 +140,8 @@ - $CC = '@CC@'; # C compiler - $CXX = '@CXX@'; # C++ compiler - $EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type --$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build -+$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build -+$USE_LINUXJDK = '@USE_LINUXJDK@'; # Use the Linux JDK - $WRAPCMD = ""; # Wrapper (only for winnt) - - # -@@ -1265,7 +1266,12 @@ - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$FreeBSD") --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+{ -+ if ($USE_LINUXJDK eq "TRUE") { -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; -+ } else { -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+ } - } - elsif ($platform eq "$NetBSD") - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk deleted file mode 100644 index 2b83f2cd2ec7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Oct 30 20:59:21 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 30 20:59:31 2002 -@@ -115,9 +115,7 @@ - # --- MOZAB BASE Library ----------------------------------- - - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index 3601766ee561..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -107,7 +107,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -123,7 +123,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -141,7 +141,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -157,6 +157,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk deleted file mode 100644 index b63d2a25f184..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002 -+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002 -@@ -134,9 +134,7 @@ - SLOFILES+=$(SLO)$/staticmbmozab.obj - .ENDIF - --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - # --- Library ----------------------------------- - - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h deleted file mode 100644 index cb43c2d165e9..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 -+++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 -@@ -94,7 +94,7 @@ - #define __CPPU_ENV gcc2 - #elif (__GNUC__ == 2) - #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." --#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) - #define __CPPU_ENV gcc3 - #elif (__GNUC__ == 3) - #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-cppu+prj+build.lst deleted file mode 100644 index 78fd210a1193..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk deleted file mode 100644 index 5fb5bd636eb1..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../cppuhelper/source/makefile.mk.orig Thu Feb 20 17:04:36 2003 -+++ ../cppuhelper/source/makefile.mk Wed Mar 5 20:32:03 2003 -@@ -194,9 +194,9 @@ - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" --#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+SHL1VERSIONMAP=gcc2_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" --#SHL1VERSIONMAP=gcc3_freebsd_intel.map -+SHL1VERSIONMAP=gcc3_linux_intel.map - .ENDIF - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h deleted file mode 100644 index 391667b66ebd..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/source/pkgchk/pkgchk_misc.h.orig Wed Mar 5 20:51:46 2003 -+++ ../desktop/source/pkgchk/pkgchk_misc.h Wed Mar 5 20:52:45 2003 -@@ -208,6 +208,8 @@ - #define THIS_PLATFORM_PATH "/macosx_powerpc.plt" - #elif defined (NETBSD) && defined (SPARC) - #define THIS_PLATFORM_PATH "/netbsd_sparc.plt" -+#elif defined (FREEBSD) && defined (INTEL) -+#define THIS_PLATFORM_PATH "/freebsd_x86.plt" - #else - #error "unknown platform" - insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk deleted file mode 100644 index 025d644a8077..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../desktop/util/makefile.mk.orig Fri Feb 14 14:43:59 2003 -+++ ../desktop/util/makefile.mk Wed Mar 5 20:54:04 2003 -@@ -102,7 +102,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= -@@ -139,7 +139,7 @@ - .ENDIF - - .IF "$(GUI)" == "UNX" --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - APP1STDLIBS+= -lXext -lSM -lICE - .ENDIF - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk deleted file mode 100644 index 5881f5d7f6a5..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../dtrans/source/X11/makefile.mk.orig Tue Dec 11 18:48:36 2001 -+++ ../dtrans/source/X11/makefile.mk Wed Apr 3 00:31:56 2002 -@@ -116,7 +116,8 @@ - APP1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk deleted file mode 100644 index 4552698eb132..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../eventattacher/source/makefile.mk.orig Tue Oct 1 09:45:21 2002 -+++ ../eventattacher/source/makefile.mk Wed Mar 5 21:06:11 2003 -@@ -104,9 +104,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk deleted file mode 100644 index 6b8071f4030e..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../external/gcc3_specific/makefile.mk.orig Wed Mar 5 23:01:32 2003 -+++ ../external/gcc3_specific/makefile.mk Wed Mar 5 23:01:59 2003 -@@ -10,6 +10,7 @@ - .IF "$(COMID)"=="gcc3" - - .IF "$(OS)"!="MACOSX" -+.IF "$(OS)"!="FREEBSD" - - - all : $(SOLARLIBDIR)$/libstdc++.so.$(LIBSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so -@@ -29,6 +30,7 @@ - -rm -f $@ - +ln -s libgcc_s.so.1 $@ - -+.ENDIF - .ENDIF - - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk deleted file mode 100644 index 3e5a8dd19f18..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../freetype/makefile.mk.orig Tue Mar 11 14:13:25 2003 -+++ ../freetype/makefile.mk Tue Mar 11 14:13:27 2003 -@@ -100,7 +100,7 @@ - .IF "$(OS)"=="MACOSX" - OUT2LIB+=objs$/.libs$/libfreetype.*.dylib - .ELIF "$(OS)"=="FREEBSD" --OUT2LIB+=objs$/.libs$/libfreetype.so.7* -+OUT2LIB+=objs$/.libs$/libfreetype.so.9* - .ELSE - OUT2LIB+=objs$/.libs$/libfreetype.so.6* - .ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" diff --git a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx deleted file mode 100644 index b15dbd1d6faf..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003 -@@ -62,7 +62,9 @@ - #include <stdlib.h> - #include <stdio.h> - #include <dlfcn.h> -+#if !(defined FREEBSD || defined NETBSD) - #include <alloca.h> -+#endif - #include <string.h> - - /* diff --git a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk deleted file mode 100644 index 19f6b86e5ab5..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../javaunohelper/source/makefile.mk.orig Thu Feb 20 17:28:43 2003 -+++ ../javaunohelper/source/makefile.mk Wed Mar 5 21:04:09 2003 -@@ -118,9 +118,9 @@ - SHL1TARGET=juhx - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(JVMACCESSLIB) \ - $(SALHELPERLIB) \ -- $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - diff --git a/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx deleted file mode 100644 index a9ff9e3fed88..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-jni_uno+jni_java2uno.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../bridges/source/jni_uno/jni_java2uno.cxx.orig Tue Mar 11 12:33:06 2003 -+++ ../bridges/source/jni_uno/jni_java2uno.cxx Tue Mar 11 12:34:03 2003 -@@ -62,7 +62,9 @@ - #if defined _MSC_VER - #include <malloc.h> - #else -+#if !defined( FREEBSD) - #include <alloca.h> -+#endif - #endif - - #include "jni_bridge.h" diff --git a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch deleted file mode 100644 index b6096654ebaf..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.6.patch +++ /dev/null @@ -1,301 +0,0 @@ ---- ../nas/nas-1.6.patch.orig Tue Mar 11 15:04:35 2003 -+++ ../nas/nas-1.6.patch Tue Mar 11 15:29:52 2003 -@@ -69,3 +69,298 @@ - number : NUMBER { $$ = $1; } - ; - -+--- misc/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include "auctl.h" -+ -+ char *ProgramName; -+--- misc/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 15:01:04 2003 -+@@ -32,7 +32,7 @@ -+ #include <stdlib.h> -+ #endif -+ #include <signal.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ -+ #if !defined(SYSV) || defined(WIN32) -+ #include <audio/Aos.h> /* for string and other os stuff */ -+--- misc/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:01:04 2003 -+@@ -32,7 +32,7 @@ -+ #if !defined(ISC40) && !defined(WIN32) -+ #include <sys/file.h> -+ #endif /* !ISC40 */ -+-#include <malloc.h> -++#include <stdlib.h> -+ -+ #include <audio/Aos.h> /* for string and other os stuff */ -+ #include <audio/Afuncs.h> /* for bcopy et. al. */ -+--- misc/nas-1.6/clients/audio/auedit/auedit.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c Tue Mar 11 15:01:04 2003 -+@@ -37,7 +37,7 @@ -+ #define access _access -+ #define R_OK 4 -+ #endif /* WIN32 */ -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <limits.h> /* for SHRT_MIN and SHRT_MAX */ -+ #ifndef SYSV -+ #include <audio/Aos.h> /* for string and other os -+--- misc/nas-1.6/clients/audio/autool/audiotool.c Tue Mar 11 14:56:16 2003 -++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c Tue Mar 11 15:01:04 2003 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/audiolib.h> -+ #include <audio/soundlib.h> -+ -+--- misc/nas-1.6/clients/audio/util/soundtoh.c Tue Mar 11 14:56:15 2003 -++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c Tue Mar 11 15:01:04 2003 -+@@ -27,7 +27,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> /* for string and other os stuff */ -+ #include <audio/Afuncs.h> /* for bcopy et. al. */ -+ #include <audio/audiolib.h> -+--- misc/nas-1.6/lib/audio/8svx.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/8svx.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <math.h> -+ #include <audio/8svx.h> -+--- misc/nas-1.6/lib/audio/aiff.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/aiff.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <math.h> -+ #include <audio/aiff.h> -+--- misc/nas-1.6/lib/audio/fileutil.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/fileutil.c Tue Mar 11 15:01:04 2003 -+@@ -29,7 +29,7 @@ -+ #include <stdio.h> -+ #include <audio/Aos.h> -+ #include <audio/fileutil.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ -+ #if NeedFunctionPrototypes -+ unsigned short FileSwapS (unsigned short us) -+--- misc/nas-1.6/lib/audio/snd.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/snd.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <audio/snd.h> -+ #include <audio/fileutil.h> -+--- misc/nas-1.6/lib/audio/sound.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/sound.c Tue Mar 11 15:01:04 2003 -+@@ -29,7 +29,7 @@ -+ #define _SOUND_C_ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <audio/audio.h> -+ #include <audio/sound.h> -+--- misc/nas-1.6/lib/audio/voc.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/voc.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <audio/voc.h> -+ #include <audio/fileutil.h> -+--- misc/nas-1.6/lib/audio/wave.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/lib/audio/wave.c Tue Mar 11 15:01:04 2003 -+@@ -27,7 +27,7 @@ -+ */ -+ -+ #include <stdio.h> -+-#include <malloc.h> -++#include <stdlib.h> -+ #include <audio/Aos.h> -+ #include <audio/wave.h> -+ #include <audio/fileutil.h> -+--- misc/nas-1.6/server/os/utils.c Tue Mar 11 14:56:13 2003 -++++ misc/build/nas-1.6/server/os/utils.c Tue Mar 11 15:01:04 2003 -+@@ -454,7 +454,7 @@ -+ } -+ -+ #ifdef CAHILL_MALLOC -+-#include <malloc.h> -++#include <stdlib.h> -+ -+ void * -+ debug_Xalloc (char *file, int line, unsigned long amount) -+--- misc/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:19:40 2003 -++++ misc/build/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:20:51 2003 -+@@ -84,6 +84,7 @@ -+ */ -+ static void -+ usleep(usecs) -++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ unsigned int usecs; -+ { -+ double s1; -+@@ -150,6 +151,7 @@ -+ pause(); -+ } -+ -++#endif -+ #endif /* SYSV else not */ -+ #endif /* VMS else not */ -+ #endif /* NEEDUSLEEP */ -+--- misc/nas-1.6/clients/audio/auedit/Graph.c Tue Mar 11 15:19:40 2003 -++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c Tue Mar 11 15:25:21 2003 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #ifndef WIN32 -+-# ifdef __NetBSD__ -++# if defined(__NetBSD__) || defined(__FreeBSD__) -+ # include <limits.h> -+ # define MAXSHORT SHRT_MAX -+ # define MINSHORT SHRT_MIN -+--- misc/nas-1.6/config/NetAudio.def Tue Mar 11 15:19:40 2003 -++++ misc/build/nas-1.6/config/NetAudio.def Tue Mar 11 15:26:55 2003 -+@@ -8,6 +8,6 @@ -+ -+ XCOMM Directory where NAS will look for it's config file(s) -+ #ifndef NasConfigSearchPath -+-#define NasConfigSearchPath /etc/nas/ -++#define NasConfigSearchPath $(PROJECTROOT)/etc/ -+ #endif -+ -+--- misc/nas-1.6/lib/audio/Imakefile Tue Mar 11 15:19:38 2003 -++++ misc/build/nas-1.6/lib/audio/Imakefile Tue Mar 11 15:26:26 2003 -+@@ -36,6 +36,10 @@ -+ #endif -+ #endif /* ProjectX < 5 */ -+ -++#if HasBSD44Sockets -++ SOCK_DEFINES = -DBSD44SOCKETS -++#endif -++ -+ #ifndef NormalLibAudio -+ #define NormalLibAudio NormalLibX -+ #endif -+@@ -79,7 +83,7 @@ -+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" -+ -+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) -+- CONN_DEFINES = ConnectionFlags -++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) -+ -+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ -+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ -+--- misc/nas-1.6/server/Imakefile Tue Mar 11 15:19:40 2003 -++++ misc/build/nas-1.6/server/Imakefile Tue Mar 11 15:27:38 2003 -+@@ -105,6 +105,9 @@ -+ # if defined(LinuxArchitecture) -+ RCMANDIR = $(FILEMANDIR) -+ RCMANSUFFIX = 5nas -++# elif defined(FreeBSDArchitecture) -++ RCMANDIR = $(FILEMANDIR) -++ RCMANSUFFIX = $(FILEMANSUFFIX) -+ # else -+ RCMANDIR = $(MANDIR) -+ RCMANSUFFIX = 5x -+--- misc/nas-1.6/server/dda/voxware/auvoxware.c Tue Mar 11 15:19:39 2003 -++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c Tue Mar 11 15:24:32 2003 -+@@ -133,7 +133,7 @@ -+ -+ #include <stdio.h> -+ #include <stdlib.h> -+-#ifndef SVR4 -++#if !defined(SVR4) && !defined(__FreeBSD__) -+ #include <getopt.h> -+ #endif -+ #include <sys/types.h> -+@@ -171,16 +171,11 @@ -+ #include <sys/param.h> -+ #include <assert.h> -+ -+-#ifdef __FreeBSD__ -+-# include <machine/soundcard.h> -+-# include <machine/pcaudioio.h> -++#ifdef __NetBSD__ -++# include <sys/ioctl.h> -++# include <soundcard.h> -+ #else -+-# ifdef __NetBSD__ -+-# include <sys/ioctl.h> -+-# include <soundcard.h> -+-# else -+-# include <sys/soundcard.h> -+-# endif -++# include <sys/soundcard.h> -+ #endif -+ -+ #include <audio/audio.h> -+@@ -659,7 +654,11 @@ -+ if(sndStatOut.fd == -1) -+ { -+ while ((sndStatOut.fd = open(sndStatOut.device, -++#if defined(__FreeBSD__) -++ sndStatOut.howToOpen|extramode, -++#else -+ sndStatOut.howToOpen|O_SYNC|extramode, -++#endif -+ 0666)) == -1 && wait) -+ { -+ osLogMsg("openDevice: waiting on output device\n"); -+@@ -1310,6 +1309,11 @@ -+ /* -+ * Setup soundcard at maximum audio quality. -+ */ -++ -++#if defined(__FreeBSD__) -++#define NO_16_BIT_SAMPLING -++#endif -++ -+ static void setupSoundcard(sndStatPtr) -+ SndStat* sndStatPtr; -+ { -+@@ -1472,7 +1476,11 @@ -+ sndStatOut.device, sndStatOut.howToOpen); -+ -+ if ((fd = open(sndStatOut.device, -++#if defined(__FreeBSD__) -++ sndStatOut.howToOpen|extramode, 0)) == -1) -++#else -+ sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1) -++#endif -+ { -+ UNIDENTMSG; -+ return AuFalse; diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl deleted file mode 100644 index 3fee562c6d38..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+setup+OSType.idl +++ /dev/null @@ -1,12 +0,0 @@ ---- ../offapi/com/sun/star/setup/OSType.idl.orig Mon Dec 18 16:34:26 2000 -+++ ../offapi/com/sun/star/setup/OSType.idl Sun Jul 21 01:37:15 2002 -@@ -88,6 +88,9 @@ - UNIX_LINUX, - - // DocMerge: empty anyway -+ UNIX_FREEBSD, -+ -+ // DocMerge: empty anyway - UNIX_HP, - - // DocMerge: empty anyway diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-3-RC/files/patch-offapi+util+makefile.pmk deleted file mode 100644 index 5cdbb1b4aa4a..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-3-RC/files/patch-package+inc+HashMaps.hxx deleted file mode 100644 index 35052d291ef7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-package+inc+HashMaps.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 -+++ ../package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 -@@ -79,7 +79,7 @@ - }; - - class ZipPackageFolder; --class ContentInfo; -+class ZipContentInfo; - - typedef std::hash_map < rtl::OUString, - ZipPackageFolder *, -@@ -87,7 +87,7 @@ - eqFunc > FolderHash; - - typedef std::hash_map < rtl::OUString, -- vos::ORef < ContentInfo >, -+ vos::ORef < ZipContentInfo >, - ::rtl::OUStringHash, - eqFunc > ContentHash; - diff --git a/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx deleted file mode 100644 index 014c61403380..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-package+inc+ZipPackageFolder.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 -+++ ../package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 -@@ -106,7 +106,7 @@ - - void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -- ContentInfo & doGetByName( const ::rtl::OUString& aName ) -+ ZipContentInfo & doGetByName( const ::rtl::OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource); - static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId() diff --git a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx deleted file mode 100644 index c4bf35e79f64..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ContentInfo.hxx +++ /dev/null @@ -1,34 +0,0 @@ ---- ../package/source/zippackage/ContentInfo.hxx.orig Tue Oct 30 14:54:47 2001 -+++ ../package/source/zippackage/ContentInfo.hxx Wed Jun 12 23:10:42 2002 -@@ -75,7 +75,7 @@ - #endif - #include <hash_map> - --class ContentInfo : public cppu::OWeakObject -+class ZipContentInfo : public cppu::OWeakObject - { - public: - com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; -@@ -85,19 +85,19 @@ - ZipPackageFolder *pFolder; - ZipPackageStream *pStream; - }; -- ContentInfo ( ZipPackageStream * pNewStream ) -+ ZipContentInfo ( ZipPackageStream * pNewStream ) - : bFolder ( false ) - , pStream ( pNewStream ) - , xTunnel ( pNewStream ) - { - } -- ContentInfo ( ZipPackageFolder * pNewFolder ) -+ ZipContentInfo ( ZipPackageFolder * pNewFolder ) - : bFolder ( true ) - , pFolder ( pNewFolder ) - , xTunnel ( pNewFolder ) - { - } -- virtual ~ContentInfo () -+ virtual ~ZipContentInfo () - { - if ( bFolder ) - pFolder->releaseUpwardRef(); diff --git a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx deleted file mode 100644 index bb504c834eef..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-package+source+zippackage+ZipPackageFolder.cxx +++ /dev/null @@ -1,41 +0,0 @@ ---- ../package/source/zippackage/ZipPackageFolder.cxx.orig Wed Jun 12 23:09:16 2002 -+++ ../package/source/zippackage/ZipPackageFolder.cxx Wed Jun 12 23:10:42 2002 -@@ -212,7 +212,7 @@ - return maContents.size() > 0; - } - // XNameAccess --ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) -+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) - { - ContentHash::iterator aIter = maContents.find ( aName ); -@@ -286,7 +286,7 @@ - aCI++) - { - const OUString &rShortName = (*aCI).first; -- const ContentInfo &rInfo = *(*aCI).second; -+ const ZipContentInfo &rInfo = *(*aCI).second; - - Sequence < PropertyValue > aPropSet (2); - PropertyValue *pValue = aPropSet.getArray(); -@@ -533,7 +533,7 @@ - aCI!=maContents.end(); - aCI++) - { -- ContentInfo &rInfo = * (*aCI).second; -+ ZipContentInfo &rInfo = * (*aCI).second; - if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () ) - rInfo.pFolder->releaseUpwardRef(); - else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() ) -@@ -577,9 +577,9 @@ - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) - { - if ( pEntry->IsFolder() ) -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); - else -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); - - if ( bSetParent ) - pEntry->setParent ( *this ); diff --git a/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx deleted file mode 100644 index fad069f83f14..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp.h deleted file mode 100644 index 417ab33ba52f..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c deleted file mode 100644 index 49fe0da8589b..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c +++ /dev/null @@ -1,160 +0,0 @@ ---- ../sal/osl/unx/nlsupport.c.orig Tue Jan 28 15:51:36 2003 -+++ ../sal/osl/unx/nlsupport.c Wed Mar 5 21:03:13 2003 -@@ -63,7 +63,7 @@ - #include <osl/diagnose.h> - #include <osl/process.h> - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) - #include <pthread.h> - #include <locale.h> - #include <langinfo.h> -@@ -114,8 +114,7 @@ - comparison = _pair_compare( key, base + current ); - if (comparison < 0) - upper = current; -- else -- if (comparison > 0) -+ else if (comparison > 0) - lower = current + 1; - else - return base + current; -@@ -241,12 +240,14 @@ - return NULL; - } - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) - - /* -- * This implementation of osl_getTextEncodingFromLocale maps -- * from nl_langinfo(CODESET) to rtl_textencoding defines. -- * nl_langinfo() is supported only on Linux, Solaris and IRIX. -+ * This implementation of osl_getTextEncodingFromLocale maps -+ * from nl_langinfo(CODESET) to rtl_textencoding defines. -+ * nl_langinfo() is supported only on Linux and Solaris. -+ * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.6 and >= FreeBSD 4.4 - * - * This routine is SLOW because of the setlocale call, so - * grab the result and cache it. -@@ -260,6 +261,12 @@ - #endif - #endif - -+/* -+ * _nl_language_list[] is an array list of supported encodings. Because -+ * we are using a binary search, the list has to be in ascending order. -+ * We are comparing the encodings case insensitiv, so the list has -+ * to be completly upper- , or lowercase. -+ */ - - #if defined(SOLARIS) - -@@ -300,23 +307,23 @@ - #elif defined(IRIX) - - const _pair _nl_language_list[] = { -- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */ -- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ -- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ -- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ -- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */ -+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ -+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */ - }; - --#elif defined(LINUX) || defined(NETBSD) -+#elif defined(LINUX) - - const _pair _nl_language_list[] = { - { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -491,13 +498,65 @@ - { "T.101-G2", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-128 */ - { "T.61-7BIT", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-102 */ - { "T.61-8BIT", RTL_TEXTENCODING_DONTKNOW }, /* T.61 ISO-IR-103 */ -- { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */ -+ { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */ - { "UTF-8", RTL_TEXTENCODING_UTF8 }, /* ISO-10646/UTF-8 */ - { "VIDEOTEX-SUPPL", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-70 */ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; - --#endif /* ifdef LINUX || NETBSD */ -+#elif defined(FREEBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#elif defined(NETBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */ -+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ - - static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; - diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+pipe.c deleted file mode 100644 index 4aa7b8af1a61..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+pipe.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ../sal/osl/unx/pipe.c.orig Thu Jul 11 16:01:39 2002 -+++ ../sal/osl/unx/pipe.c Fri Oct 18 19:56:38 2002 -@@ -264,7 +264,11 @@ - - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, name, sizeof(addr.sun_path)); -+#if defined(FREEBSD) -+ len = SUN_LEN(&addr); -+#else - len = sizeof(addr); -+#endif - - if ( Options & osl_Pipe_CREATE ) - { diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c deleted file mode 100644 index 50023576bec4..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+process.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sal/osl/unx/process.c.orig Wed Jun 5 16:24:42 2002 -+++ ../sal/osl/unx/process.c Wed Jan 15 01:25:17 2003 -@@ -222,7 +222,7 @@ - /* Memory layout of CMD_ARG_PRG: - progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */ - --#if !defined(NETBSD) -+#if !defined(NETBSD) && !defined(FREEBSD) - extern sal_Char* CMD_ARG_PRG; - #endif - extern sal_Char** CMD_ARG_ENV; diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c deleted file mode 100644 index 0cc321dcd544..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+security.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../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-3-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c deleted file mode 100644 index 9541cac8583f..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 -+++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 -@@ -82,12 +82,12 @@ - #undef HAVE_POLL_H - #endif - --#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) - #include <sys/poll.h> - #define HAVE_POLL_H - #endif /* HAVE_POLL_H */ - --#if defined(SOLARIS) || defined ( FREEBSD ) -+#if defined(SOLARIS) - #include <poll.h> - #define HAVE_POLL_H - #endif /* SOLARIS */ -@@ -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-3-RC/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.c deleted file mode 100644 index 8dc663ac03fc..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.c +++ /dev/null @@ -1,127 +0,0 @@ ---- ../sal/osl/unx/system.c.orig Sun Mar 17 12:34:13 2002 -+++ ../sal/osl/unx/system.c Wed Apr 3 01:03:36 2002 -@@ -195,6 +195,73 @@ - } - #endif - -+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, -+ size_t buflen, struct passwd **result) -+{ -+ struct passwd* res; -+ -+ pthread_mutex_lock(&getrtl_mutex); -+ -+ if ( res = getpwuid(uid) ) -+ { -+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell; -+ -+ pw_name = strlen(res->pw_name)+1; -+ pw_passwd = strlen(res->pw_passwd)+1; -+ pw_class = strlen(res->pw_class)+1; -+ pw_gecos = strlen(res->pw_gecos)+1; -+ pw_dir = strlen(res->pw_dir)+1; -+ pw_shell = strlen(res->pw_shell)+1; -+ -+ if (pw_name+pw_passwd+pw_class+pw_gecos -+ +pw_dir+pw_shell < buflen) -+ { -+ memcpy(pwd, res, sizeof(struct passwd)); -+ -+ strncpy(buffer, res->pw_name, pw_name); -+ pwd->pw_name = buffer; -+ buffer += pw_name; -+ -+ strncpy(buffer, res->pw_passwd, pw_passwd); -+ pwd->pw_passwd = buffer; -+ buffer += pw_passwd; -+ -+ strncpy(buffer, res->pw_class, pw_class); -+ pwd->pw_class = buffer; -+ buffer += pw_class; -+ -+ strncpy(buffer, res->pw_gecos, pw_gecos); -+ pwd->pw_gecos = buffer; -+ buffer += pw_gecos; -+ -+ strncpy(buffer, res->pw_dir, pw_dir); -+ pwd->pw_dir = buffer; -+ buffer += pw_dir; -+ -+ strncpy(buffer, res->pw_shell, pw_shell); -+ pwd->pw_shell = buffer; -+ buffer += pw_shell; -+ -+ *result = pwd ; -+ res = 0 ; -+ -+ } else { -+ -+ res = ENOMEM ; -+ -+ } -+ -+ } else { -+ -+ res = errno ; -+ -+ } -+ -+ pthread_mutex_unlock(&getrtl_mutex); -+ -+ return res; -+} -+ - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -518,3 +585,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-3-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h deleted file mode 100644 index c4e255952fc7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h +++ /dev/null @@ -1,35 +0,0 @@ ---- ../sal/osl/unx/system.h.orig Wed Jun 5 16:24:19 2002 -+++ ../sal/osl/unx/system.h Sun Jan 12 15:48:03 2003 -@@ -205,6 +205,13 @@ - # include <sys/ioctl.h> - # include <sys/time.h> - # include <sys/uio.h> -+# include <sys/exec.h> -+# include <vm/vm.h> -+# include <vm/vm_param.h> -+# include <vm/pmap.h> -+# include <vm/swap_pager.h> -+# include <machine/vmparam.h> -+# include <machine/pmap.h> - # include <sys/un.h> - # include <netinet/tcp.h> - # define IORESOURCE_TRANSFER_BSD -@@ -216,12 +223,13 @@ - # 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 -+/* __progname isn't sufficient here. We need the full path as well -+ * for e.g. setup and __progname only points to the binary name. -+ */ -+# define CMD_ARG_PRG_IS_DEFINED -+# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr -+# define CMD_ARG_ENV environ - #endif - - #ifdef SCO diff --git a/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c deleted file mode 100644 index 7cf80c18d0a0..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+textenc+tencinfo.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 -+++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 -@@ -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-3-RC/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk deleted file mode 100644 index 369935e31d66..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map deleted file mode 100644 index 1ffacf889bc6..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc2_freebsd_intel.map +++ /dev/null @@ -1,31 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:24 2002 -+++ ../salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 -@@ -0,0 +1,28 @@ -+SALHLP_1_0 { -+global: -+GetVersionInfo; -+_._Q28salhelper18ORealDynamicLoader; -+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4; -+__tfQ29salhelper18ORealDynamicLoader; -+__tiQ29salhelper18ORealDynamicLoader; -+__vt_Q29salhelper18ORealDynamicLoader; -+_fini; -+_init; -+acquire__Q29salhelper18ORealDynamicLoader; -+getApi__CQ29salhelper18ORealDynamicLoader; -+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2; -+release__Q29salhelper18ORealDynamicLoader; -+_._Q29salhelper21SimpleReferenceObject; -+__Q29salhelper21SimpleReferenceObject; -+__dl__Q29salhelper21SimpleReferenceObjectPv; -+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t; -+__nw__Q29salhelper21SimpleReferenceObjectUi; -+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t; -+__tfQ29salhelper21SimpleReferenceObject; -+__tiQ29salhelper21SimpleReferenceObject; -+__vt_Q29salhelper21SimpleReferenceObject; -+acquire__Q29salhelper21SimpleReferenceObject; -+release__Q29salhelper21SimpleReferenceObject; -+local: -+*; -+}; diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map deleted file mode 100644 index 823cff316ec7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+gcc3_freebsd_intel.map +++ /dev/null @@ -1,34 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:34 2002 -+++ ../salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 -@@ -0,0 +1,31 @@ -+UDK_3_0_0 { -+ global: -+GetVersionInfo; -+_DYNAMIC; -+_GLOBAL_OFFSET_TABLE_; -+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_; -+_ZN9salhelper18ORealDynamicLoader7acquireEv; -+_ZN9salhelper18ORealDynamicLoader7releaseEv; -+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderD0Ev; -+_ZN9salhelper18ORealDynamicLoaderD1Ev; -+_ZN9salhelper18ORealDynamicLoaderD2Ev; -+_ZN9salhelper21SimpleReferenceObjectD0Ev; -+_ZN9salhelper21SimpleReferenceObjectD1Ev; -+_ZN9salhelper21SimpleReferenceObjectD2Ev; -+_ZN9salhelper21SimpleReferenceObjectdlEPv; -+_ZN9salhelper21SimpleReferenceObjectnwEj; -+_ZNK9salhelper18ORealDynamicLoader6getApiEv; -+_ZTVN9salhelper18ORealDynamicLoaderE; -+_ZTVN9salhelper21SimpleReferenceObjectE; -+__bss_start; -+_edata; -+_end; -+_fini; -+_init; -+component_getDescriptionFunc; -+ local: -+ *; -+}; -+ diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk deleted file mode 100644 index 3687664d8d16..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-3-RC/files/patch-salhelper+test+rtti+makefile.mk deleted file mode 100644 index 70f25048a24a..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-salhelper+test+rtti+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../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-3-RC/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-3-RC/files/patch-sc+source+core+data+cell.cxx deleted file mode 100644 index 529f67a3e35f..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sc+source+core+data+cell.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../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-3-RC/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp deleted file mode 100644 index 623eccb0ff09..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp +++ /dev/null @@ -1,19 +0,0 @@ ---- ../scp/source/global/udk_base.scp.orig Wed Mar 5 21:12:08 2003 -+++ ../scp/source/global/udk_base.scp Wed Mar 5 21:12:10 2003 -@@ -6,7 +6,7 @@ - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are - // needed for unxlngi4 environment (setup is linked against it). - -- -+#if ( ! defined ( FREEBSD )) - #if ( defined( _gcc3 ) && defined( C300 ) ) - - File gid_File_Lib_gcc -@@ -37,6 +37,7 @@ - Name = STRING(libstdc++.so); - Styles = (NETWORK,RELATIVE); - End -+#endif - #endif - - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp b/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp deleted file mode 100644 index 2f8daab35cdd..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-scp+source+player+player.scp +++ /dev/null @@ -1,20 +0,0 @@ ---- ../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-3-RC/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+searchcache deleted file mode 100644 index 593e9eabf5bc..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+searchcache +++ /dev/null @@ -1,34 +0,0 @@ -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-3-RC/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+ziplst.cxx deleted file mode 100644 index 83b84631542e..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-scptools+source+linker+ziplst.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- ../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-3-RC/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-3-RC/files/patch-setup2+inc+fields.hxx deleted file mode 100644 index d56e12f2abf4..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+inc+fields.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- ../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-3-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c deleted file mode 100644 index 396c586ee3a3..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ../setup2/mow/source/loader/loader.c.orig Thu Oct 31 21:46:52 2002 -+++ ../setup2/mow/source/loader/loader.c Wed Jan 22 14:56:44 2003 -@@ -85,6 +85,12 @@ - # include <sys/statvfs.h> - #endif - -+#ifdef FREEBSD -+#if (OSVERSION < 500000) -+#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n') -+#endif -+#endif -+ - #include "bitmap" - #include "logo.xpm" - -@@ -650,6 +656,14 @@ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ - " Linux)\n" \ -+" 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" \ diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 5460e4296587..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../setup2/mow/source/loader/makefile.mk.orig Fri Feb 14 15:32:23 2003 -+++ ../setup2/mow/source/loader/makefile.mk Wed Mar 5 20:28:12 2003 -@@ -95,7 +95,11 @@ - - APP1TARGET= $(TARGET) - APP1OBJS= $(OBJFILES) -+.IF "$(OS)"=="FREEBSD" -+APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11 -+.ELSE - APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl -+.ENDIF - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk deleted file mode 100644 index 53846a8bdfc9..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+patch+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../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-3-RC/files/patch-setup2+script+setupserver b/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver deleted file mode 100644 index 450ea386c841..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver +++ /dev/null @@ -1,10 +0,0 @@ ---- ../setup2/script/setupserver.orig Fri Nov 17 12:29:29 2000 -+++ ../setup2/script/setupserver Fri Oct 18 23:47:09 2002 -@@ -234,6 +234,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx deleted file mode 100644 index 98f6ad2f7567..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+source+compiler+decltor.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../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-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx deleted file mode 100644 index ac0b39a6aa47..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../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-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh deleted file mode 100644 index f199b18823e1..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Fri Jun 14 15:36:11 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Fri Oct 18 23:45:45 2002 -@@ -65,6 +65,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-3-RC/files/patch-setup2+source+service+interface.cxx deleted file mode 100644 index 8e478e17971d..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+source+service+interface.cxx +++ /dev/null @@ -1,35 +0,0 @@ ---- ../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-3-RC/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+cmdmail+makefile.mk deleted file mode 100644 index 0476285c802e..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+proxysettings+makefile.mk deleted file mode 100644 index e83cf7c9d7a1..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice.org-3-RC/files/patch-shell+source+unix+exec+makefile.mk deleted file mode 100644 index 0b7712ee35f8..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index 996e282b350b..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003 -+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003 -@@ -72,11 +72,11 @@ - END { - if (state == 0) { - print "# Weak RTTI symbols for C++ exceptions:" -- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };" -+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};" - } - } - state == 2 { -- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" -+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions" - state = 3 - } - /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 } diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl deleted file mode 100644 index 71ebdb934120..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+bin+mapgen.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- ../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-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+startup+FREEBSD+macros.mk deleted file mode 100644 index 0c1b107de988..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk deleted file mode 100644 index 701692c9425a..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 -+++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 -@@ -81,7 +81,9 @@ - .ENDIF # "$(GUI)"=="WNT" - - .IF "$(OS)"!="NETBSD" -+.IF "$(OS)"!="FREEBSD" - PATCHFLAGS=-b -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)"=="NETBSD" - - #override diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk deleted file mode 100644 index 255a41f92281..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_moz.mk +++ /dev/null @@ -1,17 +0,0 @@ ---- ../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-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index b4764485aa86..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,202 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Fri Jan 31 16:46:52 2003 -+++ ../solenv/inc/unxfbsdi.mk Wed Mar 5 20:23:28 2003 -@@ -61,50 +61,115 @@ - #************************************************************************* - - # mak file for unxfbsdi -+ASM=$(CC) -+AFLAGS=-x assembler-with-cpp -c $(CDEFS) - --ASM= --AFLAGS= -+# filter for supressing verbose messages from linker -+#not needed at the moment -+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+ -+# 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 - --SOLAR_JAVA=TRUE --JAVAFLAGSDEBUG=-g -+# name of C++ Compiler -+CXX*=g++ -+# name of C Compiler -+CC*=gcc - -+# 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=450 -DOSVERSION=$(OSVERSION) -+CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT - --CC= gcc --CXX= g++ --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 --CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -+# flags for C and C++ Compile - CFLAGS+= -w -c $(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 - 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 -+ -+# 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 profilin - CFLAGSPROF= -pg -+ -+# Compiler flags for debugging - CFLAGSDEBUG= -g - CFLAGSDBGUTIL= --CFLAGSOPT= -O2 --CFLAGSNOOPT= -O -+ -+# Compiler flags to enable optimizations -+# -02 is broken for FreeBSD -+CFLAGSOPT= -O -+ -+# Compiler flags to disable optimizations -+# -0 is broken for STLport for FreeBSD -+CFLAGSNOOPT= -O0 -+ -+# Compiler flags for the output path - CFLAGSOUTOBJ= -o - -+# Enable all warnings -+CFLAGSWALL=-Wall -+ -+# Set default warn level -+CFLAGSDFLTWARN=-w -+ -+# switches for dynamic and static linking - STATIC= -Wl,-Bstatic - DYNAMIC= -Wl,-Bdynamic - --#THREADLIB= -pthread --LINK= gcc --# -v -nostdlib --LINKFLAGS= --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+# name of linker -+LINK*=$(CC) -+ -+# default linker flags -+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH) -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+ -+# linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared - LINKFLAGSSHLCUI= -shared -+ - LINKFLAGSTACK= - LINKFLAGSPROF= - LINKFLAGSDEBUG=-g -@@ -119,28 +184,41 @@ - - 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 - -+# default objectfilenames to link - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - -+# libraries for linking applications - 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 -+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 -+ -+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -+ -+# STLport always needs pthread. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r - LIBEXT= .a - -+# tool for generating import libraries - IMPLIB= - IMPLIBFLAGS= - -@@ -148,12 +226,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-3-RC/files/patch-soltools+checkdll+makefile.mk b/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk deleted file mode 100644 index e6407402258a..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-soltools+checkdll+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../soltools/checkdll/makefile.mk.orig Tue Mar 11 14:21:02 2003 -+++ ../soltools/checkdll/makefile.mk Tue Mar 11 14:21:30 2003 -@@ -80,7 +80,9 @@ - APP1TARGET = checkdll - APP1OBJS = $(OBJ)$/checkdll.obj - DEPOBJFILES = $(APP1OBJS) -+.IF "$(OS)"!="FREEBSD" - STDLIB += -ldl -+.ENDIF - .IF "$(OS)"=="NETBSD" - APP1STDLIBS += -Wl,--whole-archive -lgcc -Wl,--no-whole-archive - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-3-RC/files/patch-soltools+mkdepend+main.c deleted file mode 100644 index cffd5cbb1f43..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-soltools+mkdepend+main.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002 -+++ ../soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002 -@@ -27,6 +27,9 @@ - - */ - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include "def.h" - #ifdef hpux - #define sigvec sigvector diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk deleted file mode 100644 index 797817ba85be..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ ---- ../stlport/makefile.mk.orig Thu Feb 20 16:13:40 2003 -+++ ../stlport/makefile.mk Wed Mar 5 19:41:42 2003 -@@ -104,16 +104,27 @@ - - .IF "$(COM)"=="GCC" - .IF "$(COMID)"=="gcc3" -+# FreeBSD needs a special makefile -+.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 -+.ELIF "$(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 - # build in parallel - BUILD_FLAGS+= -j$(MAXPROCESS) - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+corereflection+makefile.mk deleted file mode 100644 index 4b319b08d401..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+defaultregistry+makefile.mk deleted file mode 100644 index 4cae0476415a..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx deleted file mode 100644 index 341d621d872c..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+implreg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../stoc/source/implementationregistration/implreg.cxx.orig Tue Apr 16 19:54:58 2002 -+++ ../stoc/source/implementationregistration/implreg.cxx Tue Apr 16 19:55:26 2002 -@@ -60,6 +60,8 @@ - ************************************************************************/ - #include <list> - -+#include <unistd.h> -+ - #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ - #include <cppuhelper/queryinterface.hxx> - #endif diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+implementationregistration+makefile.mk deleted file mode 100644 index 0051043b7ecb..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+inspect+makefile.mk deleted file mode 100644 index c7cd85253c11..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation+makefile.mk deleted file mode 100644 index 9ac2072a5612..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+invocation_adapterfactory+makefile.mk deleted file mode 100644 index 8853ad39a90e..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk deleted file mode 100644 index cea499f15c57..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../stoc/source/javaloader/makefile.mk.orig Fri Dec 6 11:51:54 2002 -+++ ../stoc/source/javaloader/makefile.mk Wed Mar 5 19:35:11 2003 -@@ -83,10 +83,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ -- $(SALLIB) \ -- $(JVMACCESSLIB) -+ $(JVMACCESSLIB) - - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk deleted file mode 100644 index b895a2b968d4..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/javavm/makefile.mk.orig Fri Dec 6 11:48:59 2002 -+++ ../stoc/source/javavm/makefile.mk Wed Mar 5 19:36:03 2003 -@@ -100,10 +100,10 @@ - SHL1TARGET= $(TARGET) - SHL1VERSIONMAP=$(TARGET).map - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(UNOLIB) \ -- $(SALLIB) \ - $(JVMACCESSLIB) \ - $(SALHELPERLIB) - diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+loader+makefile.mk deleted file mode 100644 index 5a08ee5937b6..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+namingservice+makefile.mk deleted file mode 100644 index e573081bc21d..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+proxy_factory+makefile.mk deleted file mode 100644 index 9110b2f50cd1..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+registry_tdprovider+makefile.mk deleted file mode 100644 index 9d974d1c0d10..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+makefile.mk deleted file mode 100644 index 746776d54759..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+tdmanager+makefile.mk deleted file mode 100644 index 76403fdde841..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+typeconv+makefile.mk deleted file mode 100644 index dc647f89a166..000000000000 --- a/editors/openoffice.org-3-RC/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-3-RC/files/patch-store+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk deleted file mode 100644 index 6bef6e960f2e..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-store+util+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../store/util/makefile.mk.orig Tue Mar 11 14:58:53 2003 -+++ ../store/util/makefile.mk Tue Mar 11 14:59:34 2003 -@@ -102,7 +102,11 @@ - - # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so - .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"=="FREEBSD" -+SHL1STDLIBS+= -lsupc++ -+.ELSE - SHL1STDLIBS+= -lsupc++ -lgcc_s -+.ENDIF - .ENDIF - - diff --git a/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk b/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk deleted file mode 100644 index b16030080c0d..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-svx+source+fmcomp+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../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-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk deleted file mode 100644 index 3d7c2e22aa63..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../sysui/oounix/office/gnome/makefile.mk.orig Tue Mar 11 16:53:53 2003 -+++ ../sysui/oounix/office/gnome/makefile.mk Tue Mar 11 16:55:28 2003 -@@ -84,7 +84,9 @@ - APP1TARGET=$(TARGET) - APP1OBJS=$(OBJFILES) - APP1LIBS= -+.IF "$(OS)"!="FREEBSD" - APP1STDLIBS=-ldl -+.ENDIF - - GNOMEFILES= \ - locales.tab diff --git a/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx deleted file mode 100644 index 12bd6bd0b244..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../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-3-RC/files/patch-unoil+makefile.pmk b/editors/openoffice.org-3-RC/files/patch-unoil+makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-unoil+makefile.pmk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../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-3-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c deleted file mode 100644 index 2f85a108c185..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002 -+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) ); -@@ -865,7 +865,9 @@ - static struct timeb tbp; - #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(NETBSD) && !defined(FREEBSD)) - extern long timezone; -+#endif /* !defined(NETBSD) && !defined(FREEBSD) */ - #endif /* ?BSD */ - #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx deleted file mode 100644 index 41defbd5eb59..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig Tue Mar 11 16:32:14 2003 -+++ ../vcl/unx/source/gdi/gcach_xpeer.hxx Tue Mar 11 16:32:19 2003 -@@ -65,6 +65,8 @@ - #include <glyphcache.hxx> - - #define Region XLIB_Region -+typedef unsigned long CARD32; -+#define Cursor CARD32 - #include <X11/extensions/Xrender.h> - #undef Region - diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk deleted file mode 100644 index fefc925db41f..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig Thu Feb 20 17:28:59 2003 -+++ ../vcl/unx/source/gdi/getstyle/makefile.mk Tue Mar 11 16:43:43 2003 -@@ -78,6 +78,12 @@ - GETSTYLE_GNOME=getstyle-gnome-linux-intel - HASGNOME2=TRUE - .ENDIF -+.IF "$_(HAS_GNOME2)"=="TRUE" -+.IF "$(OS)$(CPU)"=="FREEBSDI" -+GETSTYLE_GNOME=getstyle-gnome-freebsd-intel -+HASGNOME2=TRUE -+.ENDIF -+.ENDIF - .IF "$(OS)$(CPU)"=="SOLARISS" - GETSTYLE_GNOME=getstyle-gnome-solaris-sparc - HASGNOME2=TRUE diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk deleted file mode 100644 index 984313fc540a..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig Thu Feb 20 17:29:08 2003 -+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk Tue Mar 11 16:39:29 2003 -@@ -75,9 +75,15 @@ - - HASGNOME2= - --.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI" -+.IF "$(OS)$(CPU)"=="LINUXI" - MSGBOX_GNOME=msgbox-gnome-linux-intel - HASGNOME2=TRUE -+.ENDIF -+.IF "$(_HAS_GNOME2)"=="TRUE" -+.IF "$(OS)$(CPU)"=="FREEBSDI" -+MSGBOX_GNOME=msgbox-gnome-freebsd-intel -+HASGNOME2=TRUE -+.ENDIF - .ENDIF - .IF "$(OS)$(CPU)"=="SOLARISS" - MSGBOX_GNOME=msgbox-gnome-solaris-sparc diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx deleted file mode 100644 index 07d9f1060557..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../vcl/workben/officeacceptthread.cxx.orig Wed Mar 5 20:25:36 2003 -+++ ../vcl/workben/officeacceptthread.cxx Wed Mar 5 20:26:03 2003 -@@ -125,7 +125,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-3-RC/files/zipmoz.sh b/editors/openoffice.org-3-RC/files/zipmoz.sh deleted file mode 100644 index 43a4591f3430..000000000000 --- a/editors/openoffice.org-3-RC/files/zipmoz.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh -f - -RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \ - components/libmork.so components/libmozldap.so \ - components/libnecko.so components/libprofile.so \ - components/librdf.so components/libstrres.so \ - components/libunicharutil.so components/libuconv.so \ - components/libucvcn.so components/libucvibm.so \ - components/libucvja.so components/libucvko.so \ - components/libucvlatin.so components/libucvtw.so \ - components/libucvtw2.so components/liburiloader.so \ - components/libvcard.so components/libxpconnect.so \ - components/libpref.so components/libchrome.so libmozjs.so \ - libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \ - libplds4.so libxpcom.so libmozz.so component.reg \ - components/necko_dns.xpt components/xpcom_xpti.xpt \ - components/xpcom_threads.xpt components/xpcom_io.xpt \ - components/xpcom_ds.xpt components/xpcom_components.xpt \ - components/xpcom_base.xpt components/xpti.dat \ - defaults/pref/all.js defaults/pref/config.js \ - defaults/pref/editor.js defaults/pref/initpref.js \ - defaults/pref/inspector.js defaults/pref/mailnews.js \ - defaults/pref/security-prefs.js defaults/pref/unix.js \ - defaults/pref/xpinstall.js" - -LIB_FILES=" lib/libembed_base_s.a lib/libmozreg_s.a \ - lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so" - -INC_FILES="include/" -INC_FILES2="public/" - -if [ $# -lt 2 -o $# -gt 3 ] ; then - echo - echo usage: $0 mozilla_dist target [target_dir] - echo - echo where: - echo - echo "mozilla_dist points to the mozilla distribution" - echo "target concatenates OS, compiler and CPU (e.g. FREEBSDGCCI etc)" - echo "target_dir is the directory to place the zips" - exit 1 -fi - -MOZ_DIST=$1 -TARGET=$2 -if [ "w$3" != "w" ]; then - TARGET_DIR=$3 -else - if [ "w$TARGET_DIR" == "w" ]; then - TARGET_DIR= - fi -fi - -ZIP_TARGET=$TARGET_DIR -if [ -z "$ZIP_TARGET" ] ; then - ZIP_TARGET=../ -fi - -# just to remember the current working directory -STARTING_DIR=`pwd` - -echo -echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST - -# Create the directories -[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime -[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components -[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults -[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref -[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib -[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc -[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr -[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete - -# Copy the files -echo -echo --- copying files -echo - -for i in $RUNTIME_FILES; do - if [ ! -f $MOZ_DIST/bin/$i ]; then - echo $MOZ_DIST/bin/$i does not exist, check your distribution - else - if [ `echo $i | grep component` ]; then - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/ - elif [ `echo $i | grep defaults` ]; then - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/ - else - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/ - fi - fi -done - -for i in $LIB_FILES; do - if [ ! -f $MOZ_DIST/$i ]; then - echo $MOZ_DIST/$i does not exist, check your distribution - else - cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/ - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/ - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete - fi -done - -# delete old zips - -[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip -[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip -[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip - -# zip the runtime files - -echo -echo --- creating ${TARGET}runtime.zip -echo - -cd $TARGET_DIR/$TARGET/runtime -find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@ - -# zip the lib files -echo -echo --- creating ${TARGET}lib.zip -echo - -cd $TARGET_DIR/$TARGET/lib -find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@ - -# zip the inc files -echo -echo --- creating ${TARGET}inc.zip -echo - -cd $TARGET_DIR/$TARGET/inc -find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@ - -# remove dirs -cd $STARTING_DIR -rm -rf $TARGET_DIR/$TARGET - -echo -echo --- done -echo - diff --git a/editors/openoffice.org-3-RC/pkg-descr b/editors/openoffice.org-3-RC/pkg-descr deleted file mode 100644 index 31fd1b12161a..000000000000 --- a/editors/openoffice.org-3-RC/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -OpenOffice.org is an Open Source, community-developed, multi-platform office -productivity suite. It includes the key desktop applications, such as a -word processor, spreadsheet, presentation manager, and drawing program, -with a user interface and feature set similar to other office suites. - -Components include: - * A universal word processing application for creating business - letters, extensive text documents, professional layouts, and HTML - documents. - * A sophisticated application for performing advanced spreadsheet - functions, such as analyzing figures, creating lists, and viewing data. - * A tool for creating effective eye-catching presentations. - * A vector-oriented draw module that enables the creation of 3D - illustrations diff --git a/editors/openoffice.org-3-RC/pkg-message b/editors/openoffice.org-3-RC/pkg-message deleted file mode 100644 index 1dc749f301c2..000000000000 --- a/editors/openoffice.org-3-RC/pkg-message +++ /dev/null @@ -1,73 +0,0 @@ -OpenOffice.org Build 643 Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - -OpenOffice.org will soon been installed in -${PREFIX}/OpenOffice.org-643/ - -Warning: --------- - -This port is experimental. Do not use it for production. - - -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-3-RC/pkg-plist b/editors/openoffice.org-3-RC/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice.org-3-RC/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. |