diff options
Diffstat (limited to 'textproc/xerces-c/patches/patch-am')
| -rw-r--r-- | textproc/xerces-c/patches/patch-am | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/textproc/xerces-c/patches/patch-am b/textproc/xerces-c/patches/patch-am index 28d1b39b5d9..59744537b16 100644 --- a/textproc/xerces-c/patches/patch-am +++ b/textproc/xerces-c/patches/patch-am @@ -1,23 +1,22 @@ -$NetBSD: patch-am,v 1.3 2005/12/31 00:56:42 joerg Exp $ +$NetBSD: patch-am,v 1.4 2006/08/10 13:44:22 abs Exp $ ---- ../../samples/runConfigure.orig 2005-12-30 23:58:45.000000000 +0000 -+++ ../../samples/runConfigure -@@ -196,7 +196,7 @@ echo "Extra link options: $linkeroptions - # Now check if the options are correct or not, bail out if incorrect - # - case $platform in -- aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin) -+ aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | dragonfly) - # platform has been recognized - ;; - *) -@@ -264,6 +264,9 @@ else - elif test $platform = "freebsd"; then - threadingLibs="-pthread -lc_r" - threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" -+ elif test $platform = "dragonfly"; then -+ threadingLibs="-pthread -lc_r" -+ threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" - elif test $platform = "netbsd"; then - threadingLibs="-pthread" - threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" +--- util/Platforms/NetBSD/NetBSDPlatformUtils.cpp.orig 2005-09-07 16:55:30.000000000 +0100 ++++ util/Platforms/NetBSD/NetBSDPlatformUtils.cpp +@@ -54,6 +54,8 @@ + + #if defined(XML_USE_ICU_TRANSCODER) + #include <xercesc/util/Transcoders/ICU/ICUTransService.hpp> ++#elif defined (XML_USE_GNU_TRANSCODER) ++ #include <xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp> + #else + // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER + #include <xercesc/util/Transcoders/Iconv/IconvTransService.hpp> +@@ -62,6 +64,8 @@ + + #if defined(XML_USE_ICU_MESSAGELOADER) + #include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp> ++#elif defined(XML_USE_ICONV_MESSAGELOADER) ++ #include <xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp> + #else + // Same as -DXML_USE_INMEM_MESSAGELOADER + #include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp> |