CWS-TOOLING: integrate CWS os2port05

2009-02-05 19:23:48 +0100 ydario  r267438 : i98084: add quotes to paths, required to properly set libpath when installation directory has spaces in it. Fixes ticket:135.
2009-01-22 13:24:00 +0100 ydario  r266715 : i98084: use native code to set readonly-hidden flags (see w32), fixes lock files set as readonly and not removable.
2009-01-22 13:22:45 +0100 ydario  r266714 : i98084: fix build error with gcc432, requires os2 headers now.
2009-01-21 23:42:58 +0100 ydario  r266707 : i98084: properly generates rtti names for unknown symbols, see ticket:138.
2009-01-21 23:41:27 +0100 ydario  r266706 : i98084: if xmlsec is not built, certificate is not valid, fixes ticket:138.
2009-01-15 23:39:09 +0100 ydario  r266396 : i98084: convert unicode to char for panic dialog messages.
2009-01-15 23:36:13 +0100 ydario  r266395 : i98084: use dmake build system instead of configure scripts.
2009-01-15 23:32:05 +0100 ydario  r266394 : i98084: add senddoc/open-url integration. changeset 865-866.

9 files changed, 1587 insertions, 16 deletions

diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch
index 44bce4b18749..c22ff2b53e93 100644
--- a/redland/raptor-1.4.17.patch
+++ b/redland/raptor-1.4.17.patch
@@ -18,7 +18,7 @@
 +
 --- misc/raptor-1.4.17/src/makefile.mk	Mon Jun 16 17:24:23 2008
 +++ misc/build/raptor-1.4.17/src/makefile.mk	Mon Jun 16 19:25:14 2008
-@@ -1,1 +1,121 @@
+@@ -1,1 +1,128 @@
 -dummy
 +#*************************************************************************
 +#
@@ -64,7 +64,11 @@
 +
 +.INCLUDE :  settings.mk
 +
++.IF "$(GUI)"=="OS2"
++CDEFS+=-DRAPTOR_INTERNAL -DHAVE_CONFIG_H -DNDEBUG
++.ELSE
 +CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++.ENDIF
 +
 +# --- Files --------------------------------------------------------
 +
@@ -127,6 +131,9 @@
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)$/raptor$/raptor2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
@@ -301,3 +308,317 @@
      lt_cv_file_magic_cmd='func_win32_libid'
    else
      lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+--- misc/raptor-1.4.17/src/raptor_config.h	2008-12-26 11:49:30.000000000 +0100
++++ misc/build/raptor-1.4.17/src/raptor_config.h	2008-12-26 01:10:34.000000000 +0100
+@@ -1 +1,310 @@
+-dummy
++/* src/raptor_config.h.  Generated from raptor_config.h.in by configure.  */
++/* src/raptor_config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* does expat crash when it sees an initial UTF8 BOM? */
++/* #undef EXPAT_UTF8_BOM_CRASH */
++
++/* vsnprint has C99 compatible return value */
++#define HAVE_C99_VSNPRINTF 1
++
++/* Have curl/curl.h */
++/* #undef HAVE_CURL_CURL_H */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you have the <dmalloc.h> header file. */
++/* #undef HAVE_DMALLOC_H */
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define to 1 if you have the <expat.h> header file. */
++//#define HAVE_EXPAT_H 1
++
++/* Define to 1 if you have the <fetch.h> header file. */
++/* #undef HAVE_FETCH_H */
++
++/* Define to 1 if you have the `getopt' function. */
++#define HAVE_GETOPT 1
++
++/* Define to 1 if you have the <getopt.h> header file. */
++#define HAVE_GETOPT_H 1
++
++/* Define to 1 if you have the `getopt_long' function. */
++#define HAVE_GETOPT_LONG 1
++
++/* INN parsedate function present */
++/* #undef HAVE_INN_PARSEDATE */
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the `isascii' function. */
++#define HAVE_ISASCII 1
++
++/* Define to 1 if you have the <libxml/hash.h> header file. */
++/* #undef HAVE_LIBXML_HASH_H */
++
++/* Define to 1 if you have the <libxml/HTMLparser.h> header file. */
++/* #undef HAVE_LIBXML_HTMLPARSER_H */
++
++/* Define to 1 if you have the <libxml/nanohttp.h> header file. */
++/* #undef HAVE_LIBXML_NANOHTTP_H */
++
++/* Define to 1 if you have the <libxml/parser.h> header file. */
++/* #undef HAVE_LIBXML_PARSER_H */
++
++/* Define to 1 if you have the <libxml/SAX2.h> header file. */
++/* #undef HAVE_LIBXML_SAX2_H */
++
++/* Define to 1 if you have the <libxslt/xslt.h> header file. */
++/* #undef HAVE_LIBXSLT_XSLT_H */
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the <math.h> header file. */
++#define HAVE_MATH_H 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Raptor raptor_parse_date available */
++#define HAVE_RAPTOR_PARSE_DATE 1
++
++/* have round() in libm */
++#define HAVE_ROUND 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#define HAVE_STRCASECMP 1
++
++/* Define to 1 if you have the `stricmp' function. */
++#define HAVE_STRICMP 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#define HAVE_SYS_PARAM_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* have trunc() in libm */
++#define HAVE_TRUNC 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#define HAVE_VSNPRINTF 1
++
++/* Define to 1 if you have the `xmlCtxtUseOptions' function. */
++/* #undef HAVE_XMLCTXTUSEOPTIONS */
++
++/* Define to 1 if you have the <xmlparse.h> header file. */
++/* #undef HAVE_XMLPARSE_H */
++
++/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */
++/* #undef HAVE_XMLSAX2INTERNALSUBSET */
++
++/* need 'extern int optind' declaration? */
++/* #undef NEED_OPTIND_DECLARATION */
++
++/* Name of package */
++#define PACKAGE "raptor"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "Raptor RDF Parser"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "Raptor RDF Parser 1.4.17"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "raptor"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "1.4.17"
++
++/* does libxml struct xmlEntity have a field etype */
++/* #undef RAPTOR_LIBXML_ENTITY_ETYPE */
++
++/* does libxml struct xmlEntity have a field name_length */
++/* #undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH */
++
++/* does libxml have HTML_PARSE_NONET */
++/* #undef RAPTOR_LIBXML_HTML_PARSE_NONET */
++
++/* does libxml xmlSAXHandler have externalSubset field */
++/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET */
++
++/* does libxml xmlSAXHandler have initialized field */
++/* #undef RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED */
++
++/* does libxml have XML_PARSE_NONET */
++/* #undef RAPTOR_LIBXML_XML_PARSE_NONET */
++
++/* Provide a Unicode NFC check */
++#define RAPTOR_NFC_CHECK 1
++
++/* Building GRDDL parser */
++/* #undef RAPTOR_PARSER_GRDDL */
++
++/* Building guess parser */
++#define RAPTOR_PARSER_GUESS 1
++
++/* Building Notation 3 parser */
++/* #undef RAPTOR_PARSER_N3 */
++
++/* Building N-Triples parser */
++#define RAPTOR_PARSER_NTRIPLES 1
++
++/* Building RDF/XML parser */
++#define RAPTOR_PARSER_RDFXML 1
++
++/* Building RSS Tag Soup parser */
++#define RAPTOR_PARSER_RSS 1
++
++/* Building TRiG parser */
++#define RAPTOR_PARSER_TRIG 1
++
++/* Building Turtle parser */
++#define RAPTOR_PARSER_TURTLE 1
++
++/* Building Atom 1.0 serializer */
++/* #undef RAPTOR_SERIALIZER_ATOM */
++
++/* Building GraphViz DOT serializer */
++//#define RAPTOR_SERIALIZER_DOT 1
++
++/* Building JSON serializer */
++//#define RAPTOR_SERIALIZER_JSON 1
++
++/* Building N-Triples serializer */
++#define RAPTOR_SERIALIZER_NTRIPLES 1
++
++/* Building RDF/XML serializer */
++#define RAPTOR_SERIALIZER_RDFXML 1
++
++/* Building RDF/XML-abbreviated serializer */
++#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
++
++/* Building RSS 1.0 serializer */
++#define RAPTOR_SERIALIZER_RSS_1_0 1
++
++/* Building Turtle serializer */
++//#define RAPTOR_SERIALIZER_TURTLE 1
++
++/* Release version as a decimal */
++#define RAPTOR_VERSION_DECIMAL 10417
++
++/* Major version number */
++#define RAPTOR_VERSION_MAJOR 1
++
++/* Minor version number */
++#define RAPTOR_VERSION_MINOR 4
++
++/* Release version number */
++#define RAPTOR_VERSION_RELEASE 17
++
++/* Have libcurl WWW library */
++/* #undef RAPTOR_WWW_LIBCURL */
++
++/* Have libfetch WWW library */
++/* #undef RAPTOR_WWW_LIBFETCH */
++
++/* Have libxml available as a WWW library */
++/* #undef RAPTOR_WWW_LIBXML */
++
++/* No WWW library */
++#define RAPTOR_WWW_NONE 1
++
++/* Check XML 1.1 Names */
++/* #undef RAPTOR_XML_1_1 */
++
++/* Use expat XML parser */
++//#define RAPTOR_XML_EXPAT 1
++
++/* Use libxml XML parser */
++/* #undef RAPTOR_XML_LIBXML */
++
++/* The size of `unsigned char', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_CHAR 1
++
++/* The size of `unsigned int', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_INT 4
++
++/* The size of `unsigned long', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_LONG 4
++
++/* The size of `unsigned short', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_SHORT 2
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Version number of package */
++#define VERSION "1.4.17"
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++/* #undef WORDS_BIGENDIAN */
++
++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
++   `char[]'. */
++/* #undef YYTEXT_POINTER */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* For using libxml2 on win32 */
++#define RAPTOR_XML_LIBXML
++#define HAVE_LIBXML_XMLREADER_H
++#define HAVE_LIBXML_HASH_H 1
++#define HAVE_LIBXML_HTMLPARSER_H 1
++#define HAVE_LIBXML_NANOHTTP_H 1
++#define HAVE_LIBXML_PARSER_H 1
++#define HAVE_LIBXSLT_XSLT_H 1
++
++#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
++#define RAPTOR_LIBXML_XML_PARSE_NONET 1
++
++/* does libxml struct xmlEntity have a field etype */
++#define RAPTOR_LIBXML_ENTITY_ETYPE
++
++/* does libxml struct xmlEntity have a field name_length */
++/*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
++
++/* Define to 1 if you have the `xmlCtxtUseOptions' function. */
++#define HAVE_XMLCTXTUSEOPTIONS 1
++
++/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */
++#define HAVE_XMLSAX2INTERNALSUBSET 1
++
++/* does libxml xmlSAXHandler have externalSubset field */
++#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
++
++/* does libxml xmlSAXHandler have initialized field */
++#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index e7c80b9b90ef..f51c915030a4 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -54,10 +54,13 @@ RAPTORVERSION=$(RAPTOR_MAJOR).4.17
 TARFILE_NAME=raptor-$(RAPTORVERSION)
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
-ADDITIONAL_FILES=src/makefile.mk
+ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
 
+.IF "$(OS)"=="OS2"
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
-.IF "$(OS)"=="WNT"
+.ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
@@ -132,8 +135,7 @@ OUT2BIN+=src/raptor-config
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/raptor-config
+# if we use dmake, this is done automagically
 
 .ELSE
 OUT2LIB+=src$/.libs$/libraptor*.so*
diff --git a/redland/raptor/raptor2.map b/redland/raptor/raptor2.map
new file mode 100644
index 000000000000..8c0cb819f9ff
--- /dev/null
+++ b/redland/raptor/raptor2.map
@@ -0,0 +1,294 @@
+RAPTOR2 {
+    global:
+        GetVersionInfo;
+raptor_ntriples_string_as_utf8_string;
+raptor_ntriples_term_as_string;
+raptor_feature_from_uri;
+raptor_get_feature_count;
+raptor_feature_value_type;
+raptor_xml_literal_datatype_uri_string_len;
+raptor_xml_literal_datatype_uri_string;
+raptor_version_decimal;
+raptor_version_release;
+raptor_version_minor;
+raptor_version_major;
+raptor_version_string;
+raptor_home_url_string;
+raptor_license_string;
+raptor_copyright_string;
+raptor_short_copyright_string;
+raptor_init;
+raptor_finish;
+raptor_vsnprintf;
+raptor_print_ntriples_string;
+raptor_free_memory;
+raptor_alloc_memory;
+raptor_calloc_memory;
+raptor_error_handlers_init;
+raptor_new_identifier;
+raptor_copy_identifier;
+raptor_free_identifier;
+raptor_new_iostream_to_string;
+raptor_new_iostream_to_filename;
+raptor_new_iostream_from_filename;
+raptor_iostream_write_string;
+raptor_iostream_write_uri;
+raptor_iostream_write_stringbuffer;
+raptor_iostream_format_hexadecimal;
+raptor_new_iostream_from_handler;
+raptor_new_iostream_to_sink;
+raptor_new_iostream_from_sink;
+raptor_new_iostream_from_handler2;
+raptor_new_iostream_to_file_handle;
+raptor_new_iostream_from_file_handle;
+raptor_new_iostream_from_string;
+raptor_free_iostream;
+raptor_iostream_tell;
+raptor_iostream_read_eof;
+raptor_iostream_read_bytes;
+raptor_iostream_write_decimal;
+raptor_iostream_get_bytes_written_count;
+raptor_iostream_write_end;
+raptor_iostream_write_counted_string;
+raptor_iostream_write_bytes;
+raptor_iostream_write_byte;
+raptor_print_locator;
+raptor_format_locator;
+raptor_locator_uri;
+raptor_locator_file;
+raptor_locator_byte;
+raptor_locator_column;
+raptor_locator_line;
+raptor_owl_namespace_uri;
+raptor_xmlschema_datatypes_namespace_uri;
+raptor_rdf_schema_namespace_uri;
+raptor_rdf_namespace_uri_len;
+raptor_rdf_namespace_uri;
+raptor_xml_namespace_uri;
+raptor_new_namespaces;
+raptor_namespaces_init;
+raptor_namespaces_start_namespace_full;
+raptor_new_namespace;
+raptor_namespace_copy;
+raptor_new_namespace_from_uri;
+raptor_free_namespaces;
+raptor_namespaces_clear;
+raptor_namespaces_end_for_depth;
+raptor_free_namespace;
+raptor_namespaces_format;
+raptor_iostream_write_namespace;
+raptor_new_namespace_parts_from_string;
+raptor_namespaces_qname_from_uri;
+raptor_namespaces_find_namespace;
+raptor_namespace_get_counted_prefix;
+raptor_namespace_get_prefix;
+raptor_namespace_get_uri;
+raptor_namespaces_namespace_in_scope;
+raptor_namespaces_find_namespace_by_uri;
+raptor_namespaces_get_default_namespace;
+raptor_namespaces_start_namespace;
+raptor_new_parser_for_content;
+raptor_new_parser;
+raptor_parse_file;
+raptor_parse_file_stream;
+raptor_parse_uri;
+raptor_parse_uri_with_connection;
+raptor_parse_chunk;
+raptor_start_parse;
+raptor_free_parser;
+raptor_features_enumerate;
+raptor_parser_set_feature_string;
+raptor_parser_get_feature_string;
+raptor_set_default_generate_id_parameters;
+raptor_guess_parser_name;
+raptor_syntax_name_check;
+raptor_parser_get_accept_header;
+raptor_parsers_enumerate;
+raptor_syntaxes_enumerate;
+raptor_get_mime_type;
+raptor_get_locator;
+raptor_parse_abort;
+raptor_get_need_base_uri;
+raptor_get_label;
+raptor_get_name;
+raptor_set_parser_strict;
+raptor_get_feature;
+raptor_set_feature;
+raptor_parser_set_uri_filter;
+raptor_set_namespace_handler;
+raptor_set_generate_id_handler;
+raptor_set_graph_handler;
+raptor_set_statement_handler;
+raptor_set_warning_handler;
+raptor_set_error_handler;
+raptor_set_fatal_error_handler;
+raptor_new_qname;
+raptor_new_qname_from_namespace_local_name;
+raptor_qname_copy;
+raptor_free_qname;
+raptor_qname_equal;
+raptor_qname_string_to_uri;
+raptor_iostream_write_qname;
+raptor_qname_get_counted_value;
+raptor_qname_get_value;
+raptor_qname_get_local_name;
+raptor_qname_get_namespace;
+raptor_uri_resolve_uri_reference;
+raptor_new_sax2;
+raptor_sax2_parse_start;
+raptor_free_sax2;
+raptor_sax2_parse_chunk;
+raptor_sax2_inscope_base_uri;
+raptor_sax2_inscope_xml_language;
+raptor_xml_element_is_empty;
+raptor_sax2_set_namespace_handler;
+raptor_sax2_set_external_entity_ref_handler;
+raptor_sax2_set_unparsed_entity_decl_handler;
+raptor_sax2_set_comment_handler;
+raptor_sax2_set_cdata_handler;
+raptor_sax2_set_characters_handler;
+raptor_sax2_set_end_element_handler;
+raptor_sax2_set_start_element_handler;
+raptor_compare_strings;
+raptor_sequence_sort;
+raptor_sequence_print_string;
+raptor_sequence_print_uri;
+raptor_sequence_print;
+raptor_free_sequence;
+raptor_sequence_set_at;
+raptor_sequence_push;
+raptor_sequence_shift;
+raptor_sequence_join;
+raptor_new_sequence;
+raptor_sequence_size;
+raptor_sequence_get_at;
+raptor_sequence_pop;
+raptor_sequence_unshift;
+raptor_sequence_set_print_handler;
+raptor_serializer_syntax_name_check;
+raptor_new_serializer;
+raptor_serializers_enumerate;
+raptor_serialize_start_to_filename;
+raptor_serialize_start_to_string;
+raptor_serialize_start_to_file_handle;
+raptor_serialize_start;
+raptor_serialize_set_namespace_from_namespace;
+raptor_serialize_end;
+raptor_free_serializer;
+raptor_serializer_features_enumerate;
+raptor_serializer_set_feature_string;
+raptor_serializer_get_feature_string;
+raptor_serializer_get_locator;
+raptor_serializer_set_warning_handler;
+raptor_serializer_set_error_handler;
+raptor_serializer_get_feature;
+raptor_serializer_set_feature;
+raptor_serializer_get_iostream;
+raptor_serialize_statement;
+raptor_serialize_set_namespace;
+raptor_iostream_write_statement_ntriples;
+raptor_iostream_write_string_ntriples;
+raptor_new_stringbuffer;
+raptor_free_stringbuffer;
+raptor_stringbuffer_append_decimal;
+raptor_stringbuffer_append_counted_string;
+raptor_stringbuffer_append_string;
+raptor_stringbuffer_append_stringbuffer;
+raptor_stringbuffer_prepend_counted_string;
+raptor_stringbuffer_prepend_string;
+raptor_stringbuffer_as_string;
+raptor_stringbuffer_copy_to_string;
+raptor_stringbuffer_length;
+raptor_uri_set_handler;
+raptor_uri_filename_to_uri_string;
+raptor_uri_uri_string_to_filename;
+raptor_uri_uri_string_to_filename_fragment;
+raptor_uri_is_file_uri;
+raptor_uri_uri_string_is_file_uri;
+raptor_new_uri_for_xmlbase;
+raptor_new_uri_for_retrieval;
+raptor_new_uri_from_id;
+raptor_uri_to_relative_uri_string;
+raptor_uri_to_relative_counted_uri_string;
+raptor_uri_compare;
+raptor_uri_print;
+raptor_uri_to_string;
+raptor_uri_to_counted_string;
+raptor_uri_as_counted_string;
+raptor_uri_as_string;
+raptor_uri_copy;
+raptor_uri_equals;
+raptor_free_uri;
+raptor_new_uri_for_rdf_concept;
+raptor_new_uri_relative_to_base;
+raptor_new_uri_from_uri_local_name;
+raptor_new_uri;
+raptor_uri_get_handler;
+raptor_utf8_check;
+raptor_unicode_is_xml10_namechar;
+raptor_unicode_is_xml10_namestartchar;
+raptor_unicode_is_xml11_namechar;
+raptor_unicode_is_xml11_namestartchar;
+raptor_utf8_to_unicode_char;
+raptor_unicode_char_to_utf8;
+raptor_www_new;
+raptor_www_new_with_connection;
+raptor_www_free;
+raptor_www_set_user_agent;
+raptor_www_set_proxy;
+raptor_www_set_http_accept;
+raptor_www_set_http_cache_control;
+raptor_www_fetch_to_string;
+raptor_www_fetch;
+raptor_www_get_final_uri;
+raptor_www_set_final_uri_handler;
+raptor_www_abort;
+raptor_www_get_connection;
+raptor_www_set_uri_filter;
+raptor_www_set_connection_timeout;
+raptor_www_set_content_type_handler;
+raptor_www_set_write_bytes_handler;
+raptor_www_set_error_handler;
+raptor_www_finish;
+raptor_www_no_www_library_init_finish;
+raptor_www_init;
+raptor_new_xml_element_from_namespace_local_name;
+raptor_new_xml_element;
+raptor_free_xml_element;
+raptor_xml_element_declare_namespace;
+raptor_iostream_write_xml_element;
+raptor_xml_escape_string;
+raptor_xml_any_escape_string;
+raptor_iostream_write_xml_escaped_string;
+raptor_iostream_write_xml_any_escaped_string;
+raptor_xml_name_check;
+raptor_xml_element_get_language;
+raptor_xml_element_get_attributes_count;
+raptor_xml_element_get_attributes;
+raptor_xml_element_set_attributes;
+raptor_xml_element_get_name;
+raptor_new_xml_writer;
+raptor_free_xml_writer;
+raptor_xml_writer_empty_element;
+raptor_xml_writer_start_element;
+raptor_xml_writer_end_element;
+raptor_xml_writer_comment;
+raptor_xml_writer_cdata;
+raptor_xml_writer_comment_counted;
+raptor_xml_writer_cdata_counted;
+raptor_xml_writer_raw;
+raptor_xml_writer_raw_counted;
+raptor_xml_writer_features_enumerate;
+raptor_xml_writer_set_feature_string;
+raptor_xml_writer_get_feature_string;
+raptor_xml_writer_get_feature;
+raptor_xml_writer_set_feature;
+raptor_statement_part_as_string;
+raptor_statement_part_as_counted_string;
+raptor_print_statement_as_ntriples;
+raptor_print_statement_detailed;
+raptor_print_statement;
+raptor_statement_compare;
+raptor_iostream_write_string_turtle;
+raptor_iostream_write_string_python;
+};
diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch
index 0abb72874dc9..67261f6a1d66 100644
--- a/redland/rasqal-0.9.15.patch
+++ b/redland/rasqal-0.9.15.patch
@@ -18,7 +18,7 @@
 +
 --- misc/rasqal-0.9.15/src/makefile.mk	Mon Jun 16 19:30:20 2008
 +++ misc/build/rasqal-0.9.15/src/makefile.mk	Mon Jun 16 19:25:48 2008
-@@ -1,1 +1,95 @@
+@@ -1,1 +1,102 @@
 -dummy
 +#*************************************************************************
 +#
@@ -64,7 +64,11 @@
 +
 +.INCLUDE :  settings.mk
 +
++.IF "$(GUI)"=="OS2"
++CDEFS+=-DRASQAL_INTERNAL -DHAVE_CONFIG_H -DNDEBUG -D_MT
++.ELSE
 +CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
++.ENDIF
 +
 +# --- Files --------------------------------------------------------
 +
@@ -101,6 +105,9 @@
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)$/rasqal$/rasqal2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
@@ -237,3 +244,176 @@
  	  ;;
  
  	irix | nonstopux)
+--- misc/rasqal-0.9.15/src/rasqal_config.h	Fri Dec 26 00:18:44 2008
++++ misc/build/rasqal-0.9.15/src/rasqal_config.h	Wed Nov 26 23:35:40 2008
+@@ -1 +1,169 @@
+-dummy
++/* src/rasqal_config.h.  Generated from rasqal_config.h.in by configure.  */
++/* src/rasqal_config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you have the <dmalloc.h> header file. */
++/* #undef HAVE_DMALLOC_H */
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define to 1 if you have the `getopt' function. */
++#define HAVE_GETOPT 1
++
++/* Define to 1 if you have the <getopt.h> header file. */
++#define HAVE_GETOPT_H 1
++
++/* Define to 1 if you have the `getopt_long' function. */
++#define HAVE_GETOPT_LONG 1
++
++/* Define to 1 if you have the <gmp.h> header file. */
++#define HAVE_GMP_H 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the <libxml/schemasInternals.h> header file. */
++/* #undef HAVE_LIBXML_SCHEMASINTERNALS_H */
++
++/* Define to 1 if you have the <libxml/xmlschemastypes.h> header file. */
++/* #undef HAVE_LIBXML_XMLSCHEMASTYPES_H */
++
++/* Define to 1 if you have the <libxml/xmlschemas.h> header file. */
++/* #undef HAVE_LIBXML_XMLSCHEMAS_H */
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <mpfr.h> header file. */
++/* #undef HAVE_MPFR_H */
++
++/* Define to 1 if you have the <regex.h> header file. */
++#define HAVE_REGEX_H 1
++
++/* have PCRE regex - Perl Compatible Regular Expressions */
++#define HAVE_REGEX_PCRE 1
++
++/* Define to 1 if you have the `srandomdev' function. */
++#define HAVE_SRANDOMDEV 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#define HAVE_STRCASECMP 1
++
++/* Define to 1 if you have the `stricmp' function. */
++#define HAVE_STRICMP 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#define HAVE_VSNPRINTF 1
++
++/* need 'extern int optind' declaration? */
++/* #undef NEED_OPTIND_DECLARATION */
++
++/* Name of package */
++#define PACKAGE "rasqal"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "Rasqal RDF Query Library"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "Rasqal RDF Query Library 0.9.15"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "rasqal"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.9.15"
++
++/* Use raptor to provide triples */
++#define RAPTOR_TRIPLES_SOURCE_RAPTOR 1
++
++/* Use redland to provide triples */
++/* #undef RAPTOR_TRIPLES_SOURCE_REDLAND */
++
++/* Decimal from GNU MP library */
++/* #undef RASQAL_DECIMAL_GMP */
++
++/* Decimal from MPFR library */
++/* #undef RASQAL_DECIMAL_MPFR */
++
++/* Decimal without a library */
++#define RASQAL_DECIMAL_NONE 1
++
++/* Building LAQRS query */
++/* #undef RASQAL_QUERY_LAQRS */
++
++/* Building RDQL query */
++#define RASQAL_QUERY_RDQL 1
++
++/* Building SPARQL query */
++#define RASQAL_QUERY_SPARQL 1
++
++/* Use no regex library */
++/* #undef RASQAL_REGEX_NONE */
++
++/* Use PCRE regex library */
++/* #undef RASQAL_REGEX_PCRE */
++
++/* Use posix regex library */
++#define RASQAL_REGEX_POSIX 1
++
++/* Release version as a decimal */
++#define RASQAL_VERSION_DECIMAL 915
++
++/* Major version number */
++#define RASQAL_VERSION_MAJOR 0
++
++/* Minor version number */
++#define RASQAL_VERSION_MINOR 9
++
++/* Release version number */
++#define RASQAL_VERSION_RELEASE 15
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Version number of package */
++#define VERSION "0.9.15"
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++/* #undef WORDS_BIGENDIAN */
++
++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
++   `char[]'. */
++/* #undef YYTEXT_POINTER */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 996d7d7433ae..94ee33869d2d 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -54,10 +54,14 @@ RASQALVERSION=0.9.15
 TARFILE_NAME=rasqal-$(RASQALVERSION)
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
-ADDITIONAL_FILES=src/makefile.mk
+ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
 
+.IF "$(OS)"=="OS2"
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
-.IF "$(OS)"=="WNT"
+.ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
@@ -129,8 +133,7 @@ OUT2BIN+=src/rasqal-config
 .ENDIF
 
 .ELIF "$(OS)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/rasqal-config
+# if we use dmake, this is done automagically
 
 .ELSE
 OUT2LIB+=src$/.libs$/librasqal*.so*
diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map
new file mode 100644
index 000000000000..b36d25c9664b
--- /dev/null
+++ b/redland/rasqal/rasqal2.map
@@ -0,0 +1,194 @@
+RASQAL2 {
+global:
+GetVersionInfo;
+rasqal_xsd_decimal_set_string;
+rasqal_xsd_decimal_print;
+rasqal_xsd_decimal_as_counted_string;
+rasqal_xsd_decimal_as_string;
+rasqal_new_xsd_decimal;
+rasqal_free_xsd_decimal;
+rasqal_xsd_decimal_set_long;
+rasqal_xsd_decimal_set_double;
+rasqal_xsd_decimal_add;
+rasqal_xsd_decimal_subtract;
+rasqal_xsd_decimal_multiply;
+rasqal_xsd_decimal_divide;
+rasqal_xsd_decimal_negate;
+rasqal_xsd_decimal_equals;
+rasqal_xsd_decimal_compare;
+rasqal_xsd_decimal_is_zero;
+rasqal_xsd_decimal_get_double;
+rasqal_set_triples_source_factory;
+rasqal_new_variable;
+rasqal_new_variable_typed;
+rasqal_data_graph_print;
+rasqal_prefix_print;
+rasqal_new_data_graph;
+rasqal_new_prefix;
+rasqal_new_triple;
+rasqal_new_triple_from_triple;
+rasqal_new_0op_expression;
+rasqal_new_1op_expression;
+rasqal_new_2op_expression;
+rasqal_new_3op_expression;
+rasqal_new_string_op_expression;
+rasqal_new_literal_expression;
+rasqal_new_function_expression;
+rasqal_new_cast_expression;
+rasqal_free_variable;
+rasqal_free_expression;
+rasqal_free_data_graph;
+rasqal_free_prefix;
+rasqal_free_triple;
+rasqal_expression_evaluate;
+rasqal_variable_set_value;
+rasqal_variable_print;
+rasqal_expression_print;
+rasqal_expression_print_op;
+rasqal_triple_print;
+rasqal_expression_foreach;
+rasqal_expression_visit;
+rasqal_new_expression_from_expression;
+rasqal_triple_get_origin;
+rasqal_triple_set_origin;
+rasqal_features_enumerate;
+rasqal_feature_from_uri;
+rasqal_get_feature_count;
+rasqal_feature_value_type;
+rasqal_version_decimal;
+rasqal_version_release;
+rasqal_version_minor;
+rasqal_version_major;
+rasqal_version_string;
+rasqal_home_url_string;
+rasqal_license_string;
+rasqal_copyright_string;
+rasqal_short_copyright_string;
+rasqal_init;
+rasqal_finish;
+rasqal_language_name_check;
+rasqal_query_set_default_generate_bnodeid_parameters;
+rasqal_free_memory;
+rasqal_alloc_memory;
+rasqal_calloc_memory;
+rasqal_query_set_generate_bnodeid_handler;
+rasqal_languages_enumerate;
+rasqal_graph_pattern_add_constraint;
+rasqal_graph_pattern_print;
+rasqal_graph_pattern_add_sub_graph_pattern;
+rasqal_graph_pattern_get_flags;
+rasqal_graph_pattern_visit;
+rasqal_graph_pattern_get_constraint;
+rasqal_graph_pattern_get_triple;
+rasqal_graph_pattern_get_sub_graph_pattern;
+rasqal_graph_pattern_get_sub_graph_pattern_sequence;
+rasqal_graph_pattern_get_index;
+rasqal_graph_pattern_operator_as_string;
+rasqal_graph_pattern_get_operator;
+rasqal_graph_pattern_get_constraint_sequence;
+rasqal_new_floating_literal;
+rasqal_literal_compare;
+rasqal_literal_equals;
+rasqal_new_double_literal;
+rasqal_new_integer_literal;
+rasqal_new_float_literal;
+rasqal_new_typed_literal;
+rasqal_new_decimal_literal;
+rasqal_new_decimal_literal_from_decimal;
+rasqal_new_string_literal;
+rasqal_new_uri_literal;
+rasqal_new_boolean_literal;
+rasqal_literal_as_node;
+rasqal_free_literal;
+rasqal_literal_print;
+rasqal_literal_print_type;
+rasqal_new_pattern_literal;
+rasqal_new_simple_literal;
+rasqal_new_variable_literal;
+rasqal_literal_as_string;
+rasqal_literal_as_string_flags;
+rasqal_literal_value;
+rasqal_literal_datatype;
+rasqal_literal_as_variable;
+rasqal_new_literal_from_literal;
+rasqal_free_query_results;
+rasqal_query_results_get_bindings;
+rasqal_query_results_get_binding_value;
+rasqal_query_results_get_binding_value_by_name;
+rasqal_query_results_get_triple;
+rasqal_query_results_next;
+rasqal_query_results_next_triple;
+rasqal_query_results_write;
+rasqal_query_results_formatter_write;
+rasqal_query_results_get_boolean;
+rasqal_query_results_get_bindings_count;
+rasqal_query_results_get_binding_name;
+rasqal_query_results_finished;
+rasqal_query_results_get_count;
+rasqal_query_results_is_syntax;
+rasqal_query_results_is_graph;
+rasqal_query_results_is_boolean;
+rasqal_query_results_is_bindings;
+rasqal_new_query;
+rasqal_free_query;
+rasqal_query_set_feature_string;
+rasqal_query_get_feature_string;
+rasqal_query_add_data_graph;
+rasqal_query_set_variable;
+rasqal_query_add_prefix;
+rasqal_query_add_variable;
+rasqal_query_prepare;
+rasqal_query_execute;
+rasqal_query_print;
+rasqal_query_graph_pattern_visit;
+rasqal_query_write;
+rasqal_query_get_graph_pattern_sequence;
+rasqal_query_get_graph_pattern;
+rasqal_query_get_data_graph;
+rasqal_query_get_variable;
+rasqal_query_has_variable;
+rasqal_query_get_triple;
+rasqal_query_get_prefix;
+rasqal_query_get_construct_triple;
+rasqal_query_get_order_condition;
+rasqal_query_get_group_condition;
+rasqal_query_escape_counted_string;
+rasqal_query_iostream_write_escaped_counted_string;
+rasqal_query_get_group_conditions_sequence;
+rasqal_query_get_order_conditions_sequence;
+rasqal_query_get_wildcard;
+rasqal_query_get_verb;
+rasqal_query_set_user_data;
+rasqal_query_get_user_data;
+rasqal_query_verb_as_string;
+rasqal_query_get_construct_triples_sequence;
+rasqal_query_get_query_graph_pattern;
+rasqal_query_get_prefix_sequence;
+rasqal_query_get_triple_sequence;
+rasqal_query_get_all_variable_sequence;
+rasqal_query_get_anonymous_variable_sequence;
+rasqal_query_get_bound_variable_sequence;
+rasqal_query_get_data_graph_sequence;
+rasqal_query_set_offset;
+rasqal_query_get_offset;
+rasqal_query_set_limit;
+rasqal_query_get_limit;
+rasqal_query_set_explain;
+rasqal_query_get_explain;
+rasqal_query_set_distinct;
+rasqal_query_get_distinct;
+rasqal_query_get_feature;
+rasqal_query_set_feature;
+rasqal_query_set_warning_handler;
+rasqal_query_set_error_handler;
+rasqal_query_set_fatal_error_handler;
+rasqal_query_get_label;
+rasqal_query_get_name;
+rasqal_query_results_formats_check;
+rasqal_new_query_results_formatter;
+rasqal_new_query_results_formatter_by_mime_type;
+rasqal_query_results_formats_enumerate;
+rasqal_query_results_formats_enumerate_full;
+rasqal_free_query_results_formatter;
+rasqal_query_results_formatter_get_mime_type;
+};
diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch
index dca6383d855e..97f7119e5b31 100644
--- a/redland/redland-1.0.7.patch
+++ b/redland/redland-1.0.7.patch
@@ -16,9 +16,9 @@
 +later version may be used, or where a choice of which version of the 
 +LGPL is applied is otherwise unspecified.
 +
---- misc/redland-1.0.7/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
-+++ misc/build/redland-1.0.7/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,114 @@
+--- misc/redland-1.0.7/librdf/makefile.mk	2008-12-26 17:24:00.000000000 +0100
++++ misc/build/redland-1.0.7/librdf/makefile.mk	2008-12-26 17:20:46.000000000 +0100
+@@ -1 +1,124 @@
 -dummy
 +#*************************************************************************
 +#
@@ -64,7 +64,11 @@
 +
 +.INCLUDE :  settings.mk
 +
++.IF "$(GUI)"=="OS2"
++CDEFS+=-DLIBRDF_INTERNAL -DHAVE_CONFIG_H -DNDEBUG
++.ELSE
 +CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++.ENDIF
 +
 +# --- Files --------------------------------------------------------
 +
@@ -118,6 +122,9 @@
 +SHL1USE_EXPORTS=name
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)$/redland$/redland2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
@@ -126,6 +133,9 @@
 +    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
 +    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
 +
++.IF "$(GUI)"=="OS2"
++SHL1STDLIBS+= pthread.lib
++.ENDIF
 +
 +#$(LIBXML2LIB) \
 +#    $(XSLTLIB) \
@@ -759,3 +769,250 @@
  #endif
  
  #include <stdio.h>
+--- misc/redland-1.0.7/librdf/rdf_config.h	2008-12-26 17:24:00.000000000 +0100
++++ misc/build/redland-1.0.7/librdf/rdf_config.h	2008-12-26 17:20:46.000000000 +0100
+@@ -1 +1,243 @@
+-dummy
++/* librdf/rdf_config.h.  Generated from rdf_config.h.in by configure.  */
++/* librdf/rdf_config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* BDB has close method with 2 args */
++/* #undef HAVE_BDB_CLOSE_2_ARGS */
++
++/* BDB defines DBC */
++/* #undef HAVE_BDB_CURSOR */
++
++/* BDB cursor method has 4 arguments */
++/* #undef HAVE_BDB_CURSOR_4_ARGS */
++
++/* BDB defines DB_TXN */
++/* #undef HAVE_BDB_DB_TXN */
++
++/* BDB has fd method with 2 args */
++/* #undef HAVE_BDB_FD_2_ARGS */
++
++/* Have BDB hash support */
++/* #undef HAVE_BDB_HASH */
++
++/* BDB has open method with 6 args */
++/* #undef HAVE_BDB_OPEN_6_ARGS */
++
++/* BDB has open method with 7 args */
++/* #undef HAVE_BDB_OPEN_7_ARGS */
++
++/* BDB has set_flags method */
++/* #undef HAVE_BDB_SET_FLAGS */
++
++/* BDB has dbopen method */
++/* #undef HAVE_DBOPEN */
++
++/* BDB has db_create method */
++/* #undef HAVE_DB_CREATE */
++
++/* Define to 1 if you have the <db.h> header file. */
++/* #undef HAVE_DB_H */
++
++/* BDB has db_open method */
++/* #undef HAVE_DB_OPEN */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you have the <dmalloc.h> header file. */
++/* #undef HAVE_DMALLOC_H */
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define HAVE_FCNTL_H 1
++
++/* Define to 1 if you have the `getenv' function. */
++#define HAVE_GETENV 1
++
++/* Define to 1 if you have the `getopt' function. */
++#define HAVE_GETOPT 1
++
++/* Define to 1 if you have the <getopt.h> header file. */
++#define HAVE_GETOPT_H 1
++
++/* Define to 1 if you have the `getopt_long' function. */
++#define HAVE_GETOPT_LONG 1
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#define HAVE_GETTIMEOFDAY 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the <libpq-fe.h> header file. */
++/* #undef HAVE_LIBPQ_FE_H */
++
++/* Have local MD5 digest */
++/* #undef HAVE_LOCAL_MD5_DIGEST */
++
++/* Have local RIPEMD160 digest */
++/* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
++
++/* Have local SHA1 digest */
++/* #undef HAVE_LOCAL_SHA1_DIGEST */
++
++/* Define to 1 if you have the `memcmp' function. */
++#define HAVE_MEMCMP 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the `mkstemp' function. */
++#define HAVE_MKSTEMP 1
++
++/* Define to 1 if you have the `mktemp' function. */
++#define HAVE_MKTEMP 1
++
++/* Define to 1 if you have the <openssl/crypto.h> header file. */
++#define HAVE_OPENSSL_CRYPTO_H 1
++
++/* Have openssl MD5 digest */
++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
++
++/* Have openssl RIPEMD160 digest */
++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
++
++/* Have openssl SHA1 digest */
++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
++
++/* Have openssl digests */
++#define HAVE_OPENSSL_DIGESTS 1
++
++/* Define to 1 if you have the <pthread.h> header file. */
++#define HAVE_PTHREAD_H 1
++
++/* Define to 1 if you have the <sqlite3.h> header file. */
++/* #undef HAVE_SQLITE3_H */
++
++/* Define to 1 if you have the <sqlite.h> header file. */
++/* #undef HAVE_SQLITE_H */
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <time.h> header file. */
++#define HAVE_TIME_H 1
++
++/* Define to 1 if you have the `tmpnam' function. */
++#define HAVE_TMPNAM 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Run time assertion checks. */
++#define LIBRDF_ASSERT 1
++
++/* Print run time assertion check failure messages. */
++#define LIBRDF_ASSERT_MESSAGES 1
++
++/* Release version as a decimal */
++#define LIBRDF_VERSION_DECIMAL 10007
++
++/* Major version number */
++#define LIBRDF_VERSION_MAJOR 1
++
++/* Minor version number */
++#define LIBRDF_VERSION_MINOR 0
++
++/* Release version number */
++#define LIBRDF_VERSION_RELEASE 7
++
++/* Build storage backends as modules */
++/* #undef MODULAR_LIBRDF */
++
++/* Name of package */
++#define PACKAGE "redland"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "http://bugs.librdf.org/"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "Redland RDF Application Framework"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "Redland RDF Application Framework 1.0.7"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "redland"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "1.0.7"
++
++/* The size of `unsigned char', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_CHAR 1
++
++/* The size of `unsigned int', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_INT 4
++
++/* The size of `unsigned long', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_LONG 4
++
++/* The size of `unsigned long long', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_LONG_LONG 8
++
++/* SQLite API version */
++/* #undef SQLITE_API */
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Building file storage */
++#define STORAGE_FILE 1
++
++/* Building hashes storage */
++#define STORAGE_HASHES 1
++
++/* Building memory storage */
++#define STORAGE_MEMORY 1
++
++/* Building MySQL storage */
++/* #undef STORAGE_MYSQL */
++
++/* Building PostgreSQL storage */
++/* #undef STORAGE_POSTGRESQL */
++
++/* Building SQLite storage */
++/* #undef STORAGE_SQLITE */
++
++/* Building 3store storage */
++/* #undef STORAGE_TSTORE */
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Version number of package */
++#define VERSION "1.0.7"
++
++/* Use POSIX threads */
++#define WITH_THREADS 1
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++/* #undef WORDS_BIGENDIAN */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index f5fc88f8438f..f448c5a82397 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -54,10 +54,14 @@ REDLANDVERSION=1.0.7
 TARFILE_NAME=redland-$(REDLANDVERSION)
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
-ADDITIONAL_FILES=librdf/makefile.mk
+ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
 
+.IF "$(OS)"=="OS2"
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
 
-.IF "$(OS)"=="WNT"
+.ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
@@ -133,7 +137,7 @@ OUT2BIN+=librdf$/.libs$/*.dll
 .ENDIF
 
 .ELIF "$(OS)"=="OS2"
-OUT2LIB+=librdf$/.libs$/*.a
+# if we use dmake, this is done automagically
 
 .ELSE
 OUT2LIB+=librdf$/.libs$/librdf*.so*
diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map
new file mode 100644
index 000000000000..660f80a0b8a4
--- /dev/null
+++ b/redland/redland/redland2.map
@@ -0,0 +1,316 @@
+REDLAND2 {
+global:
+GetVersionInfo;
+librdf_get_concept_resource_by_index;
+librdf_get_concept_uri_by_index;
+librdf_new_digest;
+librdf_digest_update_string;
+librdf_digest_final;
+librdf_digest_print;
+librdf_digest_to_string;
+librdf_free_digest;
+librdf_digest_get_digest_length;
+librdf_digest_get_digest;
+librdf_digest_update;
+librdf_digest_init;
+librdf_new_hash_from_string;
+librdf_new_hash_from_array_of_strings;
+librdf_hash_get_del;
+librdf_hash_get_as_boolean;
+librdf_hash_get_as_long;
+librdf_hash_get;
+librdf_hash_interpret_template;
+librdf_hash_print;
+librdf_hash_print_keys;
+librdf_hash_print_values;
+librdf_new_hash_from_hash;
+librdf_free_hash;
+librdf_hash_put_strings;
+librdf_version_decimal;
+librdf_version_release;
+librdf_version_minor;
+librdf_version_major;
+librdf_version_string;
+librdf_copyright_string;
+librdf_short_copyright_string;
+librdf_init_world;
+librdf_new_world;
+librdf_destroy_world;
+librdf_free_world;
+librdf_world_open;
+librdf_world_init_mutex;
+librdf_world_set_feature;
+librdf_world_get_feature;
+librdf_world_set_digest;
+librdf_world_set_logger;
+librdf_world_set_warning;
+librdf_world_set_error;
+librdf_iterator_have_elements;
+librdf_iterator_end;
+librdf_iterator_next;
+librdf_iterator_get_object;
+librdf_iterator_get_context;
+librdf_iterator_get_key;
+librdf_iterator_get_value;
+librdf_free_iterator;
+librdf_iterator_add_map;
+librdf_new_iterator;
+librdf_new_empty_iterator;
+librdf_log_message_locator;
+librdf_log_message_message;
+librdf_log_message_facility;
+librdf_log_message_level;
+librdf_log_message_code;
+librdf_new_model;
+librdf_new_model_with_options;
+librdf_model_enumerate;
+librdf_free_model;
+librdf_model_add_typed_literal_statement;
+librdf_model_add_string_literal_statement;
+librdf_model_add;
+librdf_model_get_source;
+librdf_model_get_arc;
+librdf_model_get_target;
+librdf_model_add_submodel;
+librdf_model_remove_submodel;
+librdf_model_print;
+librdf_model_add_statement;
+librdf_model_remove_statement;
+librdf_model_contains_statement;
+librdf_model_context_add_statements;
+librdf_model_context_add_statement;
+librdf_model_context_remove_statements;
+librdf_model_context_remove_statement;
+librdf_model_find_statements_with_options;
+librdf_model_find_statements_in_context;
+librdf_new_model_from_model;
+librdf_model_size;
+librdf_model_add_statements;
+librdf_model_as_stream;
+librdf_model_serialise;
+librdf_model_find_statements;
+librdf_model_get_sources;
+librdf_model_get_arcs;
+librdf_model_get_targets;
+librdf_model_get_arcs_in;
+librdf_model_get_arcs_out;
+librdf_model_has_arc_in;
+librdf_model_has_arc_out;
+librdf_model_contains_context;
+librdf_model_context_as_stream;
+librdf_model_context_serialize;
+librdf_model_query_execute;
+librdf_model_sync;
+librdf_model_get_storage;
+librdf_model_get_contexts;
+librdf_model_get_feature;
+librdf_model_set_feature;
+librdf_model_load;
+librdf_model_to_string;
+librdf_model_to_counted_string;
+librdf_model_transaction_get_handle;
+librdf_model_transaction_rollback;
+librdf_model_transaction_commit;
+librdf_model_transaction_start_with_handle;
+librdf_model_transaction_start;
+librdf_new_node_from_uri_local_name;
+librdf_new_node_from_normalised_uri_string;
+librdf_node_decode;
+librdf_new_node_from_uri_string;
+librdf_new_node_from_uri;
+librdf_new_node_from_literal;
+librdf_new_node_from_typed_literal;
+librdf_new_node_from_typed_counted_literal;
+librdf_new_node;
+librdf_new_node_from_blank_identifier;
+librdf_free_node;
+librdf_node_get_literal_value_as_latin1;
+librdf_node_get_literal_value_is_wf_xml;
+librdf_node_get_li_ordinal;
+librdf_node_print;
+librdf_node_to_string;
+librdf_node_to_counted_string;
+librdf_node_encode;
+librdf_node_static_iterator_create;
+librdf_new_node_from_node;
+librdf_node_get_uri;
+librdf_node_get_type;
+librdf_node_get_literal_value;
+librdf_node_get_literal_value_as_counted_string;
+librdf_node_get_literal_value_language;
+librdf_node_get_literal_value_datatype_uri;
+librdf_node_get_blank_identifier;
+librdf_node_is_resource;
+librdf_node_is_literal;
+librdf_node_is_blank;
+librdf_node_equals;
+librdf_parser_register_factory;
+librdf_new_parser;
+librdf_parser_enumerate;
+librdf_new_parser_from_factory;
+librdf_free_parser;
+librdf_parser_parse_as_stream;
+librdf_parser_parse_into_model;
+librdf_parser_parse_string_as_stream;
+librdf_parser_parse_string_into_model;
+librdf_parser_parse_counted_string_as_stream;
+librdf_parser_parse_counted_string_into_model;
+librdf_parser_get_feature;
+librdf_parser_set_feature;
+librdf_parser_guess_name;
+librdf_parser_get_uri_filter;
+librdf_parser_set_uri_filter;
+librdf_parser_get_namespaces_seen_count;
+librdf_parser_get_namespaces_seen_uri;
+librdf_parser_get_namespaces_seen_prefix;
+librdf_parser_get_accept_header;
+librdf_parser_set_warning;
+librdf_parser_set_error;
+librdf_query_register_factory;
+librdf_new_query;
+librdf_new_query_from_query;
+librdf_new_query_from_factory;
+librdf_free_query;
+librdf_query_execute;
+librdf_query_set_offset;
+librdf_query_get_offset;
+librdf_query_set_limit;
+librdf_query_get_limit;
+librdf_free_query_results;
+librdf_query_results_to_string;
+librdf_query_results_to_counted_string;
+librdf_query_results_to_file;
+librdf_query_results_to_file_handle;
+librdf_query_results_get_count;
+librdf_query_results_next;
+librdf_query_results_finished;
+librdf_query_results_get_bindings;
+librdf_query_results_get_binding_value;
+librdf_query_results_get_binding_name;
+librdf_query_results_get_binding_value_by_name;
+librdf_query_results_get_bindings_count;
+librdf_query_results_is_bindings;
+librdf_query_results_is_boolean;
+librdf_query_results_is_graph;
+librdf_query_results_is_syntax;
+librdf_query_results_get_boolean;
+librdf_query_results_as_stream;
+librdf_query_results_formats_check;
+librdf_query_results_formats_enumerate;
+librdf_query_results_formatter_write;
+librdf_free_query_results_formatter;
+librdf_new_query_results_formatter_by_mime_type;
+librdf_new_query_results_formatter;
+librdf_serializer_register_factory;
+librdf_new_serializer;
+librdf_serializer_enumerate;
+librdf_new_serializer_from_factory;
+librdf_free_serializer;
+librdf_serializer_serialize_stream_to_file;
+librdf_serializer_serialize_model_to_file;
+librdf_serializer_set_namespace;
+librdf_serializer_serialize_stream_to_file_handle;
+librdf_serializer_serialize_model;
+librdf_serializer_serialize_model_to_file_handle;
+librdf_serializer_serialize_stream_to_counted_string;
+librdf_serializer_serialize_model_to_counted_string;
+librdf_serializer_serialize_stream_to_string;
+librdf_serializer_serialize_model_to_string;
+librdf_serializer_serialize_stream_to_iostream;
+librdf_serializer_serialize_model_to_iostream;
+librdf_serializer_get_feature;
+librdf_serializer_set_feature;
+librdf_serializer_set_warning;
+librdf_serializer_set_error;
+librdf_new_statement_from_statement;
+librdf_new_statement_from_nodes;
+librdf_new_statement;
+librdf_statement_init;
+librdf_free_statement;
+librdf_statement_is_complete;
+librdf_statement_print;
+librdf_statement_to_string;
+librdf_statement_equals;
+librdf_statement_match;
+librdf_statement_encode;
+librdf_statement_encode_parts;
+librdf_statement_decode;
+librdf_statement_decode_parts;
+librdf_statement_clear;
+librdf_statement_get_subject;
+librdf_statement_set_subject;
+librdf_statement_get_predicate;
+librdf_statement_set_predicate;
+librdf_statement_get_object;
+librdf_statement_set_object;
+librdf_storage_register_factory;
+librdf_new_storage;
+librdf_new_storage_with_options;
+librdf_storage_enumerate;
+librdf_new_storage_from_factory;
+librdf_storage_context_add_statements;
+librdf_storage_add_statements;
+librdf_storage_context_add_statement;
+librdf_storage_add_statement;
+librdf_storage_contains_statement;
+librdf_storage_find_statements;
+librdf_storage_has_arc_in;
+librdf_storage_get_sources;
+librdf_storage_get_arcs;
+librdf_storage_has_arc_out;
+librdf_storage_get_targets;
+librdf_storage_get_arcs_in;
+librdf_storage_get_arcs_out;
+librdf_new_storage_from_storage;
+librdf_storage_remove_reference;
+librdf_free_storage;
+librdf_storage_context_remove_statements;
+librdf_storage_find_statements_with_options;
+librdf_storage_find_statements_in_context;
+librdf_storage_open;
+librdf_storage_close;
+librdf_storage_size;
+librdf_storage_remove_statement;
+librdf_storage_context_remove_statement;
+librdf_storage_context_serialise;
+librdf_storage_context_as_stream;
+librdf_storage_supports_query;
+librdf_storage_query_execute;
+librdf_storage_sync;
+librdf_storage_get_contexts;
+librdf_storage_get_feature;
+librdf_storage_set_feature;
+librdf_storage_transaction_get_handle;
+librdf_storage_transaction_rollback;
+librdf_storage_transaction_commit;
+librdf_storage_transaction_start_with_handle;
+librdf_storage_transaction_start;
+librdf_storage_serialise;
+librdf_storage_add_reference;
+librdf_free_stream;
+librdf_stream_print;
+librdf_stream_end;
+librdf_stream_next;
+librdf_stream_get_object;
+librdf_stream_get_context;
+librdf_stream_add_map;
+librdf_new_stream_from_node_iterator;
+librdf_new_stream;
+librdf_new_empty_stream;
+librdf_new_uri_from_uri_local_name;
+librdf_new_uri_normalised_to_base;
+librdf_new_uri_relative_to_base;
+librdf_new_uri_from_filename;
+librdf_new_uri;
+librdf_free_uri;
+librdf_uri_print;
+librdf_uri_to_string;
+librdf_uri_to_counted_string;
+librdf_uri_is_file_uri;
+librdf_uri_to_filename;
+librdf_new_uri_from_uri;
+librdf_uri_as_string;
+librdf_uri_as_counted_string;
+librdf_uri_equals;
+librdf_uri_compare;
+};