summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2008-04-07 16:24:51 +0000
committerhira <hira@pkgsrc.org>2008-04-07 16:24:51 +0000
commitd801aeed4ed8b98a8b840535a5c65a0bfd3d650f (patch)
tree01479c6421207a3a18fe686f750453ed02e8e184 /misc
parent045b3d697f79c53adbeb888c695be91f5412f9a4 (diff)
downloadpkgsrc-d801aeed4ed8b98a8b840535a5c65a0bfd3d650f.tar.gz
Update to 2.4.0.
New features: General * Connect to WebDAV servers via HTTPS * Custom icons for toolbars are imported * Control password-storing with a master password * Warning if document is from a newer ODF * PDF documents: relative links, document references, PDF/A-1 (ISO 19005-1) supported, and cross-document link behavior options * Mac OS X: Quicktime support for movies and sound / use the built in spell checker * Print dialog improvements in usability * Edit boxes: warning at limit of characters * DejaVu font is now default instead of BitStream Vera Localisation * Entries for 10 languages added Base / DBA * Improved rendering of numeric(n) data from JDBC and Oracle * Easier choice of table name in "Copy table" * Editing of views in HSQLDB * Query designer for all properties which allow SQL command * Query designer in SQL view * Relation design accessible for MySQL databases * Setting to check for required fields on forms * Support for Access 2007 (.accdb files) Calc * Convert text to columns: with this feature CSV data inside cells can be transformed into columns directly * Columns and rows in spreadsheet can be moved with drag and drop * Enter key returns to the column where the input started, one row below * Formula input: "+" and "-" can also be used to start * Individual zoom level per sheet * AutoFilter: choices clearer grouped and based on result of filtering in other columns * DataPilot: Manual Sorting / Double-click in DataPilot cell provides calculation data of that cell * Performance improvement with functions VLOOKUP and MATCH * Print dialog for Calc easier to use * PageUp and PageDown keys work in print preview * Sheet names in cell-hyperlinks: renamed properly Chart * Regression curves: The equation of trend lines and the R^2 value now can be displayed * Reverse axes possible * Bars on different axes displayed next to each other * Data labels: Number format * Data point label: display both value and percentage * Data label: display each part in a separate line * Data labels: more flexible placement of labels * Labels on pie segments: avoiding overlapping * Data point label: can be removed with delete key Draw * Navigation (tab) order of page objects * PDF export: page names as bookmark * Reduce complexity: no longer necessary display options removed Impress * Navigation (tab) order of page objects * Thrilling 3D effects in slide transitions * Export slide names as PDF bookmarks * Easier to insert background picture Writer * Selecting rectangular region of text * Find and Replace: backward references in regular expressions * Spell checking: easier selecting of the language * Insert&Insert Object toolbar redesign - Writer * Printing of hidden text can be turned on * Printing text place holders can be turned off * Shortcuts added for paragraph style Heading 4, Heading 5 and Textbody * Ctrl-click behaviour for hyperlinks can be changed * Custom document properties: Text fields and UI support Extensions/ programmability / API * Extensible Help System for extensions * Extensions can have a separate display name * Extensions: support of web based update * Extensions: additional information about the publisher and release notes * Extensions: check for updates * Dialogs can have a wallpaper set * Transparent background for controls * Remote control presentations via API * API: get selected table(s) or query(s) in the main Base window Please see the following URL for more information. http://development.openoffice.org/releases/2.4.0.html
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice2/Makefile9
-rw-r--r--misc/openoffice2/distinfo46
-rw-r--r--misc/openoffice2/options.mk12
-rw-r--r--misc/openoffice2/patches/patch-aa585
-rw-r--r--misc/openoffice2/patches/patch-ae17
-rw-r--r--misc/openoffice2/patches/patch-aj60
-rw-r--r--misc/openoffice2/patches/patch-ak70
-rw-r--r--misc/openoffice2/patches/patch-ba59
-rw-r--r--misc/openoffice2/patches/patch-bg12
-rw-r--r--misc/openoffice2/patches/patch-cp14
-rw-r--r--misc/openoffice2/patches/patch-cr17
-rw-r--r--misc/openoffice2/patches/patch-ct16
-rw-r--r--misc/openoffice2/patches/patch-cw12
-rw-r--r--misc/openoffice2/patches/patch-cz30
-rw-r--r--misc/openoffice2/patches/patch-db948
-rw-r--r--misc/openoffice2/patches/patch-dc13
16 files changed, 151 insertions, 1769 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 2f903c81247..52033a00cba 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2008/03/21 09:20:55 hira Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/07 16:24:51 hira Exp $
#
-OO_VER= 2.3.1
-PKGREVISION= 5
+OO_VER= 2.4.0
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
CATEGORIES= misc
@@ -30,7 +29,7 @@ DEPENDS+= libpaper-[0-9]*:../../print/libpaper
.include "../../mk/bsd.prefs.mk"
-WRKSRC= ${WRKDIR}/OOG680_m9
+WRKSRC= ${WRKDIR}/OOH680_m12
CONFIGURE_DIRS= config_office
# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -113,7 +112,7 @@ PLIST_SRC+= ${WRKDIR}/.PLIST_SRC
MESSAGE_SUBST+= OO_RELEASE=${OO_RELEASE}
INSTALLATION_DIRS= bin ${OO_RELEASE}
-OO_UNXNAME= openoffice.org2.3
+OO_UNXNAME= openoffice.org2.4
OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
OO_PKGROOT= /opt/${OO_UNXNAME}
OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index bccac44f0a3..a5ab911120b 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,26 +1,23 @@
-$NetBSD: distinfo,v 1.35 2008/03/21 09:20:56 hira Exp $
+$NetBSD: distinfo,v 1.36 2008/04/07 16:24:51 hira Exp $
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
-Size (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 6476673 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = de189e03a329cdd334823a52b800fad0c033ab4d
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = ab75c022d00ed6269eb9437f9c022e44181c6d3a
-Size (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = 144156134 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 004defae1496cf4b953a233abb20fd4c7e162423
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = bc10b1e05574aced79532fbef316e66dcb810fbf
-Size (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 79077332 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = ebc835f9c00ef60b9d8da1004a8f31f8a88aef6f
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = f93b0fc523a39d29e73466be4d592d5a9fcde68e
-Size (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = 36879908 bytes
-SHA1 (patch-aa) = bbbd684c158cddb8aabf9c232257a997950f6119
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
+Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e
+Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383
+Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe
+Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes
SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
-SHA1 (patch-ae) = 6fb03e29c5368f26e7187516354858df127d388b
SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-aj) = f0a38928938ba18d32b1e9007dbb8e36e54381bc
-SHA1 (patch-ak) = 23c202e81b47a415a0762aa5f30e8ed4e64017ad
+SHA1 (patch-ak) = 1d498a6f1c68d8c91576ea7cf7891faeefc02f7a
SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -29,12 +26,12 @@ SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = e1cc1c4dd80c3151c9f43d1030d89404f0537b47
+SHA1 (patch-ba) = 98504f3053540898ffe23c6108c05b2cb029c2d4
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = c050b8fa384a187fbf846f78c884c98840046a86
+SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
@@ -56,16 +53,15 @@ SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-cp) = 7c6007d18cc4f1b5d1c8e16c9170ec0e8211a040
+SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cr) = 9cf96627d480714d62109bb3a7d67777a1a2b796
+SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
-SHA1 (patch-ct) = f895442c141fb7cc172adca4903bbf784dbe3594
+SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
-SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
+SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-cz) = e9850759fccff68914b104f4075e79c61b1010eb
SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
-SHA1 (patch-db) = 2760f1dd5a19afb7e329796318beedfc6972f039
+SHA1 (patch-dc) = 56ba80d91b5b82178dc8d837bc03dbe48b4ec9d8
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 91b7298ef5f..4fa1b4bbb0c 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2007/12/18 22:24:29 hira Exp $
+# $NetBSD: options.mk,v 1.18 2008/04/07 16:24:51 hira Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd
@@ -8,11 +8,11 @@ PKG_OPTIONS_GROUP.browser= firefox seamonkey # firefox-gtk1 seamonkey-gtk1
OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
cs cy da de dz el en-GB en-US en-ZA eo es et \
eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka km kn-IN ko ku lo lt lv mk ms ml-IN mr-IN \
- ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru \
- rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx \
- te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve \
- vi xh zh-CN zh-TW zu
+ ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
+ nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
+ rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
+ ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
+ zh-TW zu
.for l in ${OO_SUPPORTED_LANGUAGES}
PKG_SUPPORTED_OPTIONS+= lang-${l}
.endfor
diff --git a/misc/openoffice2/patches/patch-aa b/misc/openoffice2/patches/patch-aa
deleted file mode 100644
index acc2ad4fd6e..00000000000
--- a/misc/openoffice2/patches/patch-aa
+++ /dev/null
@@ -1,585 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/10/06 20:02:22 hira Exp $
-
---- sal/util/sal_netbsd.map.orig 2007-09-27 06:14:49.000000000 +0900
-+++ sal/util/sal_netbsd.map 2007-09-27 08:16:30.000000000 +0900
-@@ -0,0 +1,580 @@
-+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_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;
-+
-+UDK_3.6 { # OOo 2.3
-+ global:
-+ osl_getAsciiFunctionSymbol;
-+ osl_getModuleHandle;
-+ rtl_uString_intern;
-+ rtl_uString_internConvert;
-+ rtl_ustr_indexOfAscii_WithLength;
-+ rtl_ustr_lastIndexOfAscii_WithLength;
-+ rtl_uString_iterateCodePoints;
-+ rtl_uString_newFromCodePoints;
-+} UDK_3.5;
-+
-+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-ae b/misc/openoffice2/patches/patch-ae
deleted file mode 100644
index b9191877171..00000000000
--- a/misc/openoffice2/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/10/06 20:02:22 hira Exp $
-
---- sal/util/makefile.mk.orig 2007-08-18 02:47:11.000000000 +0900
-+++ sal/util/makefile.mk 2007-09-26 17:19:33.000000000 +0900
-@@ -100,7 +100,11 @@
- .ENDIF
- SHL1IMPLIB= i$(TARGET)
-
--SHL1VERSIONMAP= $(TARGET).map
-+.IF "$(OS)"=="NETBSD"
-+SHL1VERSIONMAP= $(TARGET)_netbsd.map
-+.ELSE
-+SHL1VERSIONMAP= $(TARGET).map
-+.ENDIF
-
- .IF "$(GUI)"=="WNT"
- UWINAPILIB= $(LB)$/uwinapi.lib
diff --git a/misc/openoffice2/patches/patch-aj b/misc/openoffice2/patches/patch-aj
deleted file mode 100644
index 7955b069995..00000000000
--- a/misc/openoffice2/patches/patch-aj
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2007/10/06 20:02:22 hira Exp $
-
---- solenv/inc/unxbsdi2.mk.orig 2007-03-09 18:07:33.000000000 +0900
-+++ solenv/inc/unxbsdi2.mk 2007-09-26 19:56:27.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)"!=""
-@@ -119,7 +119,8 @@
- DYNAMIC = -Wl,-Bdynamic
-
- # name of linker
--LINK*=$(CC)
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-
- # default linker flags
- LINKFLAGSDEFS*=-z defs
-@@ -137,7 +138,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
-@@ -155,13 +156,14 @@
- STDSLOGUI=
- STDOBJCUI=
- STDSLOCUI=
-+STDOBJVCL=$(L)$/salmain.o
-
- # libraries for linking applications
--STDLIBGUIMT=-lX11 -lpthread -lm
--STDLIBCUIMT=-lpthread -lm
-+STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc
-+STDLIBCUIMT=-lpthread -lm -lc
- # libraries for linking shared libraries
--STDSHLGUIMT=-lX11 -lXext -lpthread -lm
--STDSHLCUIMT=-lpthread -lm
-+STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc
-+STDSHLCUIMT=-lpthread -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
index b03e965a5b2..e86ee4787b5 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,40 +1,40 @@
-$NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-ak,v 1.7 2008/04/07 16:24:51 hira Exp $
---- config_office/set_soenv.in.orig 2007-08-03 13:09:48.000000000 +0000
-+++ config_office/set_soenv.in 2007-10-12 01:59:21.000000000 +0000
-@@ -39,7 +39,7 @@
- #--------------------------------------------------------
+--- config_office/set_soenv.in.orig 2008-01-24 02:07:28.000000000 +0900
++++ config_office/set_soenv.in 2008-04-07 17:46:40.000000000 +0900
+@@ -40,7 +40,7 @@
#
- 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, $MINGW, $USE_MINGW, $platform,
-+ $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform,
+ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
+ $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
+- $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
++ $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
+ $USE_MINGW, $platform, $NOWRAPCMD,
$cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
- #
-@@ -86,7 +86,7 @@
- $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
+@@ -90,7 +90,7 @@
+ $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
$PROEXT,
-- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA);
-+ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA);
+- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
++ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
-@@ -111,6 +111,7 @@
+@@ -132,6 +132,7 @@
$par_dir = ".."; # parrent directory
$I = " -I"; # include search path
$L = " -L"; # library search path
-+$R = " -R"; # library runtime path
++$R = " -R"; # library search path
$D = " -D"; # define search path
$empty = ""; # used as argument
$no_stl = "NO_STLPORT4"; # possible argument
-@@ -271,6 +272,16 @@
+@@ -284,6 +285,16 @@
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
+ elsif ($platform =~ m/^x86_64/)
+ { print "Setting NetBSD x86-64 specific values... ";
-+ $outfile = "NetBSDX86-64Env.Set";
++ $outfile = "NetBSDX86-64Env.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxbsdx";
@@ -45,13 +45,12 @@ $NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... ";
$outfile = "NetBSDSparcEnv.Set";
-@@ -296,8 +307,14 @@
- exit 1;
+@@ -310,7 +321,14 @@
}
#Conditional setting depending on gcc3:
-- $CVER = "C300";
+ $CVER = "C300";
- $OUTPATH = $OUTPATH."2";
-+ if( @GCCVER@ >= 30401 ) {
++ if (@GCCVER@ >= 30401) {
+ $CVER = "C341";
+ $OUTPATH = $OUTPATH."3";
+ }
@@ -62,7 +61,7 @@ $NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
# General NetBSD settings:
$BIG_SVX = "TRUE";
$COM = "GCC";
-@@ -1243,7 +1260,8 @@
+@@ -1387,7 +1405,8 @@
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
$L_STLPORT_LIB.
@@ -72,28 +71,27 @@ $NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
}
elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
-@@ -1400,6 +1418,7 @@
-
- if ($SYSTEM_PYTHON eq "NO")
- {
-+ $PYTHON = python
- $PYTHONPATH = '.'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'pyuno'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'bin'.$ds.'pyuno';
- $PYTHONHOME = '$SOLARVER'.$ds.'$INPATH';
+@@ -1548,6 +1567,7 @@
}
-@@ -1539,6 +1558,8 @@
+
+ if ($SYSTEM_PYTHON eq "NO") {
++ $PYTHON = python
+ $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
+ $PYTHONHOME = $SOLARVER.$ds.$INPATH;
+ if ($GUIBASE eq "WIN") {
+@@ -1693,6 +1713,7 @@
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-+# Should be renamed?
+ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" );
ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
-@@ -1785,6 +1806,7 @@
- ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" );
- ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" );
- ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
-+ToFile( "PYTHON", "@PYTHON@", "e" );
+@@ -1967,6 +1988,7 @@
+ ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
+ ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
++ToFile( "PYTHON", "@PYTHON@", "e" );
ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
+ if ($SYSTEM_PYTHON eq "NO") {
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index df8e1ad511f..4f7099d08ee 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
+$NetBSD: patch-ba,v 1.11 2008/04/07 16:24:51 hira Exp $
---- config_office/configure.orig 2007-11-02 17:30:08.000000000 +0900
-+++ config_office/configure 2007-12-24 09:04:32.000000000 +0900
-@@ -3010,11 +3010,11 @@
+--- config_office/configure.orig 2008-01-31 20:47:17.000000000 +0900
++++ config_office/configure 2008-04-07 18:20:56.000000000 +0900
+@@ -3176,11 +3176,11 @@
test_cups=no
_os=OSF1
;;
@@ -16,7 +16,16 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread"
_os=NetBSD
-@@ -9544,7 +9544,7 @@
+@@ -10304,7 +10304,7 @@
+ fi
+
+ if test "$SOLAR_JAVA" != ""; then
+- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
++ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
+ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
+ cat > findhome.java <<_ACEOF
+ import java.io.File;
+@@ -10404,7 +10404,7 @@
echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
@@ -25,7 +34,7 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
fi
fi
-@@ -12477,7 +12477,7 @@
+@@ -13098,7 +13098,7 @@
if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
test "$with_system_libxslt" != "no"; then
if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
@@ -34,23 +43,14 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
# somehow AC_MSG_WARN won't work...
echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-@@ -12487,7 +12487,7 @@
- if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
- test "$with_system_libxml" != "no"; then
- if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-- test "$with_system_libxslt" == "no"; then
-+ test "$with_system_libxslt" = "no"; then
- # somehow AC_MSG_WARN won't work...
- echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
- echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-@@ -12970,13 +12970,13 @@
+@@ -13591,13 +13591,14 @@
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
+ python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
--
+
if test "$_os" = "Darwin"; then
PYTHON_LIBS="-framework Python"
else
@@ -59,7 +59,7 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
fi
save_CPPFLAGS="$CPPFLAGS"
-@@ -13200,7 +13200,7 @@
+@@ -13868,7 +13869,7 @@
echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
echo "${ECHO_T}$ac_cv_header_db_h" >&6
if test $ac_cv_header_db_h = yes; then
@@ -68,7 +68,7 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
else
CFLAGS=-I/usr/include/db4
-@@ -13323,13 +13323,13 @@
+@@ -13991,13 +13992,13 @@
#AC_CHECK_LIB(db, db_create, [],
# [AC_MSG_ERROR([db library not installed or functional])], [])
@@ -85,7 +85,7 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13386,7 +13386,7 @@
+@@ -14054,7 +14055,7 @@
#define HAVE_LIBDB 1
_ACEOF
@@ -94,7 +94,7 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
else
{ { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -19101,7 +19101,7 @@
+@@ -19781,7 +19782,7 @@
echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
if test $ac_cv_header_audio_audiolib_h = yes; then
@@ -103,7 +103,16 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
else
CFLAGS=-I/usr/X11R6/include
-@@ -22998,7 +22998,7 @@
+@@ -24012,7 +24013,7 @@
+ ENABLE_REPORTDESIGN=YES
+ echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
+ echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
+- if test "$with_system_jfreereport" == "yes"; then
++ if test "$with_system_jfreereport" = "yes"; then
+ SYSTEM_JFREEREPORT=YES
+ echo "$as_me:$LINENO: result: external" >&5
+ echo "${ECHO_T}external" >&6
+@@ -24529,7 +24530,7 @@
fi
KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -112,12 +121,12 @@ $NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
fi
-@@ -23652,7 +23652,7 @@
+@@ -25082,7 +25083,7 @@
XINERAMA_LINK=dynamic
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
++elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
- # we have both versions, let the user decide but use the static one
+ # we have both versions, let the user decide but use the dynamic one
# per default
diff --git a/misc/openoffice2/patches/patch-bg b/misc/openoffice2/patches/patch-bg
index acb33851edd..81f1d162829 100644
--- a/misc/openoffice2/patches/patch-bg
+++ b/misc/openoffice2/patches/patch-bg
@@ -1,10 +1,10 @@
-$NetBSD: patch-bg,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-bg,v 1.4 2008/04/07 16:24:51 hira Exp $
---- vcl/util/makefile.mk.orig 2007-01-19 21:56:23.000000000 +0900
-+++ vcl/util/makefile.mk 2007-04-01 21:30:29.000000000 +0900
-@@ -300,8 +300,8 @@
- SHL2STDLIBS+=$(LIBSN_LIBS)
- .ENDIF
+--- vcl/util/makefile.mk.orig 2008-01-24 02:19:40.000000000 +0900
++++ vcl/util/makefile.mk 2008-04-07 18:15:43.000000000 +0900
+@@ -323,8 +323,8 @@
+
+ .IF "$(GUIBASE)"=="unx"
-SHL2STDLIBS += -lXext -lSM -lICE -lX11
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
diff --git a/misc/openoffice2/patches/patch-cp b/misc/openoffice2/patches/patch-cp
index 067e2c38f9f..d3b566059ab 100644
--- a/misc/openoffice2/patches/patch-cp
+++ b/misc/openoffice2/patches/patch-cp
@@ -1,12 +1,12 @@
-$NetBSD: patch-cp,v 1.1 2007/10/06 20:02:24 hira Exp $
+$NetBSD: patch-cp,v 1.2 2008/04/07 16:24:51 hira Exp $
---- pyuno/source/module/makefile.mk.orig 2007-09-27 01:51:03.000000000 +0900
-+++ pyuno/source/module/makefile.mk 2007-09-27 01:52:52.000000000 +0900
-@@ -91,6 +91,7 @@
+--- pyuno/source/module/makefile.mk.orig 2008-01-03 02:29:28.000000000 +0900
++++ pyuno/source/module/makefile.mk 2008-04-07 18:22:21.000000000 +0900
+@@ -96,6 +96,7 @@
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
-+ $(PYTHON_LIBS) \
- $(PYTHONLIB)
++ $(PYTHON_LIBS) \
+ $(PYTHONLIB) \
+ $(EXTRA_FRAMEWORK_FLAG)
- SHL1DEPN=
diff --git a/misc/openoffice2/patches/patch-cr b/misc/openoffice2/patches/patch-cr
index 81bda971dc6..bf14c9b3509 100644
--- a/misc/openoffice2/patches/patch-cr
+++ b/misc/openoffice2/patches/patch-cr
@@ -1,13 +1,22 @@
-$NetBSD: patch-cr,v 1.1 2007/10/09 10:04:00 hira Exp $
+$NetBSD: patch-cr,v 1.2 2008/04/07 16:24:51 hira Exp $
---- setup_native/scripts/linuxpatchscript.sh.orig 2007-10-09 18:55:08.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh 2007-10-09 18:55:25.000000000 +0900
+--- setup_native/scripts/linuxpatchscript.sh.orig 2008-04-07 17:55:52.000000000 +0900
++++ setup_native/scripts/linuxpatchscript.sh 2008-04-07 18:23:25.000000000 +0900
@@ -49,7 +49,7 @@
# Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed)
SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}`
- if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then
+ if [ "x$SEARCHTOOLBARINSTALLED" = "x" ]; then
- # Install the online update rpm
+ # Install the search toolbar rpm
RPMLIST="$RPMLIST $SEARCHTOOLBARRPM"
fi
+@@ -62,7 +62,7 @@
+ # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed)
+ KDERPMINSTALLED=`grep kde-integration ${RPMLIST}`
+
+- if [ "x$KDERPMINSTALLED" == "x" ]; then
++ if [ "x$KDERPMINSTALLED" = "x" ]; then
+ # Install the kde integration rpm
+ RPMLIST="$RPMLIST $KDERPM"
+ fi
diff --git a/misc/openoffice2/patches/patch-ct b/misc/openoffice2/patches/patch-ct
index e8780e28e5b..331152ec109 100644
--- a/misc/openoffice2/patches/patch-ct
+++ b/misc/openoffice2/patches/patch-ct
@@ -1,20 +1,20 @@
-$NetBSD: patch-ct,v 1.1 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-ct,v 1.2 2008/04/07 16:24:51 hira Exp $
---- tools/inc/tools/solar.h.orig 2007-10-10 11:44:00.000000000 +0900
-+++ tools/inc/tools/solar.h 2007-10-10 11:44:57.000000000 +0900
-@@ -342,6 +342,7 @@
- #define SYSTEM_UNXSOGS 31
+--- tools/inc/tools/solar.h.orig 2007-11-02 22:00:07.000000000 +0900
++++ tools/inc/tools/solar.h 2008-04-07 18:24:54.000000000 +0900
+@@ -343,6 +343,7 @@
#define SYSTEM_UNXSOGI 32
#define SYSTEM_UNXMACXI 33
-+#define SYSTEM_UNXBSDX 34
+ #define SYSTEM_OS2GCCI 34
++#define SYSTEM_UNXBSDX 35
#define SYSTEM_WNTGCCI 99
#if defined WNT
-@@ -395,6 +396,8 @@
+@@ -398,6 +399,8 @@
#define __DLLEXTENSION "mxp.dylib"
#elif defined MACOSX && defined X86
#define __DLLEXTENSION "mxi.dylib"
-+elif defined NETBSD && defined X86_64
++#elif defined NETBSD && defined X86_64
+ #define __DLLEXTENSION "bx.so"
#else
#define __DLLEXTENSION ".so"
diff --git a/misc/openoffice2/patches/patch-cw b/misc/openoffice2/patches/patch-cw
index fbb55bf5ff7..660c5797870 100644
--- a/misc/openoffice2/patches/patch-cw
+++ b/misc/openoffice2/patches/patch-cw
@@ -1,24 +1,22 @@
-$NetBSD: patch-cw,v 1.1 2007/11/11 03:35:36 hira Exp $
+$NetBSD: patch-cw,v 1.2 2008/04/07 16:24:51 hira Exp $
---- i18npool/source/collator/makefile.mk.orig 2007-01-26 00:25:50.000000000 +0900
-+++ i18npool/source/collator/makefile.mk 2007-11-09 02:40:37.000000000 +0900
-@@ -46,7 +46,26 @@
+--- i18npool/source/collator/makefile.mk.orig 2007-11-07 00:50:57.000000000 +0900
++++ i18npool/source/collator/makefile.mk 2008-04-07 18:28:18.000000000 +0900
+@@ -46,7 +46,24 @@
# --- Files --------------------------------------------------------
--tempvar:=$(shell cd data && ls *.txt)
+-tempvar:=$(shell @cd data && ls *.txt)
+tempvar= \
+ dz_charset.txt \
+ hu_charset.txt \
+ ja_charset.txt \
+ ja_phonetic_alphanumeric_first.txt \
+ ja_phonetic_alphanumeric_last.txt \
-+ km_charset.txt \
+ ko_charset.txt \
+ ku_alphanumeric.txt \
+ ln_charset.txt \
+ ne_charset.txt \
-+ vi_charset.txt \
+ zh_TW_charset.txt \
+ zh_TW_radical.txt \
+ zh_TW_stroke.txt \
diff --git a/misc/openoffice2/patches/patch-cz b/misc/openoffice2/patches/patch-cz
deleted file mode 100644
index 73578628ab3..00000000000
--- a/misc/openoffice2/patches/patch-cz
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-cz,v 1.1 2008/02/05 19:17:25 hira Exp $
-
-From FreeBSD ports patch-i78875.
-
---- libtextcat/libtextcat-2.2.patch.orig 2007-10-26 15:01:46.000000000 +0000
-+++ libtextcat/libtextcat-2.2.patch 2008-02-03 00:35:33.000000000 +0000
-@@ -18,6 +18,23 @@
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
- archive_cmds=
-+***************
-+*** 6280,6286 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 6281,6287 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003
- --- misc/build/libtextcat-2.2/src/Makefile.in Fri Aug 17 21:51:26 2007
- ***************
diff --git a/misc/openoffice2/patches/patch-db b/misc/openoffice2/patches/patch-db
deleted file mode 100644
index 6cfc3ee5089..00000000000
--- a/misc/openoffice2/patches/patch-db
+++ /dev/null
@@ -1,948 +0,0 @@
-$NetBSD: patch-db,v 1.1 2008/03/21 09:20:56 hira Exp $
-
-Fix CVE-2007-4770 and CVE-2007-4771.
-
---- icu/icu-3.6.patch.orig 2007-10-25 23:01:33.000000000 +0900
-+++ icu/icu-3.6.patch 2008-03-21 17:38:36.000000000 +0900
-@@ -1,5 +1,5 @@
- *** misc/icu/source/common/putil.c Mon Jul 31 20:14:28 2006
----- misc/build/icu/source/common/putil.c Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/putil.c Mon Jan 28 21:31:50 2008
- ***************
- *** 48,54 ****
- #endif
-@@ -19,7 +19,7 @@
- #endif
-
- *** misc/icu/source/common/unicode/pwin32.h Tue Aug 29 23:34:38 2006
----- misc/build/icu/source/common/unicode/pwin32.h Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/pwin32.h Mon Jan 28 21:31:50 2008
- ***************
- *** 266,273 ****
- --- 266,278 ----
-@@ -37,10 +37,10 @@
- /*===========================================================================*/
- /* Code alignment and C function inlining */
- *** misc/icu/source/common/unicode/rbbi.h Fri Aug 11 07:46:40 2006
----- misc/build/icu/source/common/unicode/rbbi.h Tue Sep 18 19:35:01 2007
-+--- misc/build/icu/source/common/unicode/rbbi.h Mon Jan 28 21:31:50 2008
- ***************
--*** 611,616 ****
----- 611,617 ----
-+*** 611,622 ****
-+--- 611,624 ----
- virtual int32_t getBreakType() const;
- #endif
-
-@@ -48,9 +48,6 @@
- /**
- * Set the type of the break iterator.
- * @internal
--***************
--*** 617,622 ****
----- 618,624 ----
- */
- virtual void setBreakType(int32_t type);
-
-@@ -59,7 +56,7 @@
- * Common initialization function, used by constructors and bufferClone.
- * (Also used by DictionaryBasedBreakIterator::createBufferClone().)
- *** misc/icu/source/common/unicode/umachine.h Tue Feb 7 02:54:16 2006
----- misc/build/icu/source/common/unicode/umachine.h Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/umachine.h Mon Jan 28 21:31:50 2008
- ***************
- *** 322,328 ****
- */
-@@ -78,7 +75,7 @@
- #else
- typedef uint16_t UChar;
- *** misc/icu/source/common/unicode/unistr.h Tue Aug 29 23:52:50 2006
----- misc/build/icu/source/common/unicode/unistr.h Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/common/unicode/unistr.h Mon Jan 28 21:31:50 2008
- ***************
- *** 3280,3286 ****
- //========================================
-@@ -182,7 +179,7 @@
- }
-
- *** misc/icu/source/common/unicode/ustring.h Tue Aug 29 23:52:50 2006
----- misc/build/icu/source/common/unicode/ustring.h Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/common/unicode/ustring.h Mon Jan 28 21:31:50 2008
- ***************
- *** 918,924 ****
- * </pre>
-@@ -200,8 +197,180 @@
- # define U_STRING_DECL(var, cs, length) static const wchar_t var[(length)+1]={ L ## cs }
- /**@stable ICU 2.0 */
- # define U_STRING_INIT(var, cs, length)
-+*** misc/icu/source/common/uvectr32.cpp Wed Aug 27 03:01:30 2003
-+--- misc/build/icu/source/common/uvectr32.cpp Mon Jan 28 21:31:51 2008
-+***************
-+*** 1,6 ****
-+ /*
-+ ******************************************************************************
-+! * Copyright (C) 1999-2003, International Business Machines Corporation and *
-+ * others. All Rights Reserved. *
-+ ******************************************************************************
-+ * Date Name Description
-+--- 1,6 ----
-+ /*
-+ ******************************************************************************
-+! * Copyright (C) 1999-2008, International Business Machines Corporation and *
-+ * others. All Rights Reserved. *
-+ ******************************************************************************
-+ * Date Name Description
-+***************
-+*** 26,31 ****
-+--- 26,32 ----
-+ UVector32::UVector32(UErrorCode &status) :
-+ count(0),
-+ capacity(0),
-++ maxCapacity(0),
-+ elements(NULL)
-+ {
-+ _init(DEFUALT_CAPACITY, status);
-+***************
-+*** 34,39 ****
-+--- 35,41 ----
-+ UVector32::UVector32(int32_t initialCapacity, UErrorCode &status) :
-+ count(0),
-+ capacity(0),
-++ maxCapacity(0),
-+ elements(0)
-+ {
-+ _init(initialCapacity, status);
-+***************
-+*** 46,51 ****
-+--- 48,56 ----
-+ if (initialCapacity < 1) {
-+ initialCapacity = DEFUALT_CAPACITY;
-+ }
-++ if (maxCapacity>0 && maxCapacity<initialCapacity) {
-++ initialCapacity = maxCapacity;
-++ }
-+ elements = (int32_t *)uprv_malloc(sizeof(int32_t)*initialCapacity);
-+ if (elements == 0) {
-+ status = U_MEMORY_ALLOCATION_ERROR;
-+***************
-+*** 189,209 ****
-+ UBool UVector32::expandCapacity(int32_t minimumCapacity, UErrorCode &status) {
-+ if (capacity >= minimumCapacity) {
-+ return TRUE;
-+! } else {
-+! int32_t newCap = capacity * 2;
-+! if (newCap < minimumCapacity) {
-+! newCap = minimumCapacity;
-+! }
-+! int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
-+! if (newElems == 0) {
-+! status = U_MEMORY_ALLOCATION_ERROR;
-+! return FALSE;
-+! }
-+! uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
-+! uprv_free(elements);
-+! elements = newElems;
-+! capacity = newCap;
-+! return TRUE;
-+ }
-+ }
-+
-+--- 194,228 ----
-+ UBool UVector32::expandCapacity(int32_t minimumCapacity, UErrorCode &status) {
-+ if (capacity >= minimumCapacity) {
-+ return TRUE;
-+! }
-+! if (maxCapacity>0 && minimumCapacity>maxCapacity) {
-+! status = U_BUFFER_OVERFLOW_ERROR;
-+! return FALSE;
-+! }
-+! int32_t newCap = capacity * 2;
-+! if (newCap < minimumCapacity) {
-+! newCap = minimumCapacity;
-+! }
-+! if (maxCapacity > 0 && newCap > maxCapacity) {
-+! newCap = maxCapacity;
-+! }
-+! int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
-+! if (newElems == 0) {
-+! status = U_MEMORY_ALLOCATION_ERROR;
-+! return FALSE;
-+! }
-+! uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
-+! uprv_free(elements);
-+! elements = newElems;
-+! capacity = newCap;
-+! return TRUE;
-+! }
-+!
-+! void UVector32::setMaxCapacity(int32_t limit) {
-+! U_ASSERT(limit >= 0);
-+! maxCapacity = limit;
-+! if (maxCapacity < 0) {
-+! maxCapacity = 0;
-+ }
-+ }
-+
-+*** misc/icu/source/common/uvectr32.h Wed Jan 18 04:52:04 2006
-+--- misc/build/icu/source/common/uvectr32.h Mon Jan 28 21:31:51 2008
-+***************
-+*** 1,6 ****
-+ /*
-+ **********************************************************************
-+! * Copyright (C) 1999-2006, International Business Machines
-+ * Corporation and others. All Rights Reserved.
-+ **********************************************************************
-+ */
-+--- 1,6 ----
-+ /*
-+ **********************************************************************
-+! * Copyright (C) 1999-2008, International Business Machines
-+ * Corporation and others. All Rights Reserved.
-+ **********************************************************************
-+ */
-+***************
-+*** 61,66 ****
-+--- 61,68 ----
-+ int32_t count;
-+
-+ int32_t capacity;
-++
-++ int32_t maxCapacity; // Limit beyond which capacity is not permitted to grow.
-+
-+ int32_t* elements;
-+
-+***************
-+*** 162,167 ****
-+--- 164,177 ----
-+ int32_t *getBuffer() const;
-+
-+ /**
-++ * Set the maximum allowed buffer capacity for this vector/stack.
-++ * Default with no limit set is unlimited, go until malloc() fails.
-++ * A Limit of zero means unlimited capacity.
-++ * Units are vector elements (32 bits each), not bytes.
-++ */
-++ void setMaxCapacity(int32_t limit);
-++
-++ /**
-+ * ICU "poor man's RTTI", returns a UClassID for this class.
-+ */
-+ static UClassID U_EXPORT2 getStaticClassID();
-+***************
-+*** 221,227 ****
-+ }
-+
-+ inline int32_t *UVector32::reserveBlock(int32_t size, UErrorCode &status) {
-+! ensureCapacity(count+size, status);
-+ int32_t *rp = elements+count;
-+ count += size;
-+ return rp;
-+--- 231,239 ----
-+ }
-+
-+ inline int32_t *UVector32::reserveBlock(int32_t size, UErrorCode &status) {
-+! if (ensureCapacity(count+size, status) == FALSE) {
-+! return NULL;
-+! }
-+ int32_t *rp = elements+count;
-+ count += size;
-+ return rp;
- *** misc/icu/source/config/mh-darwin Wed Feb 1 08:52:42 2006
----- misc/build/icu/source/config/mh-darwin Tue Sep 18 19:30:30 2007
-+--- misc/build/icu/source/config/mh-darwin Mon Jan 28 21:31:51 2008
- ***************
- *** 25,31 ****
- SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
-@@ -220,7 +389,7 @@
- ## Compiler switch to embed a runtime search path
- LD_RPATH=
- *** misc/icu/source/config/mh-irix Thu Mar 23 19:51:52 2006
----- misc/build/icu/source/config/mh-irix Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-irix Mon Jan 28 21:31:51 2008
- ***************
- *** 23,28 ****
- --- 23,31 ----
-@@ -234,25 +403,26 @@
- THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
- LIBCPPFLAGS =
- *** misc/icu/source/config/mh-linux Thu Mar 23 19:51:52 2006
----- misc/build/icu/source/config/mh-linux Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-linux Mon Jan 28 21:31:51 2008
- ***************
- *** 20,25 ****
----- 20,32 ----
-+--- 20,33 ----
- LD_RPATH=
- LD_RPATH_PRE = -Wl,-rpath,
-
- + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
-++ ## (incl. the C++ runtime libs potentially found in the URE lib dir):
- + ENABLE_RPATH=YES
--+ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
-++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
- +
- + #SH# ENABLE_RPATH=YES
--+ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
-++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
- +
- ## These are the library specific LDFLAGS
- LDFLAGSICUDT=-nodefaultlibs -nostdlib
-
- *** misc/icu/source/config/mh-mingw Tue Aug 15 10:24:14 2006
----- misc/build/icu/source/config/mh-mingw Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-mingw Mon Jan 28 21:31:51 2008
- ***************
- *** 54,59 ****
- --- 54,62 ----
-@@ -274,16 +444,19 @@
- # Current full path directory for use in source code in a -D compiler option.
- CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
-
----- 74,80 ----
-+--- 74,83 ----
-
- # The #M# is used to delete lines for icu-config
- # Current full path directory.
- ! CURR_FULL_DIR=$(subst \,/,$(shell cygpath -aw .))#M#
-+! SRCDIRW:=$(SRCDIR)
-+! SRCDIR:=$(foreach p,$(SRCDIR),$(shell cygpath -u $(subst \,/,$(p))))#M#
-+! DATAFILEPATHS:=$(foreach p,$(DATAFILEPATHS),$(shell cygpath -u $(subst \,/,$(p))))#M#
- # Current full path directory for use in source code in a -D compiler option.
- CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
-
- *** misc/icu/source/config/mh-solaris Fri Feb 24 20:31:14 2006
----- misc/build/icu/source/config/mh-solaris Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/config/mh-solaris Mon Jan 28 21:31:51 2008
- ***************
- *** 18,34 ****
-
-@@ -330,7 +503,7 @@
-
- ## Compiler switch to embed a library name
- *** misc/icu/source/data/Makefile.in Sat Aug 12 00:22:24 2006
----- misc/build/icu/source/data/Makefile.in Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/data/Makefile.in Mon Jan 28 21:31:51 2008
- ***************
- *** 344,350 ****
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
-@@ -348,27 +521,195 @@
- else
- @echo "$@" > $@
- endif
--*** misc/icu/source/i18n/windtfmt.cpp Tue Aug 15 08:48:02 2006
----- misc/build/icu/source/i18n/windtfmt.cpp Tue Sep 18 19:30:31 2007
-+*** misc/icu/source/i18n/regexcmp.cpp Thu Feb 2 05:37:14 2006
-+--- misc/build/icu/source/i18n/regexcmp.cpp Mon Jan 28 21:31:51 2008
- ***************
--*** 232,238 ****
-- UChar stackBuffer[STACK_BUFFER_SIZE];
-- UChar *buffer = stackBuffer;
-+*** 2,8 ****
-+ //
-+ // file: regexcmp.cpp
-+ //
-+! // Copyright (C) 2002-2006 International Business Machines Corporation and others.
-+ // All Rights Reserved.
-+ //
-+ // This file contains the ICU regular expression compiler, which is responsible
-+--- 2,8 ----
-+ //
-+ // file: regexcmp.cpp
-+ //
-+! // Copyright (C) 2002-2008 International Business Machines Corporation and others.
-+ // All Rights Reserved.
-+ //
-+ // This file contains the ICU regular expression compiler, which is responsible
-+***************
-+*** 1187,1200 ****
-+ // Because capture groups can be forward-referenced by back-references,
-+ // we fill the operand with the capture group number. At the end
-+ // of compilation, it will be changed to the variable's location.
-+! U_ASSERT(groupNum > 0);
-+! int32_t op;
-+! if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-+! op = URX_BUILD(URX_BACKREF_I, groupNum);
-+ } else {
-+! op = URX_BUILD(URX_BACKREF, groupNum);
-+ }
-+- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ }
-+ break;
-
--! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, buffer, STACK_BUFFER_SIZE);
-+--- 1187,1203 ----
-+ // Because capture groups can be forward-referenced by back-references,
-+ // we fill the operand with the capture group number. At the end
-+ // of compilation, it will be changed to the variable's location.
-+! if (groupNum < 1) {
-+! error(U_REGEX_INVALID_BACK_REF);
-+ } else {
-+! int32_t op;
-+! if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-+! op = URX_BUILD(URX_BACKREF_I, groupNum);
-+! } else {
-+! op = URX_BUILD(URX_BACKREF, groupNum);
-+! }
-+! fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ }
-+ }
-+ break;
-
-- if (result == 0) {
-- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
----- 232,238 ----
-+*** misc/icu/source/i18n/rematch.cpp Thu Aug 25 20:02:20 2005
-+--- misc/build/icu/source/i18n/rematch.cpp Mon Jan 28 21:31:51 2008
-+***************
-+*** 6,12 ****
-+ //
-+ /*
-+ **************************************************************************
-+! * Copyright (C) 2002-2005 International Business Machines Corporation *
-+ * and others. All rights reserved. *
-+ **************************************************************************
-+ */
-+--- 6,12 ----
-+ //
-+ /*
-+ **************************************************************************
-+! * Copyright (C) 2002-2008 International Business Machines Corporation *
-+ * and others. All rights reserved. *
-+ **************************************************************************
-+ */
-+***************
-+*** 30,35 ****
-+--- 30,44 ----
-+
-+ U_NAMESPACE_BEGIN
-+
-++ // Limit the size of the back track stack, to avoid system failures caused
-++ // by heap exhaustion. Units are in 32 bit words, not bytes.
-++ // This value puts ICU's limits higher than most other regexp implementations,
-++ // which use recursion rather than the heap, and take more storage per
-++ // backtrack point.
-++ // This constant is _temporary_. Proper API to control the value will added.
-++ //
-++ static const int32_t BACKTRACK_STACK_CAPACITY = 8000000;
-++
-+ //-----------------------------------------------------------------------------
-+ //
-+ // Constructor and Destructor
-+***************
-+*** 53,60 ****
-+ }
-+ if (fStack == NULL || fData == NULL) {
-+ fDeferredStatus = U_MEMORY_ALLOCATION_ERROR;
-+ }
-+-
-+ reset(*RegexStaticSets::gStaticSets->fEmptyString);
-+ }
-+
-+--- 62,70 ----
-+ }
-+ if (fStack == NULL || fData == NULL) {
-+ fDeferredStatus = U_MEMORY_ALLOCATION_ERROR;
-++ } else {
-++ fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
-+ }
-+ reset(*RegexStaticSets::gStaticSets->fEmptyString);
-+ }
-+
-+***************
-+*** 78,83 ****
-+--- 88,95 ----
-+ }
-+ if (fStack == NULL || fData == NULL) {
-+ status = U_MEMORY_ALLOCATION_ERROR;
-++ } else {
-++ fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
-+ }
-+ reset(input);
-+ }
-+***************
-+*** 102,107 ****
-+--- 114,121 ----
-+ }
-+ if (fStack == NULL || fData == NULL) {
-+ status = U_MEMORY_ALLOCATION_ERROR;
-++ } else {
-++ fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
-+ }
-+ reset(*RegexStaticSets::gStaticSets->fEmptyString);
-+ }
-+***************
-+*** 1015,1020 ****
-+--- 1029,1042 ----
-+ inline REStackFrame *RegexMatcher::StateSave(REStackFrame *fp, int32_t savePatIdx, int32_t frameSize, UErrorCode &status) {
-+ // push storage for a new frame.
-+ int32_t *newFP = fStack->reserveBlock(frameSize, status);
-++ if (newFP == NULL) {
-++ // Heap allocation error on attempted stack expansion.
-++ // We need to return a writable stack frame, so just return the
-++ // previous frame. The match operation will stop quickly
-++ // becuase of the error status, after which the frame will never
-++ // be looked at again.
-++ return fp;
-++ }
-+ fp = (REStackFrame *)(newFP - frameSize); // in case of realloc of stack.
-+
-+ // New stack frame = copy of old top frame.
-+***************
-+*** 1030,1037 ****
-+ fp->fPatIdx = savePatIdx;
-+ return (REStackFrame *)newFP;
-+ }
-+!
-+!
-+ //--------------------------------------------------------------------------------
-+ //
-+ // MatchAt This is the actual matching engine.
-+--- 1052,1059 ----
-+ fp->fPatIdx = savePatIdx;
-+ return (REStackFrame *)newFP;
-+ }
-+!
-+!
-+ //--------------------------------------------------------------------------------
-+ //
-+ // MatchAt This is the actual matching engine.
-+***************
-+*** 2262,2267 ****
-+--- 2284,2290 ----
-+ }
-+
-+ if (U_FAILURE(status)) {
-++ isMatch = FALSE;
-+ break;
-+ }
-+ }
-+*** misc/icu/source/i18n/windtfmt.cpp Tue Aug 15 08:48:02 2006
-+--- misc/build/icu/source/i18n/windtfmt.cpp Mon Jan 28 21:31:51 2008
-+***************
-+*** 232,249 ****
- UChar stackBuffer[STACK_BUFFER_SIZE];
- UChar *buffer = stackBuffer;
-
--! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-+! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, buffer, STACK_BUFFER_SIZE);
-
- if (result == 0) {
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
--***************
--*** 239,249 ****
- int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
-
- buffer = NEW_ARRAY(UChar, newLength);
-@@ -380,7 +721,14 @@
-
- if (buffer != stackBuffer) {
- DELETE_ARRAY(buffer);
----- 239,249 ----
-+--- 232,249 ----
-+ UChar stackBuffer[STACK_BUFFER_SIZE];
-+ UChar *buffer = stackBuffer;
-+
-+! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-+
-+ if (result == 0) {
-+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
- int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
-
- buffer = NEW_ARRAY(UChar, newLength);
-@@ -393,7 +741,7 @@
- if (buffer != stackBuffer) {
- DELETE_ARRAY(buffer);
- ***************
--*** 258,264 ****
-+*** 258,275 ****
- UChar stackBuffer[STACK_BUFFER_SIZE];
- UChar *buffer = stackBuffer;
-
-@@ -401,16 +749,6 @@
-
- if (result == 0) {
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
----- 258,264 ----
-- UChar stackBuffer[STACK_BUFFER_SIZE];
-- UChar *buffer = stackBuffer;
--
--! result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
--
-- if (result == 0) {
-- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
--***************
--*** 265,275 ****
- int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
-
- buffer = NEW_ARRAY(UChar, newLength);
-@@ -422,7 +760,14 @@
-
- if (buffer != stackBuffer) {
- DELETE_ARRAY(buffer);
----- 265,275 ----
-+--- 258,275 ----
-+ UChar stackBuffer[STACK_BUFFER_SIZE];
-+ UChar *buffer = stackBuffer;
-+
-+! result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-+
-+ if (result == 0) {
-+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
- int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
-
- buffer = NEW_ARRAY(UChar, newLength);
-@@ -435,7 +780,7 @@
- if (buffer != stackBuffer) {
- DELETE_ARRAY(buffer);
- *** misc/icu/source/i18n/winnmfmt.cpp Thu Aug 17 07:21:06 2006
----- misc/build/icu/source/i18n/winnmfmt.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/i18n/winnmfmt.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 86,95 ****
- GetLocaleInfoA(lcid, LOCALE_SGROUPING, buf, 10);
-@@ -573,7 +918,7 @@
- if (buffer != stackBuffer) {
- DELETE_ARRAY(buffer);
- *** misc/icu/source/layout/CoverageTables.cpp Sat May 8 01:28:42 2004
----- misc/build/icu/source/layout/CoverageTables.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/CoverageTables.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 44,49 ****
- --- 44,53 ----
-@@ -588,7 +933,7 @@
- le_uint16 probe = power;
- le_uint16 index = 0;
- *** misc/icu/source/layout/DeviceTables.cpp Fri Jan 14 18:25:12 2005
----- misc/build/icu/source/layout/DeviceTables.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/DeviceTables.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 22,28 ****
- le_uint16 format = SWAPW(deltaFormat) - 1;
-@@ -608,7 +953,7 @@
- le_uint16 bits = fieldBits[format];
- le_uint16 count = 16 / bits;
- *** misc/icu/source/layout/GXLayoutEngine.cpp Fri Sep 2 20:22:10 2005
----- misc/build/icu/source/layout/GXLayoutEngine.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 39,45 ****
- return 0;
-@@ -627,7 +972,7 @@
- if (LE_FAILURE(success)) {
- return 0;
- *** misc/icu/source/layout/IndicClassTables.cpp Wed Aug 23 02:12:40 2006
----- misc/build/icu/source/layout/IndicClassTables.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/IndicClassTables.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 94,100 ****
- _dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
-@@ -646,14 +991,14 @@
-
- static const IndicClassTable::CharClass punjCharClasses[] =
- ***************
--*** 120,127 ****
----- 120,140 ----
-+*** 120,125 ****
-+--- 120,138 ----
- _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0AE0 - 0AEF
- };
-
- + #if 1
-- static const IndicClassTable::CharClass oryaCharClasses[] =
-- {
-++ static const IndicClassTable::CharClass oryaCharClasses[] =
-++ {
- + _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */
- + _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */
- + _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */
-@@ -664,11 +1009,9 @@
- + _xx, _bb /* 0B70 - 0B71 */
- + };
- + #else
--+ static const IndicClassTable::CharClass oryaCharClasses[] =
--+ {
-+ static const IndicClassTable::CharClass oryaCharClasses[] =
-+ {
- _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F
-- _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0B10 - 0B1F
-- _ct, _ct, _ct, _ct, _bb, _ct, _ct, _ct, _bb, _xx, _ct, _ct, _bb, _bb, _bb, _pb, // 0B20 - 0B2F
- ***************
- *** 131,136 ****
- --- 144,150 ----
-@@ -763,7 +1106,7 @@
- //
- // IndicClassTable addresses
- *** misc/icu/source/layout/IndicReordering.cpp Tue Apr 25 21:08:12 2006
----- misc/build/icu/source/layout/IndicReordering.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/IndicReordering.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 50,55 ****
- --- 50,63 ----
-@@ -868,7 +1211,7 @@
- output.writeMbelow();
- output.writeSMbelow(); // FIXME: there are no SMs in these scripts...
- *** misc/icu/source/layout/LESwaps.h Thu Jun 23 00:39:36 2005
----- misc/build/icu/source/layout/LESwaps.h Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/LESwaps.h Mon Jan 28 21:31:51 2008
- ***************
- *** 2,7 ****
- --- 2,8 ----
-@@ -944,7 +1287,7 @@
- * This class is used to access data which stored in big endian order
- * regardless of the conventions of the platform. It has been designed
- *** misc/icu/source/layout/MPreFixups.cpp Sat May 8 01:28:44 2004
----- misc/build/icu/source/layout/MPreFixups.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/MPreFixups.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 40,45 ****
- --- 40,51 ----
-@@ -961,7 +1304,7 @@
- {
- for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) {
- *** misc/icu/source/layout/MPreFixups.h Mon Apr 12 20:51:32 2004
----- misc/build/icu/source/layout/MPreFixups.h Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/layout/MPreFixups.h Mon Jan 28 21:31:51 2008
- ***************
- *** 31,36 ****
- --- 31,38 ----
-@@ -974,10 +1317,10 @@
- FixupData *fFixupData;
- le_int32 fFixupCount;
- *** misc/icu/source/stubdata/Makefile.in Fri Dec 2 11:21:34 2005
----- misc/build/icu/source/stubdata/Makefile.in Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/stubdata/Makefile.in Mon Jan 28 21:31:51 2008
- ***************
--*** 25,31 ****
----- 25,37 ----
-+*** 25,30 ****
-+--- 25,36 ----
- ## Target information
-
- TARGET_STUBNAME=$(DATA_STUBNAME)
-@@ -985,14 +1328,13 @@
- + FINAL_SO_TARGET=$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
- + %$(STUB_SUFFIX).$(SO): %$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
- + $(RM) $@ && ln $< $@
--
--+ endif
- +
-++ endif
-+
- ifneq ($(ENABLE_STATIC),)
- TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
-- endif
- *** misc/icu/source/test/intltest/loctest.cpp Thu Jul 6 03:50:04 2006
----- misc/build/icu/source/test/intltest/loctest.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/loctest.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -1003,8 +1345,116 @@
- #include "loctest.h"
- #include "unicode/decimfmt.h"
- #include "unicode/ucurr.h"
-+*** misc/icu/source/test/intltest/regextst.cpp Tue Jul 5 20:39:00 2005
-+--- misc/build/icu/source/test/intltest/regextst.cpp Mon Jan 28 23:18:47 2008
-+***************
-+*** 1,6 ****
-+ /********************************************************************
-+ * COPYRIGHT:
-+! * Copyright (c) 2002-2005, International Business Machines Corporation and
-+ * others. All Rights Reserved.
-+ ********************************************************************/
-+
-+--- 1,6 ----
-+ /********************************************************************
-+ * COPYRIGHT:
-+! * Copyright (c) 2002-2008, International Business Machines Corporation and
-+ * others. All Rights Reserved.
-+ ********************************************************************/
-+
-+***************
-+*** 66,71 ****
-+--- 66,75 ----
-+ case 6: name = "PerlTests";
-+ if (exec) PerlTests();
-+ break;
-++ case 7: name = "Bug 6149";
-++ if (exec) Bug6149();
-++ break;
-++
-+
-+
-+ default: name = "";
-+***************
-+*** 1639,1644 ****
-+--- 1643,1661 ----
-+
-+ }
-+
-++
-++ // Invalid Back Reference \0
-++ // For ICU 3.8 and earlier
-++ // For ICU versions newer than 3.8, \0 introduces an octal escape.
-++ //
-++ #ifndef _MSC_VER
-++ // erAck: 2008-01-28T23:16+0100 MSVC doesn't digest the escaped backslash and
-++ // mumbles something about
-++ // error C2501: 'regex_err' : missing storage-class or type specifiers
-++ // error C2078: too many initializers
-++ // We're not interested in fixing that deficiency just for a testcase.
-++ REGEX_ERR("(ab)\\0", 1, 6, U_REGEX_INVALID_BACK_REF);
-++ #endif
-+
-+ //-------------------------------------------------------------------------------
-+ //
-+***************
-+*** 2119,2124 ****
-+--- 2136,2161 ----
-+ }
-+
-+
-++ //--------------------------------------------------------------
-++ //
-++ // Bug6149 Verify limits to heap expansion for backtrack stack.
-++ // Use this pattern,
-++ // "(a?){1,}"
-++ // The zero-length match will repeat forever.
-++ // (That this goes into a loop is another bug)
-++ //
-++ //---------------------------------------------------------------
-++ void RegexTest::Bug6149() {
-++ UnicodeString pattern("(a?){1,}");
-++ UnicodeString s("xyz");
-++ uint32_t flags = 0;
-++ UErrorCode status = U_ZERO_ERROR;
-++
-++ RegexMatcher matcher(pattern, s, flags, status);
-++ UBool result = false;
-++ REGEX_ASSERT_FAIL(result=matcher.matches(status), U_BUFFER_OVERFLOW_ERROR);
-++ REGEX_ASSERT(result == FALSE);
-++ }
-+
-+ #endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
-+
-+*** misc/icu/source/test/intltest/regextst.h Wed Dec 3 07:58:28 2003
-+--- misc/build/icu/source/test/intltest/regextst.h Mon Jan 28 21:31:51 2008
-+***************
-+*** 1,6 ****
-+ /********************************************************************
-+ * COPYRIGHT:
-+! * Copyright (c) 2002-2003, International Business Machines Corporation and
-+ * others. All Rights Reserved.
-+ ********************************************************************/
-+
-+--- 1,6 ----
-+ /********************************************************************
-+ * COPYRIGHT:
-+! * Copyright (c) 2002-2008, International Business Machines Corporation and
-+ * others. All Rights Reserved.
-+ ********************************************************************/
-+
-+***************
-+*** 30,35 ****
-+--- 30,36 ----
-+ virtual void Extended();
-+ virtual void Errors();
-+ virtual void PerlTests();
-++ virtual void Bug6149();
-+
-+ // The following functions are internal to the regexp tests.
-+ virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int line);
- *** misc/icu/source/test/intltest/tsputil.cpp Wed Jul 19 00:18:10 2006
----- misc/build/icu/source/test/intltest/tsputil.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/tsputil.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -1016,7 +1466,7 @@
-
- #include <float.h> // DBL_MAX, DBL_MIN
- *** misc/icu/source/test/intltest/uobjtest.cpp Thu Mar 23 01:54:12 2006
----- misc/build/icu/source/test/intltest/uobjtest.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/uobjtest.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -1028,7 +1478,7 @@
- #include "cmemory.h" // UAlignedMemory
- #include <string.h>
- *** misc/icu/source/test/intltest/ustrtest.cpp Tue Dec 28 22:13:54 2004
----- misc/build/icu/source/test/intltest/ustrtest.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/test/intltest/ustrtest.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -1040,7 +1490,7 @@
- #include "unicode/unistr.h"
- #include "unicode/uchar.h"
- *** misc/icu/source/tools/icupkg/icupkg.cpp Fri Jul 21 23:17:52 2006
----- misc/build/icu/source/tools/icupkg/icupkg.cpp Tue Sep 18 19:30:31 2007
-+--- misc/build/icu/source/tools/icupkg/icupkg.cpp Mon Jan 28 21:31:51 2008
- ***************
- *** 332,337 ****
- --- 332,341 ----
-@@ -1054,3 +1504,63 @@
- extern int
- main(int argc, char *argv[]) {
- const char *pname, *sourcePath, *destPath, *inFilename, *outFilename, *outComment;
-+*** misc/icu/source/tools/pkgdata/make.c Wed Mar 22 09:14:10 2006
-+--- misc/build/icu/source/tools/pkgdata/make.c Tue Nov 13 13:03:52 2007
-+***************
-+*** 172,178 ****
-+--- 172,180 ----
-+ "MODE=%s\n"
-+ "MAKEFILE=%s\n"
-+ "ENTRYPOINT=%s\n"
-++ #ifndef __MINGW32__
-+ "include %s\n"
-++ #endif
-+ "\n\n\n",
-+ o->shortName,
-+ o->libName,
-+***************
-+*** 182,189 ****
-+--- 184,195 ----
-+ o->srcDir,
-+ o->mode,
-+ o->makeFile,
-++ #ifdef __MINGW32__
-++ o->entryName);
-++ #else
-+ o->entryName,
-+ o->options);
-++ #endif
-+ T_FileStream_writeLine(f, linebuf);
-+
-+ /* TEMP_PATH and TARG_PATH will be empty if the respective dir is . */
-+***************
-+*** 233,238 ****
-+--- 239,252 ----
-+
-+ pkg_writeCharListWrap(f, o->filePaths, " ", " \\\n",0);
-+
-++ #ifdef __MINGW32__
-++ sprintf(linebuf, "\n"
-++ "include %s\n"
-++ "\n\n\n",
-++ o->options);
-++ T_FileStream_writeLine(f, linebuf);
-++ #endif
-++
-+ T_FileStream_writeLine(f, "\n\n\n");
-+
-+ }
-+***************
-+*** 396,402 ****
-+--- 410,420 ----
-+ T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n");
-+ T_FileStream_writeLine(f, "\n");
-+ T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS)\n");
-++ #ifdef __MINGW32__
-++ T_FileStream_writeLine(f, "\t$(INVOKE) $(GENCMN) -c -e $(ENTRYPOINT) -n $(NAME) -s $(SRCDIRW) -t dat -d $(TEMP_DIR) 0 $(CMNLIST)\n");
-++ #else
-+ T_FileStream_writeLine(f, "\t$(INVOKE) $(GENCMN) -c -e $(ENTRYPOINT) -n $(NAME) -s $(SRCDIR) -t dat -d $(TEMP_DIR) 0 $(CMNLIST)\n");
-++ #endif
-+ T_FileStream_writeLine(f, "\n");
-+ T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME).dat\n");
-+ T_FileStream_writeLine(f, "\t$(INVOKE) $(GENCCODE) $(GENCCODE_ASSEMBLY) -n $(NAME) -e $(ENTRYPOINT) -d $(TEMP_DIR) $<\n");
diff --git a/misc/openoffice2/patches/patch-dc b/misc/openoffice2/patches/patch-dc
new file mode 100644
index 00000000000..33c30b122bd
--- /dev/null
+++ b/misc/openoffice2/patches/patch-dc
@@ -0,0 +1,13 @@
+$NetBSD: patch-dc,v 1.1 2008/04/07 16:24:51 hira Exp $
+
+--- icc/SampleICC-1.3.2.patch.orig 2008-04-07 18:02:17.000000000 +0900
++++ icc/SampleICC-1.3.2.patch 2008-04-07 18:03:10.000000000 +0900
+@@ -575,7 +575,7 @@
+ ! using namespace std;
+ !
+ ! #ifndef WIN32
+-! #ifdef sun
++! #if defined sun || defined __NetBSD__
+ ! #include <errno.h>
+ ! #else
+ ! #include <sys/errno.h>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 04:25:59 +0000