diff options
| author | mbr <mbr@FreeBSD.org> | 2003-03-06 07:24:06 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-03-06 07:24:06 +0800 |
| commit | d5ab42227f122f3e7db3288b80488e1fa4bbefb3 (patch) | |
| tree | 3f22f100bd53873997a4ac8e1360bc764a03ae89 /editors/openoffice.org-3-RC | |
| parent | 873fd3950b190a533cf2b238338998dc6ba4bb6b (diff) | |
| download | freebsd-ports-graphics-d5ab42227f122f3e7db3288b80488e1fa4bbefb3.tar.gz freebsd-ports-graphics-d5ab42227f122f3e7db3288b80488e1fa4bbefb3.tar.zst freebsd-ports-graphics-d5ab42227f122f3e7db3288b80488e1fa4bbefb3.zip | |
Update to 1.1 beta. Work in progress.
de-pkg-comment
Diffstat (limited to 'editors/openoffice.org-3-RC')
72 files changed, 516 insertions, 2308 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 24a20e6a5bc..77b1ea66db5 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 643 +PORTVERSION= 644 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/developer/%SUBDIR%/ \ @@ -15,29 +15,29 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \ http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src.tar.bz2 neon.tgz:moz \ +DISTFILES+= oo_${PORTVERSION}_src.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif -BROKEN= "Does not work anymore. soffice.bin segfaults" +BROKEN= "Does not build" SORT?= /usr/bin/sort FIND?= /usr/bin/find CUT?= /usr/bin/cut AWK?= /usr/bin/awk GREP?= /usr/bin/grep -MOUNT?= /sbin/mount +ZIP?= ${PREFIX}/bin/zip +UNZIP?= ${PREFIX}/bin/unzip +ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh -ZIP?= ${LOCALBASE}/bin/zip -UNZIP?= ${LOCALBASE}/bin/unzip -ANT?= ${LOCALBASE}/bin/ant +PASTE?= /usr/bin/paste .include <bsd.port.pre.mk> -PROCFS!= ${MOUNT} | ${GREP} ^procfs | ${AWK} '{print $1}' INSTALLATION_BASEDIR= OpenOffice.org-${PORTVERSION} +BUILD_NR= 644 DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -48,14 +48,14 @@ DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ LANG_EXT=01 .else # -# Add pkg-comment and pkg-descr if available +# Add pkg-descr and pkg-message if available # -.if exists(${.CURDIR}/pkg-comment) -COMMENTFILE= ${.CURDIR}/pkg-comment -.endif .if exists(${.CURDIR}/pkg-descr) DESCR= ${.CURDIR}/pkg-descr .endif +.if exists(${.CURDIR}/pkg-message) +PKGMESSAGE= ${.CURDIR}/pkg-message +.endif # # Set prefix and suffix # @@ -68,17 +68,30 @@ PKGNAMESUFFIX= -${LANG_SUFFIX} # # LANG_CONFIGURE_ARG is missing for the german port # -.if defined(LANG_EXT) && ${LANG_EXT}!=49 +.if defined(LANG_EXT) CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS .endif .endif +.if !defined (LANG) && !defined(USE_LANG) +USE_LANG= en_US.ISO8859-15 +LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII +.else +.if !defined(USE_LANG) +USE_LANG= ${LANG} +.endif +.endif + +LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -` + .if ${OSVERSION} < 500000 # # OO build is broken with the system gcc on STABLE. # -USE_GCC=3.1 -.else +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +CC= gcc32 +CXX= g++32 +USE_GCC=3.2 .endif .if ${OSVERSION} > 500000 @@ -95,17 +108,24 @@ CXX= g++32 EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -.if !defined(USE_GCC) -BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +.if !defined(COMMENT) +COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif +#.if !defined(USE_GCC) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +#.endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif +.if !defined(WITH_BSD_JDK) +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk14 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 +.endif USE_PERL5= yes USE_BZIP2= yes @@ -115,17 +135,21 @@ USE_GMAKE= yes EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} -EXTRACT_REST= gpc231.tar.Z neon.tgz +EXTRACT_REST= gpc231.tar.Z -JDK13DIR?= ${LOCALBASE}/jdk1.3.1 -JAVAVM= ${JDK13DIR}/bin/java +.if !defined(WITH_BSD_JDK) +JDKDIR?= ${LOCALBASE}/linux-sun-jdk1.4.1 +.else +JDKDIR?= ${LOCALBASE}/jdk1.4.1 +.endif +JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -144,12 +168,16 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} -CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} \ --with-os-version=${OSVERSION} \ - --with-ant-home=${LOCALBASE}/jakarta-ant-1.5.1 + --with-ant-home=${LOCALBASE} -.if !defined(USE_GCC) -CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} +#.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) @@ -168,41 +196,53 @@ CONFIGURE_ARGS+= --enable-gcc3 pre-fetch: @${ECHO} +.if !defined(LANG) @${ECHO} "REQUIREMENTS:" -.if ${PROCFS} @${ECHO} - @${ECHO} Check if procfs is running: YES -.else - @${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} OpenOffice setup still needs a running procfs, which may - @${ECHO} not be activated. Please read the procfs\(5\) manpage and - @${ECHO} ensure the the following line is in /etc/fstab: + @${ECHO} "USE_LANG=\"prefered language\"" @${ECHO} - @${ECHO} proc /proc procfs rw 0 0 + @${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 -.if !defined(USE_GCC) || !defined(WITH_DEBUG) @${ECHO} - @${ECHO} "OPTIONS:" .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} "Add USE_GCC=2.95 or USE_GCC=3.2" @${ECHO} "to compile openoffice with your" @${ECHO} "prefered compiler." .endif +.if !defined(WITH_BSD_JDK) + @${ECHO} + @${ECHO} "If you like to use the native BSD" + @${ECHO} "JDK for the build system, you can use" + @${ECHO} "WITH_BSD_JDK=TRUE to disable the" + @${ECHO} "usage of the linux-JDK and linux dependency." + @${ECHO} +.endif .if !defined(WITH_DEBUG) @${ECHO} @${ECHO} "You can compile OO with debug symbols" @${ECHO} "if you call make with WITH_DEBUG=1" @${ECHO} @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OO.org debug support. + @${ECHO} "OO.org debug support." @${ECHO} .endif .if !defined(WITH_TTF_BYTECODE_ENABLED) @@ -250,14 +290,18 @@ pre-fetch: @${ECHO} "kern.maxssiz=\"268435456\"" .endif @${ECHO} +.if ${OSVERSION} < 460002 @${ECHO} "REQUIRED SYSTEM PATCHES:" @${ECHO} +.endif +.if ${OSVERSION} < 500000 @${ECHO} "OO.org can crash if you enter a non existing path" @${ECHO} "or URL in the location bar. To fix these crashes" @${ECHO} "you need a uncommitted system patch for rtld:" @${ECHO} @${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff" @${ECHO} +.endif .if ${OSVERSION} < 460001 @${ECHO} @${ECHO} "OO setup is broken on STABLE < 4.6" @@ -305,9 +349,8 @@ post-extract: done @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - @${CP} -r ${WRKDIR}/neon ${WRKSRC}/../ @${MAKE} extract-mozilla - @-${RM} ${WRKSRC}/../moz/zipped/*.zip + @-${RM} -f ${WRKSRC}/../moz/zipped/*.zip @${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @@ -365,9 +408,11 @@ extract-mozilla: @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla +if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla +.endif @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla + @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" @@ -387,12 +432,8 @@ build-mozilla: < ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile .endif .if defined(USE_GCC) -.if ${USE_GCC} == 3.1 @cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX="" .else - @cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX="" -.endif -.else @cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX="" .endif @${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR} @@ -450,8 +491,8 @@ do-build: .endif @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) - @${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck + @${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" && \ @@ -464,7 +505,7 @@ do-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=${LANGEXT}' + ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}' .endif pre-install: @@ -495,18 +536,20 @@ install-user: post-install: @${ECHO_MSG} "===> Add wrapper scripts"; - @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/openoffice-wrapper \ - > ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${PORTVERSION} - @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${PORTVERSION} + @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb-${BUILD_NR} + @${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter-${BUILD_NR} @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index e696c568107..14a5e5537a4 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/oo_643_src.tar.bz2) = 53c3a72acab3af71fae8c169d5224c21 +MD5 (openoffice/oo_644_src.tar.bz2) = 1fd929f35efa897a4259180901a5b3f9 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1 diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper index fe3fbae3130..b3b6a4ba2df 100644 --- a/editors/openoffice.org-3-RC/files/openoffice-wrapper +++ b/editors/openoffice.org-3-RC/files/openoffice-wrapper @@ -1,10 +1,14 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.2 2002-10-21 16:46:37 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.3 2003-03-05 23:24:05 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-643/program/ +oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ program=`echo $0 | sed -e 's|.*-||'` +if [ ! $LANG ]; then + export LANG=%%LANG%% +fi + case $program in $0) exec $oopath/soffice "$@" diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+prot_uno+makefile.mk b/editors/openoffice.org-3-RC/files/patch-bridges+source+prot_uno+makefile.mk deleted file mode 100644 index 595ea6cb5ac..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+source+prot_uno+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001 -+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002 -@@ -88,8 +88,8 @@ - SHL1VERSIONMAP=..$/bridge_exports.map - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - DEF1NAME=$(SHL1TARGET) - diff --git a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk index 997719c43dd..f2d3092c2dd 100644 --- a/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-comphelper+util+makefile.mk @@ -1,15 +1,15 @@ ---- ../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 @@ +--- ../comphelper/util/makefile.mk.orig Fri Feb 14 15:40:49 2003 ++++ ../comphelper/util/makefile.mk Wed Mar 5 20:43:02 2003 +@@ -86,10 +86,10 @@ - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR) - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ - $(OSLLIB) \ -- $(SALLIB) \ - $(CPPRTLLIB) + SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)$(COMID) + SHL1STDLIBS= \ ++ $(SALLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ +- $(VOSLIB) \ +- $(SALLIB) ++ $(VOSLIB) - .IF "$(OS)$(CPU)"=="SOLARISS" + SHL1DEPN= + SHL1IMPLIB= i$(COMPHLP_TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in index b10dca2be51..a45332fcbec 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in @@ -1,48 +1,66 @@ ---- configure.in.orig Wed Oct 2 21:22:53 2002 -+++ configure.in Sat Oct 19 00:09:27 2002 -@@ -356,6 +356,9 @@ +--- configure.in.orig Thu Feb 20 15:49:32 2003 ++++ configure.in Wed Mar 5 21:22:34 2003 +@@ -95,6 +95,12 @@ + + Usage: --enable-macos9 + ],,) ++AC_ARG_ENABLE(linuxjdk, ++[ --enable-linuxjdk Use this option option if you like to use ++ the linux-jdk instead of the native jdk. ++ ++ Usage: --enable-linuxjdk ++],,) + AC_ARG_WITH(lang, + [ --with-lang Use this option to build OpenOffice.org with + additional language support. US English is always +@@ -556,8 +562,19 @@ + fi - dnl Set the include paths - _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then -+ _gcc_include_path="/usr/include" + dnl =================================================================== +-dnl Set the gxx include directories ++dnl Set the gcc/gxx include directories + dnl =================================================================== ++if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then ++if test "$GXX" = "yes"; then ++ if test -n "$enable_gcc3"; then ++ _gccincname1="g++-v3" ++ else ++ _gccincname1="g++-3" + fi - fi ++ _gcc_include_path=".." ++ _gxx_include_path="$_gcc_include_path/$_gccincname1" ++fi ++else + if test "$GXX" = "yes"; then + _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` + if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then +@@ -566,7 +583,7 @@ + dnl This is the original code... + dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include + fi +- ++fi dnl =================================================================== -@@ -374,20 +377,20 @@ - if test -z "$GNUMAKE"; then - AC_MSG_WARN([not found build may fail]) >> warn + dnl Extra checking for the SUN OS compiler +@@ -1232,7 +1249,11 @@ + if test -n "$enable_debug"; then + ENABLE_DEBUG="TRUE" else -- _make_version=`make --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; -+ _make_version=`gmake --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; - _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` - _make_middle=`echo $_make_version | $AWK -F. '{ print $2; }'` - _make_minor=`echo $_make_version | $AWK -F. '{ print $3; }'` - if test "$_make_major" -gt "3" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else - if test "$_make_middle" -gt "79" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else - if test "$_make_minor" -ge "1" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else -- AC_MSG_ERROR([failed (make $_make_version need 3.79.1+)]) -+ AC_MSG_ERROR([failed (gmake $_make_version need 3.79.1+)]) - fi - fi - fi -@@ -551,6 +554,9 @@ - dnl =================================================================== - if test "$GXX" = "yes"; then - _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then -+ _gxx_include_path="/usr/include" -+ fi +- ENABLE_DEBUG="FALSE" ++fi ++if test -n "$enable_linuxjdk"; then ++ USE_LINUXJDK="TRUE" ++else ++ USE_LINUXJDK="FALSE" fi + dnl =================================================================== +@@ -1278,6 +1299,7 @@ + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_LIBS) + AC_SUBST(ENABLE_DEBUG) ++AC_SUBST(USE_LINUXJDK) + + AC_OUTPUT([set_soenv]) diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in index 4652de66bcf..9ea6b11bdab 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in @@ -1,23 +1,44 @@ ---- set_soenv.in.orig Sat Oct 19 12:16:51 2002 -+++ set_soenv.in Sat Oct 19 12:17:36 2002 -@@ -933,6 +933,9 @@ +--- set_soenv.in.orig Thu Feb 27 15:12:36 2003 ++++ set_soenv.in Wed Mar 5 21:16:43 2003 +@@ -52,7 +52,7 @@ + #------------------------------------------------- + # + # Platform independent constant values. +-my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", ++my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", "GER", + "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, +@@ -88,7 +88,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK ); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -140,7 +140,8 @@ + $CC = '@CC@'; # C compiler + $CXX = '@CXX@'; # C++ compiler + $EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type +-$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build ++$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build ++$USE_LINUXJDK = '@USE_LINUXJDK@'; # Use the Linux JDK + $WRAPCMD = ""; # Wrapper (only for winnt) + + # +@@ -1265,7 +1266,12 @@ + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } elsif ($platform eq "$FreeBSD") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -+ $ps.$JRELIBDIR. -+ $ps.$JRETOOLKITDIR. -+ $ps.$JRETHREADDIR. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -@@ -1092,6 +1095,10 @@ - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. - $ps.'$SOLARENV'.$BIN; -+ if ( $JAVA_HOME ne "" ) -+ { -+ $PATH .= $ps.'$JAVA_HOME'.$BIN; +-{ $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"; + } - - $PATH .= $ps.$oldPATH; } + elsif ($platform eq "$NetBSD") + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; diff --git a/editors/openoffice.org-3-RC/files/patch-connectivity+source+parse+sqlbison.y b/editors/openoffice.org-3-RC/files/patch-connectivity+source+parse+sqlbison.y deleted file mode 100644 index 100bb15bf20..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-connectivity+source+parse+sqlbison.y +++ /dev/null @@ -1,98 +0,0 @@ ---- ../connectivity/source/parse/sqlbison.y.orig Wed Nov 6 23:58:58 2002 -+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:04:05 2002 -@@ -162,21 +162,6 @@ - %token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM - %token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME - -- /* operators */ --%left <pParseNode> SQL_TOKEN_NAME --%left <pParseNode> SQL_TOKEN_OR --%left <pParseNode> SQL_TOKEN_AND -- --%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ --%left <pParseNode> '+' '-' --%left <pParseNode> '*' '/' --%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT --%left <pParseNode> ')' --%right <pParseNode> '=' --%right <pParseNode> '.' --%right <pParseNode> '(' -- -- - %nonassoc <pParseNode> SQL_TOKEN_UMINUS - - -@@ -185,31 +170,31 @@ - - %token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG - --%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY -+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY - --%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS --%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR -+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS -+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR - - %token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC - %token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP - --%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL -+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL - --%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT -+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT - --%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH -+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER - %token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC - - %token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER - --%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC --%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT -+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC -+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK - --%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM -+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM - - %token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION - %token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW --%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE -+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE - - /* ODBC KEYWORDS */ - %token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ -@@ -232,6 +217,22 @@ - %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND - %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE - -+ -+ /* operators */ -+%left SQL_TOKEN_NAME -+%left <pParseNode> SQL_TOKEN_OR -+%left <pParseNode> SQL_TOKEN_AND -+ -+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ -+%left <pParseNode> '+' '-' -+%left <pParseNode> '*' '/' -+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT -+%left ')' -+%right '=' -+%right '.' -+%right '(' -+ -+ - %token <pParseNode> SQL_TOKEN_INVALIDSYMBOL - - /*%type <pParseNode> sql_single_statement */ -@@ -3056,7 +3057,7 @@ - } - else - YYERROR; -- } -+ }; - %% - - diff --git a/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx deleted file mode 100644 index 5bdb940ec43..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Tue Aug 13 14:29:52 2002 -+++ ../cosv/source/strings/streamstr.cxx Fri Oct 18 20:20:41 2002 -@@ -65,7 +65,7 @@ - // NOT FULLY DECLARED SERVICES - #include <string.h> - #include <stdio.h> --#if defined(WNT) || defined(LINUX) || defined(MACOSX) -+#if defined(WNT) || defined(LINUX) || defined(MACOSX) || defined(FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice.org-3-RC/files/patch-cppu+inc+cppu+macros.hxx deleted file mode 100644 index dad8a1f99a5..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppu+inc+cppu+macros.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 -+++ ../cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 -@@ -76,7 +76,7 @@ - the struct inherits from a base struct the first member is no double or [unsigned] long long. - @internal - */ --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) - #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct)))) - #else - #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+source+uno+data.cxx b/editors/openoffice.org-3-RC/files/patch-cppu+source+uno+data.cxx deleted file mode 100644 index 9c0e34bfb60..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppu+source+uno+data.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 -+++ ../cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 -@@ -295,7 +295,7 @@ - # pragma pack(8) - #endif - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define MAX_ALIGNMENT_4 - #endif - -@@ -307,7 +307,7 @@ - if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } - - #ifdef DEBUG --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) - #define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice.org-3-RC/files/patch-cppu+test+alignment+diagnose.h deleted file mode 100644 index 2a6650400a1..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppu+test+alignment+diagnose.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 -+++ ../cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 -@@ -64,7 +64,7 @@ - #include <sal/types.h> - #include <stdio.h> - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define __ALIGNMENT__(s, n) __alignof__ (s) - #else - #define __ALIGNMENT__(s, n) n diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk index 62e971de324..4ef61346feb 100644 --- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk @@ -1,24 +1,14 @@ ---- ../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) -@@ -175,6 +175,10 @@ - #SHL1VERSIONMAP=gcc2_freebsd_intel.map +--- ../cppuhelper/source/makefile.mk.orig Thu Feb 20 17:04:36 2003 ++++ ../cppuhelper/source/makefile.mk Wed Mar 5 20:32:03 2003 +@@ -194,9 +194,9 @@ .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+#SHL1VERSIONMAP=gcc3_freebsd_intel.map + .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" +-#SHL1VERSIONMAP=gcc2_freebsd_intel.map ++SHL1VERSIONMAP=gcc2_freebsd_intel.map + .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" +-#SHL1VERSIONMAP=gcc3_freebsd_intel.map ++SHL1VERSIONMAP=gcc3_freebsd_intel.map .ENDIF # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice.org-3-RC/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cpputools+source+registercomponent+makefile.mk deleted file mode 100644 index 8134445349f..00000000000 --- a/editors/openoffice.org-3-RC/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.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h new file mode 100644 index 00000000000..391667b66eb --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_misc.h @@ -0,0 +1,11 @@ +--- ../desktop/source/pkgchk/pkgchk_misc.h.orig Wed Mar 5 20:51:46 2003 ++++ ../desktop/source/pkgchk/pkgchk_misc.h Wed Mar 5 20:52:45 2003 +@@ -208,6 +208,8 @@ + #define THIS_PLATFORM_PATH "/macosx_powerpc.plt" + #elif defined (NETBSD) && defined (SPARC) + #define THIS_PLATFORM_PATH "/netbsd_sparc.plt" ++#elif defined (FREEBSD) && defined (INTEL) ++#define THIS_PLATFORM_PATH "/freebsd_x86.plt" + #else + #error "unknown platform" + insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_packages.cxx b/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_packages.cxx deleted file mode 100644 index 8615cc3bd02..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-desktop+source+pkgchk+pkgchk_packages.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Mon Oct 21 13:19:59 2002 -+++ ../desktop/source/pkgchk/pkgchk_packages.cxx Mon Oct 21 13:22:22 2002 -@@ -124,6 +124,8 @@ - static char const s_platform_path [] = "/macosx_powerpc.plt"; - #elif defined (NETBSD) && defined (SPARC) - static char const s_platform_path [] = "/netbsd_sparc.plt"; -+#elif defined (FREEBSD) && defined (INTEL) -+static char const s_platform_path [] = "/freebsd_x86.plt"; - #else - #error "unkonwn platform" - insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk index 8ceb57682cc..025d644a807 100644 --- a/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-desktop+util+makefile.mk @@ -1,6 +1,6 @@ ---- ../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 @@ +--- ../desktop/util/makefile.mk.orig Fri Feb 14 14:43:59 2003 ++++ ../desktop/util/makefile.mk Wed Mar 5 20:54:04 2003 +@@ -102,7 +102,7 @@ # --- Linken der Applikation --------------------------------------- @@ -9,12 +9,12 @@ # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, # winXX is handled like solaris for now APP1_STDPRE= -@@ -111,7 +111,7 @@ - $(SALHELPERLIB) +@@ -139,7 +139,7 @@ + .ENDIF .IF "$(GUI)" == "UNX" -.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - APP1STDLIBS+= -lXext -lSM -lICE - + .ENDIF + .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh deleted file mode 100644 index d60afa8e32e..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-dmake+unix+linux+gnu+make.sh +++ /dev/null @@ -1,244 +0,0 @@ ---- ../dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 -+++ ../dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 -@@ -3,188 +3,188 @@ - mkdir objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - fi - mv infer.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - fi - mv make.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - fi - mv stat.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - fi - mv expand.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - fi - mv dmstring.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - fi - mv hash.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - fi - mv dag.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - fi - mv dmake.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - fi - mv path.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - fi - mv imacs.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - fi - mv sysintf.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - fi - mv parse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - fi - mv getinp.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - fi - mv quit.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - fi - mv state.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - fi - mv dmdump.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - fi - mv macparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - fi - mv rulparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - fi - mv percent.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - fi - mv function.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - fi - mv arlib.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - fi - mv dirbrk.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - fi - mv rmprq.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - fi - mv ruletab.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - fi - mv runargv.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - fi - mv dcache.o objects - --gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ -+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ - objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \ - objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \ - objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \ diff --git a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+X11_selection.cxx deleted file mode 100644 index 77df99f679a..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-dtrans+source+X11+X11_selection.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dtrans/source/X11/X11_selection.cxx.orig Wed Jul 31 22:43:56 2002 -+++ ../dtrans/source/X11/X11_selection.cxx Fri Oct 18 20:16:37 2002 -@@ -66,7 +66,7 @@ - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) - #include <sys/poll.h> - #else - #include <poll.h> diff --git a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk index b09408500c2..4552698eb13 100644 --- a/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-eventattacher+source+makefile.mk @@ -1,15 +1,14 @@ ---- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002 -+++ ../eventattacher/source/makefile.mk -@@ -110,10 +110,10 @@ +--- ../eventattacher/source/makefile.mk.orig Tue Oct 1 09:45:21 2002 ++++ ../eventattacher/source/makefile.mk Wed Mar 5 21:06:11 2003 +@@ -104,9 +104,9 @@ SHL1TARGET= $(TARGET) SHL1STDLIBS= \ + $(SALLIB) \ $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(VOSLIB) \ +- $(CPPUHELPERLIB) \ - $(SALLIB) -+ $(VOSLIB) ++ $(CPPUHELPERLIB) SHL1DEPN= SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-extensions+source+plugin+unx+makefile.mk b/editors/openoffice.org-3-RC/files/patch-extensions+source+plugin+unx+makefile.mk deleted file mode 100644 index 61660a71512..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-extensions+source+plugin+unx+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../extensions/source/plugin/unx/makefile.mk.orig Mon Oct 21 08:48:31 2002 -+++ ../extensions/source/plugin/unx/makefile.mk Mon Oct 21 08:48:59 2002 -@@ -91,7 +91,11 @@ - .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX" - APP1STDLIBS+=-lXm -lXt -lX11 -ldl - .ELSE -+.IF "$(OS)"=="FREEBSD" -+APP1STDLIBS+=-lXaw -lXt -lX11 -+.ELSE - APP1STDLIBS+=-lXaw -lXt -lX11 -ldl -+.ENDIF - .ENDIF - - APP1DEF= $(MISC)$/$(TARGET).def diff --git a/editors/openoffice.org-3-RC/files/patch-external+dt+dtpatch.sh b/editors/openoffice.org-3-RC/files/patch-external+dt+dtpatch.sh deleted file mode 100644 index e5122bcb45c..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-external+dt+dtpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 -+++ ../external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 -@@ -96,7 +96,7 @@ - done - - chmod -R +w rtufiles/*.h -- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch -+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch - - if test -s "patcherror"; then - echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror diff --git a/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk new file mode 100644 index 00000000000..6b8071f4030 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-external+gcc3_specific+makefile.mk @@ -0,0 +1,18 @@ +--- ../external/gcc3_specific/makefile.mk.orig Wed Mar 5 23:01:32 2003 ++++ ../external/gcc3_specific/makefile.mk Wed Mar 5 23:01:59 2003 +@@ -10,6 +10,7 @@ + .IF "$(COMID)"=="gcc3" + + .IF "$(OS)"!="MACOSX" ++.IF "$(OS)"!="FREEBSD" + + + all : $(SOLARLIBDIR)$/libstdc++.so.$(LIBSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so +@@ -29,6 +30,7 @@ + -rm -f $@ + +ln -s libgcc_s.so.1 $@ + ++.ENDIF + .ENDIF + + .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice.org-3-RC/files/patch-external+npsdk+npsdkpatch.sh deleted file mode 100644 index 49a3056831d..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-external+npsdk+npsdkpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 -+++ ../external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 -@@ -121,7 +121,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - # diff --git a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk deleted file mode 100644 index 9cf22888eb2..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 -+++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002 -@@ -95,9 +95,11 @@ - objs$/.libs$/libfreetype.a - .IF "$(OS)"=="MACOSX" - OUT2LIB+=objs$/.libs$/libfreetype.*.dylib -+.ELIF "$(OS)"=="FREEBSD" -+OUT2LIB+=objs$/.libs$/libfreetype.so.7* - .ELSE - OUT2LIB+=objs$/.libs$/libfreetype.so.6* --.ENDIF # "$(OS)"=="MACOSX" -+.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" - - .ELSE # "$(GUI)"=="UNX" - .IF "$(USE_SHELL)"=="4nt" diff --git a/editors/openoffice.org-3-RC/files/patch-i18npool+inc+collatorImpl.hxx b/editors/openoffice.org-3-RC/files/patch-i18npool+inc+collatorImpl.hxx deleted file mode 100644 index 47d4ee627fc..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-i18npool+inc+collatorImpl.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../i18npool/inc/collatorImpl.hxx.orig Fri Oct 18 19:35:02 2002 -+++ ../i18npool/inc/collatorImpl.hxx Fri Oct 18 19:35:26 2002 -@@ -71,7 +71,7 @@ - #include <cppuhelper/implbase2.hxx> - #include <com/sun/star/lang/XServiceInfo.hpp> - --#if !defined( WIN32 ) && !defined( MACOSX ) -+#if !defined( WIN32 ) && !defined( MACOSX ) && !defined( FREEBSD) - #include <alloca.h> - #endif - #include <tools/list.hxx> diff --git a/editors/openoffice.org-3-RC/files/patch-idl+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-idl+util+makefile.mk deleted file mode 100644 index 2543593dd21..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-idl+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002 -+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002 -@@ -110,7 +110,7 @@ - .ENDIF - .ENDIF - --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - APP1STDLIBS+=-lcrypt - .ENDIF - diff --git a/editors/openoffice.org-3-RC/files/patch-idlc+source+parser.y b/editors/openoffice.org-3-RC/files/patch-idlc+source+parser.y deleted file mode 100644 index 69285ef67bd..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-idlc+source+parser.y +++ /dev/null @@ -1,36 +0,0 @@ ---- ../idlc/source/parser.y.orig Wed Jul 10 11:43:18 2002 -+++ ../idlc/source/parser.y Thu Oct 31 10:00:47 2002 -@@ -995,7 +995,8 @@ - { - idlc()->setParseState(PS_ConstantDeclSeen); - } -- ';' -+ ';' {}; -+ - - const_dcl : - IDL_CONST -@@ -1316,7 +1317,7 @@ - * Push the scope of the exception on the scopes stack - */ - idlc()->scopes()->push(pExcept); -- delete $1 -+ delete $1; - } - '{' - { -@@ -1705,10 +1706,10 @@ - { - idlc()->setParseState(PS_TypedefSeen); - } -- type_declarator -- | struct_type -- | union_type -- | enum_type -+ type_declarator {} -+ | struct_type {} -+ | union_type {} -+ | enum_type {} - ; - - type_declarator : diff --git a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk index 7f2cd2f1d22..19f6b86e5ab 100644 --- a/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-javaunohelper+source+makefile.mk @@ -1,14 +1,13 @@ ---- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002 -+++ ../javaunohelper/source/makefile.mk -@@ -110,9 +110,9 @@ - SHL1TARGET= $(TARGET) +--- ../javaunohelper/source/makefile.mk.orig Thu Feb 20 17:28:43 2003 ++++ ../javaunohelper/source/makefile.mk Wed Mar 5 21:04:09 2003 +@@ -118,9 +118,9 @@ + SHL1TARGET=juhx SHL1STDLIBS= \ + $(SALLIB) \ + $(JVMACCESSLIB) \ + $(SALHELPERLIB) \ +- $(SALLIB) \ $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) + $(CPPUHELPERLIB) - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-moz+prj+d.lst b/editors/openoffice.org-3-RC/files/patch-moz+prj+d.lst deleted file mode 100644 index d65f2df6cf3..00000000000 --- a/editors/openoffice.org-3-RC/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.org-3-RC/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch deleted file mode 100644 index cde27322f62..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001 -+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002 -@@ -120,26 +120,157 @@ - return(-1); - } - --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001 --*************** --*** 25,30 **** ----- 25,32 ---- -- -- #include "../../config/NetAudio.tmpl" -- --+ CCOPTIONS += $(EXTRA_CCOPTIONS) --+ -- #if ProjectX < 5 -- /* Pre-X11R5 compatability */ -- #ifndef NormalLibX --*************** --*** 119,124 **** ----- 121,127 ---- -- -- #endif -- BuildIncludes($(HEADERS),audio,..) --+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -- InstallMultiple($(HEADERS),$(INCDIR)) -- #if ProjectX >= 5 -- InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 -++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 -+@@ -42,6 +42,8 @@ -+ @echo "" -+ Date -+ @echo "" -++ @find . | egrep "\.(cxx|h|c)$$" | xargs \ -++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" -+ $(MAKE) $(MFLAGS) Makefiles -+ $(MAKE) $(MFLAGS) clean -+ $(MAKE) $(MFLAGS) includes -+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 -++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 -+@@ -133,6 +133,7 @@ -+ signal(SIGALRM, SIG_DFL); -+ } -+ -++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ static void -+ usleep(usecs) -+ unsigned int usecs; -+@@ -149,7 +150,7 @@ -+ setitimer(ITIMER_REAL, &ntval, &otval); -+ pause(); -+ } -+- -++#endif -+ #endif /* SYSV else not */ -+ #endif /* VMS else not */ -+ #endif /* NEEDUSLEEP */ -+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000 -++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000 -+@@ -155,8 +155,10 @@ -+ #include <assert.h> -+ -+ #ifdef __FreeBSD__ -+-# include <machine/soundcard.h> -+-# include <machine/pcaudioio.h> -++# include <sys/soundcard.h> -++# ifdef __i386__ -++# include <machine/pcaudioio.h> -++# endif -+ #else -+ # ifdef __NetBSD__ -+ # include <sys/ioctl.h> -+@@ -610,7 +612,11 @@ -+ -+ if(sndStatOut.fd == -1) -+ { -++#ifdef __FreeBSD__ -++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait) -++#else -+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait) -++#endif -+ { -+ osLogMsg("openDevice: waiting on output device\n"); -+ sleep(1); -+@@ -1230,6 +1236,11 @@ -+ /* -+ * Setup soundcard at maximum audio quality. -+ */ -++ -++#ifdef __FreeBSD__ -++#define NO_16_BIT_SAMPLING -++#endif -++ -+ static void setupSoundcard(sndStatPtr) -+ SndStat* sndStatPtr; -+ { -+@@ -1380,7 +1391,11 @@ -+ -+ AL_initialized = AuTrue; -+ -++#ifdef __FreeBSD__ -++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) { -++#else -+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) { -++#endif -+ UNIDENTMSG; -+ return AuFalse; -+ } -+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999 -++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #ifndef WIN32 -+-# ifdef __NetBSD__ -++# if defined(__NetBSD__) || defined(__FreeBSD__) -+ # include <limits.h> -+ # define MAXSHORT SHRT_MAX -+ # define MINSHORT SHRT_MIN -+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002 -++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002 -+@@ -25,6 +25,8 @@ -+ -+ #include "../../config/NetAudio.tmpl" -+ -++CCOPTIONS += $(EXTRA_CCOPTIONS) -++ -+ #if ProjectX < 5 -+ /* Pre-X11R5 compatability */ -+ #ifndef NormalLibX -+@@ -64,10 +66,14 @@ -+ COMPAT_OBJS = AuGetBest.o -+ #endif /* ProjectX < 5 */ -+ -++#if HasBSD44Sockets -++ SOCK_DEFINES = -DBSD44SOCKETS -++#endif -++ -+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" -+ -+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) -+- CONN_DEFINES = ConnectionFlags -++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) -+ -+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ -+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ -+@@ -119,6 +125,7 @@ -+ -+ #endif -+ BuildIncludes($(HEADERS),audio,..) -++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -+ InstallMultiple($(HEADERS),$(INCDIR)) -+ #if ProjectX >= 5 -+ InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 -++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000 -+@@ -8,5 +8,5 @@ -+ -+ XCOMM Directory where NAS will look for it's config file(s) -+ #ifndef NasConfigSearchPath -+-#define NasConfigSearchPath /etc/nas/ -++#define NasConfigSearchPath $(PROJECTROOT)/etc/ -+ #endif -+--- misc/nas-1.4.1/server/dia/gram.y.orig Thu Oct 31 10:13:28 2002 -++++ misc/build/nas-1.4.1/server/dia/gram.y Thu Oct 31 10:15:18 2002 -+@@ -120,13 +120,13 @@ -+ | MAXRATE number -+ { ddaSetConfig(MAXRATE, (void *)$2); } -+ | MINRATE number -+- { ddaSetConfig(MINRATE, (void *)$2); } -++ { ddaSetConfig(MINRATE, (void *)$2); }; -+ -+ string : STRING { ptr = (char *)malloc(strlen($1)+1); -+ strcpy(ptr, $1); -+ RemoveDQuote(ptr); -+ $$ = ptr; -+- } -++ }; -+ number : NUMBER { $$ = $1; } -+ ; -+ diff --git a/editors/openoffice.org-3-RC/files/patch-odk+pack+unzip_udk+makefile.mk b/editors/openoffice.org-3-RC/files/patch-odk+pack+unzip_udk+makefile.mk deleted file mode 100644 index c90775d4162..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-odk+pack+unzip_udk+makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../odk/pack/unzip_udk/makefile.mk.orig Thu Aug 8 09:28:10 2002 -+++ ../odk/pack/unzip_udk/makefile.mk Fri Oct 18 20:14:46 2002 -@@ -44,9 +44,15 @@ - .ELSE - $(GNUCOPY) -p $(UDKPATH) . - $(GNUCOPY) -p $(ODKDOCPATH) . -+.IF "$(OS)"=="FREEBSD" -+ tar -xzf $(UDKZIPPREFIX).tar.gz -+ +-$(RENAME) $(UDKNAME) $(ODKNAME) -+ tar -xzf $(ODKDOCNAME).tar.gz -+.ELSE - gzip -df < $(UDKZIPPREFIX).tar.gz | tar -xvf - - +-$(RENAME) $(UDKNAME) $(ODKNAME) - gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf - -+.ENDIF - .ENDIF - .IF "$(BUILD_SOSL)"!="" - # for OpenOffice build rename to PRODUCT_NAME diff --git a/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp deleted file mode 100644 index 693a57bb041..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp +++ /dev/null @@ -1,18 +0,0 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 -+++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 -@@ -2,6 +2,7 @@ - - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment - // (setup is linked against it). -+#if ( defined ( LINUX )) - #if ( defined( _gcc3 ) && defined( C300 ) ) - File gid_File_Lib_gcc - BIN_FILE_BODY; -@@ -31,6 +32,7 @@ - Styles = (NETWORK,RELATIVE); - End - -+#endif - #endif - - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk b/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk deleted file mode 100644 index 9773406f4ed..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-product+settings+settings.mk +++ /dev/null @@ -1,26 +0,0 @@ ---- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002 -+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002 -@@ -83,9 +83,8 @@ - - OS=SOLARIS - PS=/ --CC=CC --LINK=CC --LIB=CC -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat -@@ -136,9 +135,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat diff --git a/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk deleted file mode 100644 index cb6f306e19b..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ ---- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002 -+++ ../product/util/makefile.mk Mon Oct 21 14:26:10 2002 -@@ -131,13 +131,6 @@ - DESTDIRDLL=$(DESTDIRLIB) - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno --.IF "$(COMID)"=="gcc3" --ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ -- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) --.ENDIF - - .ELIF "$(OS)"=="NETBSD" - ########### -@@ -498,6 +491,7 @@ - #--------------------------------------------------------- - # special targets for linux gcc3 - .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"!="FREEBSD" - - $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : - $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) -@@ -511,7 +505,9 @@ - -rm -f $@ - +ln -s libstdc++.so.$(LIBSTDCPP3) $@ - .ENDIF -+.ENDIF - -+.IF "$(OS)"!="FREEBSD" - $(DLLOUT)$/libgcc_s.so.1 : - $(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT) - -@@ -521,7 +517,8 @@ - - $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ -+.ENDIF - #------------------------------------------------------------- - - $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx deleted file mode 100644 index 0880976d081..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Wed Oct 16 00:02:09 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Fri Oct 18 20:02:54 2002 -@@ -883,7 +883,7 @@ - - static const struct SystemCommandParameters aParms[] = - { --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) - { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+printerjob.cxx b/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+printerjob.cxx deleted file mode 100644 index 751ef978850..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+printerjob.cxx +++ /dev/null @@ -1,15 +0,0 @@ ---- ../psprint/source/printergfx/printerjob.cxx.orig Sat Oct 19 14:49:13 2002 -+++ ../psprint/source/printergfx/printerjob.cxx Sat Oct 19 14:49:18 2002 -@@ -285,8 +285,12 @@ - - sal_Bool bSuccess = sal_False; - -+#ifdef FREEBSD -+ pPWEntry = getpwuid( getuid()); -+#else - if (getpwuid_r(getuid(), &aPWEntry, pPWBuffer, sizeof(pPWBuffer), &pPWEntry) != 0) - pPWEntry = NULL; -+#endif - - if (pPWEntry != NULL && pPWEntry->pw_name != NULL) - { diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+psheader.ps deleted file mode 100644 index 2118d0fe6c9..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-psprint+source+printergfx+psheader.ps +++ /dev/null @@ -1,13 +0,0 @@ ---- ../psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 -+++ ../psprint/source/printergfx/psheader.ps -@@ -303,8 +303,8 @@ - /h /i /j /k /l /m /n /o - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /unused -- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -- /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused -+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -+ /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused - /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis - /space /exclamdown /cent /sterling /currency /yen /brokenbar /section diff --git a/editors/openoffice.org-3-RC/files/patch-remotebridges+source+unourl_resolver+makefile.mk b/editors/openoffice.org-3-RC/files/patch-remotebridges+source+unourl_resolver+makefile.mk deleted file mode 100644 index 72e5a97234f..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-remotebridges+source+unourl_resolver+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../remotebridges/source/unourl_resolver/makefile.mk.orig Tue Jan 1 14:11:01 2002 -+++ ../remotebridges/source/unourl_resolver/makefile.mk -@@ -102,9 +102,9 @@ - SHL1VERSIONMAP= $(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp3.c deleted file mode 100644 index f74de7504d2..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+cpp3.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 -+++ ../rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 -@@ -82,7 +82,9 @@ - #ifdef IRIX - extern void abort(void); - #else -+#ifndef FREEBSD - extern int abort(); /* For debugging */ -+#endif - #endif - #endif - diff --git a/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch deleted file mode 100644 index 6a320b4dac5..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sablot/Sablot-0.52.patch.orig Mon Aug 19 17:09:12 2002 -+++ ../sablot/Sablot-0.52.patch Fri Oct 18 21:28:48 2002 -@@ -97,7 +97,7 @@ - ! .IF "$(OS)"=="NETBSD" - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE --! .IF "$(OS)"=="MACOSX" -+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" - ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+interlck.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+interlck.c deleted file mode 100644 index 60ea1f414d1..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+interlck.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ../sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 -+++ ../sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 -@@ -81,10 +81,10 @@ - __asm__ __volatile__ ( - "movl $1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "incl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - -@@ -95,10 +95,10 @@ - __asm__ __volatile__ ( - "movl $-1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "decl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c index f82943872ab..49fe0da8589 100644 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c @@ -1,11 +1,11 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Apr 10 18:11:58 2002 -+++ ../sal/osl/unx/nlsupport.c Fri Oct 18 23:31:19 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue Jan 28 15:51:36 2003 ++++ ../sal/osl/unx/nlsupport.c Wed Mar 5 21:03:13 2003 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX) +-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) ++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) #include <pthread.h> #include <locale.h> #include <langinfo.h> @@ -19,23 +19,26 @@ lower = current + 1; else return base + current; -@@ -241,12 +240,13 @@ +@@ -241,12 +240,14 @@ return NULL; } --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) +-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) ++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) /* - * This implementation of osl_getTextEncodingFromLocale maps - * from nl_langinfo(CODESET) to rtl_textencoding defines. -- * nl_langinfo() is supported only on Linux and Solaris. +- * This implementation of osl_getTextEncodingFromLocale maps +- * from nl_langinfo(CODESET) to rtl_textencoding defines. +- * nl_langinfo() is supported only on Linux, Solaris and IRIX. ++ * This implementation of osl_getTextEncodingFromLocale maps ++ * from nl_langinfo(CODESET) to rtl_textencoding defines. ++ * nl_langinfo() is supported only on Linux and Solaris. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, + * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. -@@ -260,6 +260,12 @@ +@@ -260,6 +261,12 @@ #endif #endif @@ -48,17 +51,27 @@ #if defined(SOLARIS) -@@ -478,7 +484,79 @@ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; +@@ -300,23 +307,23 @@ + #elif defined(IRIX) --#endif /* ifdef LINUX */ -+#elif defined(IRIX) -+ -+const _pair _nl_language_list[] = { + const _pair _nl_language_list[] = { +- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ +- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ +- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ +- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ +- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ +- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ +- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ +- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ +- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */ +- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ +- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ +- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ +- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ +- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ + { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */ -+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ ++ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ + { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ + { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ + { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ @@ -70,14 +83,31 @@ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */ -+ }; -+ + }; + +-#elif defined(LINUX) || defined(NETBSD) ++#elif defined(LINUX) + + const _pair _nl_language_list[] = { + { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ +@@ -491,13 +498,65 @@ + { "T.101-G2", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-128 */ + { "T.61-7BIT", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-102 */ + { "T.61-8BIT", RTL_TEXTENCODING_DONTKNOW }, /* T.61 ISO-IR-103 */ +- { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */ ++ { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */ + { "UTF-8", RTL_TEXTENCODING_UTF8 }, /* ISO-10646/UTF-8 */ + { "VIDEOTEX-SUPPL", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-70 */ + { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ + }; + +-#endif /* ifdef LINUX || NETBSD */ +#elif defined(FREEBSD) + +const _pair _nl_language_list[] = { + { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ ++ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ + { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ + { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ + { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ @@ -89,19 +119,19 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+ }; ++}; + +#elif defined(NETBSD) + +const _pair _nl_language_list[] = { + { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ ++ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ + { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ + { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ @@ -117,15 +147,14 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ -+ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp b/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp new file mode 100644 index 00000000000..623eccb0ff0 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-scp+source+global+udk_base.scp @@ -0,0 +1,19 @@ +--- ../scp/source/global/udk_base.scp.orig Wed Mar 5 21:12:08 2003 ++++ ../scp/source/global/udk_base.scp Wed Mar 5 21:12:10 2003 +@@ -6,7 +6,7 @@ + // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are + // needed for unxlngi4 environment (setup is linked against it). + +- ++#if ( ! defined ( FREEBSD )) + #if ( defined( _gcc3 ) && defined( C300 ) ) + + File gid_File_Lib_gcc +@@ -37,6 +37,7 @@ + Name = STRING(libstdc++.so); + Styles = (NETWORK,RELATIVE); + End ++#endif + #endif + + File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk index 007c0f69b6f..5460e429658 100644 --- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk @@ -1,11 +1,14 @@ ---- ../setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 -+++ ../setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 -@@ -85,7 +85,7 @@ - APP1NOSAL=TRUE - APP1TARGET= $(TARGET) - APP1OBJS= $(OBJFILES) --APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11 +--- ../setup2/mow/source/loader/makefile.mk.orig Fri Feb 14 15:32:23 2003 ++++ ../setup2/mow/source/loader/makefile.mk Wed Mar 5 20:28:12 2003 +@@ -95,7 +95,11 @@ + + APP1TARGET= $(TARGET) + APP1OBJS= $(OBJFILES) ++.IF "$(OS)"=="FREEBSD" ++APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -lX11 ++.ELSE + APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl ++.ENDIF .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index d4b9daeb8a4..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 -+++ ../solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 -@@ -62,6 +62,7 @@ - BEGIN { global_found = "false" } - /[ \t]*local:/ { global_found = "false" } - global_found == "true" { -+ print "\t\tGetVersionInfo;" - print "\t\t_ZTS*;" - print "\t\t_ZTI*;" - global_found = "false" } diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk deleted file mode 100644 index 518cb892bcc..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+_tg_shl.mk +++ /dev/null @@ -1,372 +0,0 @@ ---- ../solenv/inc/_tg_shl.mk.orig Fri Aug 16 13:27:02 2002 -+++ ../solenv/inc/_tg_shl.mk Sat Oct 19 10:46:46 2002 -@@ -219,7 +219,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -360,22 +360,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -681,7 +681,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -822,22 +822,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1143,7 +1143,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -1284,22 +1284,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1605,7 +1605,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -1746,22 +1746,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2067,7 +2067,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -2208,22 +2208,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2529,7 +2529,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -2670,22 +2670,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2991,7 +2991,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -3132,22 +3132,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3453,7 +3453,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -3594,22 +3594,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3915,7 +3915,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -4056,22 +4056,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -4377,7 +4377,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -4518,22 +4518,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk deleted file mode 100644 index ec490e2a96f..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+pstrules.mk +++ /dev/null @@ -1,131 +0,0 @@ ---- ../solenv/inc/pstrules.mk.orig Thu Aug 29 17:01:48 2002 -+++ ../solenv/inc/pstrules.mk Sat Oct 19 10:49:28 2002 -@@ -80,15 +80,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -108,15 +108,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -142,11 +142,11 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& $(NULLDEV) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - - $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c -@@ -154,23 +154,23 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -190,11 +190,11 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& $(NULLDEV) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - - $(SLO)$/$(SECOND_BUILD)_%.obj : %.c -@@ -202,19 +202,19 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE - @+-$(RM) $@ >& $(NULLDEV) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c - .ELSE - +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - .ENDIF - .ENDIF -@@ -236,7 +236,7 @@ - @echo Making: $@ - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) - .IF "$(GUI)"=="OS2" -- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre - .ENDIF - .IF "$(GUI)"=="WNT" - cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk deleted file mode 100644 index 12d16876694..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+rules.mk +++ /dev/null @@ -1,212 +0,0 @@ ---- ../solenv/inc/rules.mk.orig Wed Aug 21 15:04:19 2002 -+++ ../solenv/inc/rules.mk Sat Oct 19 10:52:25 2002 -@@ -78,16 +78,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF - .ENDIF - -@@ -98,16 +98,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - .ENDIF - -@@ -122,17 +122,17 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE # "$(GUI)"=="UNX" - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF # "$(GUI)"=="UNX" - - $(SLO)$/%.obj : %.cpp -@@ -140,17 +140,17 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - - $(SLO)$/%.obj : $(MISC)$/%.cxx -@@ -158,16 +158,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : $(MISC)$/%.cxx -@@ -175,16 +175,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : %.c -@@ -192,20 +192,20 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c - .ELSE - +-@echo Cflags: $(CFLAGS) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -215,13 +215,13 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - $(SEMADEBUG) - .ENDIF - -@@ -230,16 +230,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -249,14 +249,14 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) - .ENDIF - .ENDIF - diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk deleted file mode 100644 index ea6a898a9a6..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002 -+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002 -@@ -166,7 +166,6 @@ - CDEFSOPT= - HDEFS= - --CC= - .IF "$(add_cflags)"!="" - ENVCFLAGS+=$(add_cflags) - .ENDIF -@@ -264,8 +263,6 @@ - AS= - BC= - COBOL= --CPP= --CXX= - FOR= - PASCAL= - diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk deleted file mode 100644 index e7f61fcd90b..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_shl.mk +++ /dev/null @@ -1,39 +0,0 @@ ---- ../solenv/inc/tg_shl.mk.orig Fri Aug 16 13:26:42 2002 -+++ ../solenv/inc/tg_shl.mk Sat Oct 19 10:54:46 2002 -@@ -319,7 +319,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -460,22 +460,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk index b189474e5f8..b4764485aa8 100644 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk @@ -1,24 +1,17 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002 -@@ -1,84 +1,139 @@ -- - # mak file fuer unxfbsdi +--- ../solenv/inc/unxfbsdi.mk.orig Fri Jan 31 16:46:52 2003 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 5 20:23:28 2003 +@@ -61,50 +61,115 @@ + #************************************************************************* --ASM= --AFLAGS= + # mak file for unxfbsdi +ASM=$(CC) +AFLAGS=-x assembler-with-cpp -c $(CDEFS) - SOLAR_JAVA=TRUE - JAVAFLAGSDEBUG=-g - +-ASM= +-AFLAGS= +# filter for supressing verbose messages from linker -+# not needed at the moment - LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - -+# options for C and C++ Compiler -+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) -+CDEFS+=$(PTHREAD_CFLAGS) ++#not needed at the moment ++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + +# this is a platform with JAVA support +.IF "$(SOLAR_JAVA)"!="" @@ -29,151 +22,135 @@ +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 + +-SOLAR_JAVA=TRUE +-JAVAFLAGSDEBUG=-g ++# name of C++ Compiler ++CXX*=g++ ++# name of C Compiler ++CC*=gcc + ++# filter for supressing verbose messages from linker ++# not needed at the moment + LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + ++# options for C and C++ Compiler ++CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) ++CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT + +-CC= gcc +-CXX= g++ +-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 +-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE ++# flags for C and C++ Compile + CFLAGS+= -w -c $(INCLUDE) + CFLAGS+= -I/usr/X11R6/include + +# flags for the C++ Compiler -+CFLAGSCC=-pipe -+CFLAGSCXX=-pipe -fno-for-scope -fpermissive + 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 + CFLAGSEXCEPTIONS= -fexceptions + CFLAGS_NO_EXCEPTIONS= -fno-exceptions + +# Compiler flags for compiling static object in single threaded +# environment with graphical user interface -+CFLAGSOBJGUIST=-fPIC + CFLAGSOBJGUIST= -fPIC + +# Compiler flags for compiling static object in single threaded +# environment with character user interface -+CFLAGSOBJCUIST=-fPIC + CFLAGSOBJCUIST= -fPIC + +# Compiler flags for compiling static object in multi threaded +# environment with graphical user interface -+CFLAGSOBJGUIMT=-fPIC - --cc= gcc --CC= g++ --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 --CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include --CFLAGSCC= -pipe --CFLAGSCXX= -pipe -fno-for-scope -fpermissive --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions --CFLAGSOBJGUIST= -fPIC --CFLAGSOBJCUIST= -fPIC --CFLAGSOBJGUIMT= -fPIC --CFLAGSOBJCUIMT= -fPIC --CFLAGSSLOGUIMT= -fPIC --CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g + CFLAGSOBJGUIMT= -fPIC ++ +# Compiler flags for compiling static object in multi threaded +# environment with character user interface -+CFLAGSOBJCUIMT=-fPIC + CFLAGSOBJCUIMT= -fPIC + +# Compiler flags for compiling shared object in multi threaded +# environment with graphical user interface -+CFLAGSSLOGUIMT=-fPIC + CFLAGSSLOGUIMT= -fPIC + +# Compiler flags for compiling shared object in multi threaded +# environment with character user interface -+CFLAGSSLOCUIMT=-fPIC + CFLAGSSLOCUIMT= -fPIC + -+# Compiler flags for profiling -+CFLAGSPROF=-pg ++# Compiler flags for profilin + CFLAGSPROF= -pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g -ggdb + CFLAGSDEBUG= -g CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O --CFLAGSOUTOBJ= -o -- --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -- --#THREADLIB= -pthread --LINK= gcc --# -v -nostdlib + +# Compiler flags to enable optimizations +# -02 is broken for FreeBSD -+CFLAGSOPT=-O ++CFLAGSOPT= -O + +# Compiler flags to disable optimizations -+# -0 is broken for STLport -+CFLAGSNOOPT=-O0 ++# -0 is broken for STLport for FreeBSD ++CFLAGSNOOPT= -O0 + +# Compiler flags for the output path -+CFLAGSOUTOBJ=-o + CFLAGSOUTOBJ= -o + ++# Enable all warnings ++CFLAGSWALL=-Wall + -+# switches for dynamic and static linking -+STATIC=-Wl,-Bstatic -+DYNAMIC=-Wl,-Bdynamic ++# Set default warn level ++CFLAGSDFLTWARN=-w + -+LINK=$(CXX) - LINKFLAGS= ++# switches for dynamic and static linking + STATIC= -Wl,-Bstatic + DYNAMIC= -Wl,-Bdynamic + +-#THREADLIB= -pthread +-LINK= gcc +-# -v -nostdlib +-LINKFLAGS= -LINKFLAGSAPPGUI= -Wl,-export-dynamic -LINKFLAGSAPPCUI= -Wl,-export-dynamic ++# name of linker ++LINK*=$(CC) ++ ++# default linker flags ++# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\' ++LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH) + +# linker flags for linking applications -+LINKFLAGSAPPGUI= -+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 - - .IF "$(NO_BSYMBOLIC)"=="" - .IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic - .ENDIF - .ENDIF +@@ -119,28 +184,41 @@ LINKVERSIONMAPFLAG=-Wl,--version-script +# Sequence of libs does matter ! STDLIBCPP=-lstdc++ --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# 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) + # _SYSLIBS= -L/usr/lib -lm + # _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 + # _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# default objectfilenames to lin ++# default objectfilenames to link STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= --STDLIBCUIST=-lm ++# libraries for linking applications + STDLIBCUIST=-lm -STDLIBGUIST=-lX11 -lm -STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc -STDLIBCUIMT=-pthread -lm -lstlport_gcc @@ -182,14 +159,30 @@ - -LIBMGR= ar -LIBFLAGS= -r --LIBEXT= .a ++STDLIBGUIST=-lXaw -lXt -lX11 -lm ++STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc ++STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc ++ ++# libraries for linking shared libraries ++STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc ++STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc ++ ++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive ++ ++# STLport always needs pthread. ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) ++ ++# name of library manager +LIBMGR=ar +LIBFLAGS=-r -+LIBEXT=.a + LIBEXT= .a ++# tool for generating import libraries IMPLIB= IMPLIBFLAGS= -@@ -87,12 +142,12 @@ + +@@ -148,12 +226,12 @@ MAPSYMFLAGS= RC=irc diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk index 0cbbfcaf00a..797817ba85b 100644 --- a/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-stlport+makefile.mk @@ -1,9 +1,10 @@ ---- ../stlport/makefile.mk.orig Tue Aug 27 19:26:10 2002 -+++ ../stlport/makefile.mk Fri Oct 18 22:33:22 2002 -@@ -107,16 +107,26 @@ +--- ../stlport/makefile.mk.orig Thu Feb 20 16:13:40 2003 ++++ ../stlport/makefile.mk Wed Mar 5 19:41:42 2003 +@@ -104,16 +104,27 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" ++# FreeBSD needs a special makefile +.IF "$(OS)"=="FREEBSD" +BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE @@ -24,6 +25,6 @@ +.ELSE BUILD_ACTION=make +.ENDIF + # build in parallel + BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF - - .IF "$(COM)"=="C52" diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk index af0fb9af619..cea499f15c5 100644 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-stoc+source+javaloader+makefile.mk @@ -1,15 +1,15 @@ ---- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javaloader/makefile.mk -@@ -83,9 +83,10 @@ +--- ../stoc/source/javaloader/makefile.mk.orig Fri Dec 6 11:51:54 2002 ++++ ../stoc/source/javaloader/makefile.mk Wed Mar 5 19:35:11 2003 +@@ -83,10 +83,10 @@ SHL1TARGET= $(TARGET) SHL1STDLIBS=\ -+ $(SALLIB) \ ++ $(SALLIB) \ $(CPPUHELPERLIB) \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(CPPULIB) -+ + $(CPPULIB) \ +- $(SALLIB) \ +- $(JVMACCESSLIB) ++ $(JVMACCESSLIB) + SHL1VERSIONMAP=$(TARGET).map SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk index f97af0ea270..b895a2b968d 100644 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+makefile.mk @@ -1,15 +1,14 @@ ---- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javavm/makefile.mk -@@ -91,10 +91,10 @@ +--- ../stoc/source/javavm/makefile.mk.orig Fri Dec 6 11:48:59 2002 ++++ ../stoc/source/javavm/makefile.mk Wed Mar 5 19:36:03 2003 +@@ -100,10 +100,10 @@ SHL1TARGET= $(TARGET) SHL1VERSIONMAP=$(TARGET).map SHL1STDLIBS= \ -+ $(SALLIB) \ ++ $(SALLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ -- $(UNOLIB) \ -- $(SALLIB) -+ $(UNOLIB) + $(UNOLIB) \ +- $(SALLIB) \ + $(JVMACCESSLIB) \ + $(SALHELPERLIB) - .IF "$(GUI)"=="WNT" - SHL1STDLIBS += advapi32.lib diff --git a/editors/openoffice.org-3-RC/files/patch-svx+source+accessibility+ChildrenManagerImpl.cxx b/editors/openoffice.org-3-RC/files/patch-svx+source+accessibility+ChildrenManagerImpl.cxx deleted file mode 100644 index ce77cccd96a..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-svx+source+accessibility+ChildrenManagerImpl.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../svx/source/accessibility/ChildrenManagerImpl.cxx Mon Oct 21 01:34:17 2002 -+++ ../svx/source/accessibility/ChildrenManagerImpl.cxx.new Mon Oct 21 01:33:50 2002 -@@ -296,8 +296,6 @@ - awt::Rectangle aPixelBBox (xComponent->getBounds()); - if ((aPixelBBox.Width > 0) && (aPixelBBox.Height > 0)) - raDescriptorList.push_back (ChildDescriptor (*I)); -- else -- OSL_TRACE ("accessible shape %x not visible", *I); - } - } - } -@@ -320,8 +318,6 @@ - // the visible area. - if (aBoundingBox.IsOver (aVisibleArea)) - raDescriptorList.push_back (ChildDescriptor (xShape)); -- else -- OSL_TRACE ("shape %x not visible", xShape); - } - } - } diff --git a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx deleted file mode 100644 index 6dc462a10d2..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Aug 28 14:10:06 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Fri Oct 18 22:45:43 2002 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <dlfcn.h> --#ifndef MACOSX -+#if !(defined NETBSD || defined FREEBSD || defined MACOSX) - #include <alloca.h> - #endif - #include <string.h> diff --git a/editors/openoffice.org-3-RC/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice.org-3-RC/files/patch-sysui+tools+lngconv+lngconv.cxx deleted file mode 100644 index 732f77fcb48..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-sysui+tools+lngconv+lngconv.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 -+++ ../sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - --#if defined( LINUX ) || defined (SOLARIS) -+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD) - #include <locale.h> - #include <langinfo.h> - #endif diff --git a/editors/openoffice.org-3-RC/files/patch-tools+bootstrp+makefile.mk b/editors/openoffice.org-3-RC/files/patch-tools+bootstrp+makefile.mk deleted file mode 100644 index b188641846f..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-tools+bootstrp+makefile.mk +++ /dev/null @@ -1,23 +0,0 @@ ---- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 -+++ ../tools/bootstrp/makefile.mk -@@ -83,6 +83,15 @@ - @echo No bootstrp for Mac OS - .ELSE # "$(OS)"=="MACOS" - -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR -+ @echo "" -+$(LB)$/libgcc_pic.a: -+ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a -+$(LB)$/libgcc.a: -+ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a -+.ENDIF -+ - OBJFILES= \ - $(OBJ)$/sstring.obj \ - $(OBJ)$/appdef.obj \ -@@ -172,3 +181,4 @@ - # --- Targets ------------------------------------------------------ - - .INCLUDE : target.mk -+ diff --git a/editors/openoffice.org-3-RC/files/patch-tools+inc+inetdef.hxx b/editors/openoffice.org-3-RC/files/patch-tools+inc+inetdef.hxx deleted file mode 100644 index a9e02c68401..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-tools+inc+inetdef.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 -+++ ../tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 -@@ -90,6 +90,8 @@ - #define TOOLS_INETDEF_OS "NETBSD Sparc" - #elif defined LINUX && defined X86 - #define TOOLS_INETDEF_OS "Linux" -+#elif defined FREEBSD && defined X86 -+#define TOOLS_INETDEF_OS "FreeBSD" - #elif defined SINIX - #define TOOLS_INETDEF_OS "SINIX" - #elif defined IRIX diff --git a/editors/openoffice.org-3-RC/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice.org-3-RC/files/patch-ucb+source+ucp+webdav+makefile.mk deleted file mode 100644 index 4b505c6571d..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-ucb+source+ucp+webdav+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 -+++ ../ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 -@@ -120,7 +120,7 @@ - - SHL1TARGET=$(TARGET)$(UCP_VERSION) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP=exports.map - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-unoil+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-unoil+prj+build.lst deleted file mode 100644 index 567f2efd324..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-unoil+prj+build.lst +++ /dev/null @@ -1,11 +0,0 @@ ---- ../unoil/prj/build.lst.orig Sun Oct 20 16:21:30 2002 -+++ ../unoil/prj/build.lst Sun Oct 20 16:22:10 2002 -@@ -41,7 +41,7 @@ - ul unoil\com\sun\star\view nmake - all ul_view ul_awt NULL - ul unoil\com\sun\star\ui nmake - all ul_ui ul_awt ul_view NULL - ul unoil\com\sun\star\xml nmake - all ul_xml ul_xml_sax ul_genall NULL --ul unoil\com\sun\star\xml\sax nmake - all ul_xml_sax NULL -+ul unoil\com\sun\star\xml\sax nmake - all ul_xml_sax ul_genall NULL - ul unoil\drafts\com\sun\star\accessibility nmake - all ul_accessibility ul_awt NULL - ul unoil\drafts\com\sun\star\accessibility\bridge nmake - all ul_accessbridge ul_accessibility NULL - ul unoil\drafts\com\sun\star\awt nmake - all ul_awt_drafts ul_awt NULL diff --git a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c deleted file mode 100644 index 3da53f865c0..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../unzip/source/misc.c.orig Wed May 2 03:13:26 2001 -+++ ../unzip/source/misc.c Fri Oct 18 23:37:13 2002 -@@ -300,7 +300,7 @@ - static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - int yr, mo, dy, hh, mm, ss, leap; - long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ - static struct timeb tbp; diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+osssound.cxx deleted file mode 100644 index af681e02047..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+osssound.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 -+++ ../vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 -@@ -72,7 +72,11 @@ - #include <unistd.h> - #include <string.h> - #include <sys/ioctl.h> -+#ifdef LINUX - #include <linux/soundcard.h> -+#else -+#include <sys/soundcard.h> -+#endif - #include <errno.h> - - #ifdef _USE_NAMESPACE diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+rptpsound.cxx deleted file mode 100644 index fca5510022f..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+rptpsound.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- ../vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 -+++ ../vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 -@@ -78,6 +78,10 @@ - extern "C" int usleep(unsigned int); - #endif - -+#ifdef FREEBSD -+#include <unistd.h> -+#endif -+ - #ifdef _USE_NAMESPACE - using namespace vcl_sal; - using namespace vos; diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+saldata.cxx deleted file mode 100644 index c292a93a831..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+saldata.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 -+++ ../vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 -@@ -78,6 +78,11 @@ - #ifdef AIX - #include <strings.h> - #endif -+#ifdef FREEBSD -+#include <sys/types.h> -+#include <sys/time.h> -+#include <unistd.h> -+#endif - - #ifndef _VOS_MUTEX_HXX - #include <vos/mutex.hxx> diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+vsound.hxx deleted file mode 100644 index 028e7c9d64c..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+vsound.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 -+++ ../vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 -@@ -61,7 +61,7 @@ - #ifndef _VCL_VSOUND_HXX - #define _VCL_VSOUND_HXX - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - #define USE_OSS - #endif - -@@ -69,7 +69,7 @@ - #define USE_DEVAUDIO - #endif - --#if defined LINUX || defined SOLARIS -+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) - #define USE_NAS - #endif - diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk index 0f2c20433de..76deaa66077 100644 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk @@ -1,11 +1,13 @@ ---- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig Sat Oct 19 19:11:55 2002 -+++ ../vcl/unx/source/gdi/getstyle/makefile.mk Sat Oct 19 19:11:58 2002 -@@ -73,7 +73,7 @@ - - # --- Files -------------------------------------------------------- - --.IF "$(OS)$(CPU)"=="LINUXI" -+.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI" +--- ../vcl/unx/source/gdi/getstyle/makefile.mk.orig Thu Feb 20 18:28:59 2003 ++++ ../vcl/unx/source/gdi/getstyle/makefile.mk Wed Mar 5 19:23:22 2003 +@@ -78,6 +78,10 @@ GETSTYLE_GNOME=getstyle-gnome-linux-intel + HASGNOME2=TRUE .ENDIF ++.IF "$(OS)$(CPU)"=="FREEBSDI" ++GETSTYLE_GNOME=getstyle-gnome-freebsd-intel ++HASGNOME2=TRUE ++.ENDIF .IF "$(OS)$(CPU)"=="SOLARISS" + GETSTYLE_GNOME=getstyle-gnome-solaris-sparc + HASGNOME2=TRUE diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk index 0e8b80a814f..9cfdc1b2797 100644 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk @@ -1,11 +1,16 @@ ---- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig Sat Oct 19 19:22:47 2002 -+++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk Sat Oct 19 19:23:03 2002 -@@ -73,7 +73,7 @@ +--- ../vcl/unx/source/gdi/native-msgbox/makefile.mk.orig Thu Feb 20 18:29:08 2003 ++++ ../vcl/unx/source/gdi/native-msgbox/makefile.mk Wed Mar 5 19:25:00 2003 +@@ -75,8 +75,12 @@ - # --- Files -------------------------------------------------------- + HASGNOME2= --.IF "$(OS)$(CPU)"=="LINUXI" -+.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI" +-.IF "$(OS)$(CPU)"=="LINUXI" || "$(OS)$(CPU)"=="FREEBSDI" ++.IF "$(OS)$(CPU)"=="LINUXI" MSGBOX_GNOME=msgbox-gnome-linux-intel ++HASGNOME2=TRUE ++.ENDIF ++.IF "$(OS)$(CPU)"=="FREEBSDI" ++MSGBOX_GNOME=msgbox-gnome-freebsd-intel + HASGNOME2=TRUE .ENDIF .IF "$(OS)$(CPU)"=="SOLARISS" diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 1ea13157ce5..00000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 -+++ ../vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 -@@ -293,9 +293,9 @@ - .ENDIF # "$(OS)"=="MACOSX" - .ENDIF # "$(OS)"=="SOLARIS" - --.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - SHL1STDLIBS += -laudio --.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - - .ENDIF # "$(GUI)"=="UNX" - diff --git a/editors/openoffice.org-3-RC/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx index 154fcd10850..07d9f106055 100644 --- a/editors/openoffice.org-3-RC/files/patch-sfx2+source+appl+officeacceptthread.cxx +++ b/editors/openoffice.org-3-RC/files/patch-vcl+workben+officeacceptthread.cxx @@ -1,6 +1,6 @@ ---- ../sfx2/source/appl/officeacceptthread.cxx.orig Thu Oct 11 15:39:58 2001 -+++ ../sfx2/source/appl/officeacceptthread.cxx Fri Oct 18 23:35:14 2002 -@@ -126,7 +126,7 @@ +--- ../vcl/workben/officeacceptthread.cxx.orig Wed Mar 5 20:25:36 2003 ++++ ../vcl/workben/officeacceptthread.cxx Wed Mar 5 20:26:03 2003 +@@ -125,7 +125,7 @@ #if defined (SOLARIS) int status; nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); diff --git a/editors/openoffice.org-3-RC/pkg-comment b/editors/openoffice.org-3-RC/pkg-comment deleted file mode 100644 index 7c6d1b73d17..00000000000 --- a/editors/openoffice.org-3-RC/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser |