diff options
author | mrauch <mrauch> | 2004-05-03 20:56:35 +0000 |
---|---|---|
committer | mrauch <mrauch> | 2004-05-03 20:56:35 +0000 |
commit | 4756a399b0f7d6f9b8532bf5c785e7824cee7ee6 (patch) | |
tree | 90e4313011f55a5028bc3bf7ebe05698f7653d3f /misc/openoffice/patches | |
parent | 3cf0320037df80a8c84b2f28643d2805c98bd655 (diff) | |
download | pkgsrc-4756a399b0f7d6f9b8532bf5c785e7824cee7ee6.tar.gz |
Update to version 1.1.1.
New features include:
* PDF, DocBook/XML, XHTML and Macromedia Flash (SWF) export
* Accessibility
* Support for Complex Text Layout (CTL)
* User installation automated
Diffstat (limited to 'misc/openoffice/patches')
122 files changed, 982 insertions, 7952 deletions
diff --git a/misc/openoffice/patches/patch-aa b/misc/openoffice/patches/patch-aa index e9f6dbaa15d..1d156141ba5 100644 --- a/misc/openoffice/patches/patch-aa +++ b/misc/openoffice/patches/patch-aa @@ -1,44 +1,525 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ +$NetBSD: patch-aa,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Jun 11 14:09:22 2001 -+++ ../berkeleydb/db-3.2.9.patch -@@ -43,3 +43,39 @@ - - CC= @MAKEFILE_CC@ - CCLINK= @MAKEFILE_CCLINK@ -+--- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 -++++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -995,6 +995,7 @@ -+ CPPFLAGS="-D_REENTRANT $CPPFLAGS";; -+ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -+ LIBS="-lsocket -lsvipc $LIBS";; -++netbsd*) optimize_def="-O2";; -+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; -+ *qnx) cat >> confdefs.h <<\EOF -+ #define HAVE_QNX 1 -+@@ -1795,6 +1796,7 @@ -+ case "$host_os" in -+ solaris*) JINCSUBDIRS="solaris";; -+ linux*) JINCSUBDIRS="linux genunix";; -++ netbsd*) JINCSUBDIRS="netbsd solaris linux genunix";; -+ *) JINCSUBDIRS="genunix";; -+ esac -+ -+--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 -++++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 -+@@ -1194,11 +1194,12 @@ -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+- else -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -+ # can we support soname and/or expsyms with a.out? -oliva -++ else -++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ need_version=no -+ fi -+ ;; -+ +--- ../sal/util/sal_netbsd.map.orig 2004-02-09 22:26:34.000000000 +0100 ++++ ../sal/util/sal_netbsd.map +@@ -0,0 +1,520 @@ ++UDK_3_0_0 { ++ global: ++ GetVersionInfo; ++ osl_acceptConnectionOnSocket; ++ osl_acceptPipe; ++ osl_acquireSocket; ++ osl_acquirePipe; ++ osl_acquireMutex; ++ osl_acquireSemaphore; ++ osl_addSignalHandler; ++ osl_addToSocketSet; ++ osl_assertFailedLine; ++ osl_bindAddrToSocket; ++ osl_breakDebug; ++ osl_checkCondition; ++ osl_clearSocketSet; ++ osl_closeDirectory; ++ osl_closePipe; ++ osl_closeProfile; ++ osl_connectSocketTo; ++ osl_copyHostAddr; ++ osl_copySocketAddr; ++ osl_createCondition; ++ osl_createEmptySocketAddr; ++ osl_createHostAddr; ++ osl_createHostAddrByAddr; ++ osl_createHostAddrByName; ++ osl_createInetSocketAddr; ++ osl_createMutex; ++ osl_createPipe; ++ osl_createSemaphore; ++ osl_createSocket; ++ osl_createSocketSet; ++ osl_createSuspendedThread; ++ osl_createThread; ++ osl_createThreadKey; ++ osl_decrementInterlockedCount; ++ osl_demultiplexSocketEvents; ++ osl_destroyCondition; ++ osl_destroyHostAddr; ++ osl_destroyMutex; ++ osl_destroySemaphore; ++ osl_destroySocketAddr; ++ osl_destroySocketSet; ++ osl_destroyThread; ++ osl_destroyThreadKey; ++ osl_enableNonBlockingMode; ++ osl_executeProcess; ++ osl_executeProcess_WithRedirectedIO; ++ osl_flushProfile; ++ osl_freeProcessHandle; ++ osl_freeSecurityHandle; ++ osl_getAddrOfSocketAddr; ++ osl_getCommandArg; ++ osl_getCommandArgCount; ++ osl_getConfigDir; ++ osl_getCurrentSecurity; ++ osl_getDirectoryItem; ++ osl_getDottedInetAddrOfSocketAddr; ++ osl_getEnvironment; ++ osl_getEthernetAddress; ++ osl_getExecutableFile; ++ osl_getFamilyOfSocketAddr; ++ osl_getFileStatus; ++ osl_getFileURLFromSystemPath; ++ osl_getGlobalMutex; ++ osl_getHomeDir; ++ osl_getHostnameOfHostAddr; ++ osl_getHostnameOfSocketAddr; ++ osl_getInetPortOfSocketAddr; ++ osl_getLastPipeError; ++ osl_getLastSocketError; ++ osl_getLastSocketErrorDescription; ++ osl_getLocalAddrOfSocket; ++ osl_getLocalHostname; ++ osl_getModuleURLFromAddress; ++ osl_getNextDirectoryItem; ++ osl_getPeerAddrOfSocket; ++ osl_getProcess; ++ osl_getProcessInfo; ++ osl_getProcessWorkingDir; ++ osl_getProfileSectionEntries; ++ osl_getProfileSections; ++ osl_getServicePort; ++ osl_getSocketAddrOfHostAddr; ++ osl_getSocketOption; ++ osl_getSocketType; ++ osl_getSymbol; ++ osl_getSystemPathFromFileURL; ++ osl_getSystemTime; ++ osl_getThreadIdentifier; ++ osl_getThreadKeyData; ++ osl_getThreadPriority; ++ osl_getThreadTextEncoding; ++ osl_getUserIdent; ++ osl_getUserName; ++ osl_getVolumeInformation; ++ osl_incrementInterlockedCount; ++ osl_isAdministrator; ++ osl_isEndOfFile; ++ osl_isEqualSocketAddr; ++ osl_isExceptionPending; ++ osl_isInSocketSet; ++ osl_isNonBlockingMode; ++ osl_isReceiveReady; ++ osl_isSendReady; ++ osl_isThreadRunning; ++ osl_joinProcess; ++ osl_joinWithThread; ++ osl_listenOnSocket; ++ osl_loadModule; ++ osl_loginUser; ++ osl_loginUserOnFileServer; ++ osl_openDirectory; ++ osl_openProfile; ++ osl_raiseSignal; ++ osl_readProfileBool; ++ osl_readProfileIdent; ++ osl_readProfileString; ++ osl_readPipe; ++ osl_readSocket; ++ osl_receiveFromSocket; ++ osl_receivePipe; ++ osl_receiveSocket; ++ osl_releaseDirectoryItem; ++ osl_releaseMutex; ++ osl_releasePipe; ++ osl_releaseSemaphore; ++ osl_releaseSocket; ++ osl_removeFromSocketSet; ++ osl_removeProfileEntry; ++ osl_removeSignalHandler; ++ osl_reportError; ++ osl_resetCondition; ++ osl_resolveHostname; ++ osl_resumeThread; ++ osl_scheduleThread; ++ osl_searchFileURL; ++ osl_sendPipe; ++ osl_sendSocket; ++ osl_sendToSocket; ++ osl_setCondition; ++ osl_setFileAttributes; ++ osl_setFileTime; ++ osl_setInetPortOfSocketAddr; ++ osl_setAddrOfSocketAddr; ++ osl_setSocketOption; ++ osl_setThreadKeyData; ++ osl_setThreadPriority; ++ osl_setThreadTextEncoding; ++ osl_shutdownSocket; ++ osl_suspendThread; ++ osl_terminateProcess; ++ osl_terminateThread; ++ osl_trace; ++ osl_tryToAcquireMutex; ++ osl_tryToAcquireSemaphore; ++ osl_unloadModule; ++ osl_waitCondition; ++ osl_waitThread; ++ osl_writePipe; ++ osl_writeSocket; ++ osl_writeProfileBool; ++ osl_writeProfileIdent; ++ osl_writeProfileString; ++ osl_yieldThread; ++ osl_loadUserProfile; ++ osl_unloadUserProfile; ++ osl_sendResourcePipe; ++ osl_receiveResourcePipe; ++ rtl_allocateMemory; ++ rtl_compareMemory; ++ rtl_copyMemory; ++ rtl_fillMemory; ++ rtl_freeMemory; ++ rtl_moveMemory; ++ rtl_reallocateMemory; ++ rtl_zeroMemory; ++ rtl_findInMemory; ++ rtl_hashentry_destroy; ++ rtl_hashfunc; ++ rtl_hashtable_add; ++ rtl_hashtable_destroy; ++ rtl_hashtable_find; ++ rtl_hashtable_grow; ++ rtl_hashtable_init; ++ rtl_locale_equals; ++ rtl_locale_getCountry; ++ rtl_locale_getDefault; ++ rtl_locale_getLanguage; ++ rtl_locale_getVariant; ++ rtl_locale_hashCode; ++ rtl_locale_register; ++ rtl_locale_setDefault; ++ rtl_str_getLength; ++ rtl_str_compare; ++ rtl_str_compare_WithLength; ++ rtl_str_shortenedCompare_WithLength; ++ rtl_str_reverseCompare_WithLength; ++ rtl_str_compareIgnoreAsciiCase; ++ rtl_str_compareIgnoreAsciiCase_WithLength; ++ rtl_str_shortenedCompareIgnoreAsciiCase_WithLength; ++ rtl_str_hashCode; ++ rtl_str_hashCode_WithLength; ++ rtl_str_indexOfChar; ++ rtl_str_indexOfChar_WithLength; ++ rtl_str_indexOfStr; ++ rtl_str_indexOfStr_WithLength; ++ rtl_str_lastIndexOfChar; ++ rtl_str_lastIndexOfChar_WithLength; ++ rtl_str_lastIndexOfStr; ++ rtl_str_lastIndexOfStr_WithLength; ++ rtl_str_replaceChar; ++ rtl_str_replaceChar_WithLength; ++ rtl_str_toAsciiLowerCase; ++ rtl_str_toAsciiLowerCase_WithLength; ++ rtl_str_toAsciiUpperCase; ++ rtl_str_toAsciiUpperCase_WithLength; ++ rtl_str_trim; ++ rtl_str_trim_WithLength; ++ rtl_str_valueOfBoolean; ++ rtl_str_valueOfChar; ++ rtl_str_valueOfInt32; ++ rtl_str_valueOfInt64; ++ rtl_str_valueOfDouble; ++ rtl_str_valueOfFloat; ++ rtl_str_toBoolean; ++ rtl_str_toInt32; ++ rtl_str_toInt64; ++ rtl_str_toDouble; ++ rtl_str_toFloat; ++ rtl_string_acquire; ++ rtl_string_assign; ++ rtl_string_getLength; ++ rtl_string_getStr; ++ rtl_string_getToken; ++ rtl_string_new; ++ rtl_string_newConcat; ++ rtl_string_newFromStr; ++ rtl_string_newFromStr_WithLength; ++ rtl_string_newFromString; ++ rtl_string_newReplace; ++ rtl_string_newReplaceStrAt; ++ rtl_string_newToAsciiLowerCase; ++ rtl_string_newToAsciiUpperCase; ++ rtl_string_newTrim; ++ rtl_string_new_WithLength; ++ rtl_string_release; ++ rtl_stringbuffer_ensureCapacity; ++ rtl_stringbuffer_insert; ++ rtl_stringbuffer_newFromStr_WithLength; ++ rtl_stringbuffer_newFromStringBuffer; ++ rtl_ustr_compare; ++ rtl_ustr_compare_WithLength; ++ rtl_ustr_shortenedCompare_WithLength; ++ rtl_ustr_reverseCompare_WithLength; ++ rtl_ustr_compareIgnoreAsciiCase; ++ rtl_ustr_compareIgnoreAsciiCase_WithLength; ++ rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength; ++ rtl_ustr_ascii_compare; ++ rtl_ustr_ascii_compare_WithLength; ++ rtl_ustr_ascii_shortenedCompare_WithLength; ++ rtl_ustr_asciil_reverseCompare_WithLength; ++ rtl_ustr_ascii_compareIgnoreAsciiCase; ++ rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength; ++ rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength; ++ rtl_ustr_getLength; ++ rtl_ustr_hashCode; ++ rtl_ustr_hashCode_WithLength; ++ rtl_ustr_indexOfChar; ++ rtl_ustr_indexOfChar_WithLength; ++ rtl_ustr_indexOfStr; ++ rtl_ustr_indexOfStr_WithLength; ++ rtl_ustr_lastIndexOfChar; ++ rtl_ustr_lastIndexOfChar_WithLength; ++ rtl_ustr_lastIndexOfStr; ++ rtl_ustr_lastIndexOfStr_WithLength; ++ rtl_ustr_replaceChar; ++ rtl_ustr_replaceChar_WithLength; ++ rtl_ustr_toAsciiLowerCase; ++ rtl_ustr_toAsciiLowerCase_WithLength; ++ rtl_ustr_toAsciiUpperCase; ++ rtl_ustr_toAsciiUpperCase_WithLength; ++ rtl_ustr_trim; ++ rtl_ustr_trim_WithLength; ++ rtl_ustr_valueOfBoolean; ++ rtl_ustr_valueOfChar; ++ rtl_ustr_valueOfInt32; ++ rtl_ustr_valueOfInt64; ++ rtl_ustr_valueOfDouble; ++ rtl_ustr_valueOfFloat; ++ rtl_ustr_toBoolean; ++ rtl_ustr_toInt32; ++ rtl_ustr_toInt64; ++ rtl_ustr_toDouble; ++ rtl_ustr_toFloat; ++ rtl_uString_acquire; ++ rtl_uString_assign; ++ rtl_uString_getLength; ++ rtl_uString_getStr; ++ rtl_uString_getToken; ++ rtl_uString_new; ++ rtl_uString_newConcat; ++ rtl_uString_newFromStr; ++ rtl_uString_newFromStr_WithLength; ++ rtl_uString_newFromAscii; ++ rtl_uString_newFromString; ++ rtl_uString_newReplace; ++ rtl_uString_newReplaceStrAt; ++ rtl_uString_newToAsciiLowerCase; ++ rtl_uString_newToAsciiUpperCase; ++ rtl_uString_newTrim; ++ rtl_uString_new_WithLength; ++ rtl_uString_release; ++ rtl_uStringbuffer_ensureCapacity; ++ rtl_uStringbuffer_insert; ++ rtl_uStringbuffer_insert_ascii; ++ rtl_uStringbuffer_newFromStr_WithLength; ++ rtl_uStringbuffer_newFromStringBuffer; ++ rtl_string2UString; ++ rtl_uString2String; ++ rtl_createTextToUnicodeConverter; ++ rtl_destroyTextToUnicodeConverter; ++ rtl_createTextToUnicodeContext; ++ rtl_destroyTextToUnicodeContext; ++ rtl_resetTextToUnicodeContext; ++ rtl_convertTextToUnicode; ++ rtl_createUnicodeToTextConverter; ++ rtl_destroyUnicodeToTextConverter; ++ rtl_createUnicodeToTextContext; ++ rtl_destroyUnicodeToTextContext; ++ rtl_resetUnicodeToTextContext; ++ rtl_convertUnicodeToText; ++ rtl_isOctetTextEncoding; ++ rtl_getTextEncodingInfo; ++ rtl_getTextEncodingFromWindowsCharset; ++ rtl_getTextEncodingFromUnixCharset; ++ rtl_getTextEncodingFromMimeCharset; ++ rtl_getBestWindowsCharsetFromTextEncoding; ++ rtl_getMimeCharsetFromTextEncoding; ++ rtl_getBestMimeCharsetFromTextEncoding; ++ rtl_getBestUnixCharsetFromTextEncoding; ++ rtl_allocateZeroMemory; ++ rtl_freeZeroMemory; ++ rtl_crc32; ++ rtl_digest_create; ++ rtl_digest_createMD2; ++ rtl_digest_createMD5; ++ rtl_digest_createSHA; ++ rtl_digest_createSHA1; ++ rtl_digest_createHMAC_MD5; ++ rtl_digest_createHMAC_SHA1; ++ rtl_digest_destroy; ++ rtl_digest_destroyMD2; ++ rtl_digest_destroyMD5; ++ rtl_digest_destroySHA; ++ rtl_digest_destroySHA1; ++ rtl_digest_destroyHMAC_MD5; ++ rtl_digest_destroyHMAC_SHA1; ++ rtl_digest_get; ++ rtl_digest_getMD2; ++ rtl_digest_getMD5; ++ rtl_digest_getSHA; ++ rtl_digest_getSHA1; ++ rtl_digest_getHMAC_MD5; ++ rtl_digest_getHMAC_SHA1; ++ rtl_digest_init; ++ rtl_digest_initHMAC_MD5; ++ rtl_digest_initHMAC_SHA1; ++ rtl_digest_queryAlgorithm; ++ rtl_digest_queryLength; ++ rtl_digest_update; ++ rtl_digest_updateMD2; ++ rtl_digest_updateMD5; ++ rtl_digest_updateSHA; ++ rtl_digest_updateSHA1; ++ rtl_digest_updateHMAC_MD5; ++ rtl_digest_updateHMAC_SHA1; ++ rtl_digest_MD2; ++ rtl_digest_MD5; ++ rtl_digest_SHA; ++ rtl_digest_SHA1; ++ rtl_digest_HMAC_MD5; ++ rtl_digest_HMAC_SHA1; ++ rtl_digest_PBKDF2; ++ ++ rtl_random_createPool; ++ rtl_random_destroyPool; ++ rtl_random_addBytes; ++ rtl_random_getBytes; ++ ++ rtl_createUuid; ++ rtl_createNamedUuid; ++ rtl_compareUuid; ++ rtl_getGlobalProcessId; ++ ++ osl_openFile; ++ osl_setFilePos; ++ osl_getFilePos; ++ osl_setFileSize; ++ osl_readFile; ++ osl_writeFile; ++ osl_closeFile; ++ osl_createDirectory; ++ osl_removeDirectory; ++ osl_removeFile; ++ osl_copyFile; ++ osl_moveFile; ++ ++ osl_closeSocket; ++ osl_createInetBroadcastAddr; ++ ++ rtl_cipher_create; ++ rtl_cipher_createBF; ++ rtl_cipher_init; ++ rtl_cipher_initBF; ++ rtl_cipher_encode; ++ rtl_cipher_encodeBF; ++ rtl_cipher_decode; ++ rtl_cipher_decodeBF; ++ rtl_cipher_destroy; ++ rtl_cipher_destroyBF; ++ ++ rtl_byte_sequence_reference2One; ++ rtl_byte_sequence_realloc; ++ rtl_byte_sequence_acquire; ++ rtl_byte_sequence_release; ++ rtl_byte_sequence_construct; ++ rtl_byte_sequence_constructNoDefault; ++ rtl_byte_sequence_constructFromArray; ++ rtl_byte_sequence_assign; ++ rtl_byte_sequence_equals; ++ rtl_byte_sequence_getConstArray; ++ rtl_byte_sequence_getLength; ++ ++ osl_acquireDirectoryItem; ++ ++ osl_abbreviateSystemPath; ++ osl_getDateTimeFromTimeValue; ++ osl_getTimeValueFromDateTime; ++ osl_getLocalTimeFromSystemTime; ++ osl_getSystemTimeFromLocalTime; ++ osl_getAbsoluteFileURL; ++ ++ osl_unmountVolumeDevice; ++ osl_automountVolumeDevice; ++ osl_releaseVolumeDeviceHandle; ++ osl_getVolumeDeviceMountPath; ++ osl_acquireVolumeDeviceHandle; ++ ++ osl_setDebugMessageFunc; ++ osl_readLine; ++ osl_getGlobalTimer; ++ osl_getCanonicalName; ++ osl_getTextEncodingFromLocale; ++ ++ rtl_getUriCharClass; ++ rtl_uriConvertRelToAbs; ++ rtl_uriEncode; ++ rtl_uriDecode; ++ ++ rtl_bootstrap_get; ++ rtl_bootstrap_set; ++ rtl_bootstrap_setIniFileName; ++ rtl_bootstrap_args_open; ++ rtl_bootstrap_args_close; ++ rtl_bootstrap_get_from_handle; ++ rtl_bootstrap_get_iniName_from_handle; ++ rtl_bootstrap_expandMacros_from_handle; ++ rtl_bootstrap_expandMacros; ++ rtl_getAppCommandArgCount; ++ rtl_getAppCommandArg; ++ ++ rtl_moduleCount_acquire; ++ rtl_moduleCount_release; ++ rtl_moduleCount_canUnload; ++ rtl_registerModuleForUnloading; ++ rtl_unregisterModuleForUnloading; ++ rtl_unloadUnusedModules; ++ rtl_addUnloadingListener; ++ rtl_removeUnloadingListener; ++ ++ rtl_logfile_trace; ++ rtl_tres_create; ++ rtl_tres_destroy; ++ osl_getProcessLocale; ++ osl_setProcessLocale; ++ getpwnam_r; ++ getpwuid_r; ++ localtime_r; ++ gmtime_r; ++ gethostbyname_r; ++ readdir_r; ++ local: ++ *; ++}; ++ ++UDK_3.1 { ++ global: ++ osl_getTempDirURL; ++ osl_createTempFile; ++ ++ rtl_math_doubleToString; ++ rtl_math_doubleToUString; ++ rtl_math_pow10Exp; ++ rtl_math_round; ++ rtl_math_stringToDouble; ++ rtl_math_uStringToDouble; ++ rtl_convertUStringToString; ++ ++ osl_joinProcessWithTimeout; ++ ++ rtl_getTextEncodingFromWindowsCodePage; ++ rtl_getWindowsCodePageFromTextEncoding; ++} UDK_3_0_0; ++ ++UDK_3.2 { ++ global: ++ osl_syncFile; ++} UDK_3.1; diff --git a/misc/openoffice/patches/patch-ab b/misc/openoffice/patches/patch-ab index 32a20b2932a..efaa159af5e 100644 --- a/misc/openoffice/patches/patch-ab +++ b/misc/openoffice/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/02/13 18:09:24 mrauch Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/prj/build.lst.orig Mon Nov 12 22:45:25 2001 -+++ ../bridges/prj/build.lst -@@ -13,5 +13,8 @@ - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL - br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_netbsd_intel nmake - u br_gccni br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_netbsd_sparc nmake - u br_gccns br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_netbsd_powerpc nmake - u br_gccnp br_unotypes NULL - br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL - br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL +--- ../desktop/source/pkgchk/pkgchk_misc.h.orig 2004-04-17 19:21:18.000000000 +0200 ++++ ../desktop/source/pkgchk/pkgchk_misc.h +@@ -244,6 +244,8 @@ bool office_is_running( ::rtl::Bootstrap + #define THIS_PLATFORM_PATH "/linux_sparc.plt" + #elif defined (MACOSX) && defined (POWERPC) + #define THIS_PLATFORM_PATH "/macosx_powerpc.plt" ++#elif defined (NETBSD) && defined (INTEL) ++#define THIS_PLATFORM_PATH "/netbsd_intel.plt" + #elif defined (NETBSD) && defined (SPARC) + #define THIS_PLATFORM_PATH "/netbsd_sparc.plt" + #elif defined (FREEBSD) && defined (INTEL) diff --git a/misc/openoffice/patches/patch-ac b/misc/openoffice/patches/patch-ac index 05715520020..a824a07d591 100644 --- a/misc/openoffice/patches/patch-ac +++ b/misc/openoffice/patches/patch-ac @@ -1,558 +1,20 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/02/13 18:09:24 mrauch Exp $ +$NetBSD: patch-ac,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_intel/cpp2uno.cxx.orig Sun Jan 6 11:24:10 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_intel/cpp2uno.cxx -@@ -0,0 +1,553 @@ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include <malloc.h> -+#if STLPORT_VERSION<321 -+#include <list.h> -+#include <map.h> -+#else -+#include <list> -+#include <map> -+#endif -+#include <typeinfo> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include <osl/mutex.hxx> -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_netbsd_intel.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_netbsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ char * pCode = pSpace + ((nSize+2)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20); -+ pvft[nPos+2] = codeSnip; -+ -+ // mov $nPos, %eax -+ *codeSnip++ = 0xb8; -+ *(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 ); -+ codeSnip += sizeof(sal_Int32); -+ aComplexReturn.pop_front(); -+ // mov %esp, %edx -+ *codeSnip++ = 0x89; -+ *codeSnip++ = 0xe2; -+ // jmp cpp_vtable_call -+ *codeSnip++ = 0xe9; -+ *(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32); -+ codeSnip += sizeof(sal_Int32); -+ } -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ +--- ../sal/inc/osl/endian.h.orig 2004-04-17 19:22:21.000000000 +0200 ++++ ../sal/inc/osl/endian.h +@@ -103,9 +103,12 @@ extern "C" { + # include <machine/endian.h> + # if BYTE_ORDER == LITTLE_ENDIAN +-# define _LITTLE_ENDIAN ++# undef _BIG_ENDIAN ++# undef _PDP_ENDIAN + # elif BYTE_ORDER == BIG_ENDIAN ++# undef _LITTLE_ENDIAN +-# define _BIG_ENDIAN ++# undef _PDP_ENDIAN + # elif BYTE_ORDER == PDP_ENDIAN ++# undef _LITTLE_ENDIAN ++# undef _BIG_ENDIAN +-# define _PDP_ENDIAN + # endif + #endif diff --git a/misc/openoffice/patches/patch-ad b/misc/openoffice/patches/patch-ad index 73bbaca6f08..11e5691e818 100644 --- a/misc/openoffice/patches/patch-ad +++ b/misc/openoffice/patches/patch-ad @@ -1,310 +1,24 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_intel/except.cxx.orig Sun Jan 6 11:41:58 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_intel/except.cxx -@@ -0,0 +1,305 @@ -+#include <dlfcn.h> -+#include <new.h> -+#include <typeinfo> -+#if STLPORT_VERSION<321 -+#include <map.h> -+#else -+#include <map> -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include <osl/diagnose.h> -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include <com/sun/star/uno/Any.hxx> -+#endif -+ -+#include <rtl/strbuf.hxx> -+ -+#include "gcc2_netbsd_intel.hxx" -+ -+#ifdef DEBUG -+#include <stdio.h> -+#endif -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() ); -+#endif -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_netbsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __throw(); -+} -+ -+void gcc291_netbsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ +--- ../sal/osl/unx/system.c.orig 2004-04-17 19:24:56.000000000 +0200 ++++ ../sal/osl/unx/system.c +@@ -460,7 +460,7 @@ struct hostent *gethostbyname_r(const ch + return res; + } + +-#if defined(MACOSX) ++#if defined(MACOSX) || defined(NETBSD) + /* + * This section works around calls that are missing or broken + * in MacOS X 10.1.x and earlier. +@@ -504,6 +504,10 @@ int readdir_r( DIR *dirp, struct dirent + return nRet; + } + ++#endif ++ ++#if defined(MACOSX) ++ + /* No reentrant asctime() either... */ + + /*******************************************************************************/ diff --git a/misc/openoffice/patches/patch-ae b/misc/openoffice/patches/patch-ae index 883fd5eaa53..3a4a43d48a8 100644 --- a/misc/openoffice/patches/patch-ae +++ b/misc/openoffice/patches/patch-ae @@ -1,97 +1,17 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ae,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_intel/gcc2_netbsd_intel.hxx.orig Sun Jan 6 11:42:08 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_intel/gcc2_netbsd_intel.hxx -@@ -0,0 +1,92 @@ -+#ifndef _RTL_STRING_HXX_ -+#include <rtl/string.hxx> -+#endif -+#include <typeinfo> -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __throw(); -+} -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_netbsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_netbsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ +--- ../sal/util/makefile.mk.orig 2004-04-17 19:26:03.000000000 +0200 ++++ ../sal/util/makefile.mk +@@ -120,8 +120,11 @@ LIB3FILES= \ + + SHL1TARGET= $(TARGET) + SHL1IMPLIB= i$(TARGET) +- ++.IF "$(OS)"=="NETBSD" ++SHL1VERSIONMAP= $(TARGET)_netbsd.map ++.ELSE + SHL1VERSIONMAP= $(TARGET).map ++.ENDIF + + .IF "$(GUI)"=="WNT" + .IF "$(COM)"!="GCC" diff --git a/misc/openoffice/patches/patch-af b/misc/openoffice/patches/patch-af index e03d7910a9e..9d97d785b01 100644 --- a/misc/openoffice/patches/patch-af +++ b/misc/openoffice/patches/patch-af @@ -1,52 +1,21 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-af,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_intel/makefile.mk.orig Sun Jan 6 11:42:19 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_intel/makefile.mk -@@ -0,0 +1,47 @@ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDI" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(SALLIB) \ -+ $(CPPULIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ +--- ../solenv/bin/build.pl.orig 2004-04-17 19:26:27.000000000 +0200 ++++ ../solenv/bin/build.pl +@@ -532,13 +532,11 @@ sub CorrectPath { + }; + + sub check_dmake { +- open(DMAKETEMP, "which dmake |"); + my $dmake_exe; +- foreach (<DMAKETEMP>) { +- $dmake_exe = $_ if (/dmake/); ++ foreach (split(/:/,$ENV{'PATH'})) { ++ $dmake_exe = $_ . "/dmake"; ++ last if (-x $dmake_exe); + }; +- close DMAKETEMP; +- chomp $dmake_exe; + &print_error("dmake - no such file or directory") unless -x $dmake_exe; + }; + diff --git a/misc/openoffice/patches/patch-ag b/misc/openoffice/patches/patch-ag index a60be946af5..6190ff2721f 100644 --- a/misc/openoffice/patches/patch-ag +++ b/misc/openoffice/patches/patch-ag @@ -1,408 +1,21 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ag,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_intel/uno2cpp.cxx.orig Sun Jan 6 11:42:28 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_intel/uno2cpp.cxx -@@ -0,0 +1,403 @@ -+ -+#include <malloc.h> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_netbsd_intel.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && -+ (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ __asm__ ( -+ // copy values -+ "pushl %%edx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%eax\n\t" -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "mov 0(%%edx), %%ecx\n\t" -+ "sub $4, %%edx\n\t" -+ "push %%ecx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n" -+ "Lcall:\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "add $2, %%eax\n\t" // first two table entries are reserved -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %4\n\t" -+ "mov %%edx, %5\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ "popl %%eax\n\t" -+ "popl %%ecx\n\t" -+ "popl %%edx\n\t" -+ : : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) ); -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__ ( -+ "fstps %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__ ( -+ "fstpl %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch( ... ) -+ { -+ // get exception -+ cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info(); -+ gcc291_netbsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ +--- ../solenv/bin/checkdll.sh.orig 2004-04-17 19:26:43.000000000 +0200 ++++ ../solenv/bin/checkdll.sh +@@ -7,7 +7,7 @@ + # Copyright (c) 2000, Sun Microsystems, Inc. + # + +-set -- `getopt "L:" "$@"` || { ++set -- `getopt "L:R:" "$@"` || { + echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2 + exit 1 + } +@@ -19,6 +19,7 @@ if [ -x $checkdll ]; then + do + case $1 in + -L) shift; option=$1;; ++ -R) shift;; + --) break;; + esac + case "${libpath+X}" in diff --git a/misc/openoffice/patches/patch-ah b/misc/openoffice/patches/patch-ah index a4348dd7198..6cd33e15656 100644 --- a/misc/openoffice/patches/patch-ah +++ b/misc/openoffice/patches/patch-ah @@ -1,773 +1,94 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ah,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/cpp2uno.cxx.orig Sun Jan 6 11:42:47 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/cpp2uno.cxx -@@ -0,0 +1,768 @@ -+#include <stdio.h> -+ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include <malloc.h> -+#if STLPORT_VERSION<321 -+#include <list.h> -+#include <map.h> -+#else -+#include <list> -+#include <map> -+#endif -+#include <typeinfo> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include <osl/mutex.hxx> -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_netbsd_powerpc.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** gpreg, void ** fpreg, void ** ovrflw, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ int ng = 0; // number of gpr registers used -+ int nf = 0; // number of fpr registers used -+ void ** pCppStack; // temporary stack pointer -+ -+ // gpreg: [ret *], this, [gpr params] -+ // fpreg: [fpr params] -+ // ovrflw: [gpr or fpr params (properly aligned)] -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)gpreg; -+ gpreg++; -+ ng++; -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ gpreg++; -+ ng++; -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_DOUBLE: -+ if (nf < 8) { -+ pCppArgs[nPos] = fpreg; -+ pUnoArgs[nPos] = fpreg; -+ nf++; -+ fpreg += 2; -+ } else { -+ if (((long)ovrflw) & 4) ovrflw++; -+ pCppArgs[nPos] = ovrflw; -+ pUnoArgs[nPos] = ovrflw; -+ ovrflw += 2; -+ } -+ break; -+ -+ case typelib_TypeClass_FLOAT: -+ /* fpreg are all double values so need to create -+ modify fpreg to be a single word float value */ -+ if (nf < 8) { -+ float tmp = (float) (*((double *)fpreg)); -+ (*((float *) fpreg)) = tmp; -+ pCppArgs[nPos] = fpreg; -+ pUnoArgs[nPos] = fpreg; -+ nf++; -+ fpreg += 2; -+ } else { -+#if 0 /* abi is not being followed correctly */ -+ if (((long)ovrflw) & 4) ovrflw++; -+ float tmp = (float) (*((double *)ovrflw)); -+ (*((float *) ovrflw)) = tmp; -+ pCppArgs[nPos] = ovrflw; -+ pUnoArgs[nPos] = ovrflw; -+ ovrflw += 2; -+#else -+ pCppArgs[nPos] = ovrflw; -+ pUnoArgs[nPos] = ovrflw; -+ ovrflw += 1; -+#endif -+ } -+ break; -+ -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ if (ng < 7) { -+ if (ng & 1) { -+ ng++; -+ gpreg++; -+ } -+ pCppArgs[nPos] = gpreg; -+ pUnoArgs[nPos] = gpreg; -+ ng += 2; -+ gpreg += 2; -+ } else { -+ if (((long)ovrflw) & 4) ovrflw++; -+ pCppArgs[nPos] = ovrflw; -+ pUnoArgs[nPos] = ovrflw; -+ ovrflw += 2; -+ } -+ break; -+ -+ case typelib_TypeClass_BYTE: -+ case typelib_TypeClass_BOOLEAN: -+ if (ng < 8) { -+ pCppArgs[nPos] = (((char *)gpreg) + 3); -+ pUnoArgs[nPos] = (((char *)gpreg) + 3); -+ ng++; -+ gpreg++; -+ } else { -+ pCppArgs[nPos] = (((char *)ovrflw) + 3); -+ pUnoArgs[nPos] = (((char *)ovrflw) + 3); -+ ovrflw++; -+ } -+ break; -+ -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ if (ng < 8) { -+ pCppArgs[nPos] = (((char *)gpreg)+ 2); -+ pUnoArgs[nPos] = (((char *)gpreg)+ 2); -+ ng++; -+ gpreg++; -+ } else { -+ pCppArgs[nPos] = (((char *)ovrflw) + 2); -+ pUnoArgs[nPos] = (((char *)ovrflw) + 2); -+ ovrflw++; -+ } -+ break; -+ -+ default: -+ if (ng < 8) { -+ pCppArgs[nPos] = gpreg; -+ pUnoArgs[nPos] = gpreg; -+ ng++; -+ gpreg++; -+ } else { -+ pCppArgs[nPos] = ovrflw; -+ pUnoArgs[nPos] = ovrflw; -+ ovrflw++; -+ } -+ -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (ng < 8) { -+ pCppArgs[nPos] = *(void **)gpreg; -+ pCppStack = gpreg; -+ ng++; -+ gpreg++; -+ } else { -+ pCppArgs[nPos] = *(void **)ovrflw; -+ pCppStack = ovrflw; -+ ovrflw++; -+ } -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_linux_powerpc_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to return reg -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** gpreg, void ** fpreg, void ** ovrflw, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // gpreg: [ret *], this, [other gpr params] -+ // fpreg: [fpr params] -+ // ovrflw: [gpr or fpr params (properly aligned)] -+ -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(gpreg +1); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(gpreg); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ gpreg, fpreg, ovrflw, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ gpreg, fpreg, ovrflw, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( gpreg[2] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( gpreg[0] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = gpreg[0]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ gpreg, fpreg, ovrflw, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call(int nTableEntry, void** gpregptr, void** fpregptr, void** ovrflw) -+{ -+ sal_Int32 gpreg[8]; -+ double fpreg[8]; -+ -+ memcpy( gpreg, gpregptr, 32 ); -+ memcpy( fpreg, fpregptr, 64 ); -+ volatile long nRegReturn[2]; -+ -+ sal_Bool bComplex = nTableEntry & 0x80000000 ? sal_True : sal_False; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ // move return value into register space -+ // (will be loaded by machine code snippet) -+ -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ __asm__( "lbz 3,%0\n\t" : : -+ "m"(nRegReturn[0]) ); -+ break; -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ __asm__( "lhz 3,%0\n\t" : : -+ "m"(nRegReturn[0]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "lfs 1,%0\n\t" : : -+ "m" (*((float*)nRegReturn)) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "lfd 1,%0\n\t" : : -+ "m" (*((double*)nRegReturn)) ); -+ break; -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "lwz 4,%0\n\t" : : -+ "m"(nRegReturn[1]) ); -+ default: -+ __asm__( "lwz 3,%0\n\t" : : -+ "m"(nRegReturn[0]) ); -+ break; -+ } -+ -+} -+ -+//__________________________________________________________________________________________________ -+void flush_icache(char *addr) -+{ -+ __asm__ volatile ( -+ "dcbf 0,%0;" -+ "sync;" -+ "icbi 0,%0;" -+ "sync;" -+ "isync;" -+ : : "r"(addr) : "memory"); -+} -+ -+void flush_range(char * addr1, int size) -+{ -+#define MIN_LINE_SIZE 16 -+ int i; -+ for (i = 0; i < size; i += MIN_LINE_SIZE) -+ flush_icache(addr1+i); -+ flush_icache(addr1+size-1); -+} -+ -+ -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ const int nSnippetSize = 100; -+ // char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+2)*sizeof(void *)) + (nSize*nSnippetSize) ); -+ char * pSpace = (char *)rtl_allocateMemory( (nSize+2)*sizeof(void *) + (nSize*nSnippetSize) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ // char * pCode = pSpace + (2*(nSize+2)*sizeof(void *)); -+ char * pCode = pSpace + ((nSize+2)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned long * codeSnip = (unsigned long *)(pCode + (nPos*nSnippetSize)); -+ pvft[nPos+2] = codeSnip; -+ unsigned long nTablePos = nPos; -+ sal_Bool bComplex = aComplexReturn.front(); -+ if( bComplex ) -+ nTablePos |= 0x80000000; -+ aComplexReturn.pop_front(); -+ -+ /* generate this code */ -+ -+ // # so first save gpr 3 to gpr 10 (aligned to 4) -+ // stw r3, -512(r1) -+ // stw r4, -508(r1) -+ // stw r5, -504(r1) -+ // stw r6, -500(r1) -+ // stw r7, -496(r1) -+ // stw r8, -492(r1) -+ // stw r9, -488(r1) -+ // stw r10,-484(r1) -+ -+ // # next save fpr 1 to fpr 8 (aligned to 8) -+ // stfd f1, -480(r1) -+ // stfd f2, -472(r1) -+ // stfd f3, -464(r1) -+ // stfd f4, -456(r1) -+ // stfd f5, -448(r1) -+ // stfd f6, -440(r1) -+ // stfd f7, -432(r1) -+ // stfd f8, -424(r1) -+ -+ // # now here is where cpp_vtable_call must go -+ // lis r3,0xdead -+ // ori r3,r3,0xbeef -+ // mtctr r3 -+ -+ // # now load up the the table entry number -+ // lis r3, 0xdead -+ // ori r3,r3,0xbeef -+ -+ // #now load up the pointer to the saved gpr registers -+ // addi r4,r1,-512 -+ -+ // #now load up the pointer to the saved fpr registers -+ // addi r5,r1,-480 -+ -+ // #now load up the pointer to the overflow call stack -+ // addi r6,r1,8 # frame pointer plus 8 -+ -+ // bctr -+ -+ * codeSnip++ = 0x9061fe00; -+ * codeSnip++ = 0x9081fe04; -+ * codeSnip++ = 0x90a1fe08; -+ * codeSnip++ = 0x90c1fe0c; -+ * codeSnip++ = 0x90e1fe10; -+ * codeSnip++ = 0x9101fe14; -+ * codeSnip++ = 0x9121fe18; -+ * codeSnip++ = 0x9141fe1c; -+ * codeSnip++ = 0xd821fe20; -+ * codeSnip++ = 0xd841fe28; -+ * codeSnip++ = 0xd861fe30; -+ * codeSnip++ = 0xd881fe38; -+ * codeSnip++ = 0xd8a1fe40; -+ * codeSnip++ = 0xd8c1fe48; -+ * codeSnip++ = 0xd8e1fe50; -+ * codeSnip++ = 0xd901fe58; -+ * codeSnip++ = 0x3c600000 | (((unsigned long)cpp_vtable_call) >> 16); -+ * codeSnip++ = 0x60630000 | (((unsigned long)cpp_vtable_call) & 0x0000FFFF); -+ * codeSnip++ = 0x7c6903a6; -+ * codeSnip++ = 0x3c600000 | (nTablePos >> 16); -+ * codeSnip++ = 0x60630000 | (nTablePos & 0x0000FFFF); -+ * codeSnip++ = 0x3881fe00; -+ * codeSnip++ = 0x38a1fe20; -+ * codeSnip++ = 0x38c10008; -+ * codeSnip++ = 0x4e800420; -+ -+ flush_range((char*)pvft[nPos + 2],nSnippetSize); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ +--- ../solenv/inc/_tg_app.mk.orig 2004-04-17 19:27:02.000000000 +0200 ++++ ../solenv/inc/_tg_app.mk +@@ -77,7 +77,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP1OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -269,7 +269,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP2OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -461,7 +461,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP3OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -653,7 +653,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP4OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -845,7 +845,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP5OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1037,7 +1037,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP6OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1229,7 +1229,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP7OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1421,7 +1421,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP8OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP8LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1613,7 +1613,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP9OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP9LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1805,7 +1805,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP10OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP10LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd diff --git a/misc/openoffice/patches/patch-ai b/misc/openoffice/patches/patch-ai index e9f7b9c1b93..2778d1060b6 100644 --- a/misc/openoffice/patches/patch-ai +++ b/misc/openoffice/patches/patch-ai @@ -1,305 +1,13 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ai,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/except.cxx.orig Sun Jan 6 11:42:57 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/except.cxx -@@ -0,0 +1,300 @@ -+#include <dlfcn.h> -+#include <new.h> -+#include <typeinfo> -+#if STLPORT_VERSION<321 -+#include <map.h> -+#else -+#include <map> -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include <osl/diagnose.h> -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include <com/sun/star/uno/Any.hxx> -+#endif -+ -+#include <rtl/strbuf.hxx> -+ -+#include "gcc2_netbsd_powerpc.hxx" -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_netbsd_powerpc_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __throw(); -+ -+} -+ -+void gcc291_netbsd_powerpc_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ +--- ../solenv/inc/tg_app.mk.orig 2004-04-17 19:27:25.000000000 +0200 ++++ ../solenv/inc/tg_app.mk +@@ -172,7 +172,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $( + @+-$(RM) $(MISC)$/$(@:b).cmd + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + -o $@ $(APP$(TNR)OBJS:s/.obj/.o/) "\" > $(MISC)$/$(@:b).cmd +- @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd ++ @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(@:b).cmd + @+echo $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd diff --git a/misc/openoffice/patches/patch-aj b/misc/openoffice/patches/patch-aj index b568009a47d..bf70b9936c5 100644 --- a/misc/openoffice/patches/patch-aj +++ b/misc/openoffice/patches/patch-aj @@ -1,100 +1,13 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-aj,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/gcc2_netbsd_powerpc.hxx.orig Sun Jan 6 11:43:06 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/gcc2_netbsd_powerpc.hxx -@@ -0,0 +1,95 @@ -+ -+#ifndef _RTL_STRING_HXX_ -+#include <rtl/string.hxx> -+#endif -+#include <typeinfo> -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __throw(); -+} -+ -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_netbsd_powerpc_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_netbsd_powerpc_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ -+ +--- ../solenv/inc/unxbsdi2.mk.orig 2004-04-17 19:27:37.000000000 +0200 ++++ ../solenv/inc/unxbsdi2.mk +@@ -64,7 +64,7 @@ + ASM= + AFLAGS= + +-SOLAR_JAVA=TRUE ++SOLAR_JAVA*=TRUE + JAVAFLAGSDEBUG=-g + + # filter for supressing verbose messages from linker diff --git a/misc/openoffice/patches/patch-ak b/misc/openoffice/patches/patch-ak index 9d1c4f6e7c5..d51e5841aa3 100644 --- a/misc/openoffice/patches/patch-ak +++ b/misc/openoffice/patches/patch-ak @@ -1,53 +1,40 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-ak,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/makefile.mk.orig Sun Jan 6 11:43:15 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/makefile.mk -@@ -0,0 +1,48 @@ -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDP" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ +--- ../config_office/set_soenv.in.orig 2004-04-17 19:27:58.000000000 +0200 ++++ ../config_office/set_soenv.in +@@ -40,7 +40,7 @@ use File::Basename; + #-------------------------------------------------------- + # + my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, +- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW, ++ $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW, + $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include, + $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os); + # +@@ -113,6 +113,7 @@ $cur_dir = "."; # cu + $par_dir = ".."; # parrent directory + $I = " -I"; # include search path + $L = " -L"; # library search path ++$R = " -R"; # library runtime path + $D = " -D"; # define search path + $Solaris = "SunOS"; # return of uname command on Solaris + $Linux = "Linux"; # return of uname command on Linux +@@ -1237,7 +1238,8 @@ elsif (($platform eq "$Linux") || ($pla + $L.$JRETOOLKITDIR. + $L.$JRETHREADDIR. + $L_STLPORT_LIB. +- $L.$XLIB; ++ $L.$XLIB. ++ $R.$XLIB; + } + elsif ($platform eq "$Winnt") + { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +@@ -1307,6 +1309,8 @@ if ($platform eq "$Linux") + } + elsif ($platform eq "$NetBSD") + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } + elsif (($platform eq $Irix) || ($platform eq $Irix64)) + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix"; diff --git a/misc/openoffice/patches/patch-al b/misc/openoffice/patches/patch-al index 89738dac9b0..be3275d3f34 100644 --- a/misc/openoffice/patches/patch-al +++ b/misc/openoffice/patches/patch-al @@ -1,620 +1,25 @@ -$NetBSD: patch-al,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-al,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/uno2cpp.cxx.orig Sun Jan 6 11:43:24 2002 -+++ ../bridges/source/cpp_uno/gcc2_netbsd_powerpc/uno2cpp.cxx -@@ -0,0 +1,615 @@ -+#include <stdio.h> -+ -+#include <malloc.h> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_netbsd_powerpc.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ char * pPT, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs, -+ uno_Any ** pExc, -+ uno_Mapping * pCpp2uno) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ // OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ // OSL_ENSURE( (sizeof(void *) == 4) && -+ // (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ // OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ /* KBH: tried to do this right but ppc calling conventions are wierd -+ to say the least */ -+ -+ /* the basic idea here is to use gpr[8] as a storage area for -+ the future values of registers r3 to r10 needed for the call, -+ and similarly fpr[8] as a storage area for the future values -+ of floating point registers f1 to f8 -+ */ -+ -+ unsigned long * mfunc; /* actual function to be invoked */ -+ cp_eh_info* pX; -+ void (*ptr)(); -+ int gpr[8]; /* storage for gpregisters, map to r3-r10 */ -+ int off; /* offset used to find function */ -+ double fpr[8]; /* storage for fpregisters, map to f1-f8 */ -+ int n; /* number of gprs mapped so far */ -+ int f; /* number of fprs mapped so far */ -+ long *p; /* pointer to parameter overflow area */ -+ int c; /* character of parameter type being decoded */ -+ double dret; /* temporary function return values*/ -+ int iret, iret2; -+ -+ /* Because of the Power PC calling conventions we could be passing -+ parameters in both register types and on the stack. To create the -+ stack parameter area we need we now simply allocate local -+ variable storage param[] that is at least the size of the parameter stack -+ (more than enough space) which we can overwrite the parameters into. -+ -+ Note: This keeps us from having to decode the signature twice and -+ prevents problems with later local variables. -+ -+ Note: could require up to 2*nStackLongs words of parameter stack area -+ if the call has many float parameters (i.e. floats take up only 1 -+ word on the stack but take 2 words in parameter area in the -+ stack frame . -+ -+ Update! floats on the outgoing parameter stack only take up 1 word -+ (stfs is used) which is not correct according to the ABI but we -+ will match what the compiler does until this is figured out -+ -+ */ -+ __asm__ __volatile__ ( -+ "rlwinm %0,%0,3,3,28\n\t" -+ "addi %0,%0,22\n\t" -+ "rlwinm %0,%0,0,4,28\n\t" -+ "lwz 0,0(1)\n\t" -+ "subf 1,%0,1\n\t" -+ "stw 0,0(1)\n\t" -+ "addi %1,1,8\n\t" -+ : : "r" (nStackLongs), "r" (p) /* no inputs */ : "0" ); -+ -+ /* now begin to load the C++ function arguments into storage */ -+ n = 0; -+ f = 0; -+ -+ /* now we need to parse the entire signature string */ -+ /* until we get the END indicator */ -+ -+ /* treat complex return pointer like any other parameter */ -+ -+#if 0 -+ /* Let's figure out what is really going on here*/ -+ fprintf(stderr,"callVirtualMethod paramters string is %s\n",pPT); -+ int k = nStackLongs; -+ long * q = (long *)pStackLongs; -+ while (k > 0) { -+ fprintf(stderr,"uno stack is: %x\n",*q); -+ k--; -+ q++; -+ } -+#endif -+ -+ /* parse the argument list up to the ending ) */ -+ while (*pPT != 'X') { -+ c = *pPT; -+ switch (c) { -+ case 'D': /* type is double */ -+ if (f < 8) { -+ fpr[f++] = *((double *)pStackLongs); /* store in register */ -+ } else { -+ if (((long) p) & 4) -+ p++; -+ *p++ = *pStackLongs; /* or on the parameter stack */ -+ *p++ = *(pStackLongs + 1); -+ } -+ pStackLongs += 2; -+ break; -+ -+ case 'F': /* type is float */ -+ /* this assumes that floats are stored as 1 32 bit word on param -+ stack and that if passed in parameter stack to C, should be -+ as double word. -+ -+ Whoops: the abi is not actually followed by gcc, need to -+ store floats as a *single* word on outgoing parameter stack -+ to match what gcc actually does -+ */ -+ if (f < 8) { -+ fpr[f++] = *((float *)pStackLongs); -+ } else { -+#if 0 /* if abi were followed */ -+ if (((long) p) & 4) -+ p++; -+ *((double *)p) = *((float *)pStackLongs); -+ p += 2; -+#else -+ *((float *)p) = *((float *)pStackLongs); -+ p += 1; -+#endif -+ } -+ pStackLongs += 1; -+ break; -+ -+ case 'H': /* type is long long */ -+ if (n & 1) n++; /* note even elements gpr[] will map to -+ odd registers*/ -+ if (n <= 6) { -+ gpr[n++] = *pStackLongs; -+ gpr[n++] = *(pStackLongs+1); -+ } else { -+ if (((long) p) & 4) -+ p++; -+ *p++ = *pStackLongs; -+ *p++ = *(pStackLongs+1); -+ } -+ pStackLongs += 2; -+ break; -+ -+ case 'S': -+ if (n < 8) { -+ gpr[n++] = *((unsigned short*)pStackLongs); -+ } else { -+ *p++ = *((unsigned short *)pStackLongs); -+ } -+ pStackLongs += 1; -+ break; -+ -+ case 'B': -+ if (n < 8) { -+ gpr[n++] = *((char *)pStackLongs); -+ } else { -+ *p++ = *((char *)pStackLongs); -+ } -+ pStackLongs += 1; -+ break; -+ -+ default: -+ if (n < 8) { -+ gpr[n++] = *pStackLongs; -+ } else { -+ *p++ = *pStackLongs; -+ } -+ pStackLongs += 1; -+ break; -+ } -+ pPT++; -+ } -+ -+ /* figure out the address of the function we need to invoke */ -+ off = nVtableIndex + 2; // first two slots are empty -+ off = off * 4; // 4 bytes per slot -+ mfunc = *((unsigned long **)pThis); // get the address of the vtable -+ mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset -+ mfunc = *((unsigned long **)mfunc); // the function is stored at the address -+ ptr = (void (*)())mfunc; -+ -+ try { -+ -+ /* Set up the machine registers and invoke the function */ -+ -+ __asm__ __volatile__ ( -+ "lwz 3, 0(%0)\n\t" -+ "lwz 4, 4(%0)\n\t" -+ "lwz 5, 8(%0)\n\t" -+ "lwz 6, 12(%0)\n\t" -+ "lwz 7, 16(%0)\n\t" -+ "lwz 8, 20(%0)\n\t" -+ "lwz 9, 24(%0)\n\t" -+ "lwz 10, 28(%0)\n\t" -+ "lfd 1, 0(%1)\n\t" -+ "lfd 2, 8(%1)\n\t" -+ "lfd 3, 16(%1)\n\t" -+ "lfd 4, 24(%1)\n\t" -+ "lfd 5, 32(%1)\n\t" -+ "lfd 6, 40(%1)\n\t" -+ "lfd 7, 48(%1)\n\t" -+ "lfd 8, 56(%1)\n\t" -+ : : "r" (gpr), "r" (fpr) -+ : "0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" -+ ); -+ -+ (*ptr)(); -+ -+ __asm__ __volatile__ ( -+ "mr %1, 3\n\t" -+ "mr %2, 4\n\t" -+ "fmr %0, 1\n\t" -+ : "=f" (dret), "=r" (iret), "=r" (iret2) : ); -+ -+ *pExc = 0; -+ } -+ -+ catch( ... ) -+ { -+ pX = (cp_eh_info*)__cp_eh_info(); -+ gcc291_netbsd_powerpc_fillUnoException( pX, *pExc, pCpp2uno ); -+ } -+ -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[0] = iret; -+ ((long*)pRegisterReturn)[1] = iret2; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = iret; -+ break; -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = (unsigned short)iret; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = (unsigned char)iret; -+ break; -+ case typelib_TypeClass_FLOAT: -+ *(float*)pRegisterReturn = (float)dret; -+ break; -+ case typelib_TypeClass_DOUBLE: -+ *(double*)pRegisterReturn = dret; -+ break; -+ } -+} -+ -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: complex ret ptr, this, values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ /* KBH: need to know pararmeter types for callVirtualMethod so store then in string */ -+ char * pParamType = (char *) alloca(nParams+2); -+ char * pPT = pParamType; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ *pPT++ = 'I'; // signify that complex return type on stack -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ *pPT++ = 'I'; -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ /* KBH: we need to know type of each param so that we know whether to use -+ gpr or fpr to pass in parameters: -+ Key: I - int, long, pointer, etc means pass in gpr -+ B - byte value passed in gpr -+ S - short value passed in gpr -+ F - float value pass in fpr -+ D - double value pass in fpr -+ H - long long int pass in proper pairs of gpr (3,4) (5,6), etc -+ X - indicates end of parameter description string -+ */ -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_ENUM: -+ *pPT++ = 'I'; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *pPT++ = 'S'; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *pPT++ = 'B'; -+ break; -+ case typelib_TypeClass_FLOAT: -+ *pPT++ = 'F'; -+ break; -+ case typelib_TypeClass_DOUBLE: -+ *pPT++ = 'D'; -+ pCppStack += sizeof(sal_Int32); // extra long -+ break; -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ *pPT++ = 'H'; -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ /* KBH: fixme is this the right way to pass these */ -+ *pPT++='I'; -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ /* KBH: terminate the string */ -+ *pPT++='X'; -+ *pPT=0; -+ -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, -+ (sal_Int32 *)pCppStackStart, ((pCppStack - pCppStackStart) / sizeof(sal_Int32)), -+ ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ if (*ppUnoExc == 0) { -+ // NO exception occured... -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ -+ } -+ } else { -+ // get exception -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ +--- ../odk/source/bean/native/unix/makefile.mk.orig 2004-04-17 19:28:28.000000000 +0200 ++++ ../odk/source/bean/native/unix/makefile.mk +@@ -36,6 +36,20 @@ SHL1STDLIBS+=-lzip -lawt + SHL1STDLIBS+=-lstdc++ + .ENDIF + ++.IF "$(OS)" == "NETBSD" || "$(OS)" == "FREEBSD" ++.IF "$(SOLAR_JAVA)" != "" ++.IF "$(JAVANUMVER)" < "000100040000" ++SHL1STDLIBS+=-ljvm ++.ENDIF ++.ENDIF ++.ENDIF ++ ++.IF "$(OS)" == "NETBSD" ++#We might run a jdk under emulation. ++#This is fine for building, but gives a false alarm here. ++SHL1NOCHECK=TRUE ++.ENDIF ++ + NO_SHL1DESCRIPTION=TRUE + + # --- Targets ------------------------------------------------------ diff --git a/misc/openoffice/patches/patch-am b/misc/openoffice/patches/patch-am index 3b9dbb061e9..dc7c6061f1a 100644 --- a/misc/openoffice/patches/patch-am +++ b/misc/openoffice/patches/patch-am @@ -1,15 +1,20 @@ -$NetBSD: patch-am,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-am,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../bridges/source/prot_uno/makefile.mk.orig Tue Jan 1 14:08:48 2002 -+++ ../bridges/source/prot_uno/makefile.mk -@@ -85,8 +85,8 @@ - SHL1TARGET= $(TARGET) +--- ../soltools/checkdll/makefile.mk.orig 2004-04-17 19:28:45.000000000 +0200 ++++ ../soltools/checkdll/makefile.mk +@@ -81,12 +81,14 @@ APP1TARGET = checkdll + APP1OBJS = $(OBJ)$/checkdll.obj + DEPOBJFILES = $(APP1OBJS) + .IF "$(OS)"!="FREEBSD" ++.IF "$(OS)"!="NETBSD" + .IF "$(OS)"!="MACOSX" + STDLIB += -ldl + .ENDIF + .ENDIF ++.ENDIF + .IF "$(OS)"=="NETBSD" +-APP1STDLIBS += -Wl,--whole-archive -lgcc -Wl,--no-whole-archive ++APP1STDLIBS += -u _Unwind_Resume -Wl,--whole-archive -lgcc -Wl,--no-whole-archive + .ENDIF + .ENDIF # "$(GUI)"=="UNX" - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-an b/misc/openoffice/patches/patch-an index 6bc2cfa5f73..f750dec0d3b 100644 --- a/misc/openoffice/patches/patch-an +++ b/misc/openoffice/patches/patch-an @@ -1,17 +1,22 @@ -$NetBSD: patch-an,v 1.1.1.1 2002/02/13 18:09:23 mrauch Exp $ +$NetBSD: patch-an,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002 -+++ ../comphelper/util/makefile.mk -@@ -85,11 +85,11 @@ +--- ../psprint/source/printergfx/printerjob.cxx.orig 2004-04-17 19:29:37.000000000 +0200 ++++ ../psprint/source/printergfx/printerjob.cxx +@@ -107,6 +107,17 @@ - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR) - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ - $(OSLLIB) \ -- $(SALLIB) \ - $(CPPRTLLIB) + #include "glyphset.hxx" - SHL1DEPN= ++#if defined(NETBSD) ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, ++ size_t buflen, struct passwd **result); ++#if defined(__cplusplus) ++} ++#endif ++#endif ++ + using namespace psp ; + + #ifdef MACOSX diff --git a/misc/openoffice/patches/patch-ao b/misc/openoffice/patches/patch-ao index c8025b6d80e..0fcd6a1ea5e 100644 --- a/misc/openoffice/patches/patch-ao +++ b/misc/openoffice/patches/patch-ao @@ -1,64 +1,19 @@ -$NetBSD: patch-ao,v 1.2 2002/08/02 20:33:23 jdolecek Exp $ +$NetBSD: patch-ao,v 1.3 2004/05/03 20:56:36 mrauch Exp $ ---- configure.in.orig Mon Nov 12 22:45:53 2001 -+++ configure.in Fri Aug 2 21:14:58 2002 -@@ -204,12 +204,14 @@ - dnl ****************************************** - dnl Check whether the gnu gcc compiler is used. - if test -z "$with_gcc_home"; then -- if test "$CC" = "gcc"; then -- AC_PATH_PROG(GCC, gcc) -- COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"` -+ dnl NetBSD pkgsrc is guaranteed to have gcc. -+ dnl if test "$CC" = "gcc"; then -+ GCC=$CC -+ COMPATH=`echo $GCC | $AWK '{print $1}' | xargs dirname ` -+ CCFLAGS=$LDFLAGS; export CCFLAGS; - _gcc_include_start=/usr/lib/gcc-lib - _gxx_include_start=/usr/include -- fi -+ dnl fi - else - dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home - _gcc_path="$with_gcc_home/bin/gcc" -@@ -256,6 +258,9 @@ - dnl find include paths now - AC_MSG_CHECKING([the GNU gcc include paths]) - _gcc_include_path=`find $_gcc_include_start -name $_gcc_version -print 2> /dev/null` -+ if test "$_os" = "NetBSD" -a -z "$_gcc_include_path"; then -+ _gcc_include_path="/usr" -+ fi - if test "$_gcc_include_path"; then - _multiple=`echo $_gcc_include_path | $AWK '{ if ($2) print "true"; else print "false" }'` - if test "$_multiple" = "false"; then -@@ -305,7 +310,7 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -+ if test "$_os" = "FreeBSD" ; then - _gcc_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) -@@ -740,6 +745,12 @@ - fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'` -+ -+ if test "$_jdk_middle" = "false" -a \( "$_jdk_middle3" = "true" -o "$_jdk_middle4" = "true" \); then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -982,7 +993,7 @@ - HAVE_GPC_C="yes" - fi +--- ../i18npool/source/breakiterator/gendict.cxx.orig 2004-04-17 19:30:03.000000000 +0200 ++++ ../i18npool/source/breakiterator/gendict.cxx +@@ -95,8 +95,12 @@ int SAL_CALL main(int argc, char* argv[] + fprintf(cfp, "extern \"C\" {\n"); --if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then -+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - AC_MSG_RESULT([GPC files found]) - else - AC_MSG_ERROR([GPC files not found]) + sal_Int32 count, i, j; +- sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, charArray[0x10000]; +- sal_Bool exist[0x10000]; ++ sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, *charArray; ++ sal_Bool *exist; ++ charArray = (sal_Int32*) malloc(0x10000*sizeof(*charArray)); ++ if (charArray == NULL) exit(1); ++ exist = (sal_Bool*) malloc(0x10000*sizeof(*exist)); ++ if (exist == NULL) exit(1); + for (i = 0; i < 0x10000; i++) { + exist[i] = sal_False; + charArray[i] = 0; diff --git a/misc/openoffice/patches/patch-ap b/misc/openoffice/patches/patch-ap index 9f4edd7fb5f..df0c47621d0 100644 --- a/misc/openoffice/patches/patch-ap +++ b/misc/openoffice/patches/patch-ap @@ -1,1288 +1,73 @@ -$NetBSD: patch-ap,v 1.2 2002/08/02 20:33:23 jdolecek Exp $ +$NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $ ---- configure.orig Mon Nov 12 20:35:56 2001 -+++ configure Fri Aug 2 21:15:35 2002 -@@ -845,13 +845,20 @@ - fi - fi - if test "$_os" = "SunOS" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" -o "$_os" = "OSF1"; then -- CC=cc; export CC; -+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then -+ if test "$CC" != "gcc"; then -+ CC=cc; export CC; -+ CXX=CC; export CXX; -+ fi -+ else -+ CC=cc; export CC; -+ fi - fi - if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:855: checking for $ac_word" >&5 -+echo "configure:862: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -881,7 +888,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:885: checking for $ac_word" >&5 -+echo "configure:892: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -932,7 +939,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:936: checking for $ac_word" >&5 -+echo "configure:943: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -964,7 +971,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:968: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -975,12 +982,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 979 "configure" -+#line 986 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1006,12 +1013,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1010: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1015: checking whether we are using GNU C" >&5 -+echo "configure:1022: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1020,7 +1027,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1039,7 +1046,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1043: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1050: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1071,49 +1078,14 @@ - fi - - fi --if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then - if test -z "$with_gcc_home"; then -- if test "$CC" = "gcc"; then -- # Extract the first word of "gcc", so it can be a program name with args. --set dummy gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1081: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_path_GCC'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- case "$GCC" in -- /*) -- ac_cv_path_GCC="$GCC" # Let the user override the test with a path. -- ;; -- ?:/*) -- ac_cv_path_GCC="$GCC" # Let the user override the test with a dos path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_path_GCC="$ac_dir/$ac_word" -- break -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac --fi --GCC="$ac_cv_path_GCC" --if test -n "$GCC"; then -- echo "$ac_t""$GCC" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -- -- COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"` -+ GCC=$CC -+ COMPATH=`echo $GCC | $AWK '{print $1}' | xargs dirname ` -+ CCFLAGS=$LDFLAGS; export CCFLAGS; - _gcc_include_start=/usr/lib/gcc-lib - _gxx_include_start=/usr/include -- fi -- else -+ else - _gcc_path="$with_gcc_home/bin/gcc" - if test -x $_gcc_path; then - CC=gcc; export CC; -@@ -1127,7 +1099,7 @@ - - if test $GCC; then - echo $ac_n "checking the GNU gcc compiler version""... $ac_c" 1>&6 --echo "configure:1131: checking the GNU gcc compiler version" >&5 -+echo "configure:1103: checking the GNU gcc compiler version" >&5 - _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - echo "configure: warning: found egcs- version, use (stable=gcc-) version of the compiler" 1>&2 -@@ -1156,8 +1128,11 @@ - else - echo "$ac_t""checked (gcc $_gcc_version)" 1>&6 - echo $ac_n "checking the GNU gcc include paths""... $ac_c" 1>&6 --echo "configure:1160: checking the GNU gcc include paths" >&5 -+echo "configure:1132: checking the GNU gcc include paths" >&5 - _gcc_include_path=`find $_gcc_include_start -name $_gcc_version -print 2> /dev/null` -+ if test "$_os" = "NetBSD" -a -z "$_gcc_include_path"; then -+ _gcc_include_path="/usr" -+ fi - if test "$_gcc_include_path"; then - _multiple=`echo $_gcc_include_path | $AWK '{ if ($2) print "true"; else print "false" }'` - if test "$_multiple" = "false"; then -@@ -1207,7 +1182,7 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -+ if test "$_os" = "FreeBSD" ; then - _gcc_include_path="/usr/include/g++" - else - echo "configure: warning: could not find 2.95.2/include directory of the gcc compiler" 1>&2 -@@ -1231,7 +1206,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1235: checking for $ac_word" >&5 -+echo "configure:1210: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1268,7 +1243,7 @@ - - COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` - echo $ac_n "checking the SUN Workshop C compiler version""... $ac_c" 1>&6 --echo "configure:1272: checking the SUN Workshop C compiler version" >&5 -+echo "configure:1247: checking the SUN Workshop C compiler version" >&5 - _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'` - if test "$_workshop_version" = "C"; then - _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $8 }'` -@@ -1297,7 +1272,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1301: checking for $ac_word" >&5 -+echo "configure:1276: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1334,7 +1309,7 @@ - - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - echo $ac_n "checking the gcc compiler version""... $ac_c" 1>&6 --echo "configure:1338: checking the gcc compiler version" >&5 -+echo "configure:1313: checking the gcc compiler version" >&5 - cc_version=`$CC -v 2>&1 | $AWK '/Apple Computer/ { print $15 }'` - cc_major=`echo $cc_version | $AWK -F. '{ print $1 }'` - if test "$cc_major" != "2"; then -@@ -1367,7 +1342,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1371: checking for $ac_word" >&5 -+echo "configure:1346: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1404,7 +1379,7 @@ - - COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"` - echo $ac_n "checking the SGI MIPSpro C compiler version""... $ac_c" 1>&6 --echo "configure:1408: checking the SGI MIPSpro C compiler version" >&5 -+echo "configure:1383: checking the SGI MIPSpro C compiler version" >&5 - _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` - _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` - if test "$_mipspro_major" != "7"; then -@@ -1431,7 +1406,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1435: checking for $ac_word" >&5 -+echo "configure:1410: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1469,7 +1444,7 @@ - COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"` - echo "configure: warning: ******* $_cc , $COMPATH" 1>&2 - echo $ac_n "checking the Compaq C compiler version""... $ac_c" 1>&6 --echo "configure:1473: checking the Compaq C compiler version" >&5 -+echo "configure:1448: checking the Compaq C compiler version" >&5 - _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` - _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` - if test "$_compaqc_major" != "T6"; then -@@ -1484,7 +1459,7 @@ - - if test "$_os" = "WINNT"; then - echo $ac_n "checking the Microsoft C/C++ Compiler""... $ac_c" 1>&6 --echo "configure:1488: checking the Microsoft C/C++ Compiler" >&5 -+echo "configure:1463: checking the Microsoft C/C++ Compiler" >&5 - if test -x $with_cl_home/bin/cl; then - COMPATH=$with_cl_home - echo "$ac_t""found." 1>&6 -@@ -1496,7 +1471,7 @@ - - if test "$_os" != "WINNT"; then - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1500: checking how to run the C preprocessor" >&5 -+echo "configure:1475: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1511,13 +1486,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1515 "configure" -+#line 1490 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1528,13 +1503,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1532 "configure" -+#line 1507 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1545,13 +1520,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1549 "configure" -+#line 1524 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1576,12 +1551,12 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1580: checking for ANSI C header files" >&5 -+echo "configure:1555: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1585 "configure" -+#line 1560 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1589,7 +1564,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1606,7 +1581,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1610 "configure" -+#line 1585 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1624,7 +1599,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1628 "configure" -+#line 1603 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1645,7 +1620,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1649 "configure" -+#line 1624 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1656,7 +1631,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1683,7 +1658,7 @@ - - if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then - echo $ac_n "checking pam_appl.h""... $ac_c" 1>&6 --echo "configure:1687: checking pam_appl.h" >&5 -+echo "configure:1662: checking pam_appl.h" >&5 - if test -f "/usr/include/security/pam_appl.h"; then - echo "$ac_t""yes" 1>&6 - else -@@ -1697,7 +1672,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1701: checking for $ac_word" >&5 -+echo "configure:1676: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1729,7 +1704,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1733: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1708: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1740,12 +1715,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1744 "configure" -+#line 1719 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1771,12 +1746,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1750: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:1780: checking whether we are using GNU C++" >&5 -+echo "configure:1755: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1785,7 +1760,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -1804,7 +1779,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1808: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1783: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1835,10 +1810,10 @@ - fi - fi - --if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" ; then - if test "$CC" = "gcc"; then - echo $ac_n "checking g++ Compiler""... $ac_c" 1>&6 --echo "configure:1842: checking g++ Compiler" >&5 -+echo "configure:1817: checking g++ Compiler" >&5 - if test -z "$GXX"; then - echo "configure: warning: GNU g++/c++ was not found" 1>&2 - echo "configure: warning: GNU g++/c++ was not found" 1>&2 >> warn -@@ -1851,7 +1826,7 @@ - CXX=CC; export CXX; - if test "$CC" = "cc"; then - echo $ac_n "checking Sun Workshop C++ Compiler""... $ac_c" 1>&6 --echo "configure:1855: checking Sun Workshop C++ Compiler" >&5 -+echo "configure:1830: checking Sun Workshop C++ Compiler" >&5 - if test "$CXX" != "CC"; then - echo "configure: warning: Sun Workshop C++ was not found" 1>&2 - echo "configure: warning: Sun Worlshop C++ was not found" 1>&2 >> warn -@@ -1864,7 +1839,7 @@ - CXX=c++; export CXX; - if test "$CC" = "cc"; then - echo $ac_n "checking Macosx c++ Compiler""... $ac_c" 1>&6 --echo "configure:1868: checking Macosx c++ Compiler" >&5 -+echo "configure:1843: checking Macosx c++ Compiler" >&5 - if test "$CXX" != "c++"; then - echo "configure: warning: Macosx C++ was not found" 1>&2 - echo "configure: warning: Macosx C++ was not found" 1>&2 >> warn -@@ -1874,10 +1849,10 @@ - fi - fi - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then -- CXX=CC; export CXX; - if test "$CC" = "cc"; then -- echo $ac_n "checking SGI MIPSpro C++ Compiler""... $ac_c" 1>&6 --echo "configure:1881: checking SGI MIPSpro C++ Compiler" >&5 -+ CXX=CC; export CXX; -+ echo $ac_n "checking SGI MIPSpro C++ Compiler""... $ac_c" 1>&6 -+echo "configure:1856: checking SGI MIPSpro C++ Compiler" >&5 - if test "$CXX" != "CC"; then - echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2 - echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2 >> warn -@@ -1889,7 +1864,7 @@ - if test "$_os" = "OSF1"; then - CXX="cxx"; export CXX; - echo $ac_n "checking Compaq C++ compiler version""... $ac_c" 1>&6 --echo "configure:1893: checking Compaq C++ compiler version" >&5 -+echo "configure:1868: checking Compaq C++ compiler version" >&5 - _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'` - _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` - if test "$_compaqcxx_major" != "V6"; then -@@ -1904,7 +1879,7 @@ - _temp=`showrev -p | $AWK -F" " '{ print $2 }'` - if test "$_os_release" = "7"; then - echo $ac_n "checking for patch 106327-06 or greater""... $ac_c" 1>&6 --echo "configure:1908: checking for patch 106327-06 or greater" >&5 -+echo "configure:1883: checking for patch 106327-06 or greater" >&5 - _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'` - _patch="false" - for i in $_temp -@@ -1924,7 +1899,7 @@ - echo "configure: warning: patch 106327-06 not found, please install compiler patch 106327-06 or greater" 1>&2 >> warn - fi - echo $ac_n "checking for patch 106950-11 or greater""... $ac_c" 1>&6 --echo "configure:1928: checking for patch 106950-11 or greater" >&5 -+echo "configure:1903: checking for patch 106950-11 or greater" >&5 - _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'` - _patch="false" - for i in $_temp -@@ -1946,7 +1921,7 @@ - else - if test "$_os_release" = "6"; then - echo $ac_n "checking for patch 105591-09 or greater""... $ac_c" 1>&6 --echo "configure:1950: checking for patch 105591-09 or greater" >&5 -+echo "configure:1925: checking for patch 105591-09 or greater" >&5 - _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` - _patch="false" - for i in $_temp -@@ -1966,7 +1941,7 @@ - echo "configure: warning: patch 105591-09 not found, please install compiler patch 105591-09 or greater" 1>&2 >> warn - fi - echo $ac_n "checking for patch 107733-08 or greater""... $ac_c" 1>&6 --echo "configure:1970: checking for patch 107733-08 or greater" >&5 -+echo "configure:1945: checking for patch 107733-08 or greater" >&5 - _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'` - _patch="false" - for i in $_temp -@@ -1998,7 +1973,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:2002: checking how to run the C++ preprocessor" >&5 -+echo "configure:1977: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2011,12 +1986,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext <<EOF --#line 2015 "configure" -+#line 1990 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2041,12 +2016,12 @@ - echo "$ac_t""$CXXCPP" 1>&6 - - cat > conftest.$ac_ext <<EOF --#line 2045 "configure" -+#line 2020 "configure" - #include "confdefs.h" - "" - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2061,7 +2036,7 @@ - if test -n "$enable_sgistl"; then - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - echo $ac_n "checking for SGI STL""... $ac_c" 1>&6 --echo "configure:2065: checking for SGI STL" >&5 -+echo "configure:2040: checking for SGI STL" >&5 - if test -d /usr/include/CC ; then - echo "$ac_t""yes." 1>&6 - -@@ -2074,17 +2049,17 @@ - else - - echo $ac_n "checking for STLport4 headers""... $ac_c" 1>&6 --echo "configure:2078: checking for STLport4 headers" >&5 -+echo "configure:2053: checking for STLport4 headers" >&5 - if test -d "$with_stlport4_home"; then - STLPORT4=$with_stlport4_home - if test "$_os" != "WINNT"; then - cat > conftest.$ac_ext <<EOF --#line 2083 "configure" -+#line 2058 "configure" - #include "confdefs.h" - $STLPORT4/stlport/hash_map - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2106,7 +2081,7 @@ - fi - if test "$_os" != "WINNT"; then - echo $ac_n "checking for STLport4 libraries""... $ac_c" 1>&6 --echo "configure:2110: checking for STLport4 libraries" >&5 -+echo "configure:2085: checking for STLport4 libraries" >&5 - if test "$_os" = "SunOS"; then - if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then - echo "$ac_t""checked" 1>&6 -@@ -2123,7 +2098,11 @@ - if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - echo "$ac_t""checked" 1>&6 - else -- { echo "configure: error: STLport4 libraries not found" 1>&2; exit 1; } -+ if test -f "$STLPORT4/lib/libstlport_gcc.so"; then -+ echo "$ac_t""checked" 1>&6 -+ else -+ { echo "configure: error: STLport4 libraries not found" 1>&2; exit 1; } -+ fi - fi - else - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then -@@ -2143,7 +2122,7 @@ - # Extract the first word of "javac", so it can be a program name with args. - set dummy javac; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2147: checking for $ac_word" >&5 -+echo "configure:2126: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2182,7 +2161,7 @@ - fi - fi - echo $ac_n "checking the installed JDK""... $ac_c" 1>&6 --echo "configure:2186: checking the installed JDK" >&5 -+echo "configure:2165: checking the installed JDK" >&5 - if test "$JAVA"; then - _correct_jdk_exists="false" - _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }'` -@@ -2199,6 +2178,12 @@ - fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'` -+ -+ if test "$_jdk_middle" = "false" -a \( "$_jdk_middle3" = "true" -o "$_jdk_middle4" = "true" \); then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -2266,7 +2251,7 @@ - fi - if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2270: checking how to run the C preprocessor" >&5 -+echo "configure:2255: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -2281,13 +2266,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 2285 "configure" -+#line 2270 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2298,13 +2283,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 2302 "configure" -+#line 2287 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2315,13 +2300,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 2319 "configure" -+#line 2304 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2348,7 +2333,7 @@ - fi - if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:2352: checking how to run the C++ preprocessor" >&5 -+echo "configure:2337: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2361,12 +2346,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext <<EOF --#line 2365 "configure" -+#line 2350 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -2395,7 +2380,7 @@ - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2399: checking for $ac_word" >&5 -+echo "configure:2384: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2435,7 +2420,7 @@ - fi - if test "$PERL"; then - echo $ac_n "checking the Perl version""... $ac_c" 1>&6 --echo "configure:2439: checking the Perl version" >&5 -+echo "configure:2424: checking the Perl version" >&5 - _perl_temp=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $4 }'` - if test "$_perl_temp" = "version"; then - _perl_version=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $5 }'` -@@ -2461,7 +2446,7 @@ - # Extract the first word of "tcsh", so it can be a program name with args. - set dummy tcsh; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2465: checking for $ac_word" >&5 -+echo "configure:2450: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_TCSH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2509,7 +2494,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:2513: checking for X" >&5 -+echo "configure:2498: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -2571,12 +2556,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext <<EOF --#line 2575 "configure" -+#line 2560 "configure" - #include "confdefs.h" - #include <$x_direct_test_include> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2645,14 +2630,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2649 "configure" -+#line 2634 "configure" - #include "confdefs.h" - - int main() { - ${x_direct_test_function}() - ; return 0; } - EOF --if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -2758,17 +2743,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:2762: checking whether -R must be followed by a space" >&5 -+echo "configure:2747: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <<EOF --#line 2765 "configure" -+#line 2750 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -2784,14 +2769,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <<EOF --#line 2788 "configure" -+#line 2773 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -2823,7 +2808,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:2827: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:2812: checking for dnet_ntoa in -ldnet" >&5 - ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2831,7 +2816,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2835 "configure" -+#line 2820 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -2845,7 +2830,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2867,7 +2852,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:2871: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:2856: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2875,7 +2860,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2879 "configure" -+#line 2864 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -2889,7 +2874,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2918,12 +2903,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:2922: checking for gethostbyname" >&5 -+echo "configure:2907: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2927 "configure" -+#line 2912 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ -@@ -2949,7 +2934,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -2970,7 +2955,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:2974: checking for gethostbyname in -lnsl" >&5 -+echo "configure:2959: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2978,7 +2963,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2982 "configure" -+#line 2967 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -2992,7 +2977,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3022,12 +3007,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:3026: checking for connect" >&5 -+echo "configure:3011: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3031 "configure" -+#line 3016 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ -@@ -3053,7 +3038,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -3074,7 +3059,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:3078: checking for connect in -lsocket" >&5 -+echo "configure:3063: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3082,7 +3067,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3086 "configure" -+#line 3071 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3096,7 +3081,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3120,12 +3105,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:3124: checking for remove" >&5 -+echo "configure:3109: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3129 "configure" -+#line 3114 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ -@@ -3151,7 +3136,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" - else -@@ -3172,7 +3157,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:3176: checking for remove in -lposix" >&5 -+echo "configure:3161: checking for remove in -lposix" >&5 - ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3180,7 +3165,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3184 "configure" -+#line 3169 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3194,7 +3179,7 @@ - remove() - ; return 0; } - EOF --if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3218,12 +3203,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:3222: checking for shmat" >&5 -+echo "configure:3207: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3227 "configure" -+#line 3212 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ -@@ -3249,7 +3234,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" - else -@@ -3270,7 +3255,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:3274: checking for shmat in -lipc" >&5 -+echo "configure:3259: checking for shmat in -lipc" >&5 - ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3278,7 +3263,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3282 "configure" -+#line 3267 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3292,7 +3277,7 @@ - shmat() - ; return 0; } - EOF --if { (eval echo configure:3296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3325,7 +3310,7 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:3329: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:3314: checking for IceConnectionNumber in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3333,7 +3318,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3337 "configure" -+#line 3322 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3347,7 +3332,7 @@ - IceConnectionNumber() - ; return 0; } - EOF --if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3386,7 +3371,7 @@ - CFLAGS=$X_CFLAGS - LDFLAGS="$X_LDFLAGS $X_LIBS" - echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 --echo "configure:3390: checking for XOpenDisplay in -lX11" >&5 -+echo "configure:3375: checking for XOpenDisplay in -lX11" >&5 - ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3394,7 +3379,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3398 "configure" -+#line 3383 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3408,7 +3393,7 @@ - XOpenDisplay() - ; return 0; } - EOF --if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3435,7 +3420,7 @@ - fi - if test "$_os" = "Linux"; then - echo $ac_n "checking for gnu_get_libc_version in -lc""... $ac_c" 1>&6 --echo "configure:3439: checking for gnu_get_libc_version in -lc" >&5 -+echo "configure:3424: checking for gnu_get_libc_version in -lc" >&5 - ac_lib_var=`echo c'_'gnu_get_libc_version | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3443,7 +3428,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3447 "configure" -+#line 3432 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -3457,7 +3442,7 @@ - gnu_get_libc_version() - ; return 0; } - EOF --if { (eval echo configure:3461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3478,7 +3463,7 @@ - fi - - echo $ac_n "checking the installed libc is at least version 2.1.1""... $ac_c" 1>&6 --echo "configure:3482: checking the installed libc is at least version 2.1.1" >&5 -+echo "configure:3467: checking the installed libc is at least version 2.1.1" >&5 - if test "$HAVE_LIBC"; then - echo "$ac_t""checked" 1>&6 - else -@@ -3488,7 +3473,7 @@ - # Extract the first word of "bison", so it can be a program name with args. - set dummy bison; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3492: checking for $ac_word" >&5 -+echo "configure:3477: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_BISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3526,7 +3511,7 @@ - # Extract the first word of "flex", so it can be a program name with args. - set dummy flex; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3530: checking for $ac_word" >&5 -+echo "configure:3515: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_FLEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3564,7 +3549,7 @@ - # Extract the first word of "patch", so it can be a program name with args. - set dummy patch; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3568: checking for $ac_word" >&5 -+echo "configure:3553: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PATCH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3603,7 +3588,7 @@ - # Extract the first word of "bash", so it can be a program name with args. - set dummy bash; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3607: checking for $ac_word" >&5 -+echo "configure:3592: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_CYGWIN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3642,7 +3627,7 @@ - # Extract the first word of "ml.exe", so it can be a program name with args. - set dummy ml.exe; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3646: checking for $ac_word" >&5 -+echo "configure:3631: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ML_EXE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3688,7 +3673,7 @@ - # Extract the first word of "unzip.exe", so it can be a program name with args. - set dummy unzip.exe; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3692: checking for $ac_word" >&5 -+echo "configure:3677: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_UNZIP_EXE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3732,7 +3717,7 @@ - - - echo $ac_n "checking GPC files""... $ac_c" 1>&6 --echo "configure:3736: checking GPC files" >&5 -+echo "configure:3721: checking GPC files" >&5 - if test -e ../external/gpc/gpc.h; then - HAVE_GPC_H="yes" - fi -@@ -3740,7 +3725,7 @@ - HAVE_GPC_C="yes" - fi - --if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then -+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - echo "$ac_t""GPC files found" 1>&6 - else - { echo "configure: error: GPC files not found" 1>&2; exit 1; } -@@ -4006,7 +3991,6 @@ - s%@AWK@%$AWK%g - s%@SED@%$SED%g - s%@CC@%$CC%g --s%@GCC@%$GCC%g - s%@_cc@%$_cc%g - s%@CPP@%$CPP%g - s%@CXX@%$CXX%g +--- ../stlport/STLport-4.5.patch.orig 2004-04-17 20:08:34.000000000 +0200 ++++ ../stlport/STLport-4.5.patch +@@ -404,3 +404,68 @@ + # define _STLP_MUTEX_INITIALIZER + # endif + ++*** misc/STLport-4.5/src/gcc-3.0-netbsd.mak Thu Oct 16 10:00:50 2003 ++--- misc/build/STLport-4.5/src/gcc-3.0-netbsd.mak Thu Oct 16 09:49:57 2003 ++*************** ++*** 1 **** ++! dummy ++--- 1,59 ---- ++! # ++! # Note : this makefile is for gcc-3 ! ++! # ++! ++! # ++! # compiler ++! # ++! CC+= $(PTHREAD_CFLAGS) -D_REENTRANT ++! CXX+= $(PTHREAD_CFLAGS) -D_REENTRANT ++! ++! # ++! # Basename for libraries ++! # ++! LIB_BASENAME = libstlport_gcc ++! ++! # ++! # guts for common stuff ++! # ++! # ++! LINK=ar cr ++! DYN_LINK=$(CXX) $(PTHREAD_LIBS) $(LDFLAGS) -fexceptions -shared -o ++! ++! OBJEXT=o ++! DYNEXT=so ++! STEXT=a ++! RM=rm -rf ++! PATH_SEP=/ ++! MKDIR=mkdir -p ++! COMP=GCC$(ARCH) ++! INSTALL_STEP = install_unix ++! ++! all: all_dynamic all_static symbolic_links ++! ++! include common_macros.mak ++! ++! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 ++! ++! CXXFLAGS_COMMON = -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} $(CXXFLAGS) ++! ++! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC ++! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC ++! ++! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC ++! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC ++! ++! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG ++! ++! include common_percent_rules.mak ++! include common_rules.mak ++! ++! ++! #install: all ++! # cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib ++! ++! #%.s: %.cpp ++! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ++! ++! diff --git a/misc/openoffice/patches/patch-aq b/misc/openoffice/patches/patch-aq index 9346a4c48d6..949e4027729 100644 --- a/misc/openoffice/patches/patch-aq +++ b/misc/openoffice/patches/patch-aq @@ -1,12 +1,22 @@ -$NetBSD: patch-aq,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ +$NetBSD: patch-aq,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../connectivity/prj/build.lst.orig Thu Nov 8 16:14:54 2001 -+++ ../connectivity/prj/build.lst -@@ -8,6 +8,7 @@ - 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\mozillasrc\nortti nmake - all cn_mozab_mozillasrc_nortti cn_mozab_mozillasrc NULL - cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools 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 +--- ../stlport/makefile.mk.orig 2004-04-17 20:08:59.000000000 +0200 ++++ ../stlport/makefile.mk +@@ -102,7 +102,7 @@ PATCH_FILE_NAME=STLport-4.5-0119.patch + TAR_EXCLUDES=*/SC5/* + .ENDIF # "$(USE_SHELL)"=="4nt" + +-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak ++ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/gcc-3.0-netbsd.mak + + + CONFIGURE_ACTION=none +@@ -124,6 +124,8 @@ BUILD_FLAGS=-f vc7.mak + # FreeBSD needs a special makefile + .IF "$(OS)"=="FREEBSD" + BUILD_FLAGS=-f gcc-3.0-freebsd.mak ++ .ELIF "$(OS)"=="NETBSD" ++ BUILD_FLAGS=-f gcc-3.0-netbsd.mak + .ELIF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-3.0-macosx.mak + .ELSE diff --git a/misc/openoffice/patches/patch-ar b/misc/openoffice/patches/patch-ar index 98eb9845929..eb8ca8e637f 100644 --- a/misc/openoffice/patches/patch-ar +++ b/misc/openoffice/patches/patch-ar @@ -1,33 +1,24 @@ -$NetBSD: patch-ar,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ +$NetBSD: patch-ar,v 1.2 2004/05/03 20:56:36 mrauch Exp $ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Jan 1 14:08:59 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk -@@ -92,10 +92,12 @@ - $(SLO)$/MQueryHelper.obj \ - $(SLO)$/MDatabaseMetaDataHelper.obj \ - $(SLO)$/MQuery.obj \ -- $(SLO)$/MTypeConverter.obj \ - $(SLO)$/MNameMapper.obj +--- ../sal/osl/unx/tempfile.c.orig 2004-01-28 11:18:07.000000000 +0100 ++++ ../sal/osl/unx/tempfile.c +@@ -64,6 +64,9 @@ + /*****************************************************************/ -- -+.IF "$(OS)" != "NETBSD" -+SLOFILES += \ -+ $(SLO)$/MTypeConverter.obj -+.ENDIF + #include <stdio.h> ++#if defined(NETBSD) ++#include <paths.h> ++#endif + #include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -107,6 +110,9 @@ oslFileError SAL_CALL osl_getTempDirURL( + #if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) || defined (MACOSX) + if ( !pValue ) + pValue = P_tmpdir; ++#elif defined(NETBSD) ++ if ( !pValue ) ++ pValue = _PATH_TMP; + #endif + } - .IF "$(GUI)" == "WNT" - .IF "$(DEBUG)" == "" -@@ -132,6 +134,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -pthread -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "NETBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/misc/openoffice/patches/patch-as b/misc/openoffice/patches/patch-as deleted file mode 100644 index c4bf42367ef..00000000000 --- a/misc/openoffice/patches/patch-as +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../connectivity/source/drivers/mozab/mozillasrc/nortti/MTypeConverter.cxx.orig Sun Jan 6 11:44:27 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/nortti/MTypeConverter.cxx -@@ -0,0 +1,112 @@ -+ -+#include <MNSInclude.hxx> -+ -+#ifndef _CONNECTIVITY_MAB_TYPECONVERTER_HXX_ -+#include "MTypeConverter.hxx" -+#endif -+#ifndef _UCBHELPER_CONTENT_HXX -+#include <ucbhelper/content.hxx> -+#endif -+ -+using namespace connectivity::mozab; -+ -+// ------------------------------------------------------------------------- -+void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss) -+{ -+ OSL_TRACE( "IN MTypeConverter::OUStringToNsString()\n" ); -+ -+ // Convert to ::rtl::OString (utf-8 encoding). -+ ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8); -+ -+ const char *cs = os.getStr(); -+ PRUint32 csLen = os.getLength(); -+ -+ NS_ConvertUTF8toUCS2 mozString(cs, csLen); -+ //const PRUnichar* uniMozString = (const PRUnichar*) mozString; -+ nss = mozString; // temp. -+ -+ OSL_TRACE( "\tOUT MTypeConverter::OUStringToNsString()\n" ); -+} -+// ------------------------------------------------------------------------- -+void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous) -+{ -+ OSL_TRACE( "IN MTypeConverter::nsStringToOUString()\n" ); -+ -+ // Get clone of buffer. -+ PRUnichar *uc = nss.ToNewUnicode(); -+ sal_Int32 nssLen = nss.Length(); -+ -+ // TODO check if this is ok. -+ ::rtl::OUString _ous(uc, nssLen); -+ ous = _ous; -+ -+ nsMemory::Free(uc); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::nsStringToOUString()\n" ); -+} -+// ------------------------------------------------------------------------- -+void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &ous) -+{ -+ OSL_TRACE( "IN MTypeConverter::prUniCharToOUString()\n" ); -+ -+ // TODO, specify length. -+ ::rtl::OUString _ous(pru); -+ ous = _ous; -+ -+ OSL_TRACE( "\tOUT MTypeConverter::prUniCharToOUString()\n" ); -+} -+// ------------------------------------------------------------------------- -+char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous) -+{ -+ OSL_TRACE( "IN MTypeConverter::OUStringToCCharStringUtf8()\n" ); -+ -+ // Convert to ::rtl::OString, -+ ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8); -+ -+ const char *cs = os.getStr(); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::OUStringToCCharStringUtf8()\n" ); -+ return(strdup(cs)); -+} -+// ------------------------------------------------------------------------- -+char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous) -+{ -+ OSL_TRACE( "IN MTypeConverter::OUStringToCCharStringAscii()\n" ); -+ -+ // Convert ::rtl::OUString to ::rtl::OString, -+ ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_ASCII_US); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::OUStringToCCharStringAscii()\n" ); -+ return(strdup(os.getStr())); -+} -+// ------------------------------------------------------------------------- -+char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss) -+{ -+ OSL_TRACE( "IN MTypeConverter::nsStringToCCharStringAscii()\n" ); -+ -+ char cs[1024]; -+ nss.ToCString(cs, 1024); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::nsStringToCCharStringAscii()\n" ); -+ return(strdup(cs)); -+} -+// ------------------------------------------------------------------------- -+::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous) -+{ -+ OSL_TRACE( "IN MTypeConverter::ouStringToStlString()\n" ); -+ -+ // Convert ::rtl::OUString to ::rtl::OString. -+ ::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::ouStringToStlString()\n" ); -+ return( ::std::string(os.getStr())); -+} -+// ------------------------------------------------------------------------- -+::std::string MTypeConverter::nsStringToStlString(nsString const &nss) -+{ -+ OSL_TRACE( "IN MTypeConverter::nsStringToStlString()\n" ); -+ -+ OSL_TRACE( "\tOUT MTypeConverter::nsStringToStlString()\n" ); -+ return( ::std::string(nss.GetBuffer())); -+} -+// ------------------------------------------------------------------------- diff --git a/misc/openoffice/patches/patch-at b/misc/openoffice/patches/patch-at deleted file mode 100644 index 02cde76812d..00000000000 --- a/misc/openoffice/patches/patch-at +++ /dev/null @@ -1,97 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../connectivity/source/drivers/mozab/mozillasrc/nortti/makefile.mk.orig Sun Jan 6 11:44:36 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/nortti/makefile.mk -@@ -0,0 +1,92 @@ -+CALL_CDECL=TRUE -+ -+#mozilla specific stuff. -+MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) -+MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)/$/mozilla -+#End of mozilla specific stuff. -+ -+PRJ=..$/..$/..$/..$/.. -+PRJINC=..$/..$/..$/.. -+PRJNAME=connectivity -+TARGET=mozabsrc -+ -+USE_LDUMP2=TRUE -+USE_DEFFILE=TRUE -+ENABLE_EXCEPTIONS=TRUE -+LDUMP=ldump2.exe -+ -+# --- Settings ---------------------------------- -+.IF "$(DBGUTIL_OJ)"!="" -+ENVCFLAGS+=/FR$(SLO)$/ -+.ENDIF -+ -+.INCLUDE : settings.mk -+.INCLUDE : $(PRJ)$/version.mk -+ -+#mozilla specific stuff. -+# --- Files ------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/MTypeConverter.obj -+ -+ -+ -+.IF "$(GUI)" == "WNT" -+.IF "$(DEBUG)" == "" -+INCPRE += . -I.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -+CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ -+ -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ -+ -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -+ -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \ -+ -DOJI -DWIN32 -D_X86_ -D_WINDOWS \ -+ -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ -+ -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ -+ -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL -+CFLAGS += -GR- -W3 -Gy -MD -UDEBUG -+.ELSE -+INCPRE += . -I.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -+CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ -+ -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ -+ -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -+ -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \ -+ -DOJI -D_DEBUG -DWIN32 -D_X86_ -D_WINDOWS \ -+ -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ -+ -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ -+ -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL -+CFLAGS += -Zi -GR- -W3 -Gy -MDd -UNDEBUG -+.ENDIF -+.ENDIF -+.IF "$(GUI)" == "UNX" -+INCPRE += . -I.. -I..$/.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -+CDEFS+= -DMOZILLA_CLIENT \ -+ -DOSTYPE=\"Linux2.2.14-5\" -DOJI -+.IF "$(OS)" == "LINUX" -+CFLAGS += -fPIC -g -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "NETBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -+CDEFS += -DTRACING -+.ENDIF -+.ENDIF -+ -+SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) -+ -+ -+# --- Targets ---------------------------------- -+ -+.INCLUDE : target.mk -+ -+ -+killdpc: -+ -+$(RM) $(DPCTARGET) -+ -+$(RM) $(DEPFILES) -+ @+echo Dependency files removed -+ diff --git a/misc/openoffice/patches/patch-au b/misc/openoffice/patches/patch-au deleted file mode 100644 index 2eeea8558d5..00000000000 --- a/misc/openoffice/patches/patch-au +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../connectivity/source/drivers/mozaddressbook/mozillasrc/makefile.mk.orig Tue Jan 1 14:08:59 2002 -+++ ../connectivity/source/drivers/mozaddressbook/mozillasrc/makefile.mk -@@ -165,6 +165,12 @@ - -fno-rtti -fno-exceptions -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -pthread -DTRACING -g -+.ELIF "$(OS)" == "NETBSD" -+# INCPRE += -I.. -I$(MOZ_INC) -DDEBUG -DMOZILLA_CLIENT -+INCPRE += -fPIC \ -+ -fno-rtti -fno-exceptions -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -DTRACING - .ENDIF - .ENDIF - diff --git a/misc/openoffice/patches/patch-av b/misc/openoffice/patches/patch-av deleted file mode 100644 index 68edb8d19bd..00000000000 --- a/misc/openoffice/patches/patch-av +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../connectivity/source/manager/makefile.mk.orig Tue Jan 1 14:09:00 2002 -+++ ../connectivity/source/manager/makefile.mk -@@ -92,11 +92,11 @@ - .ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ -- $(OSLLIB) \ -- $(SALLIB) -+ $(OSLLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(SHL1TARGET) diff --git a/misc/openoffice/patches/patch-aw b/misc/openoffice/patches/patch-aw deleted file mode 100644 index 7e95cd56304..00000000000 --- a/misc/openoffice/patches/patch-aw +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../cppuhelper/source/makefile.mk.orig Tue Jan 1 14:09:04 2002 -+++ ../cppuhelper/source/makefile.mk -@@ -149,8 +149,8 @@ - SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COM) - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) diff --git a/misc/openoffice/patches/patch-ax b/misc/openoffice/patches/patch-ax deleted file mode 100644 index 862b1bea640..00000000000 --- a/misc/openoffice/patches/patch-ax +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../dtrans/source/X11/X11_selection.cxx.orig Tue Sep 11 11:23:56 2001 -+++ ../dtrans/source/X11/X11_selection.cxx -@@ -63,7 +63,7 @@ - #include <stdio.h> - #include <X11/Xatom.h> - #include <X11/keysym.h> --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) - #include <sys/poll.h> - #else - #include <poll.h> -@@ -2681,7 +2681,12 @@ - aPollFD.revents = 0; - - // wait for activity (outside the xlib) -+#if defined(NETBSD) -+ // PSEUDOTHREADS: never block as this stops the complete program -+ if( poll( &aPollFD, 1, 0 ) > 0 ) -+#else - if( poll( &aPollFD, 1, millisec ) > 0 ) -+#endif - { - // now acquire the mutex to prevent other threads - // from using the same X connection diff --git a/misc/openoffice/patches/patch-ay b/misc/openoffice/patches/patch-ay deleted file mode 100644 index 79c379c6427..00000000000 --- a/misc/openoffice/patches/patch-ay +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002 -+++ ../eventattacher/source/makefile.mk -@@ -110,10 +110,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(VOSLIB) \ -- $(SALLIB) -+ $(VOSLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-az b/misc/openoffice/patches/patch-az deleted file mode 100644 index 8a824a45712..00000000000 --- a/misc/openoffice/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../extensions/source/plugin/unx/makefile.mk.orig Tue Jan 1 14:09:38 2002 -+++ ../extensions/source/plugin/unx/makefile.mk -@@ -90,6 +90,8 @@ - $(SALLIB) - .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX" - APP1STDLIBS+=-lXm -lXt -lX11 -ldl -+.ELIF "$(OS)"=="NETBSD" -+APP1STDLIBS+=-lXaw -lXt -lX11 - .ELSE - APP1STDLIBS+=-lXaw -lXt -lX11 -ldl - .ENDIF diff --git a/misc/openoffice/patches/patch-ba b/misc/openoffice/patches/patch-ba deleted file mode 100644 index 05a33a326da..00000000000 --- a/misc/openoffice/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../external/prj/d.lst.orig Tue Sep 4 22:51:08 2001 -+++ ../external/prj/d.lst -@@ -60,6 +60,8 @@ - ..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a - ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib - ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a -+..\%__SRC%\slb\gnu_readdir_r.lib %_DEST%\lib%_EXT%\gnu_readdir_r.lib -+..\%__SRC%\lib\libgnu_readdir_r.a %_DEST%\lib%_EXT%\libgnu_readdir_r.a - ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib - ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a - ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a diff --git a/misc/openoffice/patches/patch-bb b/misc/openoffice/patches/patch-bb deleted file mode 100644 index 5d9fe6f2403..00000000000 --- a/misc/openoffice/patches/patch-bb +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002 -+++ ../javaunohelper/source/makefile.mk -@@ -110,9 +110,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-bc b/misc/openoffice/patches/patch-bc deleted file mode 100644 index baf372e6b3b..00000000000 --- a/misc/openoffice/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../product/inc/scp/udk_bridgesfiles.scp.orig Mon Jul 9 15:10:14 2001 -+++ ../product/inc/scp/udk_bridgesfiles.scp -@@ -21,7 +21,7 @@ - End - */ - --#if defined(LINUX) || defined(FREEBSD) // ACHUNG: Hier reine Linux-Dateien -+#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) // ACHUNG: Hier reine Linux-Dateien - - File gid_File_Lib_Gcc2_Uno - BIN_FILE_BODY; diff --git a/misc/openoffice/patches/patch-bd b/misc/openoffice/patches/patch-bd deleted file mode 100644 index c76a1cfb26b..00000000000 --- a/misc/openoffice/patches/patch-bd +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-bd,v 1.2 2002/12/25 16:20:18 jdolecek Exp $ - ---- ../product/util/makefile.mk.orig Thu Oct 11 12:10:42 2001 -+++ ../product/util/makefile.mk Tue Dec 24 17:37:53 2002 -@@ -101,6 +101,16 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=gcc2_uno - -+.ELIF "$(OS)"=="NETBSD" -+########### -+# NETBSD -+########### -+DESTDIRBIN=$(DESTDIR)$/netbsd$/bin -+DESTDIRLIB=$(DESTDIR)$/netbsd$/lib -+DESTDIRDLL=$(DESTDIRLIB) -+STLPORTLIBNAME=libstlport_gcc.so -+BINDINGDLL=gcc2_uno -+ - .ELIF "$(OS)"=="WNT" - ############### - # WINDOWS -@@ -341,30 +351,30 @@ - $(MKDIRHIER) $@ - - $(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb $(DESTDIRBIN) -- $(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ -+ $(GNUCOPY) -fp $(BINOUT)$/udkapi.rdb $@ - - $(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST) -- $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ -+ $(GNUCOPY) -fp $(BINOUT)$/$(@:f) $@ - - - .IF "$(STLPORTDEST)" != "" - #OOo build environment - $(STLPORTDEST) : $(STLPORTOUT) $(DIRLIST) -- $(GNUCOPY) -p $(STLPORTOUT) $@ -+ $(GNUCOPY) -fp $(STLPORTOUT) $@ - .ENDIF - - $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST) -- $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ -+ $(GNUCOPY) -fp $(DLLOUT)$/$(@:f) $@ - - $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) -- $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ -+ $(GNUCOPY) -fp $(DLLOUT)$/$(@:f) $@ - - $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) -- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ -- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) -+ +ln -sf $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ -+ +ln -sf $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) - - $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) -- $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ -+ $(GNUCOPY) -fp $(BINOUT)$/$(@:f) $@ - - $(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST) - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ -@@ -373,7 +383,7 @@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ - - $(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST) -- $(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ -+ $(GNUCOPY) -fp $(LIBOUT)$/$(@:f) $@ - - $(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST) - +-rm -f $@ >& $(NULLDEV) -@@ -385,7 +395,7 @@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ - - $(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README -- $(GNUCOPY) -p $(PRJ)$/examples$/README $@ -+ $(GNUCOPY) -fp $(PRJ)$/examples$/README $@ - - $(DESTDIRIDL)$/% : $(IDLOUT)$/% - +-rm -f $@ diff --git a/misc/openoffice/patches/patch-be b/misc/openoffice/patches/patch-be deleted file mode 100644 index 8188f2655c1..00000000000 --- a/misc/openoffice/patches/patch-be +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-be,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../readlicense/source/readme/unxbsdi/README.orig Sun Jan 6 11:30:15 2002 -+++ ../readlicense/source/readme/unxbsdi/README -@@ -0,0 +1,14 @@ -+(Temporary readme text file) -+ -+To be used for changes / corrections made after copy deadline or very important notices. -+ -+For latest information please visit: -+ -+http://www.openoffice.org/ -+ -+ -+Your OpenOffice.org Team -+ -+ -+------------------------------------ -+Copyright 2000 OpenOffice.org. All rights reserved. -\ No newline at end of file diff --git a/misc/openoffice/patches/patch-bf b/misc/openoffice/patches/patch-bf deleted file mode 100644 index 13c8b8e7ba6..00000000000 --- a/misc/openoffice/patches/patch-bf +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bf,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../readlicense/source/readme/unxbsdppc/README.orig Sun Jan 6 11:30:19 2002 -+++ ../readlicense/source/readme/unxbsdppc/README -@@ -0,0 +1,14 @@ -+(Temporary readme text file) -+ -+To be used for changes / corrections made after copy deadline or very important notices. -+ -+For latest information please visit: -+ -+http://www.openoffice.org/ -+ -+ -+Your OpenOffice.org Team -+ -+ -+------------------------------------ -+Copyright 2000 OpenOffice.org. All rights reserved. -\ No newline at end of file diff --git a/misc/openoffice/patches/patch-bg b/misc/openoffice/patches/patch-bg deleted file mode 100644 index 1793bbfe3e5..00000000000 --- a/misc/openoffice/patches/patch-bg +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bg,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../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/misc/openoffice/patches/patch-bh b/misc/openoffice/patches/patch-bh deleted file mode 100644 index 5844bce662e..00000000000 --- a/misc/openoffice/patches/patch-bh +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bh,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sablot/Sablot-0.52.patch.orig Sun Jan 6 13:12:45 2002 -+++ ../sablot/Sablot-0.52.patch -@@ -4,5 +4,5 @@ - *** 1 **** - ! dummy ----- 1,147 ---- -+--- 1,151 ---- - ! #************************************************************************* - ! # -@@ -86,10 +86,14 @@ - ! .ENDIF - ! --! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX" -+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX" || "$(OS)"=="NETBSD" - ! CFLAGS+= -DHAVE_UNISTD_H - ! .ENDIF - ! - ! .IF "$(GUI)"=="UNX" -+! .IF "$(OS)"=="NETBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF - ! .ENDIF - ! diff --git a/misc/openoffice/patches/patch-bi b/misc/openoffice/patches/patch-bi deleted file mode 100644 index 7e36b6a2d37..00000000000 --- a/misc/openoffice/patches/patch-bi +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-bi,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/osl/unx/file.c.orig Thu Oct 4 15:09:21 2001 -+++ ../sal/osl/unx/file.c -@@ -123,11 +123,16 @@ - #include <ctype.h> - static const sal_Char* MOUNTTAB="/etc/mtab"; - --#elif defined(NETBSD) -+#elif defined(NETBSD) || defined(FREEBSD) -+#include <sys/param.h> -+#include <sys/ucred.h> - #include <sys/mount.h> - #include <ufs/ufs/quota.h> - #include <ctype.h> --static const sal_Char* MOUNTTAB="/etc/mtab"; -+#define HAVE_STATFS_H -+/* No mounting table on *BSD -+ * This information is stored only in the kernel. */ -+/* static const sal_Char* MOUNTTAB="/etc/mtab"; */ - - #elif defined(IRIX) - #include <mntent.h> -@@ -137,7 +142,7 @@ - #include <ctype.h> - static const sal_Char* MOUNTTAB="/etc/mtab"; - --#elif defined(MACOSX) || defined(FREEBSD) -+#elif defined(MACOSX) - #include <ufs/ufs/quota.h> - #include <ctype.h> - static const sal_Char* MOUNTTAB="/etc/mtab"; -@@ -4224,10 +4229,20 @@ - mntfile = fopen(MOUNTTAB,"r"); - #endif /* SOLARIS */ - -+#if defined(NETBSD) || defined(FREEBSD) -+ struct statfs *mntbufp; -+ int mntentries,i; -+ mntentries = getmntinfo(&mntbufp,MNT_WAIT); - - buffer[0] = '\0'; - -+ if(mntentries == 0) -+#else -+ -+ buffer[0] = '\0'; -+ - if ( mntfile == 0 ) -+#endif - { - nRet=errno; - #ifdef DEBUG_OSL_FILE -@@ -4286,7 +4301,21 @@ - } - #endif /* SOLARIS */ - -+#if defined(NETBSD) || defined(FREEBSD) -+ i=0; -+ while ( i < mntentries ) -+ { -+ if ( strcmp(mntbufp[i].f_mntonname,buffer) == 0 ) -+ { -+ *bMountPoint=sal_True; -+ return osl_File_E_None; -+ } -+ i++; -+ } -+#endif -+#if ! ( defined(NETBSD) || defined(FREEBSD) ) - fclose(mntfile); -+#endif - *bMountPoint=sal_False; - return osl_File_E_None; - } diff --git a/misc/openoffice/patches/patch-bj b/misc/openoffice/patches/patch-bj deleted file mode 100644 index 33ac92a60a0..00000000000 --- a/misc/openoffice/patches/patch-bj +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-bj,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/osl/unx/nlsupport.c.orig Mon Nov 12 21:21:31 2001 -+++ ../sal/osl/unx/nlsupport.c -@@ -63,7 +63,7 @@ - #include <osl/diagnose.h> - #include <osl/process.h> - --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) - #include <pthread.h> - #include <locale.h> - #include <langinfo.h> -@@ -242,7 +242,7 @@ - return NULL; - } - --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) - - /* - * This implementation of osl_getTextEncodingFromLocale maps -@@ -296,7 +296,7 @@ - /* XXX MS-874 is an extension to tis620, so this is not - * really equivalent */ - --#elif defined(LINUX) -+#elif defined(LINUX) || defined(NETBSD) - - const _pair _nl_language_list[] = { - { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -477,7 +477,7 @@ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; - --#endif /* ifdef LINUX */ -+#endif /* ifdef LINUX || NETBSD */ - - static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; - -@@ -516,7 +516,11 @@ - } - - /* get the charset as indicated by the LC_CTYPE locale */ -+#if defined(NETBSD) && !defined(CODESET) -+ codeset = NULL; -+#else - codeset = nl_langinfo( CODESET ); -+#endif - - if ( codeset != NULL ) - { -@@ -595,7 +599,7 @@ - return ret; - } - --#elif defined(MACOSX) /* ifdef LINUX || SOLARIS */ -+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */ - - /* - * FIXME: the MacOS X implemetation is missing -@@ -628,7 +632,7 @@ - return 0; - } - --#else /* ifdef LINUX || SOLARIS || MACOSX */ -+#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ - - /* - * This implementation of osl_getTextEncodingFromLocale maps -@@ -829,7 +833,7 @@ - snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf); - env_buf[sizeof(env_buf)] = '\0'; - putenv(env_buf); --#elif defined( FREEBSD ) || defined( NETBSD ) -+#elif defined( FREEBSD ) - setenv( "LC_ALL", locale_buf, 1); - #else - setenv( "LC_ALL", locale_buf ); -@@ -841,7 +845,7 @@ - snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf); - env_buf[sizeof(env_buf)] = '\0'; - putenv(env_buf); --#elif defined( FREEBAD ) || defined( NETBSD ) -+#elif defined( FREEBAD ) - setenv("LC_CTYPE", locale_buf, 1 ); - #else - setenv( "LC_CTYPE", locale_buf ); -@@ -853,7 +857,7 @@ - snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf); - env_buf[sizeof(env_buf)] = '\0'; - putenv(env_buf); --#elif defined( FREEBAD ) || defined( NETBSD ) -+#elif defined( FREEBAD ) - setenv("LC_CTYPE", locale_buf, 1 ); - #else - setenv( "LANG", locale_buf ); -@@ -864,6 +868,6 @@ - return 0; - } - --#endif /* ifdef LINUX || SOLARIS || MACOSX*/ -+#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ - - diff --git a/misc/openoffice/patches/patch-bk b/misc/openoffice/patches/patch-bk deleted file mode 100644 index e57b53fa094..00000000000 --- a/misc/openoffice/patches/patch-bk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bk,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001 -+++ ../sal/osl/unx/pipe.c -@@ -264,7 +264,11 @@ - - addr.sun_family = AF_UNIX; - strcpy(addr.sun_path, name); -+#if defined(NETBSD) -+ len = sizeof(addr); -+#else - len = sizeof(addr.sun_family) + strlen(addr.sun_path); -+#endif - - if ( Options & osl_Pipe_CREATE ) - { diff --git a/misc/openoffice/patches/patch-bl b/misc/openoffice/patches/patch-bl deleted file mode 100644 index ba02479735f..00000000000 --- a/misc/openoffice/patches/patch-bl +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bl,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/osl/unx/socket.c.orig Thu Nov 22 15:14:54 2001 -+++ ../sal/osl/unx/socket.c -@@ -82,7 +82,7 @@ - #undef HAVE_POLL_H - #endif - --#if defined(LINUX) || defined (IRIX) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) - #include <sys/poll.h> - #define HAVE_POLL_H - #endif /* HAVE_POLL_H */ diff --git a/misc/openoffice/patches/patch-bm b/misc/openoffice/patches/patch-bm deleted file mode 100644 index c5216d535fb..00000000000 --- a/misc/openoffice/patches/patch-bm +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-bm,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/osl/unx/system.c.orig Wed Feb 28 13:08:45 2001 -+++ ../sal/osl/unx/system.c -@@ -126,6 +126,73 @@ - return res; - } - -+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, -+ size_t buflen, struct passwd **result) -+{ -+ struct passwd* res; -+ -+ pthread_mutex_lock(&getrtl_mutex); -+ -+ if ( res = getpwuid(uid) ) -+ { -+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell; -+ -+ pw_name = strlen(res->pw_name)+1; -+ pw_passwd = strlen(res->pw_passwd)+1; -+ pw_class = strlen(res->pw_class)+1; -+ pw_gecos = strlen(res->pw_gecos)+1; -+ pw_dir = strlen(res->pw_dir)+1; -+ pw_shell = strlen(res->pw_shell)+1; -+ -+ if (pw_name+pw_passwd+pw_class+pw_gecos -+ +pw_dir+pw_shell < buflen) -+ { -+ memcpy(pwd, res, sizeof(struct passwd)); -+ -+ strncpy(buffer, res->pw_name, pw_name); -+ pwd->pw_name = buffer; -+ buffer += pw_name; -+ -+ strncpy(buffer, res->pw_passwd, pw_passwd); -+ pwd->pw_passwd = buffer; -+ buffer += pw_passwd; -+ -+ strncpy(buffer, res->pw_class, pw_class); -+ pwd->pw_class = buffer; -+ buffer += pw_class; -+ -+ strncpy(buffer, res->pw_gecos, pw_gecos); -+ pwd->pw_gecos = buffer; -+ buffer += pw_gecos; -+ -+ strncpy(buffer, res->pw_dir, pw_dir); -+ pwd->pw_dir = buffer; -+ buffer += pw_dir; -+ -+ strncpy(buffer, res->pw_shell, pw_shell); -+ pwd->pw_shell = buffer; -+ buffer += pw_shell; -+ -+ *result = pwd ; -+ res = 0 ; -+ -+ } else { -+ -+ res = ENOMEM ; -+ -+ } -+ -+ } else { -+ -+ res = errno ; -+ -+ } -+ -+ pthread_mutex_unlock(&getrtl_mutex); -+ -+ return res; -+} -+ - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -449,3 +516,50 @@ - } - #endif - -+#if defined(NETBSD) || defined(FREEBSD) -+char *fcvt(double value, int ndigit, int *decpt, int *sign) -+{ -+ static char ret[256]; -+ char buf[256],zahl[256],format[256]="%"; -+ char *v1,*v2; -+ -+ if (value==0.0) value=1e-30; -+ -+ if (value<0.0) *sign=1; else *sign=0; -+ -+ if (value<1.0) -+ { -+ *decpt=(int)log10(value); -+ value*=pow(10.0,1-*decpt); -+ ndigit+=*decpt-1; -+ if (ndigit<0) ndigit=0; -+ } -+ else -+ { -+ *decpt=(int)log10(value)+1; -+ } -+ -+ sprintf(zahl,"%d",ndigit); -+ strcat(format,zahl); -+ strcat(format,"."); -+ strcat(format,zahl); -+ strcat(format,"f"); -+ -+ sprintf(buf,format,value); -+ -+ if (ndigit!=0) -+ { -+ v1=strtok(buf,"."); -+ v2=strtok(NULL,"."); -+ strcpy(ret,v1); -+ strcat(ret,v2); -+ } -+ else -+ { -+ strcpy(ret,buf); -+ } -+ -+ return(ret); -+} -+ -+#endif diff --git a/misc/openoffice/patches/patch-bn b/misc/openoffice/patches/patch-bn deleted file mode 100644 index ed0fd899364..00000000000 --- a/misc/openoffice/patches/patch-bn +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bn,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/util/makefile.mk.orig Tue Jan 1 14:11:15 2002 -+++ ../sal/util/makefile.mk -@@ -148,9 +148,13 @@ - SHL1STDLIBS= -lpthread -lposix4 - .IF "$(COM)" == "C50" - SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract --.ENDIF --.ENDIF --.ENDIF -+.ENDIF # COM == C50 -+.ENDIF # OS == SOLARIS -+.IF "$(OS)"=="NETBSD" -+SHL1STDLIBS+= -Wl,--whole-archive -lgnu_readdir_r -Wl,--no-whole-archive -+.ENDIF # OS == NETBSD -+.ENDIF # GUI == UNX -+ - - .IF "$(GUI)"=="OS2" - SHL1STDLIBS=n:\toolkit4\lib\so32dll.lib\ diff --git a/misc/openoffice/patches/patch-bo b/misc/openoffice/patches/patch-bo deleted file mode 100644 index afdbbe42d8e..00000000000 --- a/misc/openoffice/patches/patch-bo +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bo,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sal/util/sal.map.orig Tue Sep 25 08:49:38 2001 -+++ ../sal/util/sal.map -@@ -478,6 +478,15 @@ - rtl_tres_destroy; - osl_getProcessLocale; - osl_setProcessLocale; -+ -+ readdir_r; -+ gethostbyname_r; -+ getpwnam_r; -+ getpwuid_r; -+ gmtime_r; -+ localtime_r; -+ fcvt; -+ - local: - *; - }; diff --git a/misc/openoffice/patches/patch-bp b/misc/openoffice/patches/patch-bp deleted file mode 100644 index 4af62657472..00000000000 --- a/misc/openoffice/patches/patch-bp +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-bp,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../scp/source/global/setupzip.scp.orig Wed Nov 14 15:01:30 2001 -+++ ../scp/source/global/setupzip.scp -@@ -113,13 +113,24 @@ - Name = "libstlport_sunpro.so"; - #endif - #ifdef GCC -- Name = "libstlport_gcc.so"; -+ Name = "libstlport_gcc.so.0"; - #endif - #else - Name = "stlport_vc6.dll"; - #endif - End - -+File GID_FILE_LIB_STLPORT2 -+ BIN_FILE_BODY; -+ Styles = (PACKED, SETUPZIP); -+ Dir = GCFG_BINARY_DIR; -+#ifdef UNX -+#ifdef GCC -+ Name = "libstlport2_gcc.so"; -+#endif -+#endif -+End -+ - #if !defined(OSL_PRODUCT) && !defined(IPL_PRODUCT) && !defined(OPL_PRODUCT) - - #ifndef WEM_PRODUCT -@@ -225,7 +236,7 @@ - - #if defined (CLASSIC_FAT_PRODUCT) || defined (OSL_PRODUCT) - --STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_REGMIMETYPES, regmimetypes ) -+// STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_REGMIMETYPES, regmimetypes ) - - #endif - diff --git a/misc/openoffice/patches/patch-bq b/misc/openoffice/patches/patch-bq deleted file mode 100644 index f9be13c4f92..00000000000 --- a/misc/openoffice/patches/patch-bq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bq,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../setup2/script/setupserver.orig Fri Nov 17 11:29:29 2000 -+++ ../setup2/script/setupserver -@@ -234,6 +234,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - sd_cwd="`pwd`" diff --git a/misc/openoffice/patches/patch-br b/misc/openoffice/patches/patch-br deleted file mode 100644 index c560240955f..00000000000 --- a/misc/openoffice/patches/patch-br +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-br,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../setup2/source/agenda/agenda.cxx.orig Thu Oct 18 09:25:12 2001 -+++ ../setup2/source/agenda/agenda.cxx -@@ -1447,7 +1447,7 @@ - - #ifdef UNX - char passwd[1024]; -- #if defined (LINUX) || defined(IRIX) || defined(FREEBSD) -+ #if defined (LINUX) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - strcpy( passwd, getpass("Enter administrator password for configuration server: ")); - #elif MACOSX - strcpy( passwd, getpass("Enter administrator password for configuration server: ")); diff --git a/misc/openoffice/patches/patch-bs b/misc/openoffice/patches/patch-bs deleted file mode 100644 index 2a3acedb9c2..00000000000 --- a/misc/openoffice/patches/patch-bs +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bs,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Thu Mar 1 16:35:57 2001 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh -@@ -65,6 +65,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - diff --git a/misc/openoffice/patches/patch-bt b/misc/openoffice/patches/patch-bt deleted file mode 100644 index b3f5f2b65f4..00000000000 --- a/misc/openoffice/patches/patch-bt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bt,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../setup2/source/ui/pages/paddr.cxx.orig Fri Sep 14 09:56:31 2001 -+++ ../setup2/source/ui/pages/paddr.cxx -@@ -178,7 +178,10 @@ - m_aCountryList.SetDropDownLineCount( 5 ); - - #ifdef UNX -- m_aShortName.SetText( UniString::CreateFromAscii(getenv("LOGNAME")) ); -+ // LOGNAME may be unset -- passed down pointer must not be NULL -+ sal_Char* getlogname = getenv("LOGNAME"); -+ if (getlogname == NULL) { getlogname = ""; }; -+ m_aShortName.SetText( UniString::CreateFromAscii(getlogname) ); - #else - m_aFirstName.SetModifyHdl( LINK( this, PageAddress, ModifyHdl ) ); - m_aName.SetModifyHdl( LINK( this, PageAddress, ModifyHdl ) ); diff --git a/misc/openoffice/patches/patch-bu b/misc/openoffice/patches/patch-bu deleted file mode 100644 index c3cad13b3db..00000000000 --- a/misc/openoffice/patches/patch-bu +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bu,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/cmdmail/makefile.mk -@@ -81,9 +81,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/misc/openoffice/patches/patch-bv b/misc/openoffice/patches/patch-bv deleted file mode 100644 index 269830b70c5..00000000000 --- a/misc/openoffice/patches/patch-bv +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bv,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/proxysettings/makefile.mk -@@ -85,9 +85,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/misc/openoffice/patches/patch-bw b/misc/openoffice/patches/patch-bw deleted file mode 100644 index 3f78c9d4777..00000000000 --- a/misc/openoffice/patches/patch-bw +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bw,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/unix/exec/makefile.mk -@@ -79,9 +79,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/misc/openoffice/patches/patch-bx b/misc/openoffice/patches/patch-bx deleted file mode 100644 index edd4530b43d..00000000000 --- a/misc/openoffice/patches/patch-bx +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-bx,v 1.2 2004/03/14 02:29:21 kristerw Exp $ - ---- ../solenv/bin/checkdll.sh.orig Tue Jun 19 15:07:46 2001 -+++ ../solenv/bin/checkdll.sh Sun Mar 14 02:51:27 2004 -@@ -7,11 +7,14 @@ - # Copyright (c) 2000, Sun Microsystems, Inc. - # - --set -- `getopt "L:" "$@"` || { -+set -- `getopt "L:R:W:" "$@"` || { - echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2 - exit 1 - } - -+echo "WARNING: checkdll is disabled" 1>&2 -+exit 0 -+ - checkdll="$SOLARVERSION/$INPATH/bin/checkdll" - - if [ -x $checkdll ]; then -@@ -19,6 +22,8 @@ - do - case $1 in - -L) shift; option=$1;; -+ -R) shift;; -+ -W) shift;; - --) break;; - esac - case "${libpath+X}" in diff --git a/misc/openoffice/patches/patch-by b/misc/openoffice/patches/patch-by deleted file mode 100644 index 503cd5016c0..00000000000 --- a/misc/openoffice/patches/patch-by +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-by,v 1.2 2002/02/26 21:25:28 mrauch Exp $ - ---- ../solenv/inc/tg_ext.mk.orig Sun Feb 24 14:08:59 2002 -+++ ../solenv/inc/tg_ext.mk -@@ -107,7 +107,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := sh -c "gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf -" ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -145,7 +145,11 @@ - .IF "$(GUI)"=="WNT" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" -+.IF "$(OS)"=="NETBSD" -+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) -+.ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) -+.ENDIF # "$(OS)"=="NETBSD" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" - diff --git a/misc/openoffice/patches/patch-bz b/misc/openoffice/patches/patch-bz deleted file mode 100644 index adc7a86a713..00000000000 --- a/misc/openoffice/patches/patch-bz +++ /dev/null @@ -1,207 +0,0 @@ -$NetBSD: patch-bz,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../solenv/inc/unxbsdi.mk.orig Tue Jan 1 14:11:59 2002 -+++ ../solenv/inc/unxbsdi.mk -@@ -1,77 +1,131 @@ --# mak file fuer unxbsdi - --ASM= --AFLAGS= -+# mk file for unxbsdi -+ASM=gcc -+AFLAGS=-x assembler-with-cpp -c $(CDEFS) -+ -+SOLAR_JAVA=TRUE -+JAVAFLAGSDEBUG=-g -+ -+# filter for supressing verbose messages from linker -+#not needed at the moment -+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+ -+# _PTHREADS is needed for the stl -+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DX86 -+ -+# this is a platform with JAVA support -+.IF "$(SOLAR_JAVA)"!="" -+JAVADEF=-DSOLAR_JAVA -+.IF "$(debug)"=="" -+JAVA_RUNTIME=-ljava -+.ELSE -+JAVA_RUNTIME=-ljava_g -+.ENDIF -+.ENDIF - --cc=gcc -c --CC=g++ -c --CDEFS+=-D_PTHREADS -D_REENTRANT --CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE --CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR -DNCIfeature --CFLAGS+=-w -c $(INCLUDE) --CFLAGSCC=-pipe -mpentium -+# name of C++ Compiler -+CC=g++ -+# name of C Compiler -+cc=gcc -+# flags for C and C++ Compiler -+CFLAGS=-w -c $(INCLUDE) -I$(SOLARENV)/unxbsdi/usr/include -+# flags for the C++ Compiler -+CFLAGSCC= -pipe -+ -+# Flags for enabling exception handling - CFLAGSEXCEPTIONS=-fexceptions -+# Flags for disabling exception handling - CFLAGS_NO_EXCEPTIONS=-fno-exceptions --CFLAGSCXX=-pipe -mpentium -fguiding-decls -frtti - --CFLAGSOBJGUIST= --CFLAGSOBJCUIST= --CFLAGSOBJGUIMT= --CFLAGSOBJCUIMT= -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -fno-for-scope -fpermissive -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -fPIC -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -fPIC -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -fPIC -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -fPIC -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface - CFLAGSSLOGUIMT= -fPIC -+# Compiler flags for compiling shared object in multi threaded environment with character user interface - CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g -+# Compiler flags for profiling -+CFLAGSPROF= -+# Compiler flags for debugging -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= --# die zusaetzlichen Optimierungsschalter schalten alle Optimierungen ein, die zwischen -O und -O2 liegen und --# per Schalter einschaltbar sind. Dennoch gibt es einen Unterschied: einige Files im Writer werden --# misoptimiert wenn -O2 eingeschaltet ist und waehrend die untenstehenden Schalter funktionieren. --CFLAGSOPT=-O -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fstrength-reduce -fforce-mem -fcaller-saves -fgcse -frerun-cse-after-loop -frerun-loop-opt -fschedule-insns2 -fregmove -foptimize-register-move --#CFLAGSOPT=-O2 -+# Compiler flags for enabling optimazations -+CFLAGSOPT=-O2 -+# Compiler flags for disabling optimazations - CFLAGSNOOPT=-O -+# Compiler flags for discibing the output path - CFLAGSOUTOBJ=-o - --STATIC= -Bstatic --DYNAMIC= -Bdynamic -- --THREADLIB= --LINK= gcc -+# switches for dynamic and static linking -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic -+ -+# name of linker -+LINK=gcc -+# default linker flags - LINKFLAGS= --.IF "$(PRJNAME)"=="osl" || "$(PRJNAME)"=="rtl" --LINKFLAGSSHLGUI= -shared -nostdlib --LINKFLAGSSHLCUI= -shared -nostdlib --.ELSE --LINKFLAGSSHLGUI= -shared -nostdlib /usr/lib/c++rt0.o --LINKFLAGSSHLCUI= -shared -nostdlib /usr/lib/c++rt0.o --.ENDIF --LINKFLAGSAPPGUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread --LINKFLAGSAPPCUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -+# linker flags for linking shared libraries -+LINKFLAGSSHLGUI= -Wl,-export-dynamic -shared -+LINKFLAGSSHLCUI= -Wl,-export-dynamic -shared -+ - LINKFLAGSTACK= - LINKFLAGSPROF= --LINKFLAGSDEBUG= --LINKFLAGSOPT= -+LINKFLAGSDEBUG=-g -+LINKFLAGSOPT= -+ -+.IF "$(NO_BSYMBOLIC)"=="" -+.IF "$(PRJNAME)" != "envtest" -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic -+.ENDIF -+.ENDIF # "$(NO_BSYMBOLIC)"=="" - --_SYSLIBS= -lpthread -lgcc -lc -lm --_X11LIBS= -L/usr/X11R6/lib -lXext -lXt -lX11 -+LINKVERSIONMAPFLAG=-Wl,--version-script - --STDLIBCPP= -lstdc++ -+SONAME_SWITCH=-Wl,-h - -+# Sequence of libs does matter ! -+ -+STDLIBCPP=-lstdc++ -+ -+# default objectfilenames to link - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - --STDLIBGUIST= ${_X11LIBS} ${_SYSLIBS} --STDLIBCUIST= ${_SYSLIBS} --STDLIBGUIMT= ${_X11LIBS} ${_SYSLIBS} --STDLIBCUIMT= ${_SYSLIBS} --STDSHLGUIMT= --STDSHLCUIMT= -- --LIBMGR= ar --LIBFLAGS= -r --LIBEXT= .a -+# libraries for linking applications -+STDLIBCUIST=-lm -+STDLIBGUIMT=-lXaw -lXt -lX11 -lpthread -lm -+STDLIBCUIMT=-lpthread -lm -+STDLIBGUIST=-lXaw -lXt -lX11 -lm -+# libraries for linking shared libraries -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm -lgcc -+STDSHLCUIMT=-lpthread -lm -lgcc -+ -+# STLport always needs pthread. This may yield some redundant -lpthread -+# but that doesn't matter. -+LIBSTLPORT=$(DYNAMIC) -lstlport2_gcc -lpthread -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread -+ -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r - -+# tool for generating import libraries - IMPLIB= - IMPLIBFLAGS= - -@@ -79,14 +133,13 @@ - MAPSYMFLAGS= - - RC=irc --RCFLAGS= -fo$@ $(RCFILES) -+RCFLAGS=-fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= - RCSETVERSION= - --DLLPOSTFIX= bi --DLLPRE= lib --DLLPOST= .so.1.0 -- --LDUMP= -+# platform specific identifier for shared libs -+DLLPOSTFIX=bi -+DLLPRE=lib -+DLLPOST=.so - diff --git a/misc/openoffice/patches/patch-ca b/misc/openoffice/patches/patch-ca deleted file mode 100644 index 2431090f595..00000000000 --- a/misc/openoffice/patches/patch-ca +++ /dev/null @@ -1,150 +0,0 @@ -$NetBSD: patch-ca,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../solenv/inc/unxbsdppc.mk.orig Sun Jan 6 11:30:53 2002 -+++ ../solenv/inc/unxbsdppc.mk -@@ -0,0 +1,145 @@ -+ -+# mk file for unxbsdppc -+ASM=gcc -+AFLAGS= -x assembler-with-cpp -c $(CDEFS) -+ -+SOLAR_JAVA=TRUE -+JAVAFLAGSDEBUG=-g -+ -+# filter for supressing verbose messages from linker -+#not needed at the moment -+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+ -+# _PTHREADS is needed for the stl -+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPPC -DPOWERPC -+ -+# this is a platform with JAVA support -+.IF "$(SOLAR_JAVA)"!="" -+JAVADEF=-DSOLAR_JAVA -+.IF "$(debug)"=="" -+JAVA_RUNTIME=-ljava -+.ELSE -+JAVA_RUNTIME=-ljava_g -+.ENDIF -+.ENDIF -+ -+# name of C++ Compiler -+CC=g++ -+# name of C Compiler -+cc=gcc -+# flags for C and C++ Compiler -+CFLAGS=-w -c $(INCLUDE) -I$(SOLARENV)/unxbsdppc/usr/include -+# flags for the C++ Compiler -+CFLAGSCC= -pipe -+ -+# Flags for enabling exception handling -+CFLAGSEXCEPTIONS=-fexceptions -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -fno-for-scope -fpermissive -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -fPIC -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -fPIC -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -fPIC -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -fPIC -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -+CFLAGSSLOGUIMT= -fPIC -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT= -fPIC -+# Compiler flags for profiling -+CFLAGSPROF= -+# Compiler flags for debugging -+CFLAGSDEBUG=-g -+CFLAGSDBGUTIL= -+# Compiler flags for enabling optimazations -+CFLAGSOPT=-O2 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o -+ -+# switches for dynamic and static linking -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic -+ -+# name of linker -+LINK=gcc -+# default linker flags -+LINKFLAGS= -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -+# linker flags for linking shared libraries -+LINKFLAGSSHLGUI= -Wl,-export-dynamic -shared -+LINKFLAGSSHLCUI= -Wl,-export-dynamic -shared -+ -+LINKFLAGSTACK= -+LINKFLAGSPROF= -+LINKFLAGSDEBUG=-g -+LINKFLAGSOPT= -+ -+.IF "$(NO_BSYMBOLIC)"=="" -+.IF "$(PRJNAME)" != "envtest" -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic -+.ENDIF -+.ENDIF # "$(NO_BSYMBOLIC)"=="" -+ -+LINKVERSIONMAPFLAG=-Wl,--version-script -+ -+SONAME_SWITCH=-Wl,-h -+ -+# Sequence of libs does matter ! -+ -+STDLIBCPP=-lstdc++ -+ -+# default objectfilenames to link -+STDOBJGUI= -+STDSLOGUI= -+STDOBJCUI= -+STDSLOCUI= -+ -+# libraries for linking applications -+STDLIBCUIST=-lm -+STDLIBGUIMT=-lXaw -lXt -lX11 -lpthread -lm -+STDLIBCUIMT=-lpthread -lm -+STDLIBGUIST=-lXaw -lXt -lX11 -lm -+# libraries for linking shared libraries -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm -+STDSHLCUIMT=-lpthread -lm -+ -+# STLport always needs pthread. This may yield some redundant -lpthread -+# but that doesn't matter. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread -+ -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r -+ -+# tool for generating import libraries -+IMPLIB= -+IMPLIBFLAGS= -+ -+MAPSYM= -+MAPSYMFLAGS= -+ -+RC=irc -+RCFLAGS=-fo$@ $(RCFILES) -+RCLINK= -+RCLINKFLAGS= -+RCSETVERSION= -+ -+# platform specific identifier for shared libs -+DLLPOSTFIX=bp -+DLLPRE=lib -+DLLPOST=.so -+ diff --git a/misc/openoffice/patches/patch-cb b/misc/openoffice/patches/patch-cb deleted file mode 100644 index c448816d847..00000000000 --- a/misc/openoffice/patches/patch-cb +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-cb,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../solenv/inc/unxbsds.mk.orig Tue Jan 1 14:11:59 2002 -+++ ../solenv/inc/unxbsds.mk -@@ -73,7 +73,7 @@ - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - - # _PTHREADS is needed for the stl --CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DOSL_USE_SYS_V_SEMAPHORE -+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 - - # this is a platform with JAVA support - .IF "$(SOLAR_JAVA)"!="" -@@ -139,8 +139,8 @@ - LINKFLAGSAPPGUI= -Wl,-export-dynamic - LINKFLAGSAPPCUI= -Wl,-export-dynamic - # linker flags for linking shared libraries --LINKFLAGSSHLGUI= -shared --LINKFLAGSSHLCUI= -shared -+LINKFLAGSSHLGUI= -Wl,-export-dynamic -shared -+LINKFLAGSSHLCUI= -Wl,-export-dynamic -shared - - LINKFLAGSTACK= - LINKFLAGSPROF= -@@ -156,6 +156,8 @@ - - LINKVERSIONMAPFLAG=-Wl,--version-script - -+SONAME_SWITCH=-Wl,-h -+ - # Sequence of libs does matter ! - - STDLIBCPP=-lstdc++ -@@ -172,7 +174,7 @@ - STDLIBCUIMT=-lpthread -lm - STDLIBGUIST=-lXaw -lXt -lX11 -lm - # libraries for linking shared libraries --STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm - STDSHLCUIMT=-lpthread -lm - - # STLport always needs pthread. This may yield some redundant -lpthread diff --git a/misc/openoffice/patches/patch-cc b/misc/openoffice/patches/patch-cc deleted file mode 100644 index 39a5699533a..00000000000 --- a/misc/openoffice/patches/patch-cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-cc,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stlport/makefile.mk.orig Tue Jan 1 14:12:01 2002 -+++ ../stlport/makefile.mk -@@ -66,11 +66,17 @@ - TARGET=so_stlport - - .IF "$(STLPORT4)"!="NO_STLPORT4" --all: -+all: $(INPATH)$/misc$/so_copied -+ -+$(INPATH)$/misc$/so_copied: - @echo " An already available installatin of STLport has been chosen in the configure process." - @echo " Therefore the version provided here does not need to be built in addition." - -- +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST) -+ +$(COPY) $(STLPORT4)$/lib$/*stlport_gcc$(DLLPOST)* $(DLLDEST) -+.IF "$(OS)"=="NETBSD" -+ +$(LINK) $(LINKFLAGSSHLCUI) $(STLPORT4)$/lib$/$(DLLPRE)stlport_gcc$(DLLPOST) -o $(DLLDEST)$/$(DLLPRE)stlport2_gcc$(DLLPOST) -lgcc -+.ENDIF -+ +$(TOUCH) $(INPATH)$/misc$/so_copied - .ENDIF - - # --- Settings ----------------------------------------------------- diff --git a/misc/openoffice/patches/patch-cd b/misc/openoffice/patches/patch-cd deleted file mode 100644 index c49b210ffa9..00000000000 --- a/misc/openoffice/patches/patch-cd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cd,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stlport/prj/d.lst.orig Mon Sep 24 16:05:55 2001 -+++ ../stlport/prj/d.lst -@@ -17,7 +17,7 @@ - ..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\* - ..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\* - ..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\* --..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -+..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so* - ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a - ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib - ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll diff --git a/misc/openoffice/patches/patch-ce b/misc/openoffice/patches/patch-ce deleted file mode 100644 index 8222e8c6de4..00000000000 --- a/misc/openoffice/patches/patch-ce +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ce,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/corereflection/makefile.mk -@@ -87,9 +87,9 @@ - SHL1TARGET= $(TARGET) - SHL1VERSIONMAP= $(TARGET).map - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-cf b/misc/openoffice/patches/patch-cf deleted file mode 100644 index a34f1d5c590..00000000000 --- a/misc/openoffice/patches/patch-cf +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cf,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/defaultregistry/makefile.mk -@@ -84,9 +84,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP= $(TARGET).map - SHL1DEPN= diff --git a/misc/openoffice/patches/patch-cg b/misc/openoffice/patches/patch-cg deleted file mode 100644 index 80513faa77a..00000000000 --- a/misc/openoffice/patches/patch-cg +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cg,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/implementationregistration/makefile.mk -@@ -85,9 +85,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-ch b/misc/openoffice/patches/patch-ch deleted file mode 100644 index 41c77b8a2c9..00000000000 --- a/misc/openoffice/patches/patch-ch +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ch,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/inspect/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-ci b/misc/openoffice/patches/patch-ci deleted file mode 100644 index 2534f2f7d89..00000000000 --- a/misc/openoffice/patches/patch-ci +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ci,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= diff --git a/misc/openoffice/patches/patch-cj b/misc/openoffice/patches/patch-cj deleted file mode 100644 index 123bbdc7ede..00000000000 --- a/misc/openoffice/patches/patch-cj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cj,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation_adapterfactory/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP= $(TARGET).map - diff --git a/misc/openoffice/patches/patch-ck b/misc/openoffice/patches/patch-ck deleted file mode 100644 index 9c1696e9b29..00000000000 --- a/misc/openoffice/patches/patch-ck +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ck,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javaloader/makefile.mk -@@ -83,9 +83,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(CPPULIB) -+ - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-cl b/misc/openoffice/patches/patch-cl deleted file mode 100644 index 70c437c11e9..00000000000 --- a/misc/openoffice/patches/patch-cl +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cl,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javavm/makefile.mk -@@ -91,10 +91,10 @@ - SHL1TARGET= $(TARGET) - SHL1VERSIONMAP=$(TARGET).map - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ -- $(UNOLIB) \ -- $(SALLIB) -+ $(UNOLIB) - - .IF "$(GUI)"=="WNT" - SHL1STDLIBS += advapi32.lib diff --git a/misc/openoffice/patches/patch-cm b/misc/openoffice/patches/patch-cm deleted file mode 100644 index ced34e381aa..00000000000 --- a/misc/openoffice/patches/patch-cm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cm,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/loader/makefile.mk -@@ -83,9 +83,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= diff --git a/misc/openoffice/patches/patch-cn b/misc/openoffice/patches/patch-cn deleted file mode 100644 index f7be40221f1..00000000000 --- a/misc/openoffice/patches/patch-cn +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cn,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/namingservice/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - diff --git a/misc/openoffice/patches/patch-co b/misc/openoffice/patches/patch-co deleted file mode 100644 index 8aedaf4957c..00000000000 --- a/misc/openoffice/patches/patch-co +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-co,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/proxy_factory/makefile.mk -@@ -85,9 +85,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) diff --git a/misc/openoffice/patches/patch-cp b/misc/openoffice/patches/patch-cp deleted file mode 100644 index 8025b57d846..00000000000 --- a/misc/openoffice/patches/patch-cp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cp,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/registry_tdprovider/makefile.mk -@@ -88,10 +88,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(SALHELPERLIB) \ -- $(SALLIB) -+ $(SALHELPERLIB) - - SHL1DEPN= - SHL1VERSIONMAP=$(TARGET).map diff --git a/misc/openoffice/patches/patch-cq b/misc/openoffice/patches/patch-cq deleted file mode 100644 index 4677ffac9cf..00000000000 --- a/misc/openoffice/patches/patch-cq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cq,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/servicemanager/makefile.mk -@@ -84,9 +84,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/misc/openoffice/patches/patch-cr b/misc/openoffice/patches/patch-cr deleted file mode 100644 index 5393869c6bf..00000000000 --- a/misc/openoffice/patches/patch-cr +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cr,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/tdmanager/makefile.mk -@@ -83,9 +83,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) -+ - SHL1VERSIONMAP=$(TARGET).map - - SHL1DEPN= diff --git a/misc/openoffice/patches/patch-cs b/misc/openoffice/patches/patch-cs deleted file mode 100644 index 1eea88f969a..00000000000 --- a/misc/openoffice/patches/patch-cs +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cs,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/typeconv/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1VERSIONMAP= $(TARGET).map diff --git a/misc/openoffice/patches/patch-ct b/misc/openoffice/patches/patch-ct deleted file mode 100644 index 3f8f71e7a13..00000000000 --- a/misc/openoffice/patches/patch-ct +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ct,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sw/source/filter/ww8/ww8par.hxx.orig Wed Oct 17 09:35:21 2001 -+++ ../sw/source/filter/ww8/ww8par.hxx -@@ -378,7 +378,9 @@ - void Restore( SwWW8ImplReader* pRdr ); - }; - -- -+#if defined(NETBSD) -+#undef F_OK -+#endif - - enum eF_ResT{ F_OK, F_TEXT, F_TAGIGN, F_TAGTXT, F_READ_FSPA }; - diff --git a/misc/openoffice/patches/patch-cu b/misc/openoffice/patches/patch-cu deleted file mode 100644 index bd945980391..00000000000 --- a/misc/openoffice/patches/patch-cu +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cu,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../sysui/unix/office/scripts/soffice.sh.orig Wed Sep 19 11:24:33 2001 -+++ ../sysui/unix/office/scripts/soffice.sh -@@ -81,6 +81,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; - FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac diff --git a/misc/openoffice/patches/patch-cv b/misc/openoffice/patches/patch-cv deleted file mode 100644 index c268f49d7b7..00000000000 --- a/misc/openoffice/patches/patch-cv +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-cv,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../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" -+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/misc/openoffice/patches/patch-cw b/misc/openoffice/patches/patch-cw deleted file mode 100644 index 2a204624275..00000000000 --- a/misc/openoffice/patches/patch-cw +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cw,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../tools/inc/solar.h.orig Fri Oct 12 15:11:03 2001 -+++ ../tools/inc/solar.h -@@ -443,6 +443,9 @@ - #elif defined NETBSD && defined SPARC - #define __DLLEXTENSION "bs.so" - #define SYSTEM_ID SYSTEM_UNXBSDS -+#elif defined NETBSD && defined POWERPC -+ #define __DLLEXTENSION "bp.so" -+ #define SYSTEM_ID SYSTEM_UNXBSDP - #elif defined LINUX && defined X86 - #define __DLLEXTENSION "li.so" - #define SYSTEM_ID SYSTEM_UNXLNXI diff --git a/misc/openoffice/patches/patch-cx b/misc/openoffice/patches/patch-cx deleted file mode 100644 index 001d8e0476a..00000000000 --- a/misc/openoffice/patches/patch-cx +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-cx,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../tools/source/string/charset.cxx.orig Thu May 10 13:35:20 2001 -+++ ../tools/source/string/charset.cxx -@@ -64,7 +64,7 @@ - #elif defined( OS2 ) - #define INCL_DOSNLS - #include <svpm.h> --#elif defined(LINUX) || defined(SOLARIS) -+#elif defined(LINUX) || defined(SOLARIS) || defined(NETBSD) - #include <stdio.h> - #include <stdlib.h> - #include <strings.h> -@@ -126,7 +126,7 @@ - - // ----------------------------------------------------------------------- - --#if defined(NETBSD) || defined(SCO) -+#if defined(SCO) - - // check if there is a charset qualifier at the end of the given locale string - // e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what -@@ -323,7 +323,7 @@ - return RTL_TEXTENCODING_DONTKNOW; - } - --#elif defined(LINUX) || defined(SOLARIS) -+#elif defined(LINUX) || defined(SOLARIS) || defined(NETBSD) - - typedef struct { - const char *key; -@@ -363,7 +363,7 @@ - /* XXX MS-874 is an extension to tis620, so this is not - * really equivalent */ - --#elif defined(LINUX) -+#elif defined(LINUX) || defined(NETBSD) - - const _pair _nl_language_list[] = { - { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW },/* ISO-IR-99 NAPLPS */ -@@ -541,7 +541,7 @@ - - }; - --#endif /* LINUX, SOLARIS */ -+#endif /* LINUX, SOLARIS, NETBSD */ - - static int - _pair_compare (const char *key, const _pair *pair) -@@ -601,7 +601,11 @@ - - /* get the charset as indicated by the LC_CTYPE locale */ - char *ctype_locale = setlocale( LC_CTYPE, "" ); -+#if defined(NETBSD) && !defined(CODESET) -+ char *codeset = NULL; -+#else - char *codeset = nl_langinfo( CODESET ); -+#endif - - if ( codeset != NULL ) - { -@@ -707,11 +711,11 @@ - #ifdef UNX - CharSet nTextEncoding; - --#if defined(NETBSD) || defined(SCO) -+#if defined(SCO) - nTextEncoding = GetSystemCharSetFromEnvironment(); - if (nTextEncoding == RTL_TEXTENCODING_DONTKNOW) - nTextEncoding = GetSystemCharSetFromSystemLanguage(); --#elif defined(LINUX) || defined(SOLARIS) -+#elif defined(LINUX) || defined(SOLARIS) || defined(NETBSD) - nTextEncoding = GetSystemCharsetFromNLLanginfo(); - #elif defined(MACOSX) - nTextEncoding = RTL_TEXTENCODING_DONTKNOW; diff --git a/misc/openoffice/patches/patch-cy b/misc/openoffice/patches/patch-cy deleted file mode 100644 index 794e65e738d..00000000000 --- a/misc/openoffice/patches/patch-cy +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cy,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../unzip/source/file_io.c.orig Wed May 2 01:11:49 2001 -+++ ../unzip/source/file_io.c -@@ -864,7 +864,7 @@ - #ifndef __386BSD__ - static struct timeb tbp; - #endif /* !__386BSD__ */ --#else /* !BSD */ -+#elif !defined(NETBSD) /* !BSD */ - extern long timezone; - #endif /* ?BSD */ - #endif /* ?AMIGA */ diff --git a/misc/openoffice/patches/patch-cz b/misc/openoffice/patches/patch-cz deleted file mode 100644 index 720b67c2c2b..00000000000 --- a/misc/openoffice/patches/patch-cz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cz,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../unzip/source/misc.c.orig Wed May 2 01:13:26 2001 -+++ ../unzip/source/misc.c -@@ -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(NETBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ - static struct timeb tbp; diff --git a/misc/openoffice/patches/patch-da b/misc/openoffice/patches/patch-da deleted file mode 100644 index 84ce4073375..00000000000 --- a/misc/openoffice/patches/patch-da +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-da,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../vcl/unx/source/gdi/salprn.cxx.orig Fri Jul 13 17:39:42 2001 -+++ ../vcl/unx/source/gdi/salprn.cxx -@@ -1259,7 +1259,7 @@ - if( getPrinterPort( pJobSetup->maPrinterName ).EqualsIgnoreCaseAscii( "fax_queue" ) ) - { - char tmpNam[ L_tmpnam ]; --#if defined(FREEBSD) || defined(IRIX) -+#if defined(FREEBSD) || defined(IRIX) || defined(NETBSD) - mkstemp( tmpNam ); - #else - tmpnam_r( tmpNam ); diff --git a/misc/openoffice/patches/patch-db b/misc/openoffice/patches/patch-db deleted file mode 100644 index 7e5808f0890..00000000000 --- a/misc/openoffice/patches/patch-db +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-db,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../vcl/unx/source/gdi/salprnpsp.cxx.orig Wed Oct 17 13:22:31 2001 -+++ ../vcl/unx/source/gdi/salprnpsp.cxx -@@ -805,7 +805,7 @@ - static inline String getTmpName() - { - char tmpNam[ L_tmpnam ]; --#if defined( FREEBSD ) || defined (IRIX) -+#if defined( FREEBSD ) || defined (IRIX) || defined(NETBSD) - mkstemp ( tmpNam ); - #else - tmpnam_r( tmpNam ); diff --git a/misc/openoffice/patches/patch-dc b/misc/openoffice/patches/patch-dc deleted file mode 100644 index fe21b01f53c..00000000000 --- a/misc/openoffice/patches/patch-dc +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-dc,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../vcl/util/makefile.mk.orig Tue Jan 1 14:12:31 2002 -+++ ../vcl/util/makefile.mk -@@ -190,12 +190,6 @@ - $(SLB)$/salapp.lib - .ENDIF # "$(remote)" != "" - --.IF "$(GUI)" == "UNX" --.IF "$(USE_XPRINT)" != "TRUE" -- SHL1STDLIBS=-lpsp$(VERSION)$(DLLPOSTFIX) --.ENDIF --.ENDIF -- - .IF "$(USE_BUILTIN_RASTERIZER)"!="" - LIB1FILES += $(SLB)$/glyphs.lib - SHL1STDLIBS+= $(FREETYPELIBST) -@@ -214,6 +208,12 @@ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(GPC3RDLIB) -+ -+.IF "$(GUI)" == "UNX" -+.IF "$(USE_XPRINT)" != "TRUE" -+ SHL1STDLIBS+=-lpsp$(VERSION)$(DLLPOSTFIX) -+.ENDIF -+.ENDIF - - .IF "$(remote)" != "" - SHL1STDLIBS+= $(UNOLIB) diff --git a/misc/openoffice/patches/patch-dd b/misc/openoffice/patches/patch-dd deleted file mode 100644 index 88654f01511..00000000000 --- a/misc/openoffice/patches/patch-dd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-dd,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ - ---- ../xmlhelp/source/com/sun/star/help/helpserver.sh.orig Thu Jul 12 08:20:41 2001 -+++ ../xmlhelp/source/com/sun/star/help/helpserver.sh -@@ -124,6 +124,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - sd_cwd="`pwd`" diff --git a/misc/openoffice/patches/patch-de b/misc/openoffice/patches/patch-de deleted file mode 100644 index 41d56568ba9..00000000000 --- a/misc/openoffice/patches/patch-de +++ /dev/null @@ -1,106 +0,0 @@ -$NetBSD: patch-de,v 1.2 2002/02/14 22:51:42 mrauch Exp $ - ---- set_soenv.1.orig Tue Nov 20 17:26:33 2001 -+++ set_soenv.1 Thu Feb 14 23:13:12 2002 -@@ -35,0 +36 @@ -+$| = 1; # Don't cache. -@@ -283 +284,11 @@ --{ print "Setting NetBSD Sparc specific values... "; -+{ -+if ( $machine_type eq "i386" ) -+{ print "Setting NetBSD i386 specific values... "; -+ $outfile = "NetBSDIntelEnv.Set"; -+ $CPU = "I"; -+ $CPUNAME = "INTEL"; -+ $DLLSUFFIX = "bi"; -+ $OUTPATH = "unxbsdi"; -+} -+elsif ( $machine_type eq "sparc" ) -+{ print "Setting NetBSD sparc specific values... "; -@@ -284,0 +296,18 @@ -+ $CPU = "S"; -+ $CPUNAME = "SPARC"; -+ $DLLSUFFIX = "bs"; -+ $OUTPATH = "unxbsds"; -+} -+elsif ( $machine_type eq "powerpc" ) -+{ print "Setting NetBSD powerpc specific values... "; -+ $outfile = "NetBSDPPCEnv.Set"; -+ $CPU = "P"; -+ $CPUNAME = "POWERPC"; -+ $DLLSUFFIX = "bp"; -+ $OUTPATH = "unxbsdppc"; -+} -+else -+{ -+ print "This NetBSD architecture ($machine_type) is currently not supported.\n"; -+ exit(1); -+} -@@ -288,2 +316,0 @@ -- $CPU = "S"; -- $CPUNAME = "SPARC"; -@@ -291 +317,0 @@ -- $DLLSUFFIX = "bs"; -@@ -296 +321,0 @@ -- $OUTPATH = "unxbsds"; -@@ -591 +616 @@ -- my $answer = <STDIN>; -+ exit(1); -@@ -816 +840,0 @@ -- $ps.$USR_LOCAL.$LIB. -@@ -817,0 +842 @@ -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -819 +844 @@ -- $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -+ $ps.$USR_LOCAL.$LIB; -@@ -961,0 +987 @@ -+ $ps.$ENV{PREFIX}. -@@ -968,2 +994,3 @@ -- $ps.$USR.$BIN.$ds."X11". -- $ps.$USR.$LIB; -+ $ps.$USR.$ds."X11R6".$BIN. -+ $ps.$USR.$LIB. -+ $ps.$ENV{PATH}; -@@ -1057,0 +1085,18 @@ -+if ($platform eq "${NetBSD}") -+{ my $libgcc=`$COMPATH/gcc -print-libgcc-file-name | xargs dirname`; -+ chomp($libgcc); -+ $SOLARLIB = '"'.$L.$par_dir.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$JAVA_HOME'.$LIB. -+ $L_STLPORT_LIB. -+ $L.$XLIB. -+ $L.$USR_LOCAL.$LIB. -+ $L.$libgcc. -+ $L.$USR_LIB. -+ $L.$LIB. -+ " ".$ENV{'BUILDLINK_LDFLAGS'}. -+ " ".$ENV{'CCFLAGS'}.'"'; -+} -+ -@@ -1065,0 +1111,5 @@ -+if ($platform eq "${NetBSD}") -+{ -+$SOLARINC .= " ".$ENV{'BUILDLINK_CPPFLAGS'}." "; -+} -+ -@@ -1068,3 +1118,2 @@ --$SOLARINC .= $I.$USR.$INCLUDE. -- $STLPORT_stlport; --if ($platform eq "$Linux") -+$SOLARINC .= $STLPORT_stlport; -+if (($platform eq "$Linux") or ($platform eq "${NetBSD}")) -@@ -1104,0 +1154,2 @@ -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris"; -@@ -1418 +1469 @@ -- $answer = <STDIN>; -+ exit(1); -@@ -1514 +1565 @@ -- $value = <STDIN>; -+ exit(1); -@@ -1555 +1606 @@ -- my $answer = <STDIN>; -+ exit(1); diff --git a/misc/openoffice/patches/patch-df b/misc/openoffice/patches/patch-df deleted file mode 100644 index c18c44cbb37..00000000000 --- a/misc/openoffice/patches/patch-df +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-df,v 1.1.1.1 2002/02/13 18:09:25 mrauch Exp $ - ---- ../readlicense/source/license/unx/license.html.orig Tue Jan 8 22:25:38 2002 -+++ ../readlicense/source/license/unx/license.html Tue Jan 8 22:25:16 2002 -@@ -0,0 +1,111 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -+<HTML> -+<HEAD> -+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1"> -+ <TITLE></TITLE> -+ <META NAME="GENERATOR" CONTENT="StarOffice 6.0 (Win32)"> -+ <META NAME="AUTHOR" CONTENT="Frank Loehmann"> -+ <META NAME="CREATED" CONTENT="20011115;17153310"> -+ <META NAME="CHANGEDBY" CONTENT="Frank Loehmann"> -+ <META NAME="CHANGED" CONTENT="20011115;17215774"> -+</HEAD> -+<BODY LANG="de-DE"> -+<H1>(Temporary license text file)</H1> -+<P>You may only copy and distribute this program consistent with the -+requirements and distribute this Program consistent with the -+requirements of either the GNU General Public License (GPL) and GNU -+Lesser General Public License (LGPL) or the Sun Industry Standards -+Source License (SISSL), respectively, depending on whether you -+elected to obtain access to this program via the GPL/LGPL Option or -+the SISSL Option. Copies of the GPL, LGPL and SISSL licenses can be -+found http://www.openoffice.org/project/www/license.html</P> -+<H2>The program uses Berkely DB software:</H2> -+<P>Copyright (c) 1990-1999</P> -+<P>Sleepycat Software. All rights reserved.</P> -+<P>Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met:</P> -+<P>1. Redistributions of source code must retain the above copyright -+notice, this list of conditions and the following disclaimer.</P> -+<P>2. Redistributions in binary form must reproduce the above -+copyright notice, this list of conditions and the following -+disclaimer in the documentation and/or other materials provided with -+the distribution.</P> -+<P>3. Redistributions in any form must be accompanied by information -+on how to obtain complete source code for the DB software and any -+accompanying software that uses the DB software. The source code -+must either be included in the distribution or be available for no -+more than the cost of distribution plus a nominal fee, and must be -+freely redistributable under reasonable conditions. For an -+executable file, complete source code means the source code for all -+modules it contains. It does not include source code for modules or -+files that typically accompany the major components of the operating -+system on which the executable file runs.</P> -+<P>THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY -+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL -+SLEEPYCAT SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> -+<P>Copyright (c) 1990, 1993, 1994, 1995</P> -+<P>The Regents of the University of California. All rights reserved.</P> -+<P>Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met: -+</P> -+<P>1. Redistributions of source code must retain the above copyright -+notice, this list of conditions and the following disclaimer.</P> -+<P>2. Redistributions in binary form must reproduce the above -+copyright notice, this list of conditions and the following -+disclaimer in the documentation and/or other materials provided with -+the distribution.</P> -+<P>3. Neither the name of the University nor the names of its -+contributors may be used to endorse or promote products derived from -+this software without specific prior written permission.</P> -+<P>THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS -+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS -+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> -+<P>Copyright (c) 1995, 1996</P> -+<P>The President and Fellows of Harvard University. All rights -+reserved. Redistribution and use in source and binary forms, with or -+without modification, are permitted provided that the following -+conditions are met: -+</P> -+<P>1. Redistributions of source code must retain the above copyright -+notice, this list of conditions and the following disclaimer. -+</P> -+<P>2. Redistributions in binary form must reproduce the above -+copyright notice, this list of conditions and the following -+disclaimer in the documentation and/or other materials provided with -+the distribution.</P> -+<P>3. Neither the name of the University nor the names of its -+contributors may be used to endorse or promote products derived from -+this software without specific prior written permission.</P> -+<P>THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS -+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR -+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> -+<HR> -+<P>Copyright 2001 OpenOffice.org. All rights reserved.</P> -+</BODY> -+</HTML> diff --git a/misc/openoffice/patches/patch-dg b/misc/openoffice/patches/patch-dg deleted file mode 100644 index 2dfabcebb45..00000000000 --- a/misc/openoffice/patches/patch-dg +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-dg,v 1.2 2002/03/29 21:00:10 mrauch Exp $ - ---- ../idlc/source/makefile.mk.orig Fri Mar 29 11:54:39 2002 -+++ ../idlc/source/makefile.mk -@@ -72,9 +72,7 @@ - # --- Settings ----------------------------------------------------- - - --.INCLUDE : svpre.mk - .INCLUDE : settings.mk --.INCLUDE : sv.mk - - - # --- Files -------------------------------------------------------- -@@ -102,6 +100,9 @@ - astunion.cxx \ - astexpression.cxx - -+ YACCTARGET=$(MISC)$/parser.cxx -+ YACCFILES=parser.yy -+ - OBJFILES= \ - $(OBJ)$/scanner.obj \ - $(OBJ)$/parser.obj \ -@@ -146,8 +147,3 @@ - $(MISC)$/scanner.cxx: $(MISC)$/stripped_scanner.ll - +flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll - --$(MISC)$/parser.cxx: parser.yy -- +bison -v -d -o$(MISC)$/parser.cxx parser.yy -- +$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h --# with line statements (for debugging) --# +bison -v -d -o$(MISC)$/parser.cxx parser.yy diff --git a/misc/openoffice/patches/patch-dh b/misc/openoffice/patches/patch-dh deleted file mode 100644 index fb2341fb2ef..00000000000 --- a/misc/openoffice/patches/patch-dh +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-dh,v 1.2 2002/03/29 21:00:11 mrauch Exp $ - ---- ../connectivity/source/parse/makefile.mk.orig Fri Aug 10 13:09:05 2001 -+++ ../connectivity/source/parse/makefile.mk -@@ -67,12 +67,14 @@ - - # --- Settings ----------------------------------------------------- - --.INCLUDE : svpre.mk - .INCLUDE : settings.mk --.INCLUDE : sv.mk - - # --- Files -------------------------------------------------------- - -+YACCTARGET= $(MISC)$/sqlbison.cxx -+YACCFILES= sqlbison.y -+YACCFLAGS=-v -d -l -pSQLyy -bsql -o -+ - SLOFILES = \ - $(SLO)$/sqlNoException.obj \ - $(SLO)$/sqlbison.obj \ -@@ -94,13 +96,3 @@ - $(MISC)$/sqlflex.cxx: sqlflex.l - +flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l - --$(MISC)$/sqlbison.cxx: sqlbison.y -- +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y -- -$(MKDIR) $(OUT)$/inc$/connectivity -- +$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx -- --$(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx -- --$(SLO)$/sqlflex.obj : $(MISC)$/sqlflex.cxx -- --sqliterator.cxx: $(MISC)$/sqlbison.cxx diff --git a/misc/openoffice/patches/patch-di b/misc/openoffice/patches/patch-di deleted file mode 100755 index 7dc00a43300..00000000000 --- a/misc/openoffice/patches/patch-di +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-di,v 1.3 2002/03/29 21:00:11 mrauch Exp $ - ---- ../solenv/inc/tg_yxx.mk.orig Wed Sep 20 14:43:18 2000 -+++ ../solenv/inc/tg_yxx.mk -@@ -3,12 +3,10 @@ - $(YACCTARGET): $(YACCFILES) - @echo ------------------------------ - @echo Making: $@ --#.IF "$(GUI)"!="UNX" -- $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) --#.ELSE --# $(BISON) $(YACCFLAGS) $(YACCFILES) --# mv y.tab.c $(INCCOM)/rscyacc.yxx --# mv y.tab.h $(INCCOM)/yytab.h --#.ENDIF -+ $(BISON) $(YACCFLAGS) $(YACCTARGET) $(YACCFILES) -+# removing -f switch - avoid getting nothing when copying a file to itself -+ @+-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) -+ @+-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) -+ +$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) - .ENDIF - diff --git a/misc/openoffice/patches/patch-dj b/misc/openoffice/patches/patch-dj deleted file mode 100644 index 82bf42b83e4..00000000000 --- a/misc/openoffice/patches/patch-dj +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-dj,v 1.1 2002/02/26 21:25:28 mrauch Exp $ - ---- ../solenv/inc/tg_shl.mk.orig Fri Sep 28 17:11:33 2001 -+++ ../solenv/inc/tg_shl.mk -@@ -188,9 +188,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL$(TNR)VERSIONMAP): \ - $(SHL$(TNR)OBJS)\ -@@ -223,7 +225,9 @@ - USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) -+.ENDIF - .ENDIF - .ENDIF - diff --git a/misc/openoffice/patches/patch-dk b/misc/openoffice/patches/patch-dk deleted file mode 100644 index 5e505f80f6b..00000000000 --- a/misc/openoffice/patches/patch-dk +++ /dev/null @@ -1,242 +0,0 @@ -$NetBSD: patch-dk,v 1.1 2002/02/26 21:25:28 mrauch Exp $ - ---- ../solenv/inc/_tg_shl.mk.orig Fri Sep 28 17:11:33 2001 -+++ ../solenv/inc/_tg_shl.mk -@@ -88,9 +88,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL1VERSIONMAP): \ - $(SHL1OBJS)\ -@@ -123,9 +125,11 @@ - USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -519,9 +523,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL2VERSIONMAP): \ - $(SHL2OBJS)\ -@@ -554,9 +560,11 @@ - USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -950,9 +958,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL3VERSIONMAP): \ - $(SHL3OBJS)\ -@@ -985,9 +995,11 @@ - USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -1381,9 +1393,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL4VERSIONMAP): \ - $(SHL4OBJS)\ -@@ -1416,9 +1430,11 @@ - USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -1812,9 +1828,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL5VERSIONMAP): \ - $(SHL5OBJS)\ -@@ -1847,9 +1865,11 @@ - USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -2243,9 +2263,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL6VERSIONMAP): \ - $(SHL6OBJS)\ -@@ -2278,9 +2300,11 @@ - USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -2674,9 +2698,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL7VERSIONMAP): \ - $(SHL7OBJS)\ -@@ -2709,9 +2735,11 @@ - USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -3105,9 +3133,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL8VERSIONMAP): \ - $(SHL8OBJS)\ -@@ -3140,9 +3170,11 @@ - USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -3536,9 +3568,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL9VERSIONMAP): \ - $(SHL9OBJS)\ -@@ -3571,9 +3605,11 @@ - USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) - @+-$(RM) -f $@ >& $(NULLDEV) -@@ -3967,9 +4003,11 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) - .ENDIF - .ENDIF -+.ENDIF - - $(USE_SHL10VERSIONMAP): \ - $(SHL10OBJS)\ -@@ -4002,7 +4040,9 @@ - USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10VERSIONMAP:f) - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -+.IF "$(OS)"!="NETBSD" - SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) -+.ENDIF - .ENDIF - .ENDIF - diff --git a/misc/openoffice/patches/patch-dl b/misc/openoffice/patches/patch-dl deleted file mode 100644 index 44b95458f5f..00000000000 --- a/misc/openoffice/patches/patch-dl +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dl,v 1.1 2002/02/26 21:25:28 mrauch Exp $ - ---- ../xmloff/source/meta/makefile.mk.orig Tue Jul 24 17:06:08 2001 -+++ ../xmloff/source/meta/makefile.mk -@@ -92,7 +92,7 @@ - - $(INCCOM)$/rscrev.hxx: makefile.mk - .IF "$(GUI)"=="UNX" -- echo #define RSCUPDVER \""$(RSCREVISION)"\" > $@ -+ echo '#define RSCUPDVER "$(RSCREVISION)"' > $@ - .ELSE - echo #define RSCUPDVER "$(RSCREVISION)" > $@ - .ENDIF diff --git a/misc/openoffice/patches/patch-dm b/misc/openoffice/patches/patch-dm deleted file mode 100644 index eff065e7d2f..00000000000 --- a/misc/openoffice/patches/patch-dm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dm,v 1.1 2002/03/01 09:52:46 mrauch Exp $ - ---- ../starmath/source/makefile.mk.orig Wed May 16 11:55:01 2001 -+++ ../starmath/source/makefile.mk -@@ -162,7 +162,7 @@ - .ELSE - .IF "$(GUI)"=="UNX" - $(RM) $@ -- echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ELSE - echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@ - .ENDIF diff --git a/misc/openoffice/patches/patch-dn b/misc/openoffice/patches/patch-dn deleted file mode 100644 index 2d57b13ad8e..00000000000 --- a/misc/openoffice/patches/patch-dn +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dn,v 1.1 2002/03/01 09:52:46 mrauch Exp $ - ---- ../sd/source/ui/app/makefile.mk.orig Tue Sep 4 14:38:20 2001 -+++ ../sd/source/ui/app/makefile.mk -@@ -138,7 +138,7 @@ - echo "$(HASHMARK)define DLL_NAME ¶"sd$(UPD)$(DLLPOSTFIX).dll¶"" > $@ - .ELSE - .IF "$(GUI)"=="UNX" -- echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ELSE - echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@ - .ENDIF diff --git a/misc/openoffice/patches/patch-do b/misc/openoffice/patches/patch-do deleted file mode 100644 index b725a6f5bbe..00000000000 --- a/misc/openoffice/patches/patch-do +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-do,v 1.1 2002/03/01 09:52:47 mrauch Exp $ - ---- ../sch/source/ui/app/makefile.mk.orig Thu Jun 7 16:53:57 2001 -+++ ../sch/source/ui/app/makefile.mk -@@ -120,7 +120,7 @@ - .ELSE - .IF "$(GUI)"=="UNX" - $(RM) $@ -- echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ELSE - echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@ - .ENDIF diff --git a/misc/openoffice/patches/patch-dp b/misc/openoffice/patches/patch-dp deleted file mode 100644 index ec1aef0bfab..00000000000 --- a/misc/openoffice/patches/patch-dp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dp,v 1.1 2002/03/01 09:52:47 mrauch Exp $ - ---- ../sip/source/ui/app/makefile.mk.orig Tue Feb 6 14:28:40 2001 -+++ ../sip/source/ui/app/makefile.mk -@@ -105,7 +105,7 @@ - - $(INCCOM)$/rscrev.hxx: makefile.mk - .IF "$(GUI)"=="UNX" -- echo #define RSCUPDVER \""$(RSCREVISION)"\" > $@ -+ echo '#define RSCUPDVER "$(RSCREVISION)"' > $@ - .ELSE - echo #define RSCUPDVER "$(RSCREVISION)" > $@ - .ENDIF diff --git a/misc/openoffice/patches/patch-dq b/misc/openoffice/patches/patch-dq deleted file mode 100644 index d0451e5bca1..00000000000 --- a/misc/openoffice/patches/patch-dq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dq,v 1.1 2002/03/01 09:52:48 mrauch Exp $ - ---- ../sip/source/ui/dlg/makefile.mk.orig Fri May 25 14:27:37 2001 -+++ ../sip/source/ui/dlg/makefile.mk -@@ -105,7 +105,7 @@ - - $(INCCOM)$/rscrev.hxx: makefile.mk - .IF "$(GUI)"=="UNX" -- +echo #define RSCUPDVER \""$(RSCREVISION)"\" > $@ -+ +echo '#define RSCUPDVER "$(RSCREVISION)"' > $@ - .ELSE - +echo #define RSCUPDVER "$(RSCREVISION)" > $@ - .ENDIF diff --git a/misc/openoffice/patches/patch-dr b/misc/openoffice/patches/patch-dr deleted file mode 100644 index 7037b2c41df..00000000000 --- a/misc/openoffice/patches/patch-dr +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dr,v 1.1 2002/03/01 09:52:48 mrauch Exp $ - ---- ../sc/source/ui/app/makefile.mk.orig Tue Oct 2 18:25:14 2001 -+++ ../sc/source/ui/app/makefile.mk -@@ -121,7 +121,7 @@ - echo "$(HASHMARK)define DLL_NAME ¶"sc$(UPD)$(DLLPOSTFIX).dll¶"" > $@ - .ELSE - .IF "$(GUI)"=="UNX" -- echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ELSE - echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@ - .ENDIF diff --git a/misc/openoffice/patches/patch-ds b/misc/openoffice/patches/patch-ds deleted file mode 100644 index cbad775694f..00000000000 --- a/misc/openoffice/patches/patch-ds +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ds,v 1.1 2002/03/01 09:52:49 mrauch Exp $ - ---- ../sw/source/ui/app/makefile.mk.orig Thu Aug 23 13:30:57 2001 -+++ ../sw/source/ui/app/makefile.mk -@@ -157,7 +157,7 @@ - - .IF "$(GUI)"=="UNX" - $(INCCOM)$/swdll0.hxx: makefile.mk -- echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ENDIF - - diff --git a/misc/openoffice/patches/patch-dt b/misc/openoffice/patches/patch-dt deleted file mode 100644 index 60907d92142..00000000000 --- a/misc/openoffice/patches/patch-dt +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dt,v 1.1 2002/03/01 09:52:49 mrauch Exp $ - ---- ../basctl/source/basicide/makefile.mk.orig Wed Oct 10 16:23:05 2001 -+++ ../basctl/source/basicide/makefile.mk -@@ -150,7 +150,7 @@ - .ELSE - .IF "$(GUI)"=="UNX" - $(RM) $@ -- echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ -+ echo '#define DLL_NAME "libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)"' >$@ - .ELSE - echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@ - .ENDIF diff --git a/misc/openoffice/patches/patch-du b/misc/openoffice/patches/patch-du deleted file mode 100644 index 3963a6fca91..00000000000 --- a/misc/openoffice/patches/patch-du +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-du,v 1.1 2002/03/02 09:18:49 mrauch Exp $ - ---- ../psprint/source/printer/printerinfomanager.cxx.orig Mon Aug 6 13:46:21 2001 -+++ ../psprint/source/printer/printerinfomanager.cxx -@@ -883,7 +883,7 @@ - - static const struct SystemCommandParameters aParms[] = - { --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) - { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/misc/openoffice/patches/patch-dv b/misc/openoffice/patches/patch-dv deleted file mode 100644 index 42371cce8f4..00000000000 --- a/misc/openoffice/patches/patch-dv +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dv,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../idlc/source/scanner.ll.orig Fri May 18 15:38:10 2001 -+++ ../idlc/source/scanner.ll -@@ -76,7 +76,7 @@ - class AstArray; - class AstMember; - --#include <parser.h> -+#include <parser.hxx> - - sal_Int32 beginLine = 0; - ::rtl::OString docu; diff --git a/misc/openoffice/patches/patch-dw b/misc/openoffice/patches/patch-dw deleted file mode 100644 index f4834e300cd..00000000000 --- a/misc/openoffice/patches/patch-dw +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-dw,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/makefile.mk.orig Mon Sep 18 16:42:55 2000 -+++ ../rsc/source/parser/makefile.mk -@@ -69,20 +69,12 @@ - - # --- Settings ----------------------------------------------------- - --.IF "$(COM)"=="ICC" --CFLAGS+= /O- --.ENDIF -- - #prjpch=T --.INCLUDE : svpre.mk - .INCLUDE : settings.mk --.INCLUDE : sv.mk - - # --- Files -------------------------------------------------------- - --YACCOUT=$(INCCOM) -- --YACCTARGET= $(YACCOUT)$/rscyacc.yxx -+YACCTARGET= $(INCCOM)$/yyrscyacc.cxx - YACCFILES= rscyacc.y - - CXXFILES= rscpar.cxx \ diff --git a/misc/openoffice/patches/patch-dx b/misc/openoffice/patches/patch-dx deleted file mode 100644 index a2cab03bb35..00000000000 --- a/misc/openoffice/patches/patch-dx +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dx,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/rscibas.cxx.orig Fri Jul 13 12:22:18 2001 -+++ ../rsc/source/parser/rscibas.cxx -@@ -89,7 +89,7 @@ - - - #include "rsclex.hxx" --#include <rscyacc.yxx.h> -+#include <yyrscyacc.hxx> - - /****************** M A C R O S ******************************************/ - void RscTypCont::SETCONST( RscConst * pClass, char * szString, UINT32 nVal ) diff --git a/misc/openoffice/patches/patch-dy b/misc/openoffice/patches/patch-dy deleted file mode 100644 index 4bb26fa99d5..00000000000 --- a/misc/openoffice/patches/patch-dy +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dy,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/rscicpx.cxx.orig Thu Jul 19 12:37:37 2001 -+++ ../rsc/source/parser/rscicpx.cxx -@@ -86,7 +86,7 @@ - #endif - - #include "rsclex.hxx" --#include <rscyacc.yxx.h> -+#include <yyrscyacc.hxx> - - /************************************************************************* - |* RscTypCont::InsWinBit() diff --git a/misc/openoffice/patches/patch-dz b/misc/openoffice/patches/patch-dz deleted file mode 100644 index 0d62bf902cc..00000000000 --- a/misc/openoffice/patches/patch-dz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dz,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/rscinit.cxx.orig Wed Oct 10 11:51:23 2001 -+++ ../rsc/source/parser/rscinit.cxx -@@ -105,7 +105,7 @@ - #endif - - #include "rsclex.hxx" --#include <rscyacc.yxx.h> -+#include <yyrscyacc.hxx> - - /****************** M a c r o s ******************************************/ - #define INS_WINBIT( pClass, WinBit ) \ diff --git a/misc/openoffice/patches/patch-ea b/misc/openoffice/patches/patch-ea deleted file mode 100644 index fad99c2b168..00000000000 --- a/misc/openoffice/patches/patch-ea +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/rsclex.cxx.orig Wed Oct 10 11:51:23 2001 -+++ ../rsc/source/parser/rsclex.cxx -@@ -88,7 +88,7 @@ - #endif - - #include "rsclex.hxx" --#include <rscyacc.yxx.h> -+#include <yyrscyacc.hxx> - - #include <rtl/textcvt.h> - #include <rtl/textenc.h> diff --git a/misc/openoffice/patches/patch-eb b/misc/openoffice/patches/patch-eb deleted file mode 100644 index 60bfacd630b..00000000000 --- a/misc/openoffice/patches/patch-eb +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-eb,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../rsc/source/parser/rscyacc.cxx.orig Wed Oct 10 11:51:23 2001 -+++ ../rsc/source/parser/rscyacc.cxx -@@ -311,5 +311,5 @@ - #endif - #endif - --#include "rscyacc.yxx" -+#include "yyrscyacc.cxx" - diff --git a/misc/openoffice/patches/patch-ec b/misc/openoffice/patches/patch-ec deleted file mode 100644 index 50f14bcd1f5..00000000000 --- a/misc/openoffice/patches/patch-ec +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ec,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../connectivity/inc/connectivity/sqlparse.hxx.orig Thu Sep 27 06:12:33 2001 -+++ ../connectivity/inc/connectivity/sqlparse.hxx -@@ -72,7 +72,7 @@ - #endif - #ifndef YYBISON - #ifndef FLEX_SCANNER --#include <connectivity/sqlbison.hxx> -+#include <sqlbison.hxx> - #endif - #endif - #ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_ diff --git a/misc/openoffice/patches/patch-ed b/misc/openoffice/patches/patch-ed deleted file mode 100644 index 2a8f108ed15..00000000000 --- a/misc/openoffice/patches/patch-ed +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ed,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../connectivity/source/parse/sqlflex.l.orig Thu Sep 27 06:12:35 2001 -+++ ../connectivity/source/parse/sqlflex.l -@@ -38,7 +38,7 @@ - #define SQLYYDEBUG 1 - #endif - --#include "connectivity/sqlbison.hxx" -+#include "sqlbison.hxx" - #endif - #ifndef _CONNECTIVITY_SQLSCAN_HXX - #include "sqlscan.hxx" diff --git a/misc/openoffice/patches/patch-ee b/misc/openoffice/patches/patch-ee deleted file mode 100644 index 37a8f085d04..00000000000 --- a/misc/openoffice/patches/patch-ee +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ee,v 1.1 2002/03/29 21:00:11 mrauch Exp $ - ---- ../connectivity/source/parse/sqlnode.cxx.orig Mon Oct 1 11:24:22 2001 -+++ ../connectivity/source/parse/sqlnode.cxx -@@ -67,7 +67,7 @@ - #include <internalnode.hxx> - #endif - #define YYBISON 1 --#include <connectivity/sqlbison.hxx> -+#include <sqlbison.hxx> - #ifndef _CONNECTIVITY_SQLPARSE_HXX - #include <connectivity/sqlparse.hxx> - #endif diff --git a/misc/openoffice/patches/patch-ef b/misc/openoffice/patches/patch-ef deleted file mode 100644 index d8188590999..00000000000 --- a/misc/openoffice/patches/patch-ef +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ef,v 1.1 2002/03/31 12:21:09 mrauch Exp $ - ---- ../connectivity/prj/d.lst.orig Fri Mar 2 22:30:57 2001 -+++ ../connectivity/prj/d.lst -@@ -9,7 +9,7 @@ - mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx - - hedabu: ..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx --hedabu: ..\%__SRC%\inc\connectivity\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx -+hedabu: ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx - hedabu: ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx - - diff --git a/misc/openoffice/patches/patch-eg b/misc/openoffice/patches/patch-eg deleted file mode 100644 index 8ac312ef993..00000000000 --- a/misc/openoffice/patches/patch-eg +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-eg,v 1.1 2002/03/31 12:21:09 mrauch Exp $ - ---- ../scptools/source/compiler/makefile.mk.orig Mon Sep 18 16:47:19 2000 -+++ ../scptools/source/compiler/makefile.mk -@@ -70,13 +70,9 @@ - - # --- Settings ----------------------------------------------------- - --.INCLUDE : svpre.mk - .INCLUDE : settings.mk --.INCLUDE : sv.mk - --YACCOUT=$(INCCOM) -- --YACCTARGET = $(YACCOUT)$/rscyacc.yxx -+YACCTARGET = $(INCCOM)$/yyrscyacc.cxx - YACCFILES = parser.y - - CXXFILES = parser.cxx \ diff --git a/misc/openoffice/patches/patch-eh b/misc/openoffice/patches/patch-eh deleted file mode 100644 index bcc3253d759..00000000000 --- a/misc/openoffice/patches/patch-eh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eh,v 1.1 2002/03/31 12:21:09 mrauch Exp $ - ---- ../scptools/source/compiler/lex.cxx.orig Mon Sep 18 16:47:19 2000 -+++ ../scptools/source/compiler/lex.cxx -@@ -61,7 +61,7 @@ - #include <string.h> - - #include "parser.hxx" --#include "rscyacc.yxx.h" -+#include "yyrscyacc.hxx" - - int line; - diff --git a/misc/openoffice/patches/patch-ei b/misc/openoffice/patches/patch-ei deleted file mode 100644 index 327dccc5513..00000000000 --- a/misc/openoffice/patches/patch-ei +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ei,v 1.1 2002/03/31 12:21:09 mrauch Exp $ - ---- ../scptools/source/compiler/parser.cxx.orig Wed Nov 22 13:43:59 2000 -+++ ../scptools/source/compiler/parser.cxx -@@ -260,7 +260,7 @@ - - /////////////////////////////////////////////////////////////////////////////// - --#include "rscyacc.yxx" -+#include "yyrscyacc.cxx" - - int __LOADONCALLAPI main( int argv, char** argc ) - { diff --git a/misc/openoffice/patches/patch-ej b/misc/openoffice/patches/patch-ej deleted file mode 100644 index 0c95ba865bf..00000000000 --- a/misc/openoffice/patches/patch-ej +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ej,v 1.1 2002/06/04 20:43:19 mrauch Exp $ - ---- ../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/misc/openoffice/patches/patch-ek b/misc/openoffice/patches/patch-ek deleted file mode 100644 index c67b743011a..00000000000 --- a/misc/openoffice/patches/patch-ek +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ek,v 1.1 2002/08/02 20:33:23 jdolecek Exp $ - ---- ../XmlSearch/src/com/sun/xmlsearch/db/FullVectorBtree.java.orig Fri Aug 2 21:52:23 2002 -+++ ../XmlSearch/src/com/sun/xmlsearch/db/FullVectorBtree.java Fri Aug 2 22:10:22 2002 -@@ -157,7 +157,7 @@ - newbl._data[0] = (byte)0xFF; - - // count entries -- assert(_free > 0 && _free <= _blockSize); -+ doassert(_free > 0 && _free <= _blockSize); - for (count = i = 0; i < _free; count++, i += _vecLen+1-(_data[i]&0xFF)) - ; - half = (int)(count*SplitRatio + 1); diff --git a/misc/openoffice/patches/patch-el b/misc/openoffice/patches/patch-el deleted file mode 100644 index efe152b0def..00000000000 --- a/misc/openoffice/patches/patch-el +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-el,v 1.1 2002/08/02 20:33:24 jdolecek Exp $ - ---- ../XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java.orig Fri Aug 2 22:02:15 2002 -+++ ../XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java Fri Aug 2 22:09:53 2002 -@@ -274,9 +274,9 @@ - return accessBlock(bl.integerAt(index*4)); - } - -- public static void assert(boolean assertion) { -+ public static void doassert(boolean assertion) { - if (assertion == false) -- System.err.println("assertion failed"); -+ System.err.println("VectorBtree assertion failed"); - } - - public int getIteratorBufferLength() { -@@ -349,7 +349,7 @@ - } - else - { -- assert(stack.size() == 0); -+ doassert(stack.size() == 0); - return false; - } - } diff --git a/misc/openoffice/patches/patch-em b/misc/openoffice/patches/patch-em deleted file mode 100644 index c7d99b00af8..00000000000 --- a/misc/openoffice/patches/patch-em +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-em,v 1.1 2002/08/02 20:33:24 jdolecek Exp $ - ---- ../XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig Fri Aug 2 22:12:38 2002 -+++ ../XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java Fri Aug 2 22:12:52 2002 -@@ -79,7 +79,7 @@ - Class.forName(className != null - ? className - : "sun.net.www.protocol." + protocol + ".Handler"); -- return (URLStreamHandler)handlerClass.newInstance();; -+ return (URLStreamHandler)handlerClass.newInstance(); - } - catch (Exception e) { - System.err.println(e); diff --git a/misc/openoffice/patches/patch-en b/misc/openoffice/patches/patch-en deleted file mode 100644 index e2bdc2f5667..00000000000 --- a/misc/openoffice/patches/patch-en +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-en,v 1.2 2003/01/02 00:47:25 cjep Exp $ - ---- ../idlc/source/parser.yy.orig Tue Dec 24 13:09:17 2002 -+++ ../idlc/source/parser.yy Tue Dec 24 13:40:48 2002 -@@ -197,7 +197,7 @@ - %token IDL_SINGLETON - %token IDL_STRUCT - %token IDL_SWITCH --%token IDL_TYPEDEF -+%token <dclval> IDL_TYPEDEF - %token IDL_TRANSIENT - %token IDL_UNION - -@@ -970,6 +970,7 @@ - idlc()->setParseState(PS_ConstantDeclSeen); - } - ';' -+ ; - - const_dcl : - IDL_CONST -@@ -1290,7 +1291,7 @@ - * Push the scope of the exception on the scopes stack - */ - idlc()->scopes()->push(pExcept); -- delete $1 -+ delete $1; - } - '{' - { diff --git a/misc/openoffice/patches/patch-eo b/misc/openoffice/patches/patch-eo deleted file mode 100644 index f56965d6190..00000000000 --- a/misc/openoffice/patches/patch-eo +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-eo,v 1.1 2002/12/25 16:24:41 jdolecek Exp $ - ---- ../connectivity/source/parse/sqlbison.y.orig Tue Dec 24 16:30:11 2002 -+++ ../connectivity/source/parse/sqlbison.y Tue Dec 24 18:19:27 2002 -@@ -129,68 +129,49 @@ - %union { - connectivity::OSQLParseNode * pParseNode; - } --%type <pParseNode> '(' ')' ',' ':' ';' '?' '[' ']' '{' '}' '.' -+%type <pParseNode> ',' ':' ';' '?' '[' ']' '{' '}' - - %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 -- -- -+%token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT - - /* literal keyword tokens */ - - %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 -+%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 - --%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_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC -+%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_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_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_UMINUS 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 - /* string functions */ - %token <pParseNode> SQL_TOKEN_ASCII SQL_TOKEN_BIT_LENGTH SQL_TOKEN_CHAR SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHARACTER_LENGTH - %token <pParseNode> SQL_TOKEN_CONCAT --%token <pParseNode> SQL_TOKEN_DIFFERENCE SQL_TOKEN_INSERT SQL_TOKEN_LCASE SQL_TOKEN_LEFT SQL_TOKEN_LENGTH SQL_TOKEN_LOCATE -+%token <pParseNode> SQL_TOKEN_DIFFERENCE SQL_TOKEN_INSERT SQL_TOKEN_LCASE SQL_TOKEN_LENGTH SQL_TOKEN_LOCATE - %token <pParseNode> SQL_TOKEN_LOCATE_2 SQL_TOKEN_LTRIM SQL_TOKEN_OCTET_LENGTH SQL_TOKEN_POSITION SQL_TOKEN_REPEAT SQL_TOKEN_REPLACE --%token <pParseNode> SQL_TOKEN_RIGHT SQL_TOKEN_RTRIM SQL_TOKEN_SOUNDEX SQL_TOKEN_SPACE SQL_TOKEN_SUBSTRING SQL_TOKEN_UCASE -+%token <pParseNode> SQL_TOKEN_RTRIM SQL_TOKEN_SOUNDEX SQL_TOKEN_SPACE SQL_TOKEN_SUBSTRING SQL_TOKEN_UCASE - - /* time and date functions */ - %token <pParseNode> SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURDATE SQL_TOKEN_CURTIME -@@ -204,6 +185,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 <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> '(' -+ -+ - %token <pParseNode> SQL_TOKEN_INVALIDSYMBOL - - /*%type <pParseNode> sql_single_statement */ -@@ -3019,7 +3016,7 @@ - } - else - YYERROR; -- } -+ }; - %% - - diff --git a/misc/openoffice/patches/patch-ep b/misc/openoffice/patches/patch-ep deleted file mode 100644 index 9afa1484aa2..00000000000 --- a/misc/openoffice/patches/patch-ep +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ep,v 1.1 2002/12/25 16:30:00 jdolecek Exp $ - ---- ../solenv/bin/deliver.pl.orig Tue Dec 24 16:45:57 2002 -+++ ../solenv/bin/deliver.pl Tue Dec 24 17:20:07 2002 -@@ -102,7 +102,7 @@ - $module = 0; # module name - $base_dir = 0; # path to module base directory - $dlst_file = 0; # path to d.lst --$umask = 22; # default file/directory creation mask -+$umask = 022; # default file/directory creation mask - $dest = 0; # optional destination path - - @action_data = (); # LoL with all action data -@@ -245,7 +245,7 @@ - print "MKDIR: $path\n"; - } - else { -- mkpath($path, 0, 0777-$umask); -+ mkpath($path, 0, 0777 & ~$umask); - } - } - -@@ -285,7 +285,7 @@ - - $umask = umask(); - if ( !defined($umask) ) { -- $umask = 22; -+ $umask = 022; - } - - $common_outdir = $ENV{COMMON_OUTDIR}; -@@ -535,11 +535,11 @@ - my $mode = shift; - my $file = shift; - -- if ( $mode%2 == 1 ) { -- $mode = 0777 - $umask; -+ if ( ($mode & 0111) != 0 ) { # any execute bits? -+ $mode = 0777 & ~$umask; - } - else { -- $mode = 0666 - $umask; -+ $mode = 0666 & ~$umask; - } - chmod($mode, $file); - } diff --git a/misc/openoffice/patches/patch-eq b/misc/openoffice/patches/patch-eq deleted file mode 100644 index ec9282f4197..00000000000 --- a/misc/openoffice/patches/patch-eq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eq,v 1.1 2003/02/27 20:17:50 mrauch Exp $ - ---- ../xmloff/source/text/makefile.mk.orig 2001-07-25 09:09:04.000000000 +0200 -+++ ../xmloff/source/text/makefile.mk -@@ -78,6 +78,8 @@ CDEFS += -DCONV_STAR_FONTS - # --- Files -------------------------------------------------------- - - -+NOOPTFILES= $(SLO)$/txtimp.obj -+ - SLOFILES = \ - $(SLO)$/txtdrope.obj \ - $(SLO)$/txtdropi.obj \ diff --git a/misc/openoffice/patches/patch-er b/misc/openoffice/patches/patch-er deleted file mode 100644 index 238b07cbb78..00000000000 --- a/misc/openoffice/patches/patch-er +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-er,v 1.1 2004/03/26 23:37:49 kristerw Exp $ - ---- ../xmloff/source/forms/elementimport.cxx.orig Fri Mar 26 23:59:06 2004 -+++ ../xmloff/source/forms/elementimport.cxx Fri Mar 26 23:59:36 2004 -@@ -100,6 +100,7 @@ - #include <com/sun/star/form/FormComponentType.hpp> - #endif - -+#include <algorithm> - //......................................................................... - namespace xmloff - { |