From 7c36a935776badded5c66cf0d9c4cb60212675ed Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Fri, 9 Apr 2004 23:16:42 +0000 Subject: Update to cws_src680_ooo20040329, checked out at 20040402 --- .../openoffice.org-3-devel/files/Makefile.mozilla | 61 +++++ .../debugpatch-setup2+mow+source+loader+loader.c | 21 -- .../files/debugpatch-solenv+inc+unxfbsdi.mk | 18 -- ...atch-goodies+source+filter.vcl+egif+giflzwc.cxx | 290 --------------------- ...ies+source+filter.vcl+egif+giflzwc_disabled.cxx | 45 ---- ...atch-goodies+source+filter.vcl+egif+makefile.mk | 11 - .../files/moz-connectivity+prj+build.lst | 17 -- .../files/moz-scp+source+office+files.scp | 34 --- .../files/patch-config_office+configure.in | 50 ++++ .../files/patch-config_office+set_soenv.in | 13 + .../patch-cppuhelper+source+gcc3_linux_intel.map | 13 + .../files/patch-hwpfilter+source+hwpreader.hxx | 14 + .../files/patch-odk+setsdkenv_unix.in | 27 ++ .../files/patch-odk+settings+settings.mk | 90 +++++++ .../patch-setup2+mow+source+loader+makefile.mk | 17 ++ .../files/patch-sfx2+source+config+cfgmgr.cxx | 16 ++ ...ce+unix+sysshell+recently_used_file_handler.cxx | 34 +++ .../files/patch-solenv+inc+ant.mk | 13 + .../files/patch-solenv+inc+settings.mk | 15 ++ .../files/patch-vcl+source+gdi+outdev3.cxx | 14 + .../files/patch-vcl+source+gdi+sallayout.cxx | 14 + .../patch-vcl+source+glyphs+gcache_layout.cxx | 14 + .../patch-vcl+unx+source+plugadapt+salmain.cxx | 24 ++ .../files/patch-vcl+util+makefile.mk | 30 +++ 24 files changed, 459 insertions(+), 436 deletions(-) create mode 100644 editors/openoffice.org-3-devel/files/Makefile.mozilla delete mode 100644 editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c delete mode 100644 editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk delete mode 100644 editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx delete mode 100644 editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx delete mode 100644 editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk delete mode 100644 editors/openoffice.org-3-devel/files/moz-connectivity+prj+build.lst delete mode 100644 editors/openoffice.org-3-devel/files/moz-scp+source+office+files.scp create mode 100644 editors/openoffice.org-3-devel/files/patch-config_office+configure.in create mode 100644 editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in create mode 100644 editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx create mode 100644 editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in create mode 100644 editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk create mode 100644 editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk create mode 100644 editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk create mode 100644 editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk create mode 100644 editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk (limited to 'editors/openoffice.org-3-devel/files') diff --git a/editors/openoffice.org-3-devel/files/Makefile.mozilla b/editors/openoffice.org-3-devel/files/Makefile.mozilla new file mode 100644 index 000000000000..eaa3d648037a --- /dev/null +++ b/editors/openoffice.org-3-devel/files/Makefile.mozilla @@ -0,0 +1,61 @@ +extract-mozilla: +.if ! exists(${WRKDIR}/mozilla/Makefile) + @${ECHO_MSG} "===> Extracting mozilla sub project" + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz +.endif + @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" + +patch-mozilla: + @${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \ + ${WRKDIR}/mozilla/files/ + @cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX="" + +build-mozilla: +.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip) + @${ECHO_MSG} "===> Building mozilla sub project" +.if defined(WITH_DEBUG) + @${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new + @${SED} -e 's|--disable-debug||' \ + -e 's|--disable-cpp-rtti||' \ + -e 's|--enable-strip||' \ + < ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile +.endif +.if defined(USE_GCC) + @cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX="" +.else + @cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX="" +.endif + @${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR} + @${CHMOD} 755 ${WRKDIR}/zipmoz.sh + @${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR} +.endif + +install-mozilla: + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + +register-mozilla: +.if exists(${WRKDIR}/mozilla-runtime) + @${RM} -rf ${WRKDIR}/mozilla-runtime +.endif + @${MKDIR} ${WRKDIR}/mozilla-runtime + @cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip + @cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip + @${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/ + @-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg + @cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \ + && export LD_LIBRARY_PATH=.:./lib && ./regxpcom + @${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \ + ${WRKDIR}/mozilla-runtime/components/xptitemp.dat + @${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom + @cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \ + | ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@ + +mozilla: + @${MAKE} extract-mozilla + @${MAKE} patch-mozilla + @${MAKE} build-mozilla + @${MAKE} register-mozilla + @${MAKE} install-mozilla + diff --git a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c deleted file mode 100644 index 726e3ec21083..000000000000 --- a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003 -+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003 -@@ -1069,6 +1069,7 @@ - - void KillSetupDir() - { -+#if 0 - DIR* pDir; - struct dirent* pFile; - -@@ -1088,6 +1089,10 @@ - closedir( pDir ); - chdir( strInitPath ); - rmdir( strTmpPath ); -+#else -+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", -+ strTmpPath); -+#endif - } - - void makeSymLink( char* s ) diff --git a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 054f342ecfe0..000000000000 --- a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Thu Jun 5 08:44:59 2003 -+++ ../solenv/inc/unxfbsdi.mk Tue Jun 10 17:30:40 2003 -@@ -92,12 +92,12 @@ - CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT - - # flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) -+CFLAGS+= -g -ggdb -w -c $(INCLUDE) - CFLAGS+= -I/usr/X11R6/include - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti -+CFLAGSCC= -g -ggdb -pipe -fno-rtti -+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti - - # Flags for enabling exception handling - CFLAGSEXCEPTIONS= -fexceptions diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx deleted file mode 100644 index 0fcdf289cca3..000000000000 --- a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx +++ /dev/null @@ -1,290 +0,0 @@ ---- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003 -+++ /dev/null Mon Apr 14 06:10:35 2003 -@@ -1,287 +0,0 @@ --/************************************************************************* -- * -- * $RCSfile: giflzwc.cxx,v $ -- * -- * $Revision: 1.1.1.1 $ -- * -- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $ -- * -- * The Contents of this file are made available subject to the terms of -- * either of the following licenses -- * -- * - GNU Lesser General Public License Version 2.1 -- * - Sun Industry Standards Source License Version 1.1 -- * -- * Sun Microsystems Inc., October, 2000 -- * -- * GNU Lesser General Public License Version 2.1 -- * ============================================= -- * Copyright 2000 by Sun Microsystems, Inc. -- * 901 San Antonio Road, Palo Alto, CA 94303, USA -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License version 2.1, as published by the Free Software Foundation. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -- * MA 02111-1307 USA -- * -- * -- * Sun Industry Standards Source License Version 1.1 -- * ================================================= -- * The contents of this file are subject to the Sun Industry Standards -- * Source License Version 1.1 (the "License"); You may not use this file -- * except in compliance with the License. You may obtain a copy of the -- * License at http://www.openoffice.org/license.html. -- * -- * Software provided under this License is provided on an "AS IS" basis, -- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -- * See the License for the specific provisions governing your rights and -- * obligations concerning the Software. -- * -- * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -- * -- * Copyright: 2000 by Sun Microsystems, Inc. -- * -- * All Rights Reserved. -- * -- * Contributor(s): _______________________________________ -- * -- * -- ************************************************************************/ -- --#include --#include "giflzwc.hxx" -- --// ---------------------------- --// - GIFImageDataOutputStream - --// ---------------------------- -- --class GIFImageDataOutputStream --{ --private: -- -- void FlushBlockBuf(); -- inline void FlushBitsBufsFullBytes(); -- -- SvStream& rStream; -- BYTE* pBlockBuf; -- BYTE nBlockBufSize; -- ULONG nBitsBuf; -- USHORT nBitsBufSize; -- --public: -- -- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ); -- ~GIFImageDataOutputStream(); -- -- inline void WriteBits( USHORT nCode, USHORT nCodeLen ); --}; -- --// ------------------------------------------------------------------------ -- --inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes() --{ -- while (nBitsBufSize>=8) -- { -- if( nBlockBufSize==255 ) -- FlushBlockBuf(); -- -- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf; -- nBitsBuf >>= 8; -- nBitsBufSize -= 8; -- } --} -- --// ------------------------------------------------------------------------ -- --inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen ) --{ -- if( nBitsBufSize+nCodeLen>32 ) -- FlushBitsBufsFullBytes(); -- -- nBitsBuf |= (ULONG) nCode << nBitsBufSize; -- nBitsBufSize += nCodeLen; --} -- --// ------------------------------------------------------------------------ -- --GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) : -- rStream(rGIF) --{ -- pBlockBuf = new BYTE[ 255 ]; -- nBlockBufSize = 0; -- nBitsBufSize = 0; -- nBitsBuf = 0; -- rStream << nLZWDataSize; --} -- --// ------------------------------------------------------------------------ -- -- --GIFImageDataOutputStream::~GIFImageDataOutputStream() --{ -- WriteBits(0,7); -- FlushBitsBufsFullBytes(); -- FlushBlockBuf(); -- rStream << (BYTE)0; -- delete[] pBlockBuf; --} -- --// ------------------------------------------------------------------------ -- --void GIFImageDataOutputStream::FlushBlockBuf() --{ -- if( nBlockBufSize ) -- { -- rStream << (BYTE) nBlockBufSize; -- rStream.Write( pBlockBuf,nBlockBufSize ); -- nBlockBufSize = 0; -- } --} -- --// ------------------- --// - GIFLZWCTreeNode - --// ------------------- -- --struct GIFLZWCTreeNode --{ -- -- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat -- GIFLZWCTreeNode* pFirstChild; // erster Sohn -- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn -- USHORT nValue; // Der Pixelwert --}; -- --// -------------------- --// - GIFLZWCompressor - --// -------------------- -- --GIFLZWCompressor::GIFLZWCompressor() --{ -- pIDOS=NULL; --} -- --// ------------------------------------------------------------------------ -- --GIFLZWCompressor::~GIFLZWCompressor() --{ -- if (pIDOS!=NULL) EndCompression(); --} -- --// ------------------------------------------------------------------------ -- --void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize ) --{ -- if( !pIDOS ) -- { -- USHORT i; -- -- nDataSize = nPixelSize; -- -- if( nDataSize < 2 ) -- nDataSize=2; -- -- nClearCode=1<WriteBits( nClearCode,nCodeSize ); -- } --} -- --// ------------------------------------------------------------------------ -- --void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize ) --{ -- if( pIDOS ) -- { -- GIFLZWCTreeNode* p; -- USHORT i; -- BYTE nV; -- -- if( !pPrefix && nSize ) -- { -- pPrefix=pTable+(*pSrc++); -- nSize--; -- } -- -- while( nSize ) -- { -- nSize--; -- nV=*pSrc++; -- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother ) -- { -- if (p->nValue==nV) -- break; -- } -- -- if( p) -- pPrefix=p; -- else -- { -- pIDOS->WriteBits(pPrefix->nCode,nCodeSize); -- -- if (nTableSize==4096) -- { -- pIDOS->WriteBits(nClearCode,nCodeSize); -- -- for (i=0; ipBrother=pPrefix->pFirstChild; -- pPrefix->pFirstChild=p; -- p->nValue=nV; -- p->pFirstChild=NULL; -- } -- -- pPrefix=pTable+nV; -- } -- } -- } --} -- --// ------------------------------------------------------------------------ -- --void GIFLZWCompressor::EndCompression() --{ -- if( pIDOS ) -- { -- if( pPrefix ) -- pIDOS->WriteBits(pPrefix->nCode,nCodeSize); -- -- pIDOS->WriteBits( nEOICode,nCodeSize ); -- delete[] pTable; -- delete pIDOS; -- pIDOS=NULL; -- } --} diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx deleted file mode 100644 index 223277a5cd7e..000000000000 --- a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx +++ /dev/null @@ -1,45 +0,0 @@ ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200 -@@ -0,0 +1,42 @@ -+/********************************** -+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed. -+ **********************************/ -+ -+//#include -+#include "giflzwc.hxx" -+ -+// -------------------- -+// - GIFLZWCompressor - -+// -------------------- -+ -+GIFLZWCompressor::GIFLZWCompressor() -+{ -+ pIDOS=NULL; -+} -+ -+// ------------------------------------------------------------------------ -+ -+GIFLZWCompressor::~GIFLZWCompressor() -+{ -+} -+ -+// ------------------------------------------------------------------------ -+ -+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize ) -+{ -+ /********************** DISABLED *************************/ -+} -+ -+// ------------------------------------------------------------------------ -+ -+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize ) -+{ -+ /********************** DISABLED *************************/ -+} -+ -+// ------------------------------------------------------------------------ -+ -+void GIFLZWCompressor::EndCompression() -+{ -+ /********************** DISABLED *************************/ -+} diff --git a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk b/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk deleted file mode 100644 index dd9e199acc96..000000000000 --- a/editors/openoffice.org-3-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001 -+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003 -@@ -89,7 +89,7 @@ - - SLOFILES= $(SLO)$/egif.obj \ - $(SLO)$/dlgegif.obj \ -- $(SLO)$/giflzwc.obj -+ $(SLO)$/giflzwc_disabled.obj - - - # ========================================================================== diff --git a/editors/openoffice.org-3-devel/files/moz-connectivity+prj+build.lst b/editors/openoffice.org-3-devel/files/moz-connectivity+prj+build.lst deleted file mode 100644 index bd1cfd7c8ee3..000000000000 --- a/editors/openoffice.org-3-devel/files/moz-connectivity+prj+build.lst +++ /dev/null @@ -1,17 +0,0 @@ ---- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18 -+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000 -@@ -1,4 +1,4 @@ --cn connectivity : comphelper moz svtools unixODBC NULL -+cn connectivity : comphelper svtools unixODBC NULL - cn connectivity usr1 - all cn_mkout NULL - cn connectivity\source\types nmake - all cn_types NULL - cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL -@@ -7,8 +7,6 @@ - cn connectivity\source\resource nmake - all cn_res NULL - cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL - cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL --cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL --cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL - cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL - cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL - cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL diff --git a/editors/openoffice.org-3-devel/files/moz-scp+source+office+files.scp b/editors/openoffice.org-3-devel/files/moz-scp+source+office+files.scp deleted file mode 100644 index c0852e9168c1..000000000000 --- a/editors/openoffice.org-3-devel/files/moz-scp+source+office+files.scp +++ /dev/null @@ -1,34 +0,0 @@ -Index: scp/source/office/files.scp -=================================================================== -RCS file: /cvs/installation/scp/source/office/files.scp,v -retrieving revision 1.369.10.1 -diff -u -r1.369.10.1 files.scp ---- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1 -+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000 -@@ -388,7 +388,7 @@ - Styles = (PACKED); - End - --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - File GID_FILE_LIB_MOZABDRV - TXT_FILE_BODY; - #ifdef UNX -@@ -750,7 +750,7 @@ - #endif - End - --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - File GID_FILE_LIB_MOZAB_2 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); -@@ -3184,7 +3184,7 @@ - - #endif - // of #ifdef SOLAR_JAVA --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - File GID_FILE_MOZILLA_RUNTIME - TXT_FILE_BODY; - Styles = (ARCHIVE); diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in new file mode 100644 index 000000000000..8bd6e0668f6b --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in @@ -0,0 +1,50 @@ +#i27028 and #i27028 +http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) +http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) + +--- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 ++++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 +@@ -1478,7 +1478,7 @@ + elif test "$_os" != "WINNT" ; then + AC_PATH_X + AC_PATH_XTRA +- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) ++dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) + + if test "x$x_includes" = "x"; then + x_includes="/usr/include" +@@ -1830,10 +1830,12 @@ + + if test "$enable_java" != "no"; then + ANT_HOME=; export ANT_HOME ++WITH_ANT_HOME=; export WITH_ANT_HOME + if test -z "$with_ant_home"; then + AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) + else +- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) ++ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) ++ WITH_ANT_HOME=$with_ant_home + fi + + +@@ -1873,7 +1875,11 @@ + AC_TRY_EVAL(ant_cmd) + if test $? = 0 && test -f ./conftest.class ; then + AC_MSG_RESULT([Ant works]) +- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` ++ if test -z "$WITH_ANT_HOME"; then ++ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` ++ else ++ ANT_HOME="$WITH_ANT_HOME" ++ fi + else + echo "configure: Ant test failed" >&5 + cat conftest.java >&5 +@@ -1885,6 +1891,7 @@ + + rm -f conftest* core core.* *.core + fi ++ + if test -z "$ANT_HOME"; then + ANT_HOME="NO_ANT_HOME" + fi diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in new file mode 100644 index 000000000000..dbb4c3506e1e --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in @@ -0,0 +1,13 @@ +#i27028 +http://qa.openoffice.org/issues/show_bug.cgi?id=27028 + +--- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 ++++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 +@@ -1419,6 +1419,7 @@ + ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); + ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); + ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); ++ToFile( "ANT", "@ANT@", "e" ); + ToFile( "JDKLIB", $JAVA_LIB, "e" ); + ToFile( "STLPORT4", $STLPORT4, "e" ); + ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..cdb61b141eba --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,13 @@ +Mysterious :) + +http://qa.openoffice.org/issues/show_bug.cgi?id=23917 +--- ../cppuhelper/source/gcc3_linux_intel.map.orig Sat Sep 13 22:15:22 2003 ++++ ../cppuhelper/source/gcc3_linux_intel.map Sat Sep 13 22:16:01 2003 +@@ -299,6 +299,7 @@ + _ZNK4cppu6UnoUrl11getProtocolEv; + _ZNK4cppu6UnoUrl13getConnectionEv; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx new file mode 100644 index 000000000000..8d65e6a3ee83 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx @@ -0,0 +1,14 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=27033 +--- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 ++++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 +@@ -68,7 +68,9 @@ + #include + #ifdef WIN32 + #include +-#else ++#endif ++ ++#if !defined(FREEBSD) + #include + #endif + diff --git a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in new file mode 100644 index 000000000000..e5551f883231 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in @@ -0,0 +1,27 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=24142 +--- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 ++++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 +@@ -2,7 +2,8 @@ + + # This script starts a new shell and sets all enviroment variables, which + # are necessary for building the examples of the Office Development Kit. +-# The Script was developed for the operating systems Solaris and Linux. ++# The script was developed for the operating systems Solaris, Linux, MacOS X ++# and FreeBSD. + + # Installation directory of the Software Development Kit. + # Example: OO_SDK_HOME=/work/StarOffice_SDK +@@ -76,6 +77,13 @@ + LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + ;; ++ ++ FreeBSD) ++ directoryname=freebsd ++ exampleout=FREEBSDexample.out ++ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH ++ export LD_LIBRARY_PATH ++ ;; + esac + + # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk new file mode 100644 index 000000000000..8c3942d12f16 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk @@ -0,0 +1,90 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=24142 + +--- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 ++++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 +@@ -368,3 +368,85 @@ + + endif + ++ifeq "$(PLATFORM)" "FreeBSD" ++# Settings for FreeBSD using gcc compiler ++ ++PROCTYPE := $(shell uname -m) ++ ++ ++# Default is freebsd on a intel machine ++PLATFORM=FreeBSD ++PACKAGE_LIB_DIR=freebsd_x86.plt ++JAVA_PROC_TYPE=i386 ++ ++OS=FREEBSD ++PS=/ ++CC=gcc ++LINK=gcc ++LIB=gcc ++ECHO=@echo ++MKDIR=mkdir -p ++CAT=cat ++OBJ_EXT=o ++SHAREDLIB_EXT=so ++SHAREDLIB_PRE=lib ++SHAREDLIB_OUT=$(OUT_LIB) ++ ++GCC_VERSION=$(shell $(CC) -dumpversion) ++ ++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" ++COMID=gcc3 ++CPPU_ENV=gcc3 ++else ++COMID=GCC ++CPPU_ENV=gcc2 ++endif ++ ++OSEP=\< ++CSEP=\> ++QUOTE=$(subst S,\,S) ++QM=\" ++ ++DEL=rm -f ++DELRECURSIVE=rm -rf ++COPY=cp ++URLPREFIX=file:// ++ ++# Include UDK version numbers ++include $(PRJ)/include/udkversion.mk ++ ++SALLIB=-lsal ++CPPULIB=-lcppu ++CPPUHELPERLIB=-lcppuhelper$(COMID) ++SALHELPERLIB=-lsalhelper$(COMID) ++STLPORTLIB=-lstlport_gcc ++ ++EMPTYSTRING= ++PATH_SEPARATOR=: ++ ++# -O is necessary for inlining (see gcc documentation) ++ifeq "$(DEBUG)" "yes" ++CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% ++else ++CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% ++endif ++ ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd ++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include ++STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl ++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) ++ ++# define for used compiler necessary for UNO ++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 ++#-DCPPU_ENV=gcc3 -- gcc3 3.0 ++ ++CC_OUTPUT_SWITCH=-o ++ ++LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' ++ ++EXE_LINK_FLAGS=-Wl ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% ++LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) ++ ++endif ++ diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk new file mode 100644 index 000000000000..7b25ff2635df --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk @@ -0,0 +1,17 @@ +do not need -ldl + +http://qa.openoffice.org/issues/show_bug.cgi?id=27043 +--- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 ++++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 +@@ -92,7 +92,11 @@ + LINK=gcc + LINKFLAGS= + LINKFLAGSAPP= ++.IF "$(OS)"=="FREEBSD" ++STDLIB= -lX11 -lc -lm ++.ELSE + STDLIB= -lX11 -ldl -lc -lm ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)$(COMID)"=="GCC" + + OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx new file mode 100644 index 000000000000..be38de290a51 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx @@ -0,0 +1,16 @@ +Wired bug? +http://qa.openoffice.org/issues/show_bug.cgi?id=22253 + +--- ../sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 ++++ ../sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 +@@ -118,6 +118,10 @@ + catch(com::sun::star::ucb::InteractiveAugmentedIOException&) + { + } ++ // PJ: This is a workaround for weird error on FreeBSD (#i22253#) ++ catch(com::sun::star::uno::Exception&) ++ { ++ } + sal_Bool bIsDocument; + if ( (aAny >>= bIsDocument) && bIsDocument ) + return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED ); diff --git a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx new file mode 100644 index 000000000000..10c3f3c1f6e8 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -0,0 +1,34 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=24315 + +For FreeBSD, time_t is defined as +at /usr/include/machine/_types.h +49th typedef int __int32_t; +90th typedef __int32_t __time_t; /* time()... */ +and +/usr/include/pwd.h:typedef __time_t time_t; +/usr/include/time.h:typedef __time_t time_t; +/usr/include/timeconv.h:typedef __time_t time_t; +/usr/include/utime.h:typedef __time_t time_t; +so time_t is equal to 32 bit integer + +For LinuxPPC (Yellowdog 3.0.1) + + +--- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 ++++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 +@@ -188,9 +188,12 @@ + write_xml_start_tag(TAG_RECENT_ITEM, file, true); + write_xml_tag(TAG_URI, uri_, file); + write_xml_tag(TAG_MIME_TYPE, mime_type_, file); +- +- rtl::OString ts = rtl::OString::valueOf(timestamp_); +- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); ++#if defined FREEBSD ++ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); ++#else ++ rtl::OString ts = rtl::OString::valueOf(timestamp_); ++#endif ++ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); + + if (is_private_) + write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk new file mode 100644 index 000000000000..e050b85d41e9 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk @@ -0,0 +1,13 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=27028 + +--- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 ++++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 +@@ -100,7 +100,7 @@ + .ENDIF + .ENDIF + +-ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) ++#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) + #ANT=java -version + + .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk new file mode 100644 index 000000000000..f93ee2ad6bf2 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=25579 +We should set locale as UTF-8 when compiling +but this was due to violation of OOo coding style + +--- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 ++++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 +@@ -172,7 +172,7 @@ + JAVAI=gij + JAVACPS=--classpath + .ELSE +-JAVAC=javac ++JAVAC=javac -encoding UTF-8 + JAVAI=java + JAVACPS=-classpath + .ENDIF diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx new file mode 100644 index 000000000000..22ef6f26f45f --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx @@ -0,0 +1,14 @@ +do not need including stdlib.h is enough +http://qa.openoffice.org/issues/show_bug.cgi?id=27041 + +--- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 ++++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 +@@ -176,7 +176,7 @@ + #if defined(SOLARIS) || defined(IRIX) + #include + #else +-#ifndef MACOSX ++#if !(defined(MACOSX) || defined(FREEBSD)) + #include + #endif + #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx new file mode 100644 index 000000000000..5cbc59bf7db7 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx @@ -0,0 +1,14 @@ +malloc.h is deprecated +http://qa.openoffice.org/issues/show_bug.cgi?id=27041 + +--- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 ++++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 +@@ -67,7 +67,7 @@ + #if defined(SOLARIS) || defined(IRIX) + #include + #else +-#ifndef MACOSX ++#if !(defined(MACOSX) || defined(FREEBSD)) + #include + #endif + #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx new file mode 100644 index 000000000000..53c7a909faf7 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx @@ -0,0 +1,14 @@ +malloc.h is deprecated +http://qa.openoffice.org/issues/show_bug.cgi?id=27041 + +--- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 ++++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 +@@ -74,7 +74,7 @@ + #if defined(SOLARIS) || defined(IRIX) + #include + #else +-#ifndef MACOSX ++#if !(defined(MACOSX) || defined(FREEBSD)) + #include + #endif + #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx new file mode 100644 index 000000000000..f5bd54364036 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx @@ -0,0 +1,24 @@ +http://qa.openoffice.org/issues/show_bug.cgi?id=27042 + +include +Note: +-- +* $RCSfile: salmain.cxx,v $ +* +* $Revision: 1.8.12.2 $ +* +* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ +-- +includes this patch + +--- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 ++++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 +@@ -59,7 +59,7 @@ + * + ************************************************************************/ + +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include + #include diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk new file mode 100644 index 000000000000..5d133486e032 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk @@ -0,0 +1,30 @@ +FreeBSD doesn't require/need/have -ldl +http://qa.openoffice.org/issues/show_bug.cgi?id=27043 + +--- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 ++++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 +@@ -208,7 +208,9 @@ + .IF "$(GUI)"!="UNX" + SHL1OBJS= $(SLO)$/salshl.obj + .ELSE +-SHL1STDLIBS+=-ldl ++ .IF "$(OS)"!="FREEBSD" ++ SHL1STDLIBS+=-ldl ++ .ENDIF + .ENDIF + + .IF "$(GUI)" != "MAC" +@@ -351,8 +353,11 @@ + # libs for gtk plugin + SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` + SHL4STDLIBS+=-l$(SHL2TARGET) +-SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl +- ++ .IF "$(OS)"!="FREEBSD" ++ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl ++ .ELSE ++ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 ++ .ENDIF # FREEBSD + .ENDIF # UNX + + # --- Allgemein ---------------------------------------------------------- -- cgit v1.2.3