diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-07-29 02:16:38 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-07-29 02:16:38 +0000 |
| commit | 41afb89d5813c208ce4ff24858ec394b38f78270 (patch) | |
| tree | d071b674a9e458543684395cf883e739c8949794 /editors/openoffice-1.0 | |
| parent | c7985448bb5478e7b37b2fee7bace4781a96e6de (diff) | |
| download | ports-41afb89d5813c208ce4ff24858ec394b38f78270.tar.gz ports-41afb89d5813c208ce4ff24858ec394b38f78270.zip | |
Unbreak for 5-series
Notes
Notes:
svn path=/head/; revision=140362
Diffstat (limited to 'editors/openoffice-1.0')
180 files changed, 1553 insertions, 1606 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index a6279d660c68..12e7bfa0044e 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -7,598 +7,241 @@ PORTNAME= openoffice PORTVERSION= 1.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= editors -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ - ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \ - ftp://ftp.kddlabs.co.jp/office/openoffice/%SUBDIR%/ \ - ftp://ftp.tu-chemnitz.de/pub/openoffice/%SUBDIR%/ \ - http://ftp.stardiv.de/pub/OpenOffice.org/%SUBDIR%/ \ - http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ +MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ + ${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ - ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \ - http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= stable/${PORTVERSION} -DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ - mozilla-vendor-1.0.2a.tgz:moz -.if defined(L10NHELP) -DISTFILES+= ${L10NHELP:S/$/:help/} -.endif + ${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}src/:mozsrc \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help \ + ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent-1.0/:help \ + http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \ + http://people.freebsd.org/~mbr/ooo/:mbr +DISTFILES+= OOo_${RELEASE_NR}_source.tar.gz gpc231.tar.Z:gpc patch-translation-ru-1.0.3.bz2:mbr +EXTRACT_ONLY= OOo_${RELEASE_NR}_source.tar.gz -BROKEN= Unfetchable -DEPRECATED= "${BROKEN}" -EXPIRATION_DATE=2005-09-22 +MAINTAINER= openoffice@FreeBSD.org +COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser +MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz +MOZILLA_VERSION= 1.0 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz +DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc +USE_GNOME= orbit +USE_XLIB= yes +USE_PERL5= yes +USE_BISON= yes +USE_GMAKE= yes +USE_REINPLACE= yes +USE_JAVA= yes +JAVA_VERSION= 1.3 +JAVA_BUILD= jdk NO_LATEST_LINK= yes -FIND?= /usr/bin/find -CUT?= /usr/bin/cut -AWK?= /usr/bin/awk -GREP?= /usr/bin/grep -MOUNT?= /sbin/mount -ZIP?= ${PREFIX}/bin/zip -UNZIP?= ${PREFIX}/bin/unzip -ANT?= ${LOCALBASE}/bin/ant -TCSH?= /bin/tcsh -PASTE?= /usr/bin/paste - -USE_GNOME= orbit gtk12 .include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - -INSTALLATION_BASEDIR= OpenOffice.org1.0 -BUILD_NR= 641 -DIST_SUBDIR= openoffice1.0 +.include <${FILESDIR}/Makefile.localized> + +LANG_EXT?= 01 +LANG_CONFIGURE_ARG?= ENUS +L10NHELP?= helpcontent_01_unix.tgz + +DISTFILES+= ${L10NHELP}:help +.if defined(ALL_LOCALIZED_LANGS) +DISTFILES+= helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help \ + helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \ + helpcontent_34_unix.tgz:help helpcontent_35_unix.tgz:help \ + helpcontent_39_unix.tgz:help helpcontent_42_unix.tgz:help \ + helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \ + helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \ + helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help +L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \ + helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ + helpcontent_34_unix.tgz helpcontent_35_unix.tgz \ + helpcontent_39_unix.tgz helpcontent_42_unix.tgz \ + helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ + helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ + helpcontent_86_unix.tgz helpcontent_88_unix.tgz +.endif + +CODELINE= 641 +RELEASE_NR= 1.0.3 +INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} +EXECBASE= openoffice.org-${RELEASE_NR} +DIST_SUBDIR= openoffice.org1.0 +SIMPLEOSVER= ${OSREL:C/\.//g} +PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel 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 -# +# FIXME (Somehow INDEX build fails) .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 " " - -` - -# -# 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 - -EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser - -# -# The JDK dependency needs to be at the first place, so all -# following dependencies use the same JDK. -# -.if !defined(WITH_BSD_JDK) -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 -.else -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 +PKGNAMEPREFIX= ${LANG_PKGNAME}- .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/apache-ant -BUILD_DEPENDS+= xmkmf:${X_IMAKE_PORT} -.if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} .endif -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - mng.1:${PORTSDIR}/graphics/libmng \ - freetype.9:${PORTSDIR}/print/freetype2 - -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) -JDK13DIR?= ${LOCALBASE}/linux-sun-jdk1.3.1 +# This port might build with gcc 2.95.2+ +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +# FIXME (correctly add ccache before gcc and g++) +.if defined(WITH_CCACHE) +BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache +CC= ccache gcc32 +CXX= ccache g++32 .else -JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +CC= gcc32 +CXX= g++32 .endif -JAVAVM= ${JDK13DIR}/bin/java - +BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ + unzip:${PORTSDIR}/archivers/unzip \ + imake:${X_IMAKE_PORT} \ + Xvfb:${X_VFBSERVER_PORT} GNU_CONFIGURE= yes USE_AUTOCONF_VER= 253 -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 +WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src +CONFIGURE_WRKSRC= ${WRKSRC}/config_office +TCSH?= /bin/tcsh +PKGMESSAGE= ${WRKDIR}/pkg-message -.if !defined(DISPLAY) DISPLAYHACK=localhost:1001 -.endif - CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} - -CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ - --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 +CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" \ + --with-os-version=${OSVERSION} +.include <${FILESDIR}/Makefile.knobs> + +pre-everything:: +# really tweak, extremely useful when you build all localized language versions +# needed after when you build with ALL_LOCALIZED_LANGS. +.if defined(TWEAK_L10N) + @${RM} -f ${WRKDIR}/.PLIST* + @${RM} -f ${WRKDIR}/.install_done.* + @${RM} -f ${WRKDIR}/.package_done.* + @${RM} -f ${WRKDIR}/.extract_done.* + @${RM} -f ${WRKDIR}/.patch_done.* + @${RM} -f ${WRKDIR}/.configure_done.* + @${RM} -f ${WRKDIR}/.build_done.* + @${TOUCH} ${EXTRACT_COOKIE} + @${TOUCH} ${PATCH_COOKIE} + @${TOUCH} ${CONFIGURE_COOKIE} + @${TOUCH} ${BUILD_COOKIE} .endif - -.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=\"preferred 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.1" - @${ECHO} "to compile openoffice with your" - @${ECHO} "preferred 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 !defined(WITH_GIF_LZW_COMPRESSION) - @${ECHO} - @${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES" - @${ECHO} "If you want to make compressed gif images" - @${ECHO} - @${ECHO} "If must have license from the Unisys and IBM patents" - @${ECHO} "to enable this option to get compressed GIF images." - @${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} < 480000 - @${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} < 480000 - @${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} ${WRKSRC}/../moz/zipped/*.zip - @${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl - @${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj - @${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc3_freebsd_intel -.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 - @${MAKE} fix-kdewrappers - @${MAKE} fix-gnomewrappers .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_GIF_LZW_COMPRESSION) - @if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \ - ${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \ - if [ ${PATCH_DEBUG_TMP} = yes ]; then \ - ${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \ - fi; \ - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \ - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \ - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \ - 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" - -fix-kdewrappers: - @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice-|' \ - ${WRKSRC}/../sysui/oounix/office/kde2/kdeint - -fix-gnomewrappers: - @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice-|' \ - ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype +.endif +#fix for gnome/kde wrapper + #${REINPLACE_CMD} -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/kde2/kdeint + #${REINPLACE_CMD} -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/gnome/gnomeint +#Russian and Ukrainian support + #cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-support-RU-1.0.3.bz2 | ${BUNZIP2} + #cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-support-UA-1.0.3.bz2 | ${BUNZIP2} + @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ + @${CHMOD} +x ${WRKSRC}/solenv/bin/zipdep.pl -extract-mozilla: -.if ! exists(${WRKDIR}/mozilla/Makefile) - @${ECHO_MSG} "===> Extracting mozilla sub project" - @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz -.endif - @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" - -patch-mozilla: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \ - ${WRKDIR}/mozilla/files/ - @cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX="" - -build-mozilla: -.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip) - @${ECHO_MSG} "===> Building mozilla sub project" -.if defined(WITH_DEBUG) - @${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new - @${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 + @${MKDIR} ${WRKDIR}/L10NHELP + @cd ${WRKDIR}/L10NHELP ; \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - +.if defined(ALL_LOCALIZED_LANGS) + @cd ${WRKDIR}/L10NHELP ; \ + for helpfile in ${L10NHELPS}; do \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \ + done .endif - @${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 + @cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch + @${MKDIR} ${WRKSRC}/moz/download + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download 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 + cd ${WRKSRC} ; ./bootstrap + cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped + @${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck .if exists(${WRKDIR}/.Xvfb.pid) @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .endif -.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}' + cd ${WRKSRC} && DISPLAY=${DISPLAYHACK} ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' + -${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill + ${RM} -f ${WRKDIR}/.Xvfb.pid + +do-install: +.if exists(${WRKDIR}/.Xvfb.pid) @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid -.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 + ${SETENV} DISPLAY=${DISPLAYHACK} ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}" @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid -.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 +#temporary hack (contains space in dir name) + @${RM} -rf ${PREFIX}/${INSTALLATION_BASEDIR}/share/kde/net/applnk install-user: - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @${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 - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-smath - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp + @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ + @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ + -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ + ${WRKDIR}/openoffice.org-wrapper + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ + ${PREFIX}/bin/${EXECBASE} + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter + @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} + @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} + @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ + -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ + -e 's#%%EXECBASE%%#${EXECBASE}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + ${PKGMESSAGE} + @${ECHO_CMD} + @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} package-rename: - @${ECHO_MSG} "===> Rename package for OO.org mirror upload"; + @${ECHO_MSG} "===> Rename package for OOo 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 + @${MV} ${PKGFILE} \ + ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX} +.elif defined(LANG_PKGNAME) + @${MV} ${PKGFILE} \ + ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX} .else - @${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2 + @${MV} ${PKGFILE} \ + ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX} .endif +sdk: + @${ECHO_MSG} "===> Make SDK of OpenOffice.org" + @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' + @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz + +solver: + @${ECHO_MSG} "===> Make Solver of OpenOffice.org" + @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver + .include <bsd.port.post.mk> diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index e86028bf4bad..f7b79dbe2c34 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -1,11 +1,40 @@ -MD5 (openoffice1.0/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899 -MD5 (openoffice1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -MD5 (openoffice1.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468 -MD5 (openoffice1.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a -MD5 (openoffice1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 -MD5 (openoffice1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 -MD5 (openoffice1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7 -MD5 (openoffice1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8 -MD5 (openoffice1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b -MD5 (openoffice1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942 -MD5 (openoffice1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14 +MD5 (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = e85acb04b2906a460dfdd19a309c1aea +SIZE (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = 184856160 +MD5 (openoffice.org1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +SIZE (openoffice.org1.0/gpc231.tar.Z) = 27917 +MD5 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14 +SIZE (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 10628 +MD5 (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 +SIZE (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 39708 +MD5 (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 +SIZE (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 39881558 +MD5 (openoffice.org1.0/helpcontent_01_unix.tgz) = ff3eb5095a74ae7a9b2918ef5874288f +SIZE (openoffice.org1.0/helpcontent_01_unix.tgz) = 12693536 +MD5 (openoffice.org1.0/helpcontent_01_unix.tgz) = ff3eb5095a74ae7a9b2918ef5874288f +SIZE (openoffice.org1.0/helpcontent_01_unix.tgz) = 12693536 +MD5 (openoffice.org1.0/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611 +SIZE (openoffice.org1.0/helpcontent_07_unix.tgz) = 13820401 +MD5 (openoffice.org1.0/helpcontent_30_unix.tgz) = ef9d577e467b54d07cf443e1ed5e904f +SIZE (openoffice.org1.0/helpcontent_30_unix.tgz) = 16754161 +MD5 (openoffice.org1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 +SIZE (openoffice.org1.0/helpcontent_33_unix.tgz) = 13190241 +MD5 (openoffice.org1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 +SIZE (openoffice.org1.0/helpcontent_34_unix.tgz) = 13208085 +MD5 (openoffice.org1.0/helpcontent_35_unix.tgz) = cf90274a2e46ddd04422c08157575780 +SIZE (openoffice.org1.0/helpcontent_35_unix.tgz) = 12221016 +MD5 (openoffice.org1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7 +SIZE (openoffice.org1.0/helpcontent_39_unix.tgz) = 13045311 +MD5 (openoffice.org1.0/helpcontent_42_unix.tgz) = a7bcb51e5bff1673b32113308a026563 +SIZE (openoffice.org1.0/helpcontent_42_unix.tgz) = 12997234 +MD5 (openoffice.org1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8 +SIZE (openoffice.org1.0/helpcontent_46_unix.tgz) = 12622320 +MD5 (openoffice.org1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b +SIZE (openoffice.org1.0/helpcontent_49_unix.tgz) = 14230759 +MD5 (openoffice.org1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942 +SIZE (openoffice.org1.0/helpcontent_81_unix.tgz) = 13567923 +MD5 (openoffice.org1.0/helpcontent_82_unix.tgz) = ea45780e3027317ec6b4f38f009b579b +SIZE (openoffice.org1.0/helpcontent_82_unix.tgz) = 13259424 +MD5 (openoffice.org1.0/helpcontent_86_unix.tgz) = ea0debc121b6912a42cdc24e1b99b625 +SIZE (openoffice.org1.0/helpcontent_86_unix.tgz) = 13308043 +MD5 (openoffice.org1.0/helpcontent_88_unix.tgz) = 260a17a84a16c18b4371a84b95cea2cb +SIZE (openoffice.org1.0/helpcontent_88_unix.tgz) = 13308769 diff --git a/editors/openoffice-1.0/files/Makefile.knobs b/editors/openoffice-1.0/files/Makefile.knobs new file mode 100644 index 000000000000..fd0e3da1125f --- /dev/null +++ b/editors/openoffice-1.0/files/Makefile.knobs @@ -0,0 +1,49 @@ +.if defined(WITH_DEBUG) +CFLAGS+= -g +.if ${WITH_DEBUG} == 2 +BUILD= dmake debug="true" +.else +BUILD= dmake +.endif +.else +BUILD= dmake strip="true" +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + +pre-fetch: + @${ECHO} + @${ECHO} "OPTIONS:" +.if !defined(WITH_DEBUG) + @${ECHO} + @${ECHO} "You can compile OO with debug symbols" + @${ECHO} "if you call make with WITH_DEBUG=1" + @${ECHO} + @${ECHO} "If you set WITH_DEBUG=2, you add internal" + @${ECHO} "OO.org debug support." + @${ECHO} +.endif +.if !defined(WITH_TTF_BYTECODE_ENABLED) + @${ECHO} + @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" + @${ECHO} "if you like to use the Freetype library to" + @${ECHO} "render TTF fonts. Normally the TTF lib is" + @${ECHO} "not used to render fonts." + @${ECHO} + @${ECHO} "If you have licensed the Apple patents" + @${ECHO} "US05155805 US05159668 and US05325479" + @${ECHO} "you can enable this option to get better" + @${ECHO} "quality of glyphs at small bitmap sizes." + @${ECHO} +.endif + @${ECHO} + @${ECHO} "NOTICE:" + @${ECHO} + @${ECHO} "To build Openoffice, you should have a lot" +.if defined(WITH_DEBUG) + @${ECHO} "of free diskspace (~ 8GB)." +.else + @${ECHO} "of free diskspace (~ 4GB)." +.endif diff --git a/editors/openoffice-1.0/files/Makefile.localized b/editors/openoffice-1.0/files/Makefile.localized new file mode 100644 index 000000000000..7fe0ac466b66 --- /dev/null +++ b/editors/openoffice-1.0/files/Makefile.localized @@ -0,0 +1,157 @@ +# localized makefile +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD$ + +################################################################ +# consult oo_1.0.3_src/config_office/set_soenv.in for +# available localized languages +################################################################ +.if defined(LOCALIZED_LANG) +################################################################ +.if ${LOCALIZED_LANG} == "ar" +CATEGORIES= arabic +LANG_PKGNAME= ar +LANG_EXT= 96 +LANG_CONFIGURE_ARG= ARAB +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-CN" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= CN +LANG_EXT= 86 +LANG_CONFIGURE_ARG= CHINSIM +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-TW" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= TW +LANG_EXT= 88 +LANG_CONFIGURE_ARG= CHINTRAD +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "dk" +LANG_PKGNAME= dk +LANG_EXT= 45 +LANG_CONFIGURE_ARG= DAN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "nl" +LANG_PKGNAME= nl +LANG_EXT= 31 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= DTCH +.endif +################################################################ +.if ${LOCALIZED_LANG} == "fr" +CATEGORIES= french +LANG_PKGNAME= fr +LANG_EXT= 33 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= FREN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "el" +LANG_PKGNAME= el +LANG_EXT= 30 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= GREEK +.endif +################################################################ +.if ${LOCALIZED_LANG} == "de" +CATEGORIES= german +LANG_PKGNAME= de +LANG_EXT= 49 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= GER +COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm +.endif +################################################################ +.if ${LOCALIZED_LANG} == "it" +LANG_PKGNAME= it +LANG_EXT= 39 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= ITAL +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ja" +CATEGORIES= japanese +LANG_PKGNAME= ja +LANG_EXT= 81 +LANG_CONFIGURE_ARG= JAPN +MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} +RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ko" +CATEGORIES= korean +LANG_PKGNAME= ko +LANG_EXT= 82 +LANG_CONFIGURE_ARG= KOREAN +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pl" +CATEGORIES= polish +LANG_PKGNAME= pl +LANG_EXT= 48 +LANG_CONFIGURE_ARG= POL +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pt" +COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado +CATEGORIES= portuguese +LANG_PKGNAME= pt +LANG_EXT= 03 +LANG_CONFIGURE_ARG= PORT +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ru" +CATEGORIES= russian +LANG_PKGNAME= ru +LANG_EXT= 07 +LANG_CONFIGURE_ARG= RUSS +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "es" +LANG_PKGNAME= es +LANG_EXT= 34 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= SPAN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tr" +LANG_PKGNAME= tr +LANG_EXT= 90 +LANG_CONFIGURE_ARG= TURK +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sv" +LANG_PKGNAME= sv +LANG_EXT= 46 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= SWED +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tr" +LANG_PKGNAME= tr +LANG_EXT= 90 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= TURK +.endif +################################################################ +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif +.endif + diff --git a/editors/openoffice-1.0/files/generate.pl b/editors/openoffice-1.0/files/generate.pl new file mode 100644 index 000000000000..30cb431cfb6e --- /dev/null +++ b/editors/openoffice-1.0/files/generate.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# generate full build shell script for OpenOffice.org +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.1 2005-07-29 02:16:38 maho Exp $ + +print "#!/bin/csh\n"; +print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n"; +print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n"; + +open ( FILE, "< Makefile.localized") ; +while(<FILE>){ +@tmp=split (' ',$_); +@tmp2=split ('"',$tmp[3]); +if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; + print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; + print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; + } +} +close FILE; + diff --git a/editors/openoffice-1.0/files/moz-patch b/editors/openoffice-1.0/files/moz-patch new file mode 100644 index 000000000000..2eafbc036881 --- /dev/null +++ b/editors/openoffice-1.0/files/moz-patch @@ -0,0 +1,40 @@ +o disable freetype2 support since build broken and + this functionality is not used at all. +o reduce dependency (gtk is no longer needed) +o GNUCOPY is not supported by 1.0 series + +--- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 ++++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 +@@ -269,8 +269,8 @@ + +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) + +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) + .ELSE +- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) +- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) ++ +cp -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) ++ +cp -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) + .ENDIF + + .IF "$(GUI)"=="UNX" + +--- moz/mozilla-source-1.0.patch.org Tue Feb 10 19:44:34 2004 ++++ moz/mozilla-source-1.0.patch Sat Mar 19 12:51:35 2005 +@@ -4471,14 +4471,16 @@ + return NS_OK; + } + +---- miss/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 ++--- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 + +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 +-@@ -0,0 +1,8 @@ ++@@ -0,0 +1,10 @@ + +ac_add_options --disable-tests + +ac_add_options --disable-xprint + +ac_add_options --without-system-zlib + +ac_add_options --enable-ldap + +ac_add_options --disable-debug +++ac_add_options --disable-freetype2 +++ac_add_options --enable-default-toolkit=xlib + +ac_add_options --enable-optimize + +ac_add_options --enable-crypto + +ac_add_options --enable-strip diff --git a/editors/openoffice-1.0/files/oo_setup.resp b/editors/openoffice-1.0/files/oo_setup.resp deleted file mode 100644 index 364169bdd695..000000000000 --- a/editors/openoffice-1.0/files/oo_setup.resp +++ /dev/null @@ -1,7 +0,0 @@ -[Environment] -InstallationMode = INSTALL_NETWORK -InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org1.0 - -[Java] -JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-1.0/files/openoffice.org-wrapper b/editors/openoffice-1.0/files/openoffice.org-wrapper new file mode 100644 index 000000000000..150792e7fde8 --- /dev/null +++ b/editors/openoffice-1.0/files/openoffice.org-wrapper @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 02:16:38 maho Exp $ + +oopath=%%PREFIX%%/OpenOffice.org1.0.3/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` + +case $program in +$0) + exec $oopath/soffice "$@" + ;; + *) + exec $oopath/$program "$@" + ;; +esac diff --git a/editors/openoffice-1.0/files/optpatch-freetype+patch b/editors/openoffice-1.0/files/optpatch-freetype+patch index b426a8fb7fcc..287676e14dc0 100644 --- a/editors/openoffice-1.0/files/optpatch-freetype+patch +++ b/editors/openoffice-1.0/files/optpatch-freetype+patch @@ -1,208 +1,211 @@ -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 -++ -++ -++ /*************************************************************************/ +--- freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 ++++ freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 +@@ -1,118 +1,79 @@ +-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 +---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 +-*************** +-*** 63,69 **** +- # ANSI compliance. +- # +- ifndef CFLAGS +-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX +- endif +- +- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. +---- 63,69 ---- +- # ANSI compliance. +- # +- ifndef CFLAGS +-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS +- endif +- +- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. +-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 +---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 +-*************** +-*** 631,637 **** +- if test "$build_old_libs" = yes; then +- if test "$pic_mode" != yes; then +- # Don't build PIC code +-! command="$base_compile $srcfile" +- else +- # All platforms use -DPIC, to notify preprocessed assembler code. +- command="$base_compile $srcfile $pic_flag -DPIC" +---- 631,637 ---- +- if test "$build_old_libs" = yes; then +- if test "$pic_mode" != yes; then +- # Don't build PIC code +-! command="$base_compile $srcfile -DPIC $pic_flag" +- else +- # All platforms use -DPIC, to notify preprocessed assembler code. +- command="$base_compile $srcfile $pic_flag -DPIC" +-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 +---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 +-*************** +-*** 1,7 **** +---- 1,9 ---- +- FT_USE_MODULE(autohint_module_class) +- FT_USE_MODULE(cff_driver_class) +- FT_USE_MODULE(t1cid_driver_class) +-+ /* +- FT_USE_MODULE(pcf_driver_class) +-+ */ +- FT_USE_MODULE(psaux_module_class) +- FT_USE_MODULE(psnames_module_class) +- FT_USE_MODULE(ft_raster1_renderer_class) +-*************** +-*** 9,12 **** +---- 11,16 ---- +- FT_USE_MODULE(ft_smooth_renderer_class) +- FT_USE_MODULE(tt_driver_class) +- FT_USE_MODULE(t1_driver_class) +-+ /* +- FT_USE_MODULE(winfnt_driver_class) +-+ */ +-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 +---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 +-*************** +-*** 70,76 **** +---- 70,79 ---- +- /* All convenience functions are declared as such in their */ +- /* documentation. */ +- /* */ +-+ /* +- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS +-+ */ +-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS +- +- +- /*************************************************************************/ +-*************** +-*** 108,116 **** +- /* use a vector `plotter' format that isn't supported when this */ +- /* macro is undefined. */ +- /* */ +- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS +- +-- +- /*************************************************************************/ +- /* */ +- /* Glyph Postscript Names handling */ +---- 111,121 ---- +- /* use a vector `plotter' format that isn't supported when this */ +- /* macro is undefined. */ +- /* */ +-+ /* +- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS +-+ */ +-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS +- +- /*************************************************************************/ +- /* */ +- /* Glyph Postscript Names handling */ +-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 +---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 +-*************** +-*** 2251,2257 **** +- ;; +- +- irix) +-! major=`expr $current - $age + 1` +- verstring="sgi$major.$revision" +- +- # Add in all the interfaces that we are compatible with. +---- 2251,2257 ---- +- ;; +- +- irix) +-! major=`expr $current - $age` +- verstring="sgi$major.$revision" +- +- # Add in all the interfaces that we are compatible with. ++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk ++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 +++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 ++@@ -63,7 +63,7 @@ ++ # ANSI compliance. ++ # ++ ifndef CFLAGS ++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX +++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS ++ endif ++ ++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. ++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh ++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 +++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 ++@@ -631,7 +631,7 @@ ++ if test "$build_old_libs" = yes; then ++ if test "$pic_mode" != yes; then ++ # Don't build PIC code ++- command="$base_compile $srcfile" +++ command="$base_compile $srcfile -DPIC $pic_flag" ++ else ++ # All platforms use -DPIC, to notify preprocessed assembler code. ++ command="$base_compile $srcfile $pic_flag -DPIC" ++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h ++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 +++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 ++@@ -1,7 +1,9 @@ ++ FT_USE_MODULE(autohint_module_class) ++ FT_USE_MODULE(cff_driver_class) ++ FT_USE_MODULE(t1cid_driver_class) +++/* ++ FT_USE_MODULE(pcf_driver_class) +++*/ ++ FT_USE_MODULE(psaux_module_class) ++ FT_USE_MODULE(psnames_module_class) ++ FT_USE_MODULE(ft_raster1_renderer_class) ++@@ -9,4 +11,6 @@ ++ FT_USE_MODULE(ft_smooth_renderer_class) ++ FT_USE_MODULE(tt_driver_class) ++ FT_USE_MODULE(t1_driver_class) +++/* ++ FT_USE_MODULE(winfnt_driver_class) +++*/ ++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h ++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 +++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 ++@@ -70,7 +70,10 @@ ++ /* All convenience functions are declared as such in their */ ++ /* documentation. */ ++ /* */ +++/* ++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS +++*/ +++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS ++ ++ ++ /*************************************************************************/ ++@@ -108,8 +111,10 @@ ++ /* use a vector `plotter' format that isn't supported when this */ ++ /* macro is undefined. */ ++ /* */ +++/* ++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS ++- +++*/ +++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS ++ ++ /*************************************************************************/ ++ /* */ ++@@ -338,7 +343,7 @@ ++ /* By undefining this, you will only compile the code necessary to load */ ++ /* TrueType glyphs without hinting. */ ++ /* */ ++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER +++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER ++ ++ ++ /*************************************************************************/ +--- vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003 ++++ vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003 +@@ -67,7 +67,7 @@ + .IF "$(remote)" != "" + USE_BUILTIN_RASTERIZER=true + .ENDIF +-.IF "$(GUI)" == "UNX" ++.IF "$(GUI)" == "UNX" && "$(OS)" != "FREEBSD" + USE_BUILTIN_RASTERIZER=true + .ENDIF + diff --git a/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk index b9d899406bf0..028e67de2c91 100644 --- a/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk +++ b/editors/openoffice-1.0/files/optpatch-vcl+util+makefile.pmk @@ -1,5 +1,5 @@ ---- ../vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003 -+++ ../vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003 +--- vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003 ++++ vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003 @@ -67,7 +67,7 @@ .IF "$(remote)" != "" USE_BUILTIN_RASTERIZER=true diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch index 150ec02e28c0..174bd03fac25 100644 --- a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch @@ -1,14 +1,5 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 -+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 -@@ -51,7 +51,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" - LIBS="-lsocket -lsvipc $LIBS";; --+ netbsd*) optimize_def="-O2";; -++ netbsd*) optimize_def="-O";; - osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - *qnx) cat >> confdefs.h <<\EOF - #define HAVE_QNX 1 +--- berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 ++++ berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 @@ -62,54 +62,57 @@ solaris*) JINCSUBDIRS="solaris";; linux*) JINCSUBDIRS="linux genunix";; diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk b/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk index 5e9491a54dcc..43fee3b58750 100644 --- a/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk +++ b/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk @@ -1,5 +1,5 @@ ---- ../berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003 -+++ ../berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003 +--- berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003 ++++ berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003 @@ -84,7 +84,9 @@ BUILD_DIR=$(CONFIGURE_DIR) diff --git a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst b/editors/openoffice-1.0/files/patch-bridges+prj+build.lst index cd979b062a34..bcf3a8aa850f 100644 --- a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst +++ b/editors/openoffice-1.0/files/patch-bridges+prj+build.lst @@ -1,5 +1,5 @@ ---- ../bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 -+++ ../bridges/prj/build.lst Tue Jun 4 12:24:46 2002 +--- bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 ++++ bridges/prj/build.lst Tue Jun 4 12:24:46 2002 @@ -9,6 +9,8 @@ br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk index 512a57e75b9b..011bc09d09a7 100644 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk +++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk @@ -1,5 +1,5 @@ ---- ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig Fri May 31 10:22:18 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Fri May 31 10:22:46 2002 +--- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig Fri May 31 10:22:18 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Fri May 31 10:22:46 2002 @@ -76,7 +76,7 @@ # --- Files -------------------------------------------------------- diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj index 95874155c7db..d4eeabf5c05a 100644 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj +++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj @@ -1,6 +1,5 @@ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx --- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx Tue Jun 4 10:49:43 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx Tue Jun 4 10:49:43 2002 @@ -0,0 +1,615 @@ +/************************************************************************* + * @@ -617,9 +616,9 @@ diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cx + CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); +} + -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx + --- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx Tue Jun 4 10:49:44 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx Tue Jun 4 10:49:44 2002 @@ -0,0 +1,365 @@ +/************************************************************************* + * @@ -986,9 +985,9 @@ diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx + +} + -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx + --- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx Tue Jun 4 10:49:36 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx Tue Jun 4 10:49:36 2002 @@ -0,0 +1,153 @@ +/************************************************************************* + * @@ -1145,7 +1144,7 @@ diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freeb + diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk --- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk Tue Jun 4 12:20:58 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk Tue Jun 4 12:20:58 2002 @@ -0,0 +1,109 @@ +#************************************************************************* +# @@ -1258,7 +1257,7 @@ diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.m + diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx --- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx Tue Jun 4 10:49:44 2002 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx Tue Jun 4 10:49:44 2002 @@ -0,0 +1,473 @@ +/************************************************************************* + * diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel index c11aaa918d05..bda7f0e32487 100644 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel @@ -1,5 +1,5 @@ --- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:23:27 2002 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:23:27 2002 @@ -0,0 +1,594 @@ +/************************************************************************* + * @@ -62,7 +62,7 @@ + * + ************************************************************************/ + -+#include <malloc.h> ++#include <stdlib.h> +#include <hash_map> + +#include <rtl/alloc.h> @@ -596,7 +596,7 @@ +} +} --- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Mar 4 21:23:27 2002 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Mar 4 21:23:27 2002 @@ -0,0 +1,317 @@ +/************************************************************************* + * @@ -916,7 +916,7 @@ +} + --- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Mon Mar 4 21:24:53 2002 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Mon Mar 4 21:24:53 2002 @@ -0,0 +1,112 @@ +#************************************************************************* +# @@ -1031,7 +1031,7 @@ +.INCLUDE : target.mk + --- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx Mon Mar 4 21:23:27 2002 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx Mon Mar 4 21:23:27 2002 @@ -0,0 +1,120 @@ +/************************************************************************* + * @@ -1154,7 +1154,7 @@ + __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); +} --- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:23:27 2002 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:23:27 2002 @@ -0,0 +1,450 @@ +/************************************************************************* + * diff --git a/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk b/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk deleted file mode 100644 index 595ea6cb5ac9..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+prot_uno+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001 -+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002 -@@ -88,8 +88,8 @@ - SHL1VERSIONMAP=..$/bridge_exports.map - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - DEF1NAME=$(SHL1TARGET) - diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx new file mode 100644 index 000000000000..5735846cf20b --- /dev/null +++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx @@ -0,0 +1,23 @@ +Index: bridges/source/remote/iiop/dispatch.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/remote/iiop/dispatch.cxx,v +retrieving revision 1.5.14.1 +diff -u -r1.5.14.1 dispatch.cxx +--- bridges/source/remote/iiop/dispatch.cxx 8 Aug 2002 02:49:44 -0000 1.5.14.1 ++++ bridges/source/remote/iiop/dispatch.cxx 28 Jul 2005 12:17:15 -0000 +@@ -58,14 +58,7 @@ + * + * + ************************************************************************/ +-#if defined(SOLARIS) || defined(IRIX) +-#include <alloca.h> +-#elif defined MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif ++#include <stdlib.h> + + #include <osl/diagnose.h> + diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx new file mode 100644 index 000000000000..7a37360e6fe1 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx @@ -0,0 +1,23 @@ +Index: bridges/source/remote/iiop/unmarshal.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/remote/iiop/unmarshal.cxx,v +retrieving revision 1.4.10.1 +diff -u -r1.4.10.1 unmarshal.cxx +--- bridges/source/remote/iiop/unmarshal.cxx 8 Aug 2002 02:49:44 -0000 1.4.10.1 ++++ bridges/source/remote/iiop/unmarshal.cxx 28 Jul 2005 12:18:13 -0000 +@@ -58,14 +58,7 @@ + * + * + ************************************************************************/ +-#if defined(SOLARIS) || defined(IRIX) +-#include <alloca.h> +-#elif defined MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif ++#include <stdlib.h> + + #include <osl/diagnose.h> + diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx new file mode 100644 index 000000000000..cbf4f9552c70 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx @@ -0,0 +1,23 @@ +Index: bridges/source/remote/static/proxy.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/remote/static/proxy.cxx,v +retrieving revision 1.3.6.1 +diff -u -r1.3.6.1 proxy.cxx +--- bridges/source/remote/static/proxy.cxx 8 Aug 2002 02:49:46 -0000 1.3.6.1 ++++ bridges/source/remote/static/proxy.cxx 28 Jul 2005 12:08:44 -0000 +@@ -59,14 +59,7 @@ + * + ************************************************************************/ + #include <assert.h> +-#if defined(SOLARIS) || defined(IRIX) +-#include <alloca.h> +-#elif defined MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif ++#include <stdlib.h> + + #include <bridges/remote/proxy.hxx> + #include <bridges/remote/context.h> diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx new file mode 100644 index 000000000000..dde90d83c4c2 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx @@ -0,0 +1,23 @@ +Index: bridges/source/remote/static/stub.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/remote/static/stub.cxx,v +retrieving revision 1.2.26.1 +diff -u -r1.2.26.1 stub.cxx +--- bridges/source/remote/static/stub.cxx 8 Aug 2002 02:49:47 -0000 1.2.26.1 ++++ bridges/source/remote/static/stub.cxx 28 Jul 2005 12:13:32 -0000 +@@ -58,14 +58,7 @@ + * + * + ************************************************************************/ +-#if defined(SOLARIS) || defined(IRIX) +-#include <alloca.h> +-#elif defined MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif ++#include <stdlib.h> + + #include <osl/diagnose.h> + diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx new file mode 100644 index 000000000000..eabe859aee7e --- /dev/null +++ b/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx @@ -0,0 +1,23 @@ +Index: bridges/source/remote/urp/urp_dispatch.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/remote/urp/urp_dispatch.cxx,v +retrieving revision 1.8.2.1 +diff -u -r1.8.2.1 urp_dispatch.cxx +--- bridges/source/remote/urp/urp_dispatch.cxx 8 Aug 2002 02:49:48 -0000 1.8.2.1 ++++ bridges/source/remote/urp/urp_dispatch.cxx 28 Jul 2005 12:15:51 -0000 +@@ -58,14 +58,7 @@ + * + * + ************************************************************************/ +-#if defined(SOLARIS) || defined(IRIX) +-#include <alloca.h> +-#elif MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif ++#include <stdlib.h> + + #include <osl/mutex.hxx> + #include <osl/diagnose.h> diff --git a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk index ba211f9044c4..7bd2a784d49d 100644 --- a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk @@ -1,5 +1,5 @@ ---- ../chaos/util/makefile.mk.orig Wed Jun 12 01:16:35 2002 -+++ ../chaos/util/makefile.mk Wed Jun 12 01:16:47 2002 +--- chaos/util/makefile.mk.orig Wed Jun 12 01:16:35 2002 ++++ chaos/util/makefile.mk Wed Jun 12 01:16:47 2002 @@ -100,7 +100,7 @@ SHL1TARGET= cnt$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx b/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx index a1a86242db9b..6f2ed220356a 100644 --- a/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx +++ b/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx @@ -1,5 +1,5 @@ ---- ../codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003 -+++ ../codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003 +--- codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003 ++++ codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003 @@ -149,11 +149,7 @@ strcat(tmpPattern, "\\"); strcat(tmpPattern, pPrefix); diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk b/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk new file mode 100644 index 000000000000..b83a620116f9 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk @@ -0,0 +1,15 @@ +Index: codemaker/source/cppumaker/makefile.mk +=================================================================== +RCS file: /cvs/udk/codemaker/source/cppumaker/makefile.mk,v +retrieving revision 1.5 +diff -u -r1.5 makefile.mk +--- codemaker/source/cppumaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.5 ++++ codemaker/source/cppumaker/makefile.mk 10 Jul 2005 07:39:54 -0000 +@@ -92,6 +92,7 @@ + APP1STDLIBS= \ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + APP1LIBS= \ diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk b/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk new file mode 100644 index 000000000000..56906191f2f0 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk @@ -0,0 +1,15 @@ +Index: codemaker/source/javamaker/makefile.mk +=================================================================== +RCS file: /cvs/udk/codemaker/source/javamaker/makefile.mk,v +retrieving revision 1.7 +diff -u -r1.7 makefile.mk +--- codemaker/source/javamaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.7 ++++ codemaker/source/javamaker/makefile.mk 10 Jul 2005 08:39:43 -0000 +@@ -96,6 +96,7 @@ + APP1STDLIBS= \ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + APP1LIBS= \ diff --git a/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk b/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk deleted file mode 100644 index 997719c43dd8..000000000000 --- a/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../comphelper/util/makefile.mk.orig Tue Feb 19 13:26:37 2002 -+++ ../comphelper/util/makefile.mk Wed Apr 3 00:16:43 2002 -@@ -85,11 +85,11 @@ - - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR) - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ - $(OSLLIB) \ -- $(SALLIB) \ - $(CPPRTLLIB) - - .IF "$(OS)$(CPU)"=="SOLARISS" diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in index 94d4b1cf08dc..e0af7351d24e 100644 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice-1.0/files/patch-config_office+configure.in @@ -1,19 +1,11 @@ ---- configure.in.orig Thu Jan 16 13:42:46 2003 -+++ configure.in Sat Jan 25 18:24:08 2003 -@@ -89,6 +89,12 @@ - - Usage: --enable-check-only=yes - ],,) -+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_ENABLE(macos9, - [ --enable-macos9 Use this option option if you want to generate a - macos9 environment on macosx. -@@ -352,10 +358,7 @@ +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.41.2.18 +diff -u -r1.41.2.18 configure.in +--- config_office/configure.in 12 Mar 2003 11:38:41 -0000 1.41.2.18 ++++ config_office/configure.in 10 Jul 2005 03:38:11 -0000 +@@ -383,10 +383,7 @@ if test "$COMPATH" != "NO_GCC"; then AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi @@ -24,8 +16,8 @@ +fi dnl =================================================================== - dnl Search all the common names for GNU make -@@ -553,14 +556,27 @@ + dnl Test the solaris compiler version +@@ -545,14 +542,27 @@ fi dnl =================================================================== @@ -34,10 +26,10 @@ dnl =================================================================== +if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then +if test "$GXX" = "yes"; then -+ if test -n "$enable_gcc3"; then ++ if test "$_gcc_major" = "3" ; then + _gccincname1="g++-v3" + else -+ _gccincname1="g++-3" ++ _gccincname1="g++-3" #not checked + fi + _gcc_include_path=".." + _gxx_include_path="$_gcc_include_path/$_gccincname1" @@ -57,29 +49,3 @@ dnl =================================================================== dnl Extra checking for the SUN OS compiler -@@ -1222,12 +1238,16 @@ - else - with_lang=","$with_lang"," - fi -- - 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 =================================================================== - dnl Bits to substitute into set_soenv.in -@@ -1272,6 +1292,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-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in index 8f159960ab19..0eab61ef13ae 100644 --- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in +++ b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in @@ -1,5 +1,10 @@ ---- set_soenv.in.orig Thu Jan 9 14:41:31 2003 -+++ set_soenv.in Sat Jan 25 18:27:08 2003 +Index: config_office/set_soenv.in +=================================================================== +RCS file: /cvs/tools/config_office/set_soenv.in,v +retrieving revision 1.3.2.2.2.8.2.2.2.3 +diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in +--- config_office/set_soenv.in 3 Apr 2003 04:52:43 -0000 1.3.2.2.2.8.2.2.2.3 ++++ config_office/set_soenv.in 10 Jul 2005 03:39:39 -0000 @@ -52,8 +52,8 @@ #------------------------------------------------- # @@ -11,34 +16,14 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -@@ -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, - $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. -@@ -141,6 +141,7 @@ - $CXX = '@CXX@'; # C++ compiler - $EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type - $ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build -+$USE_LINUXJDK = '@USE_LINUXJDK@'; # Enable a debug build - $WRAPCMD = ""; # Wrapper (only for winnt) - - # -@@ -1265,7 +1266,12 @@ +@@ -1251,7 +1251,9 @@ { $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"; -+ } ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd". ++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$NetBSD") { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk index fdab3ab41e7d..985c87525e68 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/adabas/makefile.mk.orig Wed Jun 12 01:06:20 2002 -+++ ../connectivity/source/drivers/adabas/makefile.mk Wed Jun 12 01:06:34 2002 +--- connectivity/source/drivers/adabas/makefile.mk.orig Wed Jun 12 01:06:20 2002 ++++ connectivity/source/drivers/adabas/makefile.mk Wed Jun 12 01:06:34 2002 @@ -104,7 +104,7 @@ $(SLO)$/BResultSetMetaData.obj \ $(SLO)$/BResultSet.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk index 043038a77f4b..845cdffa9915 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/calc/makefile.mk.orig Wed Jun 12 01:36:16 2002 -+++ ../connectivity/source/drivers/calc/makefile.mk Wed Jun 12 01:36:22 2002 +--- connectivity/source/drivers/calc/makefile.mk.orig Wed Jun 12 01:36:16 2002 ++++ connectivity/source/drivers/calc/makefile.mk Wed Jun 12 01:36:22 2002 @@ -92,9 +92,7 @@ $(SLO)$/CDriver.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk index 029f04a655c7..50a7123bb829 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/dbase/makefile.mk.orig Wed Jun 12 01:26:39 2002 -+++ ../connectivity/source/drivers/dbase/makefile.mk Wed Jun 12 01:26:48 2002 +--- connectivity/source/drivers/dbase/makefile.mk.orig Wed Jun 12 01:26:39 2002 ++++ connectivity/source/drivers/dbase/makefile.mk Wed Jun 12 01:26:48 2002 @@ -116,7 +116,7 @@ $(SLO)$/DDriver.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk index 8776a49f52f1..a94e5e388d10 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/file/makefile.mk.orig Wed Jun 12 01:12:42 2002 -+++ ../connectivity/source/drivers/file/makefile.mk Wed Jun 12 01:12:44 2002 +--- connectivity/source/drivers/file/makefile.mk.orig Wed Jun 12 01:12:42 2002 ++++ connectivity/source/drivers/file/makefile.mk Wed Jun 12 01:12:44 2002 @@ -112,7 +112,7 @@ $(SLO)$/fanalyzer.obj \ $(SLO)$/fcomp.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk index d6af428b7794..0e863e93ad65 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/flat/makefile.mk.orig Wed Jun 12 01:14:43 2002 -+++ ../connectivity/source/drivers/flat/makefile.mk Wed Jun 12 01:15:03 2002 +--- connectivity/source/drivers/flat/makefile.mk.orig Wed Jun 12 01:14:43 2002 ++++ connectivity/source/drivers/flat/makefile.mk Wed Jun 12 01:15:03 2002 @@ -104,7 +104,7 @@ $(SLO)$/EDriver.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk index 1801ae3083c4..8c35f8387963 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/jdbc/makefile.mk.orig Wed Jun 12 00:57:12 2002 -+++ ../connectivity/source/drivers/jdbc/makefile.mk Wed Jun 12 00:57:21 2002 +--- connectivity/source/drivers/jdbc/makefile.mk.orig Wed Jun 12 00:57:12 2002 ++++ connectivity/source/drivers/jdbc/makefile.mk Wed Jun 12 00:57:21 2002 @@ -111,7 +111,7 @@ $(SLO)$/tools.obj diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk index f422040f99d4..a72837ceded0 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 +--- connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 ++++ connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 @@ -107,9 +107,7 @@ # --- MOZAB BASE Library ----------------------------------- diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk index 3601766ee561..eea25f2b889c 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk @@ -1,5 +1,5 @@ ---- ../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 +--- 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) diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk index b63d2a25f184..d9655c5e9855 100644 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk +++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk @@ -1,5 +1,5 @@ ---- ../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 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx index dad8a1f99a5c..3e6e3f558c4f 100644 --- a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx +++ b/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx @@ -1,5 +1,5 @@ ---- ../cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 -+++ ../cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 +--- cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 ++++ cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 @@ -76,7 +76,7 @@ the struct inherits from a base struct the first member is no double or [unsigned] long long. @internal diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h index cb43c2d165e9..ec9dbb3a299c 100644 --- a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h +++ b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h @@ -1,5 +1,5 @@ ---- ../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 +--- 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) diff --git a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst b/editors/openoffice-1.0/files/patch-cppu+prj+build.lst index 78fd210a1193..c4e803c46e69 100644 --- a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst +++ b/editors/openoffice-1.0/files/patch-cppu+prj+build.lst @@ -1,5 +1,5 @@ ---- ../cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002 -+++ ../cppu/prj/build.lst Mon Mar 11 14:14:30 2002 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx b/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx new file mode 100644 index 000000000000..226c6033836e --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx @@ -0,0 +1,20 @@ +Index: cppu/source/typelib/typelib.cxx +=================================================================== +RCS file: /cvs/udk/cppu/source/typelib/typelib.cxx,v +retrieving revision 1.14.10.1 +diff -u -r1.14.10.1 typelib.cxx +--- cppu/source/typelib/typelib.cxx 9 Aug 2002 02:30:50 -0000 1.14.10.1 ++++ cppu/source/typelib/typelib.cxx 10 Jul 2005 09:13:22 -0000 +@@ -71,12 +71,6 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> +-#ifdef MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> +-#else +-#include <malloc.h> +-#endif + #if defined(SOLARIS) || defined(IRIX) + #include <alloca.h> + #endif diff --git a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx b/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx index 9c0e34bfb60b..3a610504c83b 100644 --- a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx +++ b/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx @@ -1,5 +1,5 @@ ---- ../cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 -+++ ../cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 +--- cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 ++++ cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 @@ -295,7 +295,7 @@ # pragma pack(8) #endif diff --git a/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx b/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx new file mode 100644 index 000000000000..45a097727c30 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx @@ -0,0 +1,18 @@ +Index: cppu/source/uno/lbenv.cxx +=================================================================== +RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v +retrieving revision 1.23 +diff -u -r1.23 lbenv.cxx +--- cppu/source/uno/lbenv.cxx 13 Aug 2002 15:07:09 -0000 1.23 ++++ cppu/source/uno/lbenv.cxx 10 Jul 2005 09:32:20 -0000 +@@ -93,10 +93,6 @@ + #include <stdio.h> + #ifdef SOLARIS + #include <alloca.h> +-#elif defined MACOSX +-#include <sys/malloc.h> +-#else +-#include <malloc.h> + #endif + #include <hash_map> + #include <vector> diff --git a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h index 2a6650400a1e..c8eb02d754c5 100644 --- a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h +++ b/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h @@ -1,5 +1,5 @@ ---- ../cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 -+++ ../cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 +--- cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 ++++ cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 @@ -64,7 +64,7 @@ #include <sal/types.h> #include <stdio.h> diff --git a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk index 875a5fb6deeb..db6dafce246f 100644 --- a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk @@ -1,5 +1,5 @@ ---- ../cppu/util/makefile.mk.orig Wed Jun 12 01:39:28 2002 -+++ ../cppu/util/makefile.mk Wed Jun 12 01:39:32 2002 +--- cppu/util/makefile.mk.orig Wed Jun 12 01:39:28 2002 ++++ cppu/util/makefile.mk Wed Jun 12 01:39:32 2002 @@ -87,9 +87,7 @@ SHL1DEPN= diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx b/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx new file mode 100644 index 000000000000..1ff1d3920840 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx @@ -0,0 +1,20 @@ +Index: cppuhelper/source/implbase_ex.cxx +=================================================================== +RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v +retrieving revision 1.5 +diff -u -r1.5 implbase_ex.cxx +--- cppuhelper/source/implbase_ex.cxx 15 Aug 2002 12:36:30 -0000 1.5 ++++ cppuhelper/source/implbase_ex.cxx 10 Jul 2005 09:41:00 -0000 +@@ -61,11 +61,8 @@ + + #ifdef SOLARIS + #include <alloca.h> +-#elif defined MACOSX +-#include <sys/types.h> +-#include <sys/malloc.h> + #else +-#include <malloc.h> ++#include <stdlib.h> + #endif + #include <string.h> + diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk index 62e971de324a..3e74fb33e425 100644 --- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk @@ -1,16 +1,5 @@ ---- ../cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002 -+++ ../cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002 -@@ -149,8 +149,8 @@ - SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) +--- cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002 ++++ cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002 @@ -175,6 +175,10 @@ #SHL1VERSIONMAP=gcc2_freebsd_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx b/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx new file mode 100644 index 000000000000..a3f59112ea22 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx @@ -0,0 +1,16 @@ +Index: cppuhelper/source/tdmgr.cxx +=================================================================== +RCS file: /cvs/udk/cppuhelper/source/tdmgr.cxx,v +retrieving revision 1.4 +diff -u -r1.4 tdmgr.cxx +--- cppuhelper/source/tdmgr.cxx 15 Oct 2001 16:07:59 -0000 1.4 ++++ cppuhelper/source/tdmgr.cxx 10 Jul 2005 09:41:51 -0000 +@@ -60,7 +60,7 @@ + ************************************************************************/ + + #ifndef MACOSX +-#include <malloc.h> ++#include <stdlib.h> + #endif + #ifdef SOLARIS + #include <alloca.h> diff --git a/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk deleted file mode 100644 index 8134445349f1..000000000000 --- a/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 -+++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 -@@ -104,6 +104,7 @@ - - APP1STDLIBS=\ - $(SALLIB) \ -+ $(TOOLSLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - diff --git a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx index 7b01e4f554b5..b60b684b25ee 100644 --- a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx +++ b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx @@ -1,5 +1,5 @@ ---- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 -+++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 +--- desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 ++++ desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 @@ -124,6 +124,10 @@ static char const s_platform_path [] = "/macosx_powerpc.plt"; #elif defined (NETBSD) && defined (SPARC) diff --git a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk b/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk index 8ceb57682cc7..bb622aa62e25 100644 --- a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk @@ -1,5 +1,5 @@ ---- ../desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002 -+++ ../desktop/util/makefile.mk Sun Jul 21 00:04:38 2002 +--- desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002 ++++ desktop/util/makefile.mk Sun Jul 21 00:04:38 2002 @@ -81,7 +81,7 @@ # --- Linken der Applikation --------------------------------------- diff --git a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh index d60afa8e32e8..0956ef9c130a 100644 --- a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh +++ b/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh @@ -1,5 +1,5 @@ ---- ../dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 -+++ ../dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 +--- dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 ++++ dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 @@ -3,188 +3,188 @@ mkdir objects diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx index e3159c23c1a3..a1e3006b3022 100644 --- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx @@ -1,5 +1,5 @@ ---- ../dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 -+++ ../dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 +--- dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 ++++ dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 @@ -65,7 +65,7 @@ #include <X11/keysym.h> #include <X11/Xlib.h> diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk deleted file mode 100644 index 5881f5d7f6a5..000000000000 --- a/editors/openoffice-1.0/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-1.0/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-1.0/files/patch-eventattacher+source+makefile.mk deleted file mode 100644 index b09408500c2d..000000000000 --- a/editors/openoffice-1.0/files/patch-eventattacher+source+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002 -+++ ../eventattacher/source/makefile.mk -@@ -110,10 +110,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(VOSLIB) \ -- $(SALLIB) -+ $(VOSLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh b/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh index e5122bcb45c1..528a1110f48d 100644 --- a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh +++ b/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh @@ -1,5 +1,5 @@ ---- ../external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 -+++ ../external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 +--- external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 ++++ external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 @@ -96,7 +96,7 @@ done diff --git a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh b/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh index ce07edcfffd8..5140022b3e99 100644 --- a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh +++ b/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh @@ -1,5 +1,5 @@ ---- ../external/expat/expatpatch.sh.orig Wed Mar 13 16:59:16 2002 -+++ ../external/expat/expatpatch.sh Wed Mar 13 17:00:18 2002 +--- external/expat/expatpatch.sh.orig Wed Mar 13 16:59:16 2002 ++++ external/expat/expatpatch.sh Wed Mar 13 17:00:18 2002 @@ -87,7 +87,7 @@ for PNAME in `cat flist.pat` diff --git a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch index 07e2f5373ee8..b77c0644b3fd 100644 --- a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch +++ b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch @@ -1,9 +1,9 @@ --- /dev/null Sun Jun 2 16:11:00 2002 -+++ ../external/glibc/flist.pat Sun Jun 2 12:00:09 2002 ++++ external/glibc/flist.pat Sun Jun 2 12:00:09 2002 @@ -0,0 +1 @@ +patch-getopt.h --- /dev/null Sun Jun 2 16:11:00 2002 -+++ ../external/glibc/patch-getopt.h Sun Jun 2 16:14:52 2002 ++++ external/glibc/patch-getopt.h Sun Jun 2 16:14:52 2002 @@ -0,0 +1,14 @@ +--- rtufiles/getopt.h.orig Fri May 31 16:46:21 2002 ++++ rtufiles/getopt.h Fri May 31 17:07:19 2002 @@ -19,8 +19,8 @@ + # endif /* __GNU_LIBRARY__ */ + + # ifndef __need_getopt ---- ../external/glibc/glibcpatch.sh.orig Sun Jun 2 11:46:42 2002 -+++ ../external/glibc/glibcpatch.sh Sun Jun 2 16:13:51 2002 +--- external/glibc/glibcpatch.sh.orig Sun Jun 2 11:46:42 2002 ++++ external/glibc/glibcpatch.sh Sun Jun 2 16:13:51 2002 @@ -113,7 +113,10 @@ # apply the patches # diff --git a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh b/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh index 4fb55f5d70d0..c742b4f31e5a 100644 --- a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh +++ b/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh @@ -1,5 +1,5 @@ ---- ../external/jpeg/jpegpatch.sh.orig Wed Mar 13 17:04:35 2002 -+++ ../external/jpeg/jpegpatch.sh Wed Mar 13 17:08:02 2002 +--- external/jpeg/jpegpatch.sh.orig Wed Mar 13 17:04:35 2002 ++++ external/jpeg/jpegpatch.sh Wed Mar 13 17:08:02 2002 @@ -112,7 +112,7 @@ for PNAME in `cat flist.pat` diff --git a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat b/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat index 46c5e062128e..6c0b7624be45 100644 --- a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat +++ b/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat @@ -1,5 +1,5 @@ --- /dev/null Thu Aug 8 22:39:51 2002 -+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002 ++++ external/neon/md5.c.pat Thu Aug 8 22:35:33 2002 @@ -0,0 +1,109 @@ +*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001 +--- sub\md5.c Tue May 08 12:52:02 2001 diff --git a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh b/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh index 1ccc1adf27f9..ac228884ad46 100644 --- a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh +++ b/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh @@ -1,5 +1,5 @@ ---- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001 -+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002 +--- external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001 ++++ external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002 @@ -119,10 +119,7 @@ # apply the patches # diff --git a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh index 49a3056831dd..658223558005 100644 --- a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh +++ b/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh @@ -1,5 +1,5 @@ ---- ../external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 -+++ ../external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 +--- external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 ++++ external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 @@ -121,7 +121,7 @@ for PNAME in `cat flist.pat` diff --git a/editors/openoffice-1.0/files/patch-freetype+makefile.mk b/editors/openoffice-1.0/files/patch-freetype+makefile.mk index 802c6b4d1a8b..4d29bbb79d9c 100644 --- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice-1.0/files/patch-freetype+makefile.mk @@ -1,18 +1,5 @@ ---- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 -+++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003 -@@ -86,7 +86,11 @@ - .IF "$(GUI)"=="UNX" - #relative to CONFIGURE_DIR - CONFIGURE_ACTION=$(GNUMAKE) --CONFIGURE_FLAGS=setup -+.IF "$(debug)"=="" -+CONFIGURE_FLAGS=setup CFLAGS="-O" -+.ELSE # "$(debug)"=="" -+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb" -+.ENDIF - - BUILD_DIR=$(CONFIGURE_DIR) - BUILD_ACTION=$(GNUMAKE) +--- freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ freetype/makefile.mk Sat Jan 18 13:39:03 2003 @@ -95,6 +99,8 @@ objs$/.libs$/libfreetype.a .IF "$(OS)"=="MACOSX" diff --git a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx index 796b7bbf4567..a484b5db2fc5 100644 --- a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx +++ b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx @@ -1,5 +1,5 @@ ---- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 -+++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +--- i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ i18n/inc/collator.hxx Wed May 1 22:31:57 2002 @@ -78,7 +78,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx b/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx index dc4af11250f4..e6dab620463f 100644 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx +++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx @@ -1,5 +1,5 @@ ---- ../i18npool/source/localedata/localedata.cxx.orig Mon Feb 24 17:47:22 2003 -+++ ../i18npool/source/localedata/localedata.cxx Tue Feb 25 16:41:58 2003 +--- i18npool/source/localedata/localedata.cxx.orig Mon Feb 24 17:47:22 2003 ++++ i18npool/source/localedata/localedata.cxx Tue Feb 25 16:41:58 2003 @@ -150,6 +150,7 @@ { "pt_BR", lcl_ASCII }, { "pt_PT", lcl_ASCII }, diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk index 47957effbdbf..45089ef1ec01 100644 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk +++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk @@ -1,5 +1,5 @@ ---- ../i18npool/source/localedata_ascii/makefile.mk.orig Sun Nov 17 23:27:32 2002 -+++ ../i18npool/source/localedata_ascii/makefile.mk Tue Feb 25 16:43:21 2003 +--- i18npool/source/localedata_ascii/makefile.mk.orig Sun Nov 17 23:27:32 2002 ++++ i18npool/source/localedata_ascii/makefile.mk Tue Feb 25 16:43:21 2003 @@ -138,6 +138,7 @@ $(MISC)$/localedata_pt_BR.cxx \ $(MISC)$/localedata_pt_PT.cxx \ diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml index 68325b32eff0..03b434315902 100644 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml +++ b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml @@ -1,5 +1,5 @@ ---- ../i18npool/source/localedata_ascii/uk_UA.xml.orig Thu Jan 1 00:00:00 1970 -+++ ../i18npool/source/localedata_ascii/uk_UA.xml Fri Feb 28 13:04:01 2003 +--- i18npool/source/localedata_ascii/uk_UA.xml.orig Thu Jan 1 00:00:00 1970 ++++ i18npool/source/localedata_ascii/uk_UA.xml Fri Feb 28 13:04:01 2003 @@ -0,0 +1,451 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE Locale SYSTEM 'locale.dtd'> diff --git a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy b/editors/openoffice-1.0/files/patch-idlc+source+parser.yy index 5ad06d2a4100..77b46c571f59 100644 --- a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy +++ b/editors/openoffice-1.0/files/patch-idlc+source+parser.yy @@ -1,5 +1,5 @@ ---- ../idlc/source/parser.yy.orig Wed Jul 10 11:43:18 2002 -+++ ../idlc/source/parser.yy Thu Oct 31 10:00:47 2002 +--- idlc/source/parser.yy.orig Wed Jul 10 11:43:18 2002 ++++ idlc/source/parser.yy Thu Oct 31 10:00:47 2002 @@ -995,7 +995,8 @@ { idlc()->setParseState(PS_ConstantDeclSeen); diff --git a/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk deleted file mode 100644 index 7f2cd2f1d220..000000000000 --- a/editors/openoffice-1.0/files/patch-javaunohelper+source+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002 -+++ ../javaunohelper/source/makefile.mk -@@ -110,9 +110,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-1.0/files/patch-moz+prj+d.lst b/editors/openoffice-1.0/files/patch-moz+prj+d.lst deleted file mode 100644 index d65f2df6cf3b..000000000000 --- a/editors/openoffice-1.0/files/patch-moz+prj+d.lst +++ /dev/null @@ -1,34 +0,0 @@ ---- ../moz/prj/d.lst Sat May 18 16:06:23 2002 -+++ ../moz/prj/d.lst Sat May 18 16:16:33 2002 -@@ -43,6 +43,7 @@ - mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul - mkdir: %_DEST%\inc%_EXT%\mozilla\ldap - mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap -+mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr - mkdir: %_DEST%\inc%_EXT%\mozilla\locale - mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk - mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews -@@ -71,6 +72,7 @@ - mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private - mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm - mkdir: %_DEST%\inc%_EXT%\mozilla\oji -+mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete - mkdir: %_DEST%\inc%_EXT%\mozilla\plugin - mkdir: %_DEST%\inc%_EXT%\mozilla\png - mkdir: %_DEST%\inc%_EXT%\mozilla\pref -@@ -158,6 +160,7 @@ - ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul - ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap - ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap -+..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr - ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale - ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk - ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews -@@ -186,6 +189,7 @@ - ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private - ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm - ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji -+..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete - ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin - ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png - ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref diff --git a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch index 5432812bb50c..2fb8d0cc15ff 100644 --- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch +++ b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch @@ -1,5 +1,5 @@ ---- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 -+++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 +--- nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 ++++ nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 @@ -1,5 +1,5 @@ -*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 ---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 diff --git a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl index 3fee562c6d38..f6bb7fbd9886 100644 --- a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl +++ b/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl @@ -1,5 +1,5 @@ ---- ../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 +--- 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, diff --git a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk index 5cdbb1b4aa4a..418bf7386412 100644 --- a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk +++ b/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk @@ -1,5 +1,5 @@ ---- ../offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002 -+++ ../offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx index 35052d291ef7..13b28b2a978f 100644 --- a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx +++ b/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx @@ -1,5 +1,5 @@ ---- ../package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 -+++ ../package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 +--- 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 @@ }; diff --git a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx index 014c61403380..a6b291661686 100644 --- a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx +++ b/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx @@ -1,5 +1,5 @@ ---- ../package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 -+++ ../package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 +--- 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 ) diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx index c4bf35e79f64..adf7578a5b96 100644 --- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx +++ b/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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> diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx index bb504c834eef..dc0f493f124d 100644 --- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx +++ b/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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; } diff --git a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp index 0f59b9ebee9b..1850fe136c9e 100644 --- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,10 +1,10 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 +--- product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 ++++ product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 @@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). -+#if ( defined ( LINUX )) ++#if ( !defined ( FREEBSD )) #if ( defined( _gcc3 ) && defined( C300 ) ) File gid_File_Lib_gcc diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk index 3dae50f091a3..fe1093e1e772 100644 --- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk +++ b/editors/openoffice-1.0/files/patch-product+settings+settings.mk @@ -1,14 +1,14 @@ ---- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 -+++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003 +--- product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 ++++ product/settings/settings.mk Sat Jan 18 18:37:12 2003 @@ -225,3 +226,72 @@ endif +ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for Linux using gcc compiler ++# Settings for FreeBSD using gcc compiler + -+OS=LINUX -+PLATFORM=linux ++OS=FREEBSD ++PLATFORM=freebsd +PS=/ +LINK=$(CC) +LIB=$(CC) @@ -19,7 +19,7 @@ +SHAREDLIB_EXT=so +SHAREDLIB_PRE=lib +SHAREDLIB_OUT=$(OUT_LIB) -+PACKAGE_LIB_DIR=linux_x86.plt ++PACKAGE_LIB_DIR=freebsd_x86.plt + +GCC_VERSION=$(shell $(CC) -dumpversion) + @@ -57,10 +57,10 @@ +else +CC_FLAGS=-c -O +endif -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux +CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include +STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport -+CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) ++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) + +# define for used compiler necessary for UNO +#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 @@ -70,6 +70,6 @@ + +LIBRARY_LINK_FLAGS=-shared +EXE_LINK_FLAGS=-Wl -export-dynamic -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) -pthread + +endif diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk index 6e72982a23bf..7b7e6d665ec7 100644 --- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk @@ -1,5 +1,5 @@ ---- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 -+++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003 +--- product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 ++++ product/util/makefile.mk Sat Jan 18 13:30:54 2003 @@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx index 4947227f8d52..fa1e6ccb68b2 100644 --- a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx +++ b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -1,5 +1,5 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +--- psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 @@ -883,7 +883,7 @@ static const struct SystemCommandParameters aParms[] = diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps index 2118d0fe6c93..f0b93e643758 100644 --- a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps +++ b/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps @@ -1,5 +1,5 @@ ---- ../psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 -+++ ../psprint/source/printergfx/psheader.ps +--- psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 ++++ psprint/source/printergfx/psheader.ps @@ -303,8 +303,8 @@ /h /i /j /k /l /m /n /o /p /q /r /s /t /u /v /w diff --git a/editors/openoffice-1.0/files/patch-registry+source+registry.cxx b/editors/openoffice-1.0/files/patch-registry+source+registry.cxx index 87c5cd17a614..afa16cc20a6d 100644 --- a/editors/openoffice-1.0/files/patch-registry+source+registry.cxx +++ b/editors/openoffice-1.0/files/patch-registry+source+registry.cxx @@ -1,5 +1,5 @@ ---- ../registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003 -+++ ../registry/source/registry.cxx Fri Apr 4 00:06:25 2003 +--- registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003 ++++ registry/source/registry.cxx Fri Apr 4 00:06:25 2003 @@ -134,11 +134,7 @@ #ifdef UNX diff --git a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx index fad069f83f14..a04188601413 100644 --- a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx +++ b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx @@ -1,5 +1,5 @@ ---- ../registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002 -+++ ../registry/source/regkey.cxx Mon Mar 11 01:28:51 2002 +--- 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; diff --git a/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk b/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk new file mode 100644 index 000000000000..488b4a2eed71 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk @@ -0,0 +1,39 @@ +Index: registry/tools/makefile.mk +=================================================================== +RCS file: /cvs/udk/registry/tools/makefile.mk,v +retrieving revision 1.4 +diff -u -r1.4 makefile.mk +--- registry/tools/makefile.mk 18 May 2001 15:20:12 -0000 1.4 ++++ registry/tools/makefile.mk 10 Jul 2005 05:16:53 -0000 +@@ -88,6 +88,7 @@ + APP1STDLIBS=\ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + .IF "$(GUI)"=="WNT" +@@ -102,6 +103,7 @@ + APP2STDLIBS=\ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + .IF "$(GUI)"=="WNT" +@@ -115,6 +117,7 @@ + APP3STDLIBS=\ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + .IF "$(GUI)"=="WNT" +@@ -128,6 +131,7 @@ + APP4STDLIBS=\ + $(SALLIB) \ + $(SALHELPERLIB) \ ++ $(STORELIB) \ + $(REGLIB) + + .IF "$(GUI)"=="WNT" diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h index 417ab33ba52f..c49c2533f367 100644 --- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h +++ b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h @@ -1,5 +1,5 @@ ---- ../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 +--- 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(); diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c index f74de7504d2e..3a4aa79dee18 100644 --- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c +++ b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c @@ -1,5 +1,5 @@ ---- ../rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 -+++ ../rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 +--- rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 ++++ rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 @@ -82,7 +82,9 @@ #ifdef IRIX extern void abort(void); diff --git a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch index c3a0ffc47e73..59837cad556c 100644 --- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch @@ -1,5 +1,5 @@ ---- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 -+++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 +--- sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 ++++ sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 @@ -3,7 +3,7 @@ *************** *** 1 **** diff --git a/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h b/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h index 95e5d1861a70..7f709a502e81 100644 --- a/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h +++ b/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h @@ -1,5 +1,5 @@ ---- ../sal/inc/osl/endian.h.orig Thu May 8 20:19:09 2003 -+++ ../sal/inc/osl/endian.h Thu May 8 20:29:00 2003 +--- sal/inc/osl/endian.h.orig Thu May 8 20:19:09 2003 ++++ sal/inc/osl/endian.h Thu May 8 20:29:00 2003 @@ -107,7 +107,9 @@ #endif diff --git a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h b/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h index 10731179cff5..b7869a30acfb 100644 --- a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h +++ b/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h @@ -1,5 +1,5 @@ ---- ../sal/inc/rtl/textenc.h.orig Mon Feb 24 17:46:26 2003 -+++ ../sal/inc/rtl/textenc.h Tue Feb 25 16:45:00 2003 +--- sal/inc/rtl/textenc.h.orig Mon Feb 24 17:46:26 2003 ++++ sal/inc/rtl/textenc.h Tue Feb 25 16:45:00 2003 @@ -173,8 +173,9 @@ #define RTL_TEXTENCODING_MS_1361 (RTL_TEXTENC_CAST( 84 )) #define RTL_TEXTENCODING_GB_18030 (RTL_TEXTENC_CAST( 85 )) diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c index 60ea1f414d1a..d7f43eaa741a 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 -+++ ../sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 +--- sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 ++++ sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 @@ -81,10 +81,10 @@ __asm__ __volatile__ ( "movl $1, %0\n\t" diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c index 2cca9a3b76f9..a21898194f4d 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 -+++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 +--- sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -9,16 +9,6 @@ #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,13 @@ return NULL; } diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c index 217bd0be4d58..acf47ad85552 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/pipe.c.orig Mon Feb 18 13:48:55 2002 -+++ ../sal/osl/unx/pipe.c Wed Apr 3 00:59:15 2002 +--- sal/osl/unx/pipe.c.orig Mon Feb 18 13:48:55 2002 ++++ sal/osl/unx/pipe.c Wed Apr 3 00:59:15 2002 @@ -264,7 +264,11 @@ addr.sun_family = AF_UNIX; diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c index 4c3fdcc8f0ad..9f94bc83493c 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c @@ -1,5 +1,5 @@ ---- ../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 +--- 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] */ diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..c10adeb079b3 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 +--- sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 ++++ sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 @@ -82,7 +82,7 @@ #undef HAVE_POLL_H #endif diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c index 0ccb35463636..a50abf9acbf9 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/system.c.orig Tue Aug 20 08:49:46 2002 -+++ ../sal/osl/unx/system.c Sat Apr 19 22:15:25 2003 +--- sal/osl/unx/system.c.orig Tue Aug 20 08:49:46 2002 ++++ sal/osl/unx/system.c Sat Apr 19 22:15:25 2003 @@ -74,7 +74,8 @@ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h index 642977f77a4d..a6ba577cda4b 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 -+++ ../sal/osl/unx/system.h Thu May 8 20:31:08 2003 +--- sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 ++++ sal/osl/unx/system.h Thu May 8 20:31:08 2003 @@ -203,12 +203,19 @@ # include <dlfcn.h> # include <sys/filio.h> diff --git a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c index 91a5289d6636..7630ff8cf8c1 100644 --- a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c +++ b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c @@ -1,5 +1,5 @@ ---- ../sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 -+++ ../sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 +--- sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 ++++ sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 @@ -1104,10 +1104,12 @@ } else if ( *pStr == '+' ) diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab b/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab index 3597a0587962..3fd7b4a43560 100644 --- a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab +++ b/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab @@ -1,5 +1,5 @@ ---- ../sal/textenc/tcvtest1.tab.orig Fri Oct 12 13:44:53 2001 -+++ ../sal/textenc/tcvtest1.tab Tue Feb 25 16:47:50 2003 +--- sal/textenc/tcvtest1.tab.orig Fri Oct 12 13:44:53 2001 ++++ sal/textenc/tcvtest1.tab Tue Feb 25 16:47:50 2003 @@ -4328,3 +4328,170 @@ "koi8-r", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c index 03825fb8b4a5..d91b0fecccc6 100644 --- a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c +++ b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c @@ -1,5 +1,5 @@ ---- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 -+++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 +--- sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 ++++ sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 @@ -532,6 +532,7 @@ static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = { diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c b/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c index 1e822ae076ce..47cfbbdca8bd 100644 --- a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c +++ b/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c @@ -1,5 +1,5 @@ ---- ../sal/textenc/textenc.c.orig Mon Feb 24 17:46:29 2003 -+++ ../sal/textenc/textenc.c Tue Feb 25 16:51:28 2003 +--- sal/textenc/textenc.c.orig Mon Feb 24 17:46:29 2003 ++++ sal/textenc/textenc.c Tue Feb 25 16:51:28 2003 @@ -254,7 +254,8 @@ &aImplJISX0212TextEncodingData, /* JIS_X_0212 */ &aImplMS1361TextEncodingData, /* MS_1361 */ diff --git a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk index 369935e31d66..103ddd1b4166 100644 --- a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk +++ b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk @@ -1,5 +1,5 @@ ---- ../sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001 -+++ ../sal/workben/makefile.mk Sun Mar 10 23:46:59 2002 +--- 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" diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map index 1ffacf889bc6..15efdfc2a5d1 100644 --- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map +++ b/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map @@ -1,5 +1,5 @@ --- /dev/null Thu Jun 6 20:06:24 2002 -+++ ../salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 ++++ salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 @@ -0,0 +1,28 @@ +SALHLP_1_0 { +global: diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map index 823cff316ec7..0b7d6c6ddf86 100644 --- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map +++ b/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map @@ -1,5 +1,5 @@ --- /dev/null Thu Jun 6 20:06:34 2002 -+++ ../salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 ++++ salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 @@ -0,0 +1,31 @@ +UDK_3_0_0 { + global: diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk index 3687664d8d16..aa0f41647531 100644 --- a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk +++ b/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk @@ -1,5 +1,5 @@ ---- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001 -+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002 +--- 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" diff --git a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk index 70f25048a24a..3abd9347b78e 100644 --- a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk +++ b/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk @@ -1,5 +1,5 @@ ---- ../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 +--- 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" diff --git a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx index 529f67a3e35f..15b6118abc52 100644 --- a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx +++ b/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp b/editors/openoffice-1.0/files/patch-scp+source+player+player.scp index 2f8daab35cdd..d1fbf56ad0d3 100644 --- a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp +++ b/editors/openoffice-1.0/files/patch-scp+source+player+player.scp @@ -1,5 +1,5 @@ ---- ../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 +--- 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 //////////////////////// diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache index d090f9911990..1a2067f1fa61 100644 --- a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache +++ b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache @@ -1,5 +1,5 @@ ---- ../scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003 -+++ ../scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003 +--- scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003 ++++ scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003 @@ -72,11 +72,11 @@ // types /////////////////////////////////////////////////////////////////////////////// @@ -14,8 +14,8 @@ }; DECLARE_LIST( IncludeList, Include* ) ---- ../scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003 -+++ ../scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003 +--- scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003 ++++ scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003 @@ -218,7 +218,7 @@ rPath += aDelim; } diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx index 83b84631542e..d15aba2f7b2e 100644 --- a/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx +++ b/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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" diff --git a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx index d56e12f2abf4..f2637f906727 100644 --- a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx +++ b/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx @@ -1,5 +1,5 @@ ---- ../setup2/inc/fields.hxx.orig Sun Jul 21 00:19:07 2002 -+++ ../setup2/inc/fields.hxx Sun Jul 21 00:19:12 2002 +--- 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[]; diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c index 396c586ee3a3..f15dd902f548 100644 --- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c +++ b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c @@ -1,5 +1,5 @@ ---- ../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 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk index 007c0f69b6f9..8c143732b985 100644 --- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk +++ b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk @@ -1,5 +1,5 @@ ---- ../setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 -+++ ../setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 +--- setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 ++++ setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 @@ -85,7 +85,7 @@ APP1NOSAL=TRUE APP1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk index 53846a8bdfc9..4614208daac9 100644 --- a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk +++ b/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk @@ -1,5 +1,5 @@ ---- ../setup2/patch/makefile.mk.orig Sun Jul 21 00:21:46 2002 -+++ ../setup2/patch/makefile.mk Sun Jul 21 00:21:52 2002 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-setup2+script+setupserver b/editors/openoffice-1.0/files/patch-setup2+script+setupserver index 7d3b13f659b9..d637810f69b7 100644 --- a/editors/openoffice-1.0/files/patch-setup2+script+setupserver +++ b/editors/openoffice-1.0/files/patch-setup2+script+setupserver @@ -1,5 +1,5 @@ ---- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 -+++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +--- setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ setup2/script/setupserver Wed May 1 22:30:13 2002 @@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in diff --git a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx index 98f6ad2f7567..0f828b694ac8 100644 --- a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx +++ b/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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 || @@ -8,8 +8,8 @@ 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 +--- 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"; diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx index ac0b39a6aa47..f8a044ad3b62 100644 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx +++ b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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) diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index 1919789038db..9caaf49ec0d2 100644 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,5 +1,5 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +--- setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 @@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; diff --git a/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx index 8e478e17971d..3a7d3d70c689 100644 --- a/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx +++ b/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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 ) diff --git a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx index a33491e0d8b2..e99ad46303a5 100644 --- a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx +++ b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx @@ -1,5 +1,5 @@ ---- ../sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 -+++ ../sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 +--- sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 ++++ sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 @@ -123,13 +123,13 @@ sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) { diff --git a/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx b/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx new file mode 100644 index 000000000000..ea41c8e28b7f --- /dev/null +++ b/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx @@ -0,0 +1,18 @@ +Index: shell/source/proxysettings/soprxsettings.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/proxysettings/Attic/soprxsettings.cxx,v +retrieving revision 1.4 +diff -u -r1.4 soprxsettings.cxx +--- shell/source/proxysettings/soprxsettings.cxx 15 Aug 2002 13:26:49 -0000 1.4 ++++ shell/source/proxysettings/soprxsettings.cxx 28 Jul 2005 22:03:30 -0000 +@@ -87,9 +87,7 @@ + #include <osl/thread.h> + #endif + +-#ifndef MACOSX +-#include <malloc.h> +-#endif ++#include <stdlib.h> + #include <map> + #include <utility> + diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk index d4b9daeb8a48..c8e3464a75b1 100644 --- a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk +++ b/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk @@ -1,5 +1,5 @@ ---- ../solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 -+++ ../solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 +--- solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 ++++ solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 @@ -62,6 +62,7 @@ BEGIN { global_found = "false" } /[ \t]*local:/ { global_found = "false" } diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl index 71ebdb934120..15514eaba176 100644 --- a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl +++ b/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl @@ -1,5 +1,5 @@ ---- ../solenv/bin/mapgen.pl.orig Sat Jul 20 22:30:21 2002 -+++ ../solenv/bin/mapgen.pl Sat Jul 20 22:31:31 2002 +--- 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') { diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk b/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk index 722ec086cc54..fec8ea1b4ab6 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk @@ -1,5 +1,5 @@ ---- ../solenv/inc/postset.mk.orig Tue Jan 7 17:22:04 2003 -+++ ../solenv/inc/postset.mk Tue Feb 25 16:52:34 2003 +--- solenv/inc/postset.mk.orig Tue Jan 7 17:22:04 2003 ++++ solenv/inc/postset.mk Tue Feb 25 16:52:34 2003 @@ -220,6 +220,19 @@ RCLANGFLAGS_07+= -d RUSS iso_07=ru diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk index 0c1b107de988..b624b834495c 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk @@ -1,5 +1,5 @@ --- /dev/null Mon Mar 11 14:55:01 2002 -+++ ../solenv/inc/startup/FREEBSD/macros.mk Mon Mar 11 14:54:59 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-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk index 701692c9425a..dd3cc059345a 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk @@ -1,5 +1,5 @@ ---- ../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 +--- 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" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk index 255a41f92281..f5d6a86d7346 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk @@ -1,5 +1,5 @@ ---- ../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 +--- 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 diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk index 2a9d4ba1b65c..d7657528eade 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk @@ -1,5 +1,5 @@ ---- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 -+++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 +--- solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 ++++ solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 @@ -319,7 +319,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk index 4c2fd26f5c2c..e2fe57952517 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -1,24 +1,90 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003 -+++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003 -@@ -1,84 +1,139 @@ -- - # mak file fuer unxfbsdi +Index: solenv/inc/unxfbsdi.mk +=================================================================== +RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v +retrieving revision 1.4.4.1 +diff -u -r1.4.4.1 unxfbsdi.mk +--- solenv/inc/unxfbsdi.mk 7 Jan 2003 15:22:18 -0000 1.4.4.1 ++++ solenv/inc/unxfbsdi.mk 18 Jul 2005 04:00:18 -0000 +@@ -1,49 +1,162 @@ ++#************************************************************************* ++# ++# $RCSfile:$ ++# ++# $Revision:$ ++# ++# last change: $Author:$ ++# ++# The Contents of this file are made available subject to the terms of ++# either of the following licenses ++# ++# - GNU Lesser General Public License Version 2.1 ++# - Sun Industry Standards Source License Version 1.1 ++# ++# Sun Microsystems Inc., October, 2000 ++# ++# GNU Lesser General Public License Version 2.1 ++# ============================================= ++# Copyright 2000 by Sun Microsystems, Inc. ++# 901 San Antonio Road, Palo Alto, CA 94303, USA ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License version 2.1, as published by the Free Software Foundation. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++# ++# Sun Industry Standards Source License Version 1.1 ++# ================================================= ++# The contents of this file are subject to the Sun Industry Standards ++# Source License Version 1.1 (the "License"); You may not use this file ++# except in compliance with the License. You may obtain a copy of the ++# License at http://www.openoffice.org/license.html. ++# ++# Software provided under this License is provided on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, ++# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, ++# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. ++# See the License for the specific provisions governing your rights and ++# obligations concerning the Software. ++# ++# The Initial Developer of the Original Code is: Sun Microsystems, Inc. ++# ++# Copyright: 2000 by Sun Microsystems, Inc. ++# ++# All Rights Reserved. ++# ++# Contributor(s): _______________________________________ ++# ++# ++# ++#************************************************************************* --ASM= --AFLAGS= -+ASM=$(CC) -+AFLAGS=-x assembler-with-cpp -c $(CDEFS) +-# mak file fuer unxfbsdi +- ++# mk file for unxfbsdi + ASM= + AFLAGS= SOLAR_JAVA=TRUE JAVAFLAGSDEBUG=-g +-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +- +# filter for supressing verbose messages from linker -+# not needed at the moment - LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - ++#not needed at the moment ++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" ++ +# options for C and C++ Compiler -+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) -+CDEFS+=$(PTHREAD_CFLAGS) ++CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) + +# this is a platform with JAVA support +.IF "$(SOLAR_JAVA)"!="" @@ -28,33 +94,7 @@ +.ELSE +JAVA_RUNTIME=-ljava_g +.ENDIF -+.ENDIF -+ -+# flags for C and C++ Compiler -+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include -+CFLAGS+=-I/usr/X11R6/include -+ -+# flags for the C++ Compiler -+CFLAGSCC=-pipe -+CFLAGSCXX=-pipe -fno-for-scope -fpermissive -+ -+# Flags for enabling exception handling -+CFLAGSEXCEPTIONS=-fexceptions -+ -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# Compiler flags for compiling static object in single threaded -+# environment with graphical user interface -+CFLAGSOBJGUIST=-fPIC -+ -+# Compiler flags for compiling static object in single threaded -+# environment with character user interface -+CFLAGSOBJCUIST=-fPIC -+ -+# Compiler flags for compiling static object in multi threaded -+# environment with graphical user interface -+CFLAGSOBJGUIMT=-fPIC ++.ENDIF -CC= gcc -CXX= g++ @@ -74,23 +114,48 @@ -CFLAGSSLOCUIMT= -fPIC -CFLAGSPROF= -pg -CFLAGSDEBUG= -g -+# Compiler flags for compiling static object in multi threaded -+# environment with character user interface -+CFLAGSOBJCUIMT=-fPIC ++# name of C++ Compiler ++CXX*=g++ ++# name of C Compiler ++CC*=gcc ++# flags for C and C++ Compiler ++# do not use standard header search paths ++# if installed elsewhere ++.IF "$(BUILD_SOSL)"!="" ++CFLAGS= ++.ENDIF ++CFLAGS+=-fmessage-length=0 -c $(INCLUDE) ++# flags for the C++ Compiler ++CFLAGSCC= -pipe -mcpu=pentiumpro ++# Flags for enabling exception handling ++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs ++# Flags for disabling exception handling ++CFLAGS_NO_EXCEPTIONS=-fno-exceptions + -+# Compiler flags for compiling shared object in multi threaded -+# environment with graphical user interface -+CFLAGSSLOGUIMT=-fPIC ++# -fpermissive should be removed as soon as possible ++CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive + -+# Compiler flags for compiling shared object in multi threaded -+# environment with character user interface -+CFLAGSSLOCUIMT=-fPIC ++# FIXME: This 'if' does not work due to a sequence error in files. ++#.IF "$(CCNUMVER)"<"000300020000" ++#CFLAGSCXX+=-fno-rtti ++#.ENDIF + ++# Compiler flags for compiling static object in single threaded environment with graphical user interface ++CFLAGSOBJGUIST= ++# Compiler flags for compiling static object in single threaded environment with character user interface ++CFLAGSOBJCUIST= ++# Compiler flags for compiling static object in multi threaded environment with graphical user interface ++CFLAGSOBJGUIMT= ++# Compiler flags for compiling static object in multi threaded environment with character user interface ++CFLAGSOBJCUIMT= ++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface ++CFLAGSSLOGUIMT=-fpic ++# Compiler flags for compiling shared object in multi threaded environment with character user interface ++CFLAGSSLOCUIMT=-fpic +# Compiler flags for profiling -+CFLAGSPROF=-pg -+ ++CFLAGSPROF= +# Compiler flags for debugging -+CFLAGSDEBUG=-g -ggdb ++CFLAGSDEBUG=-g CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O @@ -102,79 +167,76 @@ -#THREADLIB= -pthread -LINK= gcc -# -v -nostdlib -+ -+# Compiler flags to enable optimizations -+# -02 is broken for FreeBSD -+CFLAGSOPT=-O -+ -+# Compiler flags to disable optimizations -+# -0 is broken for STLport -+CFLAGSNOOPT=-O0 -+ -+# Compiler flags for the output path ++# Compiler flags for enabling optimazations ++# CFLAGSOPT=-O2 ++# reduce to -O1 to avoid optimisation problems ++CFLAGSOPT=-O1 ++# Compiler flags for disabling optimazations ++CFLAGSNOOPT=-O ++# Compiler flags for discibing 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 ++STATIC = -Wl,-Bstatic ++DYNAMIC = -Wl,-Bdynamic + -+LINK=$(CXX) ++# name of linker ++LINK*=$(CC) ++# default linker flags LINKFLAGS= -LINKFLAGSAPPGUI= -Wl,-export-dynamic -LINKFLAGSAPPCUI= -Wl,-export-dynamic + +# linker flags for linking applications -+LINKFLAGSAPPGUI= -+LINKFLAGSAPPCUI= ++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 --LINKFLAGSOPT= -+LINKFLAGSOPT=-O +@@ -51,35 +164,46 @@ .IF "$(NO_BSYMBOLIC)"=="" .IF "$(PRJNAME)" != "envtest" -LINKFLAGSSHLGUI+= -Wl,-Bsymbolic -LINKFLAGSSHLCUI+= -Wl,-Bsymbolic +-.ENDIF +LINKFLAGSSHLGUI+=-Wl,-Bsymbolic +LINKFLAGSSHLCUI+=-Wl,-Bsymbolic .ENDIF - .ENDIF ++.ENDIF # "$(NO_BSYMBOLIC)"=="" LINKVERSIONMAPFLAG=-Wl,--version-script -+# Sequence of libs does matter ! - STDLIBCPP=-lstdc++ +-STDLIBCPP=-lstdc++ ++SONAME_SWITCH=-Wl,-h -# _SYSLIBS= -L/usr/lib -lm -# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 -# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# libraries for linking applications -+STDLIBCUIST=-lm -+STDLIBGUIST=-lXaw -lXt -lX11 -lm -+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc -+STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc -+ -+# libraries for linking shared libraries -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc -+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc -+ -+# STLport always needs pthread. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) ++# Sequence of libs does matter ! -+# default objectfilenames to lin ++STDLIBCPP=-lstdc++ ++ ++# default objectfilenames to link STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= --STDLIBCUIST=-lm --STDLIBGUIST=-lX11 -lm ++# libraries for linking applications + STDLIBCUIST=-lm ++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm ++STDLIBCUIMT=$(PTHREAD_LIBS) -lm + STDLIBGUIST=-lX11 -lm -STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc -STDLIBCUIMT=-pthread -lm -lstlport_gcc -STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc @@ -183,13 +245,26 @@ -LIBMGR= ar -LIBFLAGS= -r -LIBEXT= .a ++# libraries for linking shared libraries ++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm ++STDSHLCUIMT=$(PTHREAD_LIBS) -lm ++STDSHLGUIST=-lX11 -lXext -lm ++STDSHLCUIST=-lm ++ ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) ++ ++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) ++ ++# name of library manager +LIBMGR=ar +LIBFLAGS=-r -+LIBEXT=.a ++# tool for generating import libraries IMPLIB= IMPLIBFLAGS= -@@ -87,12 +142,12 @@ + +@@ -87,12 +211,13 @@ MAPSYMFLAGS= RC=irc @@ -207,3 +282,4 @@ +DLLPOSTFIX=fi +DLLPRE=lib +DLLPOST=.so ++ diff --git a/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c index cffd5cbb1f43..aec4487ae529 100644 --- a/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c +++ b/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c @@ -1,5 +1,5 @@ ---- ../soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002 -+++ ../soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002 +--- 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 @@ */ diff --git a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch index 2a34de03f4b1..eb8ca5822940 100644 --- a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch +++ b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch @@ -1,5 +1,5 @@ ---- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 -+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 +--- stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 ++++ stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 @@ -174,3 +174,110 @@ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { public: diff --git a/editors/openoffice-1.0/files/patch-stlport+makefile.mk b/editors/openoffice-1.0/files/patch-stlport+makefile.mk index 70ec58c3428e..2341f7225a25 100644 --- a/editors/openoffice-1.0/files/patch-stlport+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stlport+makefile.mk @@ -1,5 +1,5 @@ ---- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 -+++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003 +--- stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 ++++ stlport/makefile.mk Sat Jan 18 13:01:53 2003 @@ -98,16 +98,28 @@ .IF "$(COM)"=="GCC" diff --git a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx new file mode 100644 index 000000000000..6016d8eade94 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx @@ -0,0 +1,23 @@ +Index: stoc/source/corereflection/criface.cxx +=================================================================== +RCS file: /cvs/udk/stoc/source/corereflection/criface.cxx,v +retrieving revision 1.6 +diff -u -r1.6 criface.cxx +--- stoc/source/corereflection/criface.cxx 3 May 2001 13:56:57 -0000 1.6 ++++ stoc/source/corereflection/criface.cxx 28 Jul 2005 12:24:08 -0000 +@@ -60,14 +60,7 @@ + ************************************************************************/ + + #include <sal/config.h> +-#ifdef SAL_UNX +-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) +-#include <alloca.h> +-#endif +-#endif +-#ifndef MACOSX +-#include <malloc.h> +-#endif ++#include <stdlib.h> + #ifndef _RTL_ALLOC_H_ + #include <rtl/alloc.h> + #endif diff --git a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk index 4b319b08d401..5db200c7c628 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/corereflection/makefile.mk +--- 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 diff --git a/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk index 4cae0476415a..dcc517a980f3 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+defaultregistry+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/defaultregistry/makefile.mk +--- stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/defaultregistry/makefile.mk @@ -84,9 +84,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx index 341d621d872c..f82860ca0c4b 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx +++ b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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> diff --git a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk index 0051043b7ecb..c58e6bc7ede8 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/implementationregistration/makefile.mk +--- 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 diff --git a/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk index c7cd85253c11..53b884ad762b 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+inspect+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/inspect/makefile.mk +--- stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/inspect/makefile.mk @@ -82,9 +82,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk index 9ac2072a5612..458bbbc0e7c2 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+invocation+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation/makefile.mk +--- stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/invocation/makefile.mk @@ -82,9 +82,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk index 8853ad39a90e..6516bfb298ab 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+invocation_adapterfactory+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation_adapterfactory/makefile.mk +--- 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) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk index af0fb9af619c..afbd28b01716 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+javaloader+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javaloader/makefile.mk +--- stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/javaloader/makefile.mk @@ -83,9 +83,10 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk index f97af0ea270d..f1cbf39cb508 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+javavm+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javavm/makefile.mk +--- stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/javavm/makefile.mk @@ -91,10 +91,10 @@ SHL1TARGET= $(TARGET) SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk index 5a08ee5937b6..668292c2a554 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+loader+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/loader/makefile.mk +--- stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/loader/makefile.mk @@ -83,9 +83,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk index e573081bc21d..1778afe80e6f 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+namingservice+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/namingservice/makefile.mk +--- stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002 ++++ stoc/source/namingservice/makefile.mk @@ -82,9 +82,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk index 9110b2f50cd1..aaff11dd441a 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+proxy_factory+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/proxy_factory/makefile.mk +--- 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 diff --git a/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk index 9d974d1c0d10..c1d3494013b5 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+registry_tdprovider+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/registry_tdprovider/makefile.mk +--- 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) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk index 746776d54759..eeb45f459ec1 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+servicemanager+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/servicemanager/makefile.mk +--- 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 diff --git a/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk index 76403fdde841..e8a6612852a8 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+tdmanager+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/tdmanager/makefile.mk +--- stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 ++++ stoc/source/tdmanager/makefile.mk @@ -83,9 +83,10 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk index dc647f89a166..38a27a4fbc4e 100644 --- a/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stoc+source+typeconv+makefile.mk @@ -1,5 +1,5 @@ ---- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/typeconv/makefile.mk +--- stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002 ++++ stoc/source/typeconv/makefile.mk @@ -82,9 +82,9 @@ SHL1TARGET= $(TARGET) diff --git a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src b/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src index 05258a0a70e4..c48a6f485bdd 100644 --- a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src +++ b/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src @@ -1,5 +1,5 @@ ---- ../svx/source/dialog/txenctab.src.orig Thu Oct 31 23:18:23 2002 -+++ ../svx/source/dialog/txenctab.src Tue Feb 25 16:57:06 2003 +--- svx/source/dialog/txenctab.src.orig Thu Oct 31 23:18:23 2002 ++++ svx/source/dialog/txenctab.src Tue Feb 25 16:57:06 2003 @@ -147,6 +147,7 @@ < "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; < "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; diff --git a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx b/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx index 4029175a3236..c3ed62994322 100644 --- a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx +++ b/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx @@ -1,5 +1,5 @@ ---- ../sw/source/filter/basflt/fltini.cxx.orig Mon Feb 24 17:46:43 2003 -+++ ../sw/source/filter/basflt/fltini.cxx Tue Feb 25 16:59:03 2003 +--- sw/source/filter/basflt/fltini.cxx.orig Mon Feb 24 17:46:43 2003 ++++ sw/source/filter/basflt/fltini.cxx Tue Feb 25 16:59:03 2003 @@ -1007,7 +1007,8 @@ sToken081[] = "JIS_X_212", sToken082[] = "MS_1361", diff --git a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx index ec91def86fe6..d194744fd4e1 100644 --- a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx @@ -1,5 +1,5 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 +--- sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 ++++ sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 @@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> diff --git a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx index a62a9c84a935..106f6d3ed063 100644 --- a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx +++ b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx @@ -1,5 +1,5 @@ ---- ../sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 -+++ ../sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 +--- sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 ++++ sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 @@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> diff --git a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab b/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab index 0c91acc455d1..51149a8e797c 100644 --- a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab +++ b/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab @@ -1,5 +1,5 @@ ---- ../sysui/unix/office/cde/locales.tab.orig Tue Nov 20 19:26:28 2001 -+++ ../sysui/unix/office/cde/locales.tab Tue Feb 25 17:04:36 2003 +--- sysui/unix/office/cde/locales.tab.orig Tue Nov 20 19:26:28 2001 ++++ sysui/unix/office/cde/locales.tab Tue Feb 25 17:04:36 2003 @@ -7,6 +7,7 @@ locales+=$(assign locale_34 = es es.UTF-8) locales+=$(assign locale_35 = fi fi.UTF-8) diff --git a/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk b/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk new file mode 100644 index 000000000000..edc1e226b8a3 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk @@ -0,0 +1,20 @@ +Index: tools/bootstrp/static.mk +=================================================================== +RCS file: /cvs/util/tools/bootstrp/Attic/static.mk,v +retrieving revision 1.14.6.1 +diff -u -r1.14.6.1 static.mk +--- tools/bootstrp/static.mk 17 Dec 2002 15:10:48 -0000 1.14.6.1 ++++ tools/bootstrp/static.mk 28 Jul 2005 11:29:46 -0000 +@@ -154,10 +154,11 @@ + .IF "$(OS)"=="SOLARIS" + STATIC_LIBS += -lnsl -lsocket -lposix4 -lc + .ENDIF +-.IF "$(OS)"=="LINUX" ++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" + STATIC_LIBS += -lsupc++ -lX11 -lXext + .ENDIF + ++ + # ----------------------------------------------------------- + + .ELSE diff --git a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx b/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx index a9e02c684019..3344734ef143 100644 --- a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx +++ b/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx @@ -1,5 +1,5 @@ ---- ../tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 -+++ ../tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 +--- tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 ++++ tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 @@ -90,6 +90,8 @@ #define TOOLS_INETDEF_OS "NETBSD Sparc" #elif defined LINUX && defined X86 diff --git a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx b/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx index 58fc8db2a85b..77201507ac1d 100644 --- a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx +++ b/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx @@ -1,5 +1,5 @@ ---- ../tools/source/inet/inetmime.cxx.orig Mon Feb 24 17:46:55 2003 -+++ ../tools/source/inet/inetmime.cxx Tue Feb 25 17:08:22 2003 +--- tools/source/inet/inetmime.cxx.orig Mon Feb 24 17:46:55 2003 ++++ tools/source/inet/inetmime.cxx Tue Feb 25 17:08:22 2003 @@ -1633,7 +1633,8 @@ "ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047 "ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047 diff --git a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx b/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx index 7e6174dd56fe..c00b4f3d4a9f 100644 --- a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx +++ b/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx @@ -1,5 +1,5 @@ ---- ../tools/source/rc/resmgr.cxx.orig Mon Feb 24 17:46:55 2003 -+++ ../tools/source/rc/resmgr.cxx Tue Feb 25 17:09:39 2003 +--- tools/source/rc/resmgr.cxx.orig Mon Feb 24 17:46:55 2003 ++++ tools/source/rc/resmgr.cxx Tue Feb 25 17:09:39 2003 @@ -1189,6 +1189,8 @@ return "36"; case LANGUAGE_RUSSIAN: diff --git a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx b/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx index 1263573285d3..0a4d4b9977c2 100644 --- a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx +++ b/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx @@ -1,5 +1,7 @@ ---- ../transex3/inc/export.hxx.orig Fri May 24 15:26:18 2002 -+++ ../transex3/inc/export.hxx Tue Feb 25 17:13:09 2003 +Adding ukrainian language + +--- transex3/inc/export.hxx.orig Fri May 24 15:26:18 2002 ++++ transex3/inc/export.hxx Tue Feb 25 17:13:09 2003 @@ -187,18 +187,22 @@ #define CATALAN_ISO "ca" #define CATALAN_INDEX 28 diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export.cxx index b5ee0d1b294e..fc2d31d92048 100644 --- a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx +++ b/editors/openoffice-1.0/files/patch-transex3+source+export.cxx @@ -1,5 +1,7 @@ ---- ../transex3/source/export.cxx.orig Mon Feb 24 17:45:55 2003 -+++ ../transex3/source/export.cxx Tue Feb 25 17:14:06 2003 +Adding UKRAINIAN language + +--- transex3/source/export.cxx.orig Mon Feb 24 17:45:55 2003 ++++ transex3/source/export.cxx Tue Feb 25 17:14:06 2003 @@ -1205,6 +1205,8 @@ return PORTUGUESE_INDEX; else if ( sLang == "RUSSIAN" ) diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx index 031b9bdf4b8f..bf9f89ae2688 100644 --- a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx +++ b/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx @@ -1,5 +1,6 @@ ---- ../transex3/source/export2.cxx.orig Mon Feb 24 17:45:55 2003 -+++ ../transex3/source/export2.cxx Tue Feb 25 17:19:19 2003 +adding ukrainian language +--- transex3/source/export2.cxx.orig Mon Feb 24 17:45:55 2003 ++++ transex3/source/export2.cxx Tue Feb 25 17:19:19 2003 @@ -144,6 +144,7 @@ ARABIC, HEBREW, diff --git a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx b/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx index 4bad0a9b6b2b..e712f262edc7 100644 --- a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx +++ b/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx @@ -1,5 +1,7 @@ ---- ../transex3/source/gsiconv.cxx.orig Mon Feb 24 17:45:55 2003 -+++ ../transex3/source/gsiconv.cxx Tue Feb 25 17:20:08 2003 +adding ukrainian language + +--- transex3/source/gsiconv.cxx.orig Mon Feb 24 17:45:55 2003 ++++ transex3/source/gsiconv.cxx Tue Feb 25 17:20:08 2003 @@ -210,6 +210,7 @@ fprintf( stdout, " 34 => SPANISH\n" ); fprintf( stdout, " 35 => FINNISH\n" ); diff --git a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx b/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx index 6137c2a2408d..bfc0c3ef5d10 100644 --- a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx +++ b/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx @@ -1,5 +1,7 @@ ---- ../transex3/source/merge.cxx.orig Mon Feb 24 17:45:55 2003 -+++ ../transex3/source/merge.cxx Tue Feb 25 17:20:43 2003 +adding ukrainian language + +--- transex3/source/merge.cxx.orig Mon Feb 24 17:45:55 2003 ++++ transex3/source/merge.cxx Tue Feb 25 17:20:43 2003 @@ -388,6 +388,7 @@ case ENGLISH_US: return ENGLISH_US_INDEX; case PORTUGUESE: return PORTUGUESE_INDEX; diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk index 18e68e89120b..8ab5b3ec9f19 100644 --- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk +++ b/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk @@ -1,5 +1,5 @@ ---- ../ucb/source/ucp/hierarchy/makefile.mk.orig Wed Jun 12 01:34:50 2002 -+++ ../ucb/source/ucp/hierarchy/makefile.mk Wed Jun 12 01:34:52 2002 +--- ucb/source/ucp/hierarchy/makefile.mk.orig Wed Jun 12 01:34:50 2002 ++++ ucb/source/ucp/hierarchy/makefile.mk Wed Jun 12 01:34:52 2002 @@ -96,7 +96,7 @@ SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR) diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk index 4b505c6571d8..7f344e226745 100644 --- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk +++ b/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk @@ -1,5 +1,5 @@ ---- ../ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 -+++ ../ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 +--- ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 ++++ ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 @@ -120,7 +120,7 @@ SHL1TARGET=$(TARGET)$(UCP_VERSION) diff --git a/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk b/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk deleted file mode 100644 index 63b73d0e107c..000000000000 --- a/editors/openoffice-1.0/files/patch-unoil+com+sun+star+document+makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../unoil/com/sun/star/document/makefile.mk.orig Wed Sep 11 11:51:49 2002 -+++ ../unoil/com/sun/star/document/makefile.mk Wed Sep 11 11:52:08 2002 -@@ -64,6 +64,7 @@ - PRJ = ..$/..$/..$/.. - TARGET = unoil_document - PACKAGE = com$/sun$/star$/document -+GENJAVAFILES = $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java - - # --- Settings ----------------------------------------------------- - diff --git a/editors/openoffice-1.0/files/patch-unoil+makefile.pmk b/editors/openoffice-1.0/files/patch-unoil+makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice-1.0/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-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c index 2a838fe377b1..44061a540707 100644 --- a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c @@ -1,5 +1,7 @@ ---- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +FreeBSD support + +--- unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ unzip/source/file_io.c Wed May 1 22:34:51 2002 @@ -864,7 +864,7 @@ #ifndef __386BSD__ static struct timeb tbp; diff --git a/editors/openoffice-1.0/files/patch-unzip+source+misc.c b/editors/openoffice-1.0/files/patch-unzip+source+misc.c index 649a976f4c4d..32db9ec72246 100644 --- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.0/files/patch-unzip+source+misc.c @@ -1,5 +1,6 @@ ---- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 -+++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +FreeBSD support +--- unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ unzip/source/misc.c Mon Jul 15 14:27:15 2002 @@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; diff --git a/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx b/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx index 4ca91d11399d..05f264c7316b 100644 --- a/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx @@ -1,5 +1,5 @@ ---- ../vcl/source/gdi/print.cxx.orig Thu Apr 17 18:58:42 2003 -+++ ../vcl/source/gdi/print.cxx Thu Apr 17 18:59:10 2003 +--- vcl/source/gdi/print.cxx.orig Thu Apr 17 18:58:42 2003 ++++ vcl/source/gdi/print.cxx Thu Apr 17 18:59:10 2003 @@ -532,7 +532,7 @@ if ( (pJobSetup->maPrinterName != pInfo->maPrinterName) || (pJobSetup->maDriver != pInfo->maDriver) ) diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx index af681e020472..56c5645f9126 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 -+++ ../vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 +--- vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 ++++ vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 @@ -72,7 +72,11 @@ #include <unistd.h> #include <string.h> diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx index fca5510022f9..92b3c2e99673 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 -+++ ../vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 +--- vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 ++++ vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 @@ -78,6 +78,10 @@ extern "C" int usleep(unsigned int); #endif diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx index c292a93a8313..482d8b351787 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 -+++ ../vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 +--- vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 ++++ vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 @@ -78,6 +78,11 @@ #ifdef AIX #include <strings.h> diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx index 028e7c9d64c1..4f3246b24589 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 -+++ ../vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 +--- vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 ++++ vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 @@ -61,7 +61,7 @@ #ifndef _VCL_VSOUND_HXX #define _VCL_VSOUND_HXX diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx index 8b588120c718..81bdd1fa836d 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/gdi/salcvt.cxx.orig Mon Feb 24 17:46:21 2003 -+++ ../vcl/unx/source/gdi/salcvt.cxx Tue Feb 25 17:21:50 2003 +--- vcl/unx/source/gdi/salcvt.cxx.orig Mon Feb 24 17:46:21 2003 ++++ vcl/unx/source/gdi/salcvt.cxx Tue Feb 25 17:21:50 2003 @@ -261,6 +261,17 @@ || ( nChar >= 0x2500 && nChar <= 0x25a0 ); break; diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx index 15142495e078..9f86be8199c5 100644 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx +++ b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx @@ -1,5 +1,5 @@ ---- ../vcl/unx/source/gdi/xlfd_extd.cxx.orig Mon Feb 24 17:46:21 2003 -+++ ../vcl/unx/source/gdi/xlfd_extd.cxx Tue Feb 25 17:22:26 2003 +--- vcl/unx/source/gdi/xlfd_extd.cxx.orig Mon Feb 24 17:46:21 2003 ++++ vcl/unx/source/gdi/xlfd_extd.cxx Tue Feb 25 17:22:26 2003 @@ -205,6 +205,7 @@ case RTL_TEXTENCODING_ISO_8859_15: case RTL_TEXTENCODING_MS_1251: diff --git a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk b/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk index 1ea13157ce57..907a9d874f0e 100644 --- a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk @@ -1,5 +1,5 @@ ---- ../vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 -+++ ../vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 +--- vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 ++++ vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 @@ -293,9 +293,9 @@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(OS)"=="SOLARIS" diff --git a/editors/openoffice-1.0/pkg-message b/editors/openoffice-1.0/files/pkg-message.in index 7e350cc28402..5cdb0eeb5156 100644 --- a/editors/openoffice-1.0/pkg-message +++ b/editors/openoffice-1.0/files/pkg-message.in @@ -8,7 +8,7 @@ ${PREFIX}/OpenOffice.org1.0/ 1 User installation ------------------- -Just type "openoffice" after you have successfully +Just type "openoffice.org" after you have successfully installed the package. If there is no installed OO.org dir in your homedir, you'll be prompted to install some files and choose a installed JDK. @@ -29,16 +29,16 @@ 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 +${PREFIX}/bin/openoffice.org-1.0 +${PREFIX}/bin/openoffice.org-1.0-sagenda +${PREFIX}/bin/openoffice.org-1.0-scalc +${PREFIX}/bin/openoffice.org-1.0-sdraw +${PREFIX}/bin/openoffice.org-1.0-setup +${PREFIX}/bin/openoffice.org-1.0-sfax +${PREFIX}/bin/openoffice.org-1.0-simpress +${PREFIX}/bin/openoffice.org-1.0-spadmin +${PREFIX}/bin/openoffice.org-1.0-sweb +${PREFIX}/bin/openoffice.org-1.0-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. @@ -51,25 +51,7 @@ If you have chosen US-ASCII as locale, you cannot load and save documents with special characters and these characters are also not available in swriter and scalc. -3 Setup problems (FreeBSD < 4.7-RELEASE only) ---------------------------------------------- - -If the setup complains about a missing file "setup.ins", -it's time to upgrade your FreeBSD system to the latest -version. You will encounter this bug only if your OS is -older than FreeBSD 4.7-RELEASE. - -4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only) ----------------------------------------------------------- - -OO.org can crash if you enter a non existing path -or URL in the location bar. To fix these crashes -you need the following patch. You will see this -bug only if your OS is older than FreeBSD 4.7-RELEASE. - -http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff - -5 Crash at startup after using a localized version +3 Crash at startup after using a localized version -------------------------------------------------- If you had installed the english version, and then have @@ -80,3 +62,4 @@ OpenOffice.org1.0.3 dir in your homedir and remove the appropriate entry from ".sversionrc". After you have done this, redo the user installation and the problem will go away. + diff --git a/editors/openoffice-1.0/files/zipmoz.sh b/editors/openoffice-1.0/files/zipmoz.sh deleted file mode 100644 index 43a4591f3430..000000000000 --- a/editors/openoffice-1.0/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 - |