diff options
| author | hira <hira@pkgsrc.org> | 2007-02-27 11:55:57 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2007-02-27 11:55:57 +0000 |
| commit | 4b2fe80c0b309bbf9c418be748c98d690437d277 (patch) | |
| tree | 19089b76f0938552dbb97bc36e66e1c4bec9b52a /misc/openoffice2/patches | |
| parent | a028058bed1a3623566d21084d9bd9e4c89b9dc8 (diff) | |
| download | pkgsrc-4b2fe80c0b309bbf9c418be748c98d690437d277.tar.gz | |
Import OpenOffice.org 2.1.0 for build.
This fixes a lot of bugs and adds a lot of new features since 1.1.5.
Guide to New Features:
http://marketing.openoffice.org/2.0/featureguide.html
Release Note:
http://development.openoffice.org/releases/2.1.0.html
Diffstat (limited to 'misc/openoffice2/patches')
36 files changed, 1573 insertions, 0 deletions
diff --git a/misc/openoffice2/patches/patch-aa b/misc/openoffice2/patches/patch-aa new file mode 100644 index 00000000000..f5cbe8270eb --- /dev/null +++ b/misc/openoffice2/patches/patch-aa @@ -0,0 +1,574 @@ +$NetBSD: patch-aa,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/util/sal_netbsd.map.orig 2007-02-18 01:17:57.000000000 +0900 ++++ ../sal/util/sal_netbsd.map 2007-02-18 01:46:52.000000000 +0900 +@@ -0,0 +1,569 @@ ++UDK_3_0_0 { ++ global: ++ GerVersionInfo; ++ 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_getFunctionSymbol; ++ 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_setCommandArgs; ++ 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_asciil_reverseEquals_WithLength; ++ 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_setDetailedDebugMessageFunc; ++ 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; ++UDK_3.3 { ++ global: ++ osl_createDirectoryPath; ++ osl_getFunctionSymbol; ++ osl_getModuleURLFromFunctionAddress; ++ rtl_cipher_createARCFOUR; ++ rtl_cipher_initARCFOUR; ++ rtl_cipher_decodeARCFOUR; ++ rtl_cipher_encodeARCFOUR; ++ rtl_cipher_destroyARCFOUR; ++ rtl_digest_rawMD5; ++ osl_getFileSize; ++ osl_setCommandArgs; ++ rtl_uStringbuffer_insertUtf32; ++ rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths; ++ rtl_logfile_longTrace; ++ rtl_ustr_asciil_reverseEquals_WithLength; ++} UDK_3.2; ++ ++UDK_3.4 { ++ global: ++ osl_setErrorReporting; ++} UDK_3.3; ++ ++UDK_3.5 { ++ global: ++ rtl_arena_create; ++ rtl_arena_destroy; ++ rtl_arena_alloc; ++ rtl_arena_free; ++ ++ rtl_cache_create; ++ rtl_cache_destroy; ++ rtl_cache_alloc; ++ rtl_cache_free; ++} UDK_3.4; ++ ++PRIVATE_1.0 { ++ global: ++ osl_detail_ObjectRegistry_storeAddresses; ++ osl_detail_ObjectRegistry_checkObjectCount; ++ osl_detail_ObjectRegistry_registerObject; ++ osl_detail_ObjectRegistry_revokeObject; ++ osl_detail_ObjectRegistry_getMutex; ++}; diff --git a/misc/openoffice2/patches/patch-ac b/misc/openoffice2/patches/patch-ac new file mode 100644 index 00000000000..321d71fb4df --- /dev/null +++ b/misc/openoffice2/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/inc/osl/endian.h.orig 2007-02-17 23:15:28.000000000 +0900 ++++ ../sal/inc/osl/endian.h 2007-02-17 23:16:59.000000000 +0900 +@@ -76,11 +76,14 @@ + #ifdef NETBSD + # include <machine/endian.h> + # if BYTE_ORDER == LITTLE_ENDIAN +-# define _LITTLE_ENDIAN ++# undef _BIG_ENDIAN ++# undef _PDP_ENDIAN + # elif BYTE_ORDER == BIG_ENDIAN +-# define _BIG_ENDIAN ++# undef _LITTLE_ENDIAN ++# undef _PDP_ENDIAN + # elif BYTE_ORDER == PDP_ENDIAN +-# define _PDP_ENDIAN ++# undef _LITTLE_ENDIAN ++# undef _BIG_ENDIAN + # endif + #endif + diff --git a/misc/openoffice2/patches/patch-ad b/misc/openoffice2/patches/patch-ad new file mode 100644 index 00000000000..b57f2a32ea1 --- /dev/null +++ b/misc/openoffice2/patches/patch-ad @@ -0,0 +1,47 @@ +$NetBSD: patch-ad,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/osl/unx/system.c.orig 2007-02-17 23:06:23.000000000 +0900 ++++ ../sal/osl/unx/system.c 2007-02-17 23:08:46.000000000 +0900 +@@ -71,8 +71,11 @@ + struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) + #endif /* BUILD_OS_APPLEOSX */ + #else /* MACOSX */ ++#if (__NetBSD_Version__ < 299001000) + struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) ++#endif + #endif /* MACOSX */ ++#if (__NetBSD_Version__ < 299001000) + { + struct passwd* res; + +@@ -138,8 +141,9 @@ + return(res); + #endif /* MACOSX */ + } ++#endif + +-#if defined(NETBSD) || defined(MACOSX) ++#if defined(NETBSD) && (__NetBSD_Version__ < 299001000) || defined(MACOSX) + int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, + size_t buflen, struct passwd **result) + { +@@ -437,7 +441,7 @@ + } + #endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */ + +-#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. +@@ -481,6 +485,10 @@ + return nRet; + } + ++#endif ++ ++#if defined(MACOSX) ++ + /* No reentrant asctime() either... */ + + /*******************************************************************************/ diff --git a/misc/openoffice2/patches/patch-ae b/misc/openoffice2/patches/patch-ae new file mode 100644 index 00000000000..f3338957aa1 --- /dev/null +++ b/misc/openoffice2/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/util/makefile.mk.orig 2007-02-17 17:25:20.000000000 +0900 ++++ ../sal/util/makefile.mk 2007-02-17 17:26:16.000000000 +0900 +@@ -97,7 +97,11 @@ + .ENDIF + SHL1IMPLIB= i$(TARGET) + +-SHL1VERSIONMAP= $(TARGET).map ++.IF "$(OS)"=="NETBSD" ++SHL1VERSIONMAP= $(TARGET)_netbsd.map ++.ELSE ++SHL1VERSIONMAP= $(TARGET).map ++.ENDIF + + .IF "$(GUI)"=="WNT" + .IF "$(COM)"!="GCC" diff --git a/misc/openoffice2/patches/patch-ag b/misc/openoffice2/patches/patch-ag new file mode 100644 index 00000000000..85bf9bb241d --- /dev/null +++ b/misc/openoffice2/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../solenv/bin/checkdll.sh.orig 2007-02-17 17:27:21.000000000 +0900 ++++ ../solenv/bin/checkdll.sh 2007-02-17 17:27:43.000000000 +0900 +@@ -37,7 +37,7 @@ + # checkdll.sh - execute checkdll with all -L arguments to this script + # prepended to LD_LIBRARY_PATH + +-set -- `getopt "L:" "$@"` || { ++set -- `getopt "L:R:" "$@"` || { + echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2 + exit 1 + } +@@ -49,6 +49,7 @@ + do + case $1 in + -L) shift; option=$1;; ++ -R) shift;; + --) break;; + esac + case "${libpath+X}" in diff --git a/misc/openoffice2/patches/patch-ah b/misc/openoffice2/patches/patch-ah new file mode 100644 index 00000000000..1e6489b333c --- /dev/null +++ b/misc/openoffice2/patches/patch-ah @@ -0,0 +1,94 @@ +$NetBSD: patch-ah,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../solenv/inc/_tg_app.mk.orig 2007-02-17 17:28:18.000000000 +0900 ++++ ../solenv/inc/_tg_app.mk 2007-02-17 17:35:58.000000000 +0900 +@@ -87,7 +87,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -255,7 +255,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -423,7 +423,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -591,7 +591,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -759,7 +759,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -927,7 +927,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1095,7 +1095,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1263,7 +1263,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1431,7 +1431,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd +@@ -1599,7 +1599,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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 $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd diff --git a/misc/openoffice2/patches/patch-ai b/misc/openoffice2/patches/patch-ai new file mode 100644 index 00000000000..96a73e7f542 --- /dev/null +++ b/misc/openoffice2/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ +--- ../solenv/inc/tg_app.mk.orig 2007-02-17 17:36:28.000000000 +0900 ++++ ../solenv/inc/tg_app.mk 2007-02-17 17:37:00.000000000 +0900 +@@ -124,7 +124,7 @@ + @+-$(RM) $(MISC)$/$(@:b).cmd + @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(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$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(@:b).cmd + cat $(MISC)$/$(@:b).cmd + @source $(MISC)$/$(@:b).cmd diff --git a/misc/openoffice2/patches/patch-aj b/misc/openoffice2/patches/patch-aj new file mode 100644 index 00000000000..cc75266d36c --- /dev/null +++ b/misc/openoffice2/patches/patch-aj @@ -0,0 +1,70 @@ +$NetBSD: patch-aj,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../solenv/inc/unxbsdi2.mk.orig 2006-12-02 02:57:07.000000000 +0900 ++++ ../solenv/inc/unxbsdi2.mk 2007-02-23 20:49:52.000000000 +0900 +@@ -37,7 +37,7 @@ + ASM= + AFLAGS= + +-SOLAR_JAVA=TRUE ++SOLAR_JAVA= + JAVAFLAGSDEBUG=-g + + # filter for supressing verbose messages from linker +@@ -45,7 +45,7 @@ + #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + + # _PTHREADS is needed for the stl +-CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 ++CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 + + # this is a platform with JAVA support + .IF "$(SOLAR_JAVA)"!="" +@@ -123,7 +123,8 @@ + DYNAMIC = -Wl,-Bdynamic + + # name of linker +-LINK*=$(CC) ++LINK*=$(CXX) ++LINKC*=$(CC) + + # default linker flags + LINKFLAGSDEFS*=-z defs +@@ -141,7 +142,7 @@ + LINKFLAGSTACK= + LINKFLAGSPROF= + LINKFLAGSDEBUG=-g +-LINKFLAGSOPT= ++LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib + + # linker flags for optimization (symbol hashtable) + # for now, applied to symbol scoped libraries, only +@@ -159,17 +160,20 @@ + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= ++STDOBJVCL=$(L)$/salmain.o ++ ++X11_LDFLAGS=@X11_LDFLAGS@ + + # libraries for linking applications +-STDLIBCUIST=-lm +-STDLIBGUIMT=-lX11 -lpthread -lm +-STDLIBCUIMT=-lpthread -lm +-STDLIBGUIST=-lX11 -lm ++STDLIBCUIST=-lm -lc ++STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc ++STDLIBCUIMT=-lpthread -lm -lc ++STDLIBGUIST=${X11_LDFLAGS} -lX11 -lm -lc + # libraries for linking shared libraries +-STDSHLGUIMT=-lX11 -lXext -lpthread -lm +-STDSHLCUIMT=-lpthread -lm +-STDSHLGUIST=-lX11 -lXext -lm +-STDSHLCUIST=-lm ++STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc ++STDSHLCUIMT=-lpthread -lm -lc ++STDSHLGUIST=${X11_LDFLAGS} -lX11 -lXext -lm -lc ++STDSHLCUIST=-lm -lc + + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak new file mode 100644 index 00000000000..3f7ff188279 --- /dev/null +++ b/misc/openoffice2/patches/patch-ak @@ -0,0 +1,31 @@ +$NetBSD: patch-ak,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../config_office/set_soenv.in.orig 2007-02-17 17:38:22.000000000 +0900 ++++ ../config_office/set_soenv.in 2007-02-17 17:40:50.000000000 +0900 +@@ -39,7 +39,7 @@ + #-------------------------------------------------------- + # + my ( $outfile, $outfile_sh, $outfile_bat, $outfile_jam, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, +- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $platform, ++ $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, $platform, + $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, + $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $unsetvarsjam, $exportvars, $win_format_var, $perl_os); + # +@@ -111,6 +111,7 @@ + $par_dir = ".."; # parrent directory + $I = " -I"; # include search path + $L = " -L"; # library search path ++$R = " -R"; # library runtime path + $D = " -D"; # define search path + $empty = ""; # used as argument + $no_stl = "NO_STLPORT4"; # possible argument +@@ -1263,7 +1264,8 @@ + $L.$JRETOOLKITDIR. + $L.$JRETHREADDIR. + $L_STLPORT_LIB. +- $L.$XLIB; ++ $L.$XLIB. ++ $R.$XLIB; + } + elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/) + { $SOLARLIB = $L.$par_dir.$LIB. diff --git a/misc/openoffice2/patches/patch-am b/misc/openoffice2/patches/patch-am new file mode 100644 index 00000000000..7dd13921f1a --- /dev/null +++ b/misc/openoffice2/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../soltools/checkdll/makefile.mk.orig 2007-02-17 17:42:05.000000000 +0900 ++++ ../soltools/checkdll/makefile.mk 2007-02-17 17:42:44.000000000 +0900 +@@ -57,7 +57,7 @@ + STDLIB += -ldl + .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" + diff --git a/misc/openoffice2/patches/patch-an b/misc/openoffice2/patches/patch-an new file mode 100644 index 00000000000..b43eaea241e --- /dev/null +++ b/misc/openoffice2/patches/patch-an @@ -0,0 +1,22 @@ +$NetBSD: patch-an,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../psprint/source/printergfx/printerjob.cxx.orig 2007-02-17 17:43:14.000000000 +0900 ++++ ../psprint/source/printergfx/printerjob.cxx 2007-02-17 17:43:55.000000000 +0900 +@@ -82,6 +82,17 @@ + + #include "glyphset.hxx" + ++#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; + using namespace rtl; + diff --git a/misc/openoffice2/patches/patch-ao b/misc/openoffice2/patches/patch-ao new file mode 100644 index 00000000000..4494d0b288f --- /dev/null +++ b/misc/openoffice2/patches/patch-ao @@ -0,0 +1,19 @@ +$NetBSD: patch-ao,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../i18npool/source/breakiterator/gendict.cxx.orig 2007-02-17 23:18:38.000000000 +0900 ++++ ../i18npool/source/breakiterator/gendict.cxx 2007-02-17 23:20:08.000000000 +0900 +@@ -74,8 +74,12 @@ + fprintf(cfp, "extern \"C\" {\n"); + + 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/openoffice2/patches/patch-ap b/misc/openoffice2/patches/patch-ap new file mode 100644 index 00000000000..78f0ebab926 --- /dev/null +++ b/misc/openoffice2/patches/patch-ap @@ -0,0 +1,87 @@ +$NetBSD: patch-ap,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../stlport/STLport-4.5.patch.orig 2006-12-02 02:57:09.000000000 +0900 ++++ ../stlport/STLport-4.5.patch 2007-02-17 23:38:22.000000000 +0900 +@@ -847,6 +847,82 @@ + ! # if defined (__sun) + # 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,69 ---- ++! # ++! # Note : this makefile is for gcc-3 ! ++! # ++! ++! # ++! # compiler ++! # ++! CC+= -D_REENTRANT ++! CXX+= -D_REENTRANT ++! ++! # ++! # Basename for libraries ++! # ++! LIB_BASENAME = libstlport_gcc ++! ++! # ++! # guts for common stuff ++! # ++! # ++! LINK=ar cr ++! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -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) ++! CFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS} ++! ++! 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 ++! ++! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC ++! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC ++! ++! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC ++! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC ++! ++! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG ++! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_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 $@ ++! ++! + + *** misc/build/STLport-4.5/stlport/stl/_rope.h Mon Aug 6 04:21:25 2001 + --- misc/modified/STLport-4.5/stlport/stl/_rope.h Thu Jul 27 15:19:10 2006 diff --git a/misc/openoffice2/patches/patch-aq b/misc/openoffice2/patches/patch-aq new file mode 100644 index 00000000000..eb5c65bddf4 --- /dev/null +++ b/misc/openoffice2/patches/patch-aq @@ -0,0 +1,29 @@ +$NetBSD: patch-aq,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../stlport/makefile.mk.orig 2006-12-02 02:57:09.000000000 +0900 ++++ ../stlport/makefile.mk 2007-02-17 17:51:36.000000000 +0900 +@@ -111,7 +111,7 @@ + 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 src$/sunpro11.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 +@@ -133,6 +133,8 @@ + # 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 +@@ -238,4 +240,4 @@ + $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch + .ENDIF # "$(USE_NEW_SDK)"!="" + .ENDIF # COMVER<=001300000000 +-.ENDIF # "$(GUI)"=="WNT" +\ No newline at end of file ++.ENDIF # "$(GUI)"=="WNT" diff --git a/misc/openoffice2/patches/patch-ar b/misc/openoffice2/patches/patch-ar new file mode 100644 index 00000000000..7b6fb2cff5b --- /dev/null +++ b/misc/openoffice2/patches/patch-ar @@ -0,0 +1,24 @@ +$NetBSD: patch-ar,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/osl/unx/tempfile.c.orig 2007-02-17 23:20:56.000000000 +0900 ++++ ../sal/osl/unx/tempfile.c 2007-02-17 23:22:45.000000000 +0900 +@@ -38,6 +38,9 @@ + /*****************************************************************/ + + #include <stdio.h> ++#if defined(NETBSD) ++#include <paths.h> ++#endif + #include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -91,6 +94,9 @@ + #if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) + if ( !pValue ) + pValue = P_tmpdir; ++#elif defined(NETBSD) ++ if ( !pValue ) ++ pValue = _PATH_TMP; + #endif + } + #endif /* MACOSX */ diff --git a/misc/openoffice2/patches/patch-as b/misc/openoffice2/patches/patch-as new file mode 100644 index 00000000000..fed2790bb85 --- /dev/null +++ b/misc/openoffice2/patches/patch-as @@ -0,0 +1,46 @@ +$NetBSD: patch-as,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/osl/unx/file.cxx.orig 2007-02-17 23:02:10.000000000 +0900 ++++ ../sal/osl/unx/file.cxx 2007-02-17 23:04:04.000000000 +0900 +@@ -1424,7 +1424,7 @@ + + #ifdef HAVE_STATFS_H + +-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) ++#if defined(FREEBSD) || defined(MACOSX) + # define __OSL_STATFS_STRUCT struct statfs + # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) + # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) +@@ -1438,6 +1438,32 @@ + # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1) + #endif /* FREEBSD || NETBSD */ + ++#if defined(NETBSD) ++ ++#include <sys/param.h> ++ ++/* statvfs() replaced statfs() in 2.99.9 */ ++# if __NetBSD_Version__ >= 299000900 ++ /* 2.0D or later */ ++# define __OSL_STATFS_STRUCT struct statvfs ++# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0) ++ ++# else ++ /* version before 2.0D */ ++# define __OSL_STATFS_STRUCT struct statfs ++# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0) ++ ++# endif /* >2.0D */ ++ ++# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) ++# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename) ++ ++# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0) ++# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0) ++#endif ++ + #if defined(LINUX) + # define __OSL_NFS_SUPER_MAGIC 0x6969 + # define __OSL_SMB_SUPER_MAGIC 0x517B diff --git a/misc/openoffice2/patches/patch-aw b/misc/openoffice2/patches/patch-aw new file mode 100644 index 00000000000..1214dd53dea --- /dev/null +++ b/misc/openoffice2/patches/patch-aw @@ -0,0 +1,23 @@ +$NetBSD: patch-aw,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/osl/unx/system.h.orig 2007-02-17 23:26:16.000000000 +0900 ++++ ../sal/osl/unx/system.h 2007-02-17 22:59:36.000000000 +0900 +@@ -136,7 +136,10 @@ + #endif + + #ifdef NETBSD ++# include <sys/param.h> ++# ifndef ETIME + # define ETIME ETIMEDOUT ++# endif + # define _POSIX_THREAD_SYSCALL_SOFT 1 + # include <pthread.h> + # include <netdb.h> +@@ -530,7 +533,6 @@ + + #ifdef NO_PTHREAD_RTL + #if !defined FREEBSD || (__FreeBSD_version < 500112) +-struct passwd *getpwent_r(struct passwd *pwd, char *buffer, int buflen); + extern struct spwd *getspnam_r(const char *name, struct spwd *result, + char *buffer, int buflen); + diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba new file mode 100644 index 00000000000..725025bb79f --- /dev/null +++ b/misc/openoffice2/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- configure.orig 2006-12-02 02:52:35.000000000 +0900 ++++ configure 2007-02-23 18:40:17.000000000 +0900 +@@ -2940,7 +2940,7 @@ + test_cups=no + _os=OSF1 + ;; +- netbsd) ++ *netbsd*) + test_x=yes + test_gtk=yes + build_cairo=yes diff --git a/misc/openoffice2/patches/patch-bb b/misc/openoffice2/patches/patch-bb new file mode 100644 index 00000000000..5465c231670 --- /dev/null +++ b/misc/openoffice2/patches/patch-bb @@ -0,0 +1,22 @@ +$NetBSD: patch-bb,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/osl/unx/backtrace.h.orig 2007-02-17 22:54:13.000000000 +0900 ++++ ../sal/osl/unx/backtrace.h 2007-02-17 22:57:00.000000000 +0900 +@@ -34,7 +34,7 @@ + ************************************************************************/ + + +-#if defined (SOLARIS) || (FREEBSD) ++#if defined (SOLARIS) || (FREEBSD) || (NETBSD) + + #ifdef __cplusplus + extern "C" { +@@ -47,7 +47,7 @@ + void backtrace_symbols_fd( void **buffer, int size, int fd ); + + /* no frame.h on FreeBSD */ +-#if defined FREEBSD ++#if defined FREEBSD || NETBSD + struct frame { + long arg0[8]; + long arg1[6]; diff --git a/misc/openoffice2/patches/patch-bc b/misc/openoffice2/patches/patch-bc new file mode 100644 index 00000000000..002ae00513a --- /dev/null +++ b/misc/openoffice2/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../portaudio/portaudio_v18_1.patch.orig 2007-02-19 01:22:02.000000000 +0900 ++++ ../portaudio/portaudio_v18_1.patch 2007-02-19 01:22:28.000000000 +0900 +@@ -98,7 +98,7 @@ + + #ifdef __linux__ + #include <linux/soundcard.h> +-+ #elif defined (__FreeBSD__) +++ #elif defined (__FreeBSD__) || defined (__NetBSD__) + + #include <sys/soundcard.h> + #else + #include <machine/soundcard.h> /* JH20010905 */ diff --git a/misc/openoffice2/patches/patch-bd b/misc/openoffice2/patches/patch-bd new file mode 100644 index 00000000000..beb08b6ef37 --- /dev/null +++ b/misc/openoffice2/patches/patch-bd @@ -0,0 +1,15 @@ +$NetBSD: patch-bd,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../sal/rtl/source/makefile.mk.orig 2007-02-22 20:55:50.000000000 +0900 ++++ ../sal/rtl/source/makefile.mk 2007-02-22 20:56:44.000000000 +0900 +@@ -135,6 +135,10 @@ + + .ENDIF # .IF "$(OS)"=="LINUX" + ++.IF "$(OS)" == "NETBSD" ++CDEFS+= -DFORCE_SYSALLOC ++.ENDIF ++ + #.ENDIF + + .ENDIF diff --git a/misc/openoffice2/patches/patch-be b/misc/openoffice2/patches/patch-be new file mode 100644 index 00000000000..cc5e51e949a --- /dev/null +++ b/misc/openoffice2/patches/patch-be @@ -0,0 +1,36 @@ +$NetBSD: patch-be,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../python/Python-2.3.4.patch.orig 2007-02-23 02:52:48.000000000 +0900 ++++ ../python/Python-2.3.4.patch 2007-02-23 03:03:12.000000000 +0900 +@@ -1,5 +1,5 @@ +-*** misc/Python-2.3.4/Makefile.pre.in Tue Nov 18 20:54:00 2003 +---- misc/build/Python-2.3.4/Makefile.pre.in Thu Jun 29 11:02:18 2006 ++*** misc/Python-2.3.4/Makefile.pre.in Wed Nov 19 04:54:00 2003 ++--- misc/build/Python-2.3.4/Makefile.pre.in Fri Feb 23 02:56:31 2007 + *************** + *** 114,123 **** + RUNSHARED= @RUNSHARED@ +@@ -65,6 +65,23 @@ + + # Install the manual page + maninstall: ++*************** ++*** 729,735 **** ++ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ ++ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ ++ export EXE; EXE="$(BUILDEXE)"; \ ++! cd $(srcdir)/Lib/$(PLATDIR); ./regen ++ ++ # Install the include files ++ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) ++--- 735,741 ---- ++ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ ++ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ ++ export EXE; EXE="$(BUILDEXE)"; \ ++! cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen ++ ++ # Install the include files ++ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) + *** misc/Python-2.3.4/configure Fri May 7 21:13:40 2004 + --- misc/build/Python-2.3.4/configure Thu Jun 29 11:02:18 2006 + *************** diff --git a/misc/openoffice2/patches/patch-bf b/misc/openoffice2/patches/patch-bf new file mode 100644 index 00000000000..c7d7f2804fa --- /dev/null +++ b/misc/openoffice2/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../soltools/cpp/cpp.h.orig 2007-02-23 12:14:25.000000000 +0900 ++++ ../soltools/cpp/cpp.h 2007-02-23 12:14:59.000000000 +0900 +@@ -2,7 +2,7 @@ + + #define INS 32768 /* input buffer */ + #define OBS 8092 /* outbut buffer */ +-#define NARG 32 /* Max number arguments to a macro */ ++#define NARG 64 /* Max number arguments to a macro */ + #define NINCLUDE 32 /* Max number of include directories (-I) */ + #define NIF 64 /* depth of nesting of #if */ + #define NINC 32 /* depth of nesting of #include */ diff --git a/misc/openoffice2/patches/patch-bg b/misc/openoffice2/patches/patch-bg new file mode 100644 index 00000000000..ba5f90445a6 --- /dev/null +++ b/misc/openoffice2/patches/patch-bg @@ -0,0 +1,70 @@ +$NetBSD: patch-bg,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../vcl/util/makefile.mk.orig 2006-12-02 02:58:04.000000000 +0900 ++++ ../vcl/util/makefile.mk 2007-02-23 18:56:11.000000000 +0900 +@@ -187,7 +187,7 @@ + SHL1LIBS= $(LIB1TARGET) + .IF "$(GUI)"!="UNX" + SHL1OBJS= $(SLO)$/salshl.obj +-.ELIF "$(OS)"!="FREEBSD" ++.ELIF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" + SHL1STDLIBS+=-ldl + .ENDIF + +@@ -227,7 +227,7 @@ + + .IF "$(GUI)"=="UNX" + +-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" ++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" + SHL1STDLIBS+= -ldl + .ENDIF + +@@ -235,7 +235,7 @@ + SHL1STDLIBS += -framework Cocoa + .ENDIF + +-SHL1STDLIBS += -lX11 ++SHL1STDLIBS += $(X11_LDFLAGS) -lX11 + + .IF "$(OS)"=="MACOSX" + SHL1STDLIBS += -framework Foundation -framework CoreFoundation +@@ -315,8 +315,8 @@ + SHL2STDLIBS+=$(LIBSN_LIBS) + .ENDIF + +-SHL2STDLIBS += -lXext -lSM -lICE -lX11 +-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" ++SHL2STDLIBS += $(X11_LDFLAGS) -lXext -lSM -lICE -lX11 ++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" + # needed by salprnpsp.cxx + SHL2STDLIBS+= -ldl + .ENDIF +@@ -372,10 +372,10 @@ + + + SHL4STDLIBS+=-l$(SHL2TARGET) +-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" +-SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 ++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" ++SHL4STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 + .ELSE +-SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl ++SHL4STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 -ldl + .ENDIF # "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" + .ENDIF # "$(ENABLE_GTK)" != "" + +@@ -390,10 +390,10 @@ + # libs for KDE plugin + SHL5STDLIBS=$(KDE_LIBS) + SHL5STDLIBS+=-l$(SHL2TARGET) +-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" +-SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 ++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" ++SHL5STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 + .ELSE +-SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl ++SHL5STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 -ldl + .ENDIF # "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" + .ENDIF # "$(ENABLE_KDE)" != "" + diff --git a/misc/openoffice2/patches/patch-bh b/misc/openoffice2/patches/patch-bh new file mode 100644 index 00000000000..33c8042c751 --- /dev/null +++ b/misc/openoffice2/patches/patch-bh @@ -0,0 +1,12 @@ +$NetBSD: patch-bh,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../psprint/util/makefile.mk.orig 2007-02-23 18:34:44.000000000 +0900 ++++ ../psprint/util/makefile.mk 2007-02-23 18:35:16.000000000 +0900 +@@ -77,6 +77,7 @@ + $(I18NISOLANGLIB) \ + $(TOOLSLIB) \ + $(SALLIB) \ ++ $(X11_LDFLAGS) \ + -lX11 + .IF "$(SOLAR_JAVA)"!="" + SHL1STDLIBS+=$(JVMFWKLIB) diff --git a/misc/openoffice2/patches/patch-bi b/misc/openoffice2/patches/patch-bi new file mode 100644 index 00000000000..dc3244b022a --- /dev/null +++ b/misc/openoffice2/patches/patch-bi @@ -0,0 +1,13 @@ +$NetBSD: patch-bi,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../shell/source/unix/misc/makefile.mk.orig 2007-02-23 18:59:47.000000000 +0900 ++++ ../shell/source/unix/misc/makefile.mk 2007-02-23 19:00:19.000000000 +0900 +@@ -59,7 +59,7 @@ + APP1OBJS = \ + $(OBJ)$/gnome-open-url.obj + APP1LIBS = +-.IF "$(OS)"!="FREEBSD" ++.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" + APP1STDLIBS=-ldl + .ENDIF + diff --git a/misc/openoffice2/patches/patch-bj b/misc/openoffice2/patches/patch-bj new file mode 100644 index 00000000000..44b58464c22 --- /dev/null +++ b/misc/openoffice2/patches/patch-bj @@ -0,0 +1,20 @@ +$NetBSD: patch-bj,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../toolkit/util/makefile.mk.orig 2007-02-23 19:08:23.000000000 +0900 ++++ ../toolkit/util/makefile.mk 2007-02-23 19:09:14.000000000 +0900 +@@ -84,13 +84,13 @@ + + .IF "$(GUIBASE)"=="unx" + SHL1STDLIBS +=\ +- -lX11 -lXt -lXmu ++ $(X11_LDFLAGS) -lX11 -lXt -lXmu + .ENDIF + + .ELSE + .IF "$(GUI)"=="UNX" + SHL1STDLIBS +=\ +- -lX11 ++ $(X11_LDFLAGS) -lX11 + .ENDIF + .ENDIF + diff --git a/misc/openoffice2/patches/patch-bk b/misc/openoffice2/patches/patch-bk new file mode 100644 index 00000000000..dc51b11fe57 --- /dev/null +++ b/misc/openoffice2/patches/patch-bk @@ -0,0 +1,18 @@ +$NetBSD: patch-bk,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../forms/util/makefile.mk.orig 2007-02-23 19:13:29.000000000 +0900 ++++ ../forms/util/makefile.mk 2007-02-23 19:13:44.000000000 +0900 +@@ -111,11 +111,11 @@ + .IF "$(OS)"=="MACOSX" + .IF "$(GUIBASE)"=="unx" + SHL1STDLIBS +=\ +- -lX11 -lXt -lXmu ++ $(X11_LDFLAGS) -lX11 -lXt -lXmu + .ENDIF + .ELSE + SHL1STDLIBS +=\ +- -lX11 ++ $(X11_LDFLAGS) -lX11 + .ENDIF # OS == MACOSX + + .ENDIF diff --git a/misc/openoffice2/patches/patch-bl b/misc/openoffice2/patches/patch-bl new file mode 100644 index 00000000000..97b45cd8836 --- /dev/null +++ b/misc/openoffice2/patches/patch-bl @@ -0,0 +1,12 @@ +$NetBSD: patch-bl,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../padmin/source/makefile.mk.orig 2007-02-23 19:14:40.000000000 +0900 ++++ ../padmin/source/makefile.mk 2007-02-23 19:14:51.000000000 +0900 +@@ -103,6 +103,7 @@ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ ++ $(X11_LDFLAGS) \ + -lXext -lX11 + + .ENDIF diff --git a/misc/openoffice2/patches/patch-bm b/misc/openoffice2/patches/patch-bm new file mode 100644 index 00000000000..5f5619829a7 --- /dev/null +++ b/misc/openoffice2/patches/patch-bm @@ -0,0 +1,18 @@ +$NetBSD: patch-bm,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../binfilter/bf_forms/util/makefile.mk.orig 2007-02-24 00:55:39.000000000 +0900 ++++ ../binfilter/bf_forms/util/makefile.mk 2007-02-24 00:56:10.000000000 +0900 +@@ -109,11 +109,11 @@ + .IF "$(OS)"=="MACOSX" + .IF "$(GUIBASE)"=="unx" + SHL1STDLIBS +=\ +- -lX11 -lXt -lXmu ++ $(X11_LDFLAGS) -lX11 -lXt -lXmu + .ENDIF + .ELSE + SHL1STDLIBS +=\ +- -lX11 ++ $(X11_LDFLAGS) -lX11 + .ENDIF # OS == MACOSX + + .ENDIF diff --git a/misc/openoffice2/patches/patch-bn b/misc/openoffice2/patches/patch-bn new file mode 100644 index 00000000000..86bf523fded --- /dev/null +++ b/misc/openoffice2/patches/patch-bn @@ -0,0 +1,15 @@ +$NetBSD: patch-bn,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../crashrep/source/unx/makefile.mk.orig 2007-02-24 00:59:23.000000000 +0900 ++++ ../crashrep/source/unx/makefile.mk 2007-02-24 00:59:55.000000000 +0900 +@@ -70,8 +70,8 @@ + APP1TARGET=$(TARGET) + APP1OBJS=$(OBJFILES) + +-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 +-.IF "$(OS)" != "FREEBSD" ++APP1STDLIBS=$(DYNAMIC) $(X11_LDFLAGS) -lXext -lX11 ++.IF "$(OS)" != "FREEBSD" && "$(OS)" != "NETBSD" + APP1STDLIBS+=-ldl -lnsl + .ENDIF + .IF "$(OS)" == "SOLARIS" diff --git a/misc/openoffice2/patches/patch-bo b/misc/openoffice2/patches/patch-bo new file mode 100644 index 00000000000..6e832ed5862 --- /dev/null +++ b/misc/openoffice2/patches/patch-bo @@ -0,0 +1,13 @@ +$NetBSD: patch-bo,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../extensions/source/plugin/unx/makefile.mk.orig 2007-02-24 01:01:46.000000000 +0900 ++++ ../extensions/source/plugin/unx/makefile.mk 2007-02-24 01:02:08.000000000 +0900 +@@ -74,7 +74,7 @@ + APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl + .ELSE + .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" +-APP1STDLIBS+=-lXaw -lXt -lXext -lX11 ++APP1STDLIBS+=$(X11_LDFLAGS) -lXaw -lXt -lXext -lX11 + .ELSE + APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl + .ENDIF diff --git a/misc/openoffice2/patches/patch-bp b/misc/openoffice2/patches/patch-bp new file mode 100644 index 00000000000..875b860e02c --- /dev/null +++ b/misc/openoffice2/patches/patch-bp @@ -0,0 +1,13 @@ +$NetBSD: patch-bp,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../extensions/source/nsplugin/source/makefile.mk.orig 2007-02-24 02:05:26.000000000 +0900 ++++ ../extensions/source/nsplugin/source/makefile.mk 2007-02-24 02:13:01.000000000 +0900 +@@ -115,7 +115,7 @@ + $(TOOLSLIB) + + .IF "$(GUI)"=="UNX" +-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" ++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" + .ELSE + APP1STDLIBS+= -ldl -lnsl -lnls -lsocket + .ENDIF diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq new file mode 100644 index 00000000000..7fb38e93b6c --- /dev/null +++ b/misc/openoffice2/patches/patch-bq @@ -0,0 +1,49 @@ +$NetBSD: patch-bq,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../instsetoo_native/util/makefile.mk.orig 2006-12-02 02:55:09.000000000 +0900 ++++ ../instsetoo_native/util/makefile.mk 2007-02-27 15:45:28.000000000 +0900 +@@ -60,6 +60,9 @@ + ENABLE_DOWNLOADSETS=TRUE + .ENDIF # "$(FORCE_DOWNLOADSETS)"!="" + ++# Don't create download set with pkgsrc. ++ENABLE_DOWNLOADSETS= ++ + .EXPORT: ENABLE_DOWNLOADSETS + .EXPORT: LAST_MINOR + .EXPORT: PRJ +@@ -194,14 +197,14 @@ + .ELSE # "$(PKGFORMAT)"!="" + openoffice_% : + .ENDIF # "$(PKGFORMAT)"!="" +-.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable" ++.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + .ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging + +$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_* + +-$(MKDIR) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background +- +$(GNUCOPY) -u $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png +- +$(GNUCOPY) -u $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store ++ +$(GNUCOPY) $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png ++ +$(GNUCOPY) $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store + +cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b)) && hdiutil makehybrid -hfs -hfs-openfolder staging staging \ + -hfs-volume-name OpenOffice.org -ov -o tmp && hdiutil convert -ov -format UDZO tmp.dmg \ + -o $(subst,$(@:s/_/ /:1),OpenOffice.org-$(shell sed -n '/^OpenOffice$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) && $(RM) tmp.dmg +@@ -403,11 +406,11 @@ + +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) + +-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) + +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) +- $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) +- $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) +- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) +- $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) +- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) ++ $(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) ++ $(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) ++ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) ++ $(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) ++ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) + +$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp + +$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp + +$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp diff --git a/misc/openoffice2/patches/patch-br b/misc/openoffice2/patches/patch-br new file mode 100644 index 00000000000..7776c0b7757 --- /dev/null +++ b/misc/openoffice2/patches/patch-br @@ -0,0 +1,31 @@ +$NetBSD: patch-br,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../scp2/source/ooo/file_library_ooo.scp.orig 2006-12-02 02:56:41.000000000 +0900 ++++ ../scp2/source/ooo/file_library_ooo.scp 2007-02-27 03:46:51.000000000 +0900 +@@ -503,6 +503,8 @@ + #ifdef UNX + #ifdef MACOSX + Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX)); ++ #elif defined(NETBSD) ++ Name = STRING(CONCAT6(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR)); + #else + Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO)); + #endif +@@ -2421,6 +2423,8 @@ + #ifdef UNX + #ifdef MACOSX + Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX)); ++ #elif defined(NETBSD) ++ Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.3.6)); + #else + Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6)); + #endif +@@ -2445,6 +2449,8 @@ + TXT_FILE_BODY; + #ifdef MACOSX + Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX)); ++ #elif defined(NETBSD) ++ Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.3.6)); + #else + Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6)); + #endif diff --git a/misc/openoffice2/patches/patch-bs b/misc/openoffice2/patches/patch-bs new file mode 100644 index 00000000000..e9dee371a1e --- /dev/null +++ b/misc/openoffice2/patches/patch-bs @@ -0,0 +1,26 @@ +$NetBSD: patch-bs,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $ + +--- ../xmlsecurity/util/makefile.mk.orig 2007-02-27 08:39:08.000000000 +0900 ++++ ../xmlsecurity/util/makefile.mk 2007-02-27 08:40:08.000000000 +0900 +@@ -106,6 +106,7 @@ + $(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ ++ $(LIBXML_LIBS) \ + $(XMLOFFLIB) + + .IF "$(SYSTEM_MOZILLA)" == "YES" +@@ -164,11 +165,12 @@ + $(SOTLIB) \ + $(SVLLIB) \ + $(SFXLIB) \ ++ $(LIBXML_LIBS) \ + $(XMLOFFLIB) \ + $(SVXLIB) + + #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings +-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB) ++SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB) + + SHL4VERSIONMAP = xmlsecurity.map + SHL4DEPN= |