merge commit to DEV300_m57

27 files changed, 1441 insertions, 2102 deletions

diff --git a/redland/README b/redland/README
index 57397ccc10d7..d01ae085cc66 100644
--- a/redland/README
+++ b/redland/README
@@ -19,3 +19,16 @@ It consists of 3 parts:
 
 Libraries: libraptor, librasqal, librdf
 
+Patches:
+There are several patches, most of which contain only hacks to get it to
+build with OOo build system.
+There are also 3 patches that fix bugs in redland and are of general interest:
+- redland-1.0.8.patch.free_null:
+  redland destructor functions don't check if argument is NULL
+- redland-1.0.8.patch.storage_hashes_context_serialize_get_statement:
+  hashes storage: the function to create statements during serialization does
+                  not fill in the context propery (i.e. context is NULL)
+- redland-1.0.8.patch.storage_hashes_list_duplicates:
+  hashes, list storage: if contexts are enabled, then it is possible to add
+                        duplicate statements
+
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 03bbd21147ea..6363f9bbe330 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -3,10 +3,10 @@
 symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
 ..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
 symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so.0
-symlink: %_DEST%\lib%_EXT%\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.0.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
+symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
+..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
+symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
 ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0
 symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so
 ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib
diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch
deleted file mode 100644
index 5dcda739aea5..000000000000
--- a/redland/raptor-1.4.17.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- misc/raptor-1.4.17/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/build/raptor-1.4.17/LICENSE.txt	Mon Jun 16 15:55:38 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2000-2008 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- 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,129 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: raptor-1.4.17.patch,v $
-+#
-+# $Revision: 1.2.6.2 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=raptor
-+LIBTARGET=NO
-+UWINAPILIB=

-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.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 --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/n3_lexer.obj \
-+   $(SLO)$/n3_parser.obj \
-+   $(SLO)$/ntriples_parse.obj \
-+   $(SLO)$/parsedate.obj \
-+   $(SLO)$/raptor_feature.obj \
-+   $(SLO)$/raptor_general.obj \
-+   $(SLO)$/raptor_guess.obj \
-+   $(SLO)$/raptor_identifier.obj \
-+   $(SLO)$/raptor_iostream.obj \
-+   $(SLO)$/raptor_libxml.obj \
-+   $(SLO)$/raptor_locator.obj \
-+   $(SLO)$/raptor_namespace.obj \
-+   $(SLO)$/raptor_nfc.obj \
-+   $(SLO)$/raptor_nfc_data.obj \
-+   $(SLO)$/raptor_parse.obj \
-+   $(SLO)$/raptor_qname.obj \
-+   $(SLO)$/raptor_rdfxml.obj \
-+   $(SLO)$/raptor_rfc2396.obj \
-+   $(SLO)$/raptor_rss.obj \
-+   $(SLO)$/raptor_rss_common.obj \
-+   $(SLO)$/raptor_sax2.obj \
-+   $(SLO)$/raptor_sequence.obj \
-+   $(SLO)$/raptor_serialize.obj \
-+   $(SLO)$/raptor_serialize_ntriples.obj \
-+   $(SLO)$/raptor_serialize_rdfxml.obj \
-+   $(SLO)$/raptor_serialize_rdfxmla.obj \
-+   $(SLO)$/raptor_serialize_rss.obj \
-+   $(SLO)$/raptor_serialize_simple.obj \
-+   $(SLO)$/raptor_set.obj \
-+   $(SLO)$/raptor_stringbuffer.obj \
-+   $(SLO)$/raptor_uri.obj \
-+   $(SLO)$/raptor_utf8.obj \
-+   $(SLO)$/raptor_win32.obj \
-+   $(SLO)$/raptor_www.obj \
-+   $(SLO)$/raptor_www_libxml.obj \
-+   $(SLO)$/raptor_xml.obj \
-+   $(SLO)$/raptor_xml_writer.obj \
-+   $(SLO)$/raptor_xsd.obj \
-+   $(SLO)$/raptor_strcasecmp.obj \
-+   $(SLO)$/turtle_common.obj \
-+   $(SLO)$/turtle_lexer.obj \
-+   $(SLO)$/turtle_parser.obj \
-+   $(SLO)$/raptor_grddl.obj \
-+   $(SLO)$/raptor_abbrev.obj \
-+   $(SLO)$/raptor_avltree.obj \
-+   $(SLO)$/raptor_statement.obj \
-+   $(SLO)$/raptor_turtle_writer.obj \
-+
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= lib$(TARGET)
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+.IF "$(GUI)"=="OS2"
-+SHL1VERSIONMAP=$(PRJ)$/raptor$/raptor2.map
-+.ENDIF
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(LIBXML2LIB) \
-+    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
-+	$(COPY) $< $@
-+
---- misc/raptor-1.4.17/src/raptor-config.in	Sat Jan  6 05:02:00 2007
-+++ misc/build/raptor-1.4.17/src/raptor-config.in	Mon Jun 16 15:55:38 2008
-@@ -21,14 +21,23 @@
- # 
- #
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
-+prefix=${SOLARVERSION}/${INPATH}
-+exec_prefix=${SOLARVERSION}/${INPATH}
-+#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+# HACK: map to build directory
-+includedir=../../../../inc
-+libdir=../../../../lib
-+includes=-I${includedir}
- 
--if test "@includedir@" != /usr/include ; then
--  includes="-I@includedir@"
--else
--  includes=
--fi
-+#prefix=@prefix@
-+#exec_prefix=@exec_prefix@
-+#
-+#if test "@includedir@" != /usr/include ; then
-+#  includes="-I@includedir@"
-+#else
-+#  includes=
-+#fi
- 
- 
- usage()
-@@ -130,7 +139,8 @@
-   done
- fi
- if test "$echo_libs" = "yes"; then
--  echo -L@libdir@ -lraptor
-+#  echo -L@libdir@ -lraptor
-+  echo -L${libdir} -lraptor
- fi
- if test "$echo_libtool_libs" = "yes"; then
-   echo @libdir@/@RAPTOR_LIBTOOLLIBS@
---- misc/raptor-1.4.17/src/win32_raptor_config.h	Tue Oct  2 06:12:55 2007
-+++ misc/build/raptor-1.4.17/src/win32_raptor_config.h	2008-07-06 10:27:03.553625000 +0900
-@@ -38,6 +38,8 @@
- 
- #define HAVE_STDLIB_H 1
- 
-+#define HAVE_ERRNO_H 1
-+
- #if 0
- /* For using expat on win32 */
- #define RAPTOR_XML_EXPAT 1
-@@ -47,8 +49,17 @@
- /* 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*/
-+#define RAPTOR_LIBXML_ENTITY_ETYPE
- 
- /* does libxml struct xmlEntity have a field name_length */
- /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
-@@ -60,16 +71,17 @@
- #define HAVE_XMLSAX2INTERNALSUBSET 1
- 
- /* does libxml xmlSAXHandler have externalSubset field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
- 
- /* does libxml xmlSAXHandler have initialized field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
- #endif
- 
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -114,7 +126,9 @@
- 
- #define RAPTOR_PARSER_GUESS 1
- #define RAPTOR_PARSER_GRDDL 1
-+#ifndef __MINGW32__ /* conflicts with normal configure result */
- #define RAPTOR_PARSER_N3 1
-+#endif
- #define RAPTOR_PARSER_TURTLE 1
- #define RAPTOR_PARSER_NTRIPLES 1
- #define RAPTOR_PARSER_RDFXML 1
-@@ -125,7 +139,8 @@
- #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
- #define RAPTOR_SERIALIZER_NTRIPLES 1
- 
--#define RAPTOR_WWW_LIBCURL 1
-+//#define RAPTOR_WWW_LIBCURL 1
-+#define RAPTOR_WWW_LIBXML 1
- 
- 
- #include <windows.h>
---- misc/raptor-1.4.17/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
-+++ misc/build/raptor-1.4.17/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
-@@ -3262,9 +3262,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3344,8 +3344,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	irix | nonstopux)
---- misc/raptor-1.4.17/configure	2008-03-17 16:37:20.000000000 +0900
-+++ misc/build/raptor-1.4.17/configure	2008-07-06 09:05:29.974875000 +0900
-@@ -4317,7 +4317,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4326,7 +4326,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     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 12479a355f00..9c0bbaf47efd 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.6.4.4 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -48,22 +48,42 @@ all:
 
 .INCLUDE :	../redlandversion.mk
 
-RAPTORVERSION=$(RAPTOR_MAJOR).4.17
+RAPTORVERSION=$(RAPTOR_MAJOR).4.18
 
 TARFILE_NAME=raptor-$(RAPTORVERSION)
-PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
 
+OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.legal \
+    $(TARFILE_NAME).patch.autotools \
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.dmake \
+    $(TARFILE_NAME).patch.win32 \
+
+
+PATCH_FILES=$(OOO_PATCH_FILES)
+
+
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
-
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
+raptor_CC=$(CC)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+raptor_CC+=-shared-libgcc
+.ENDIF
+raptor_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+raptor_LIBS+=-lstdc++_s
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -100,7 +120,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
 
 CPPFLAGS+:=$(EXTRA_CFLAGS)
 LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 
 .EXPORT: CPPFLAGS
 .EXPORT: LDFLAGS
@@ -110,7 +130,8 @@ XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -122,7 +143,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 OUT2INC+=src$/raptor.h
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor.1.dylib src$/.libs$/libraptor.dylib
+OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
 OUT2BIN+=src/raptor-config
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -132,12 +153,10 @@ OUT2BIN+=src/raptor-config
 .ELSE
 # if we use dmake, this is done automagically
 .ENDIF
-
 .ELIF "$(GUI)"=="OS2"
 # if we use dmake, this is done automagically
-
 .ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.1 src$/.libs$/libraptor.so
+OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
 OUT2BIN+=src/raptor-config
 .ENDIF
 
diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
new file mode 100644
index 000000000000..4b43def56511
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.autotools
@@ -0,0 +1,46 @@
+--- misc/raptor-1.4.18/configure	Sun Jun 15 10:25:55 2008
++++ misc/build/raptor-1.4.18/configure	Wed Feb 18 13:23:12 2009
+@@ -4321,7 +4321,7 @@
+ 
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+@@ -4330,7 +4330,7 @@
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+   if ( file / ) >/dev/null 2>&1; then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     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.18/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
++++ misc/build/raptor-1.4.18/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
+@@ -3262,9 +3262,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor`
+@@ -3344,8 +3344,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
new file mode 100644
index 000000000000..aa0f5ab29117
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -0,0 +1,126 @@
+--- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
++++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
+@@ -1,1 +1,122 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: raptor-1.4.18.patch,v $
++#
++# $Revision: 1.1.2.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=redland
++TARGET=raptor
++LIBTARGET=NO
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++
++# --- Files --------------------------------------------------------
++
++SLOFILES =	\
++   $(SLO)$/n3_lexer.obj \
++   $(SLO)$/n3_parser.obj \
++   $(SLO)$/ntriples_parse.obj \
++   $(SLO)$/parsedate.obj \
++   $(SLO)$/raptor_feature.obj \
++   $(SLO)$/raptor_general.obj \
++   $(SLO)$/raptor_guess.obj \
++   $(SLO)$/raptor_identifier.obj \
++   $(SLO)$/raptor_iostream.obj \
++   $(SLO)$/raptor_libxml.obj \
++   $(SLO)$/raptor_locator.obj \
++   $(SLO)$/raptor_namespace.obj \
++   $(SLO)$/raptor_nfc.obj \
++   $(SLO)$/raptor_nfc_data.obj \
++   $(SLO)$/raptor_parse.obj \
++   $(SLO)$/raptor_qname.obj \
++   $(SLO)$/raptor_rdfxml.obj \
++   $(SLO)$/raptor_rfc2396.obj \
++   $(SLO)$/raptor_rss.obj \
++   $(SLO)$/raptor_rss_common.obj \
++   $(SLO)$/raptor_sax2.obj \
++   $(SLO)$/raptor_sequence.obj \
++   $(SLO)$/raptor_serialize.obj \
++   $(SLO)$/raptor_serialize_ntriples.obj \
++   $(SLO)$/raptor_serialize_rdfxml.obj \
++   $(SLO)$/raptor_serialize_rdfxmla.obj \
++   $(SLO)$/raptor_serialize_simple.obj \
++   $(SLO)$/raptor_set.obj \
++   $(SLO)$/raptor_stringbuffer.obj \
++   $(SLO)$/raptor_uri.obj \
++   $(SLO)$/raptor_utf8.obj \
++   $(SLO)$/raptor_win32.obj \
++   $(SLO)$/raptor_www.obj \
++   $(SLO)$/raptor_www_libxml.obj \
++   $(SLO)$/raptor_xml.obj \
++   $(SLO)$/raptor_xml_writer.obj \
++   $(SLO)$/raptor_xsd.obj \
++   $(SLO)$/raptor_strcasecmp.obj \
++   $(SLO)$/turtle_common.obj \
++   $(SLO)$/turtle_lexer.obj \
++   $(SLO)$/turtle_parser.obj \
++   $(SLO)$/raptor_abbrev.obj \
++   $(SLO)$/raptor_avltree.obj \
++   $(SLO)$/raptor_statement.obj \
++   $(SLO)$/raptor_turtle_writer.obj \
++
++#   $(SLO)$/raptor_grddl.obj \
++#   $(SLO)$/raptor_serialize_rss.obj \
++
++
++SHL1DEPN=   makefile.mk
++SHL1OBJS=   $(SLOFILES)
++SHL1USE_EXPORTS=name
++
++#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
++SHL1TARGET=	$(TARGET)
++SHL1IMPLIB= lib$(TARGET)
++
++#SHL1VERSIONMAP=../service/exports.map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++
++SHL1STDLIBS= \
++    $(LIBXML2LIB) \
++    $(XSLTLIB) \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
++	$(COPY) $< $@
++
diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.patch.legal
new file mode 100644
index 000000000000..217b7d154812
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.legal
@@ -0,0 +1,18 @@
+--- misc/raptor-1.4.18/LICENSE.txt	Sun Mar 30 06:52:22 2008
++++ misc/build/raptor-1.4.18/LICENSE.txt	Mon Jun 16 15:55:38 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2000-2008 David Beckett
+    Copyright (C) 2000-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw
new file mode 100644
index 000000000000..e29a0a07c5a9
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.mingw
@@ -0,0 +1,30 @@
+--- misc/raptor-1.4.18/configure	2008-06-15 17:25:55.000000000 +0900
++++ misc/build/raptor-1.4.18/configure	2009-06-04 21:10:22.447125000 +0900
+@@ -25238,6 +25238,12 @@
+ rdfa_parser=yes
+ 
+ rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
++case $host_os in
++mingw*)
++  rdfa_parser=no
++  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
++  ;;
++esac
+ if test "$USE_MAINTAINER_MODE" = yes; then
+   rdf_parsers_available="$rdf_parsers_available n3"
+ fi
+--- misc/raptor-1.4.18/configure.ac	2008-06-15 17:25:20.000000000 +0900
++++ misc/build/raptor-1.4.18/configure.ac	2009-06-04 21:10:31.025250000 +0900
+@@ -758,6 +758,12 @@
+ rdfa_parser=yes
+ 
+ rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
++case $host_os in
++mingw*)
++  rdfa_parser=no
++  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
++  ;;
++esac
+ if test "$USE_MAINTAINER_MODE" = yes; then
+   rdf_parsers_available="$rdf_parsers_available n3"
+ fi
diff --git a/redland/raptor/raptor-1.4.18.patch.ooo_build b/redland/raptor/raptor-1.4.18.patch.ooo_build
new file mode 100644
index 000000000000..a16878503ede
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.ooo_build
@@ -0,0 +1,43 @@
+--- misc/raptor-1.4.18/src/raptor-config.in	Sat Jan  6 05:02:00 2007
++++ misc/build/raptor-1.4.18/src/raptor-config.in	Mon Jun 16 15:55:38 2008
+@@ -21,14 +21,23 @@
+ # 
+ #
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
++# HACK: map to build directory
++includedir=../../../../inc
++libdir=../../../../lib
++includes=-I${includedir}
+ 
+-if test "@includedir@" != /usr/include ; then
+-  includes="-I@includedir@"
+-else
+-  includes=
+-fi
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#
++#if test "@includedir@" != /usr/include ; then
++#  includes="-I@includedir@"
++#else
++#  includes=
++#fi
+ 
+ 
+ usage()
+@@ -130,7 +139,8 @@
+   done
+ fi
+ if test "$echo_libs" = "yes"; then
+-  echo -L@libdir@ -lraptor
++#  echo -L@libdir@ -lraptor
++  echo -L${libdir} -lraptor
+ fi
+ if test "$echo_libtool_libs" = "yes"; then
+   echo @libdir@/@RAPTOR_LIBTOOLLIBS@
diff --git a/redland/raptor/raptor-1.4.18.patch.win32 b/redland/raptor/raptor-1.4.18.patch.win32
new file mode 100644
index 000000000000..8de0d25cad5e
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.win32
@@ -0,0 +1,78 @@
+--- misc/raptor-1.4.18/src/win32_raptor_config.h	Wed Apr  2 06:50:14 2008
++++ misc/build/raptor-1.4.18/src/win32_raptor_config.h	Wed Feb 18 13:21:23 2009
+@@ -38,6 +38,8 @@
+ 
+ #define HAVE_STDLIB_H 1
+ 
++#define HAVE_ERRNO_H 1
++
+ #if 0
+ /* For using expat on win32 */
+ #define RAPTOR_XML_EXPAT 1
+@@ -47,8 +49,17 @@
+ /* 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*/
++#define RAPTOR_LIBXML_ENTITY_ETYPE
+ 
+ /* does libxml struct xmlEntity have a field name_length */
+ /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
+@@ -60,16 +71,17 @@
+ #define HAVE_XMLSAX2INTERNALSUBSET 1
+ 
+ /* does libxml xmlSAXHandler have externalSubset field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
+ 
+ /* does libxml xmlSAXHandler have initialized field */
+-/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
++#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
+ #endif
+ 
+ #define HAVE_STRICMP 1
+ 
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -113,19 +125,23 @@
+ #endif
+ 
+ #define RAPTOR_PARSER_GUESS 1
+-#define RAPTOR_PARSER_GRDDL 1
++/* #define RAPTOR_PARSER_GRDDL 1   disabled: (#i93768#) */
++#ifndef __MINGW32__ /* conflicts with normal configure result */
+ #define RAPTOR_PARSER_N3 1
++#endif
+ #define RAPTOR_PARSER_TURTLE 1
+ #define RAPTOR_PARSER_NTRIPLES 1
+ #define RAPTOR_PARSER_RDFXML 1
+ 
++/* does not build on wntmsci12 due to gettimeofday
+ #define RAPTOR_SERIALIZER_ATOM 1
+-#define RAPTOR_SERIALIZER_RSS_1_0 1
++#define RAPTOR_SERIALIZER_RSS_1_0 1 */
+ #define RAPTOR_SERIALIZER_RDFXML 1
+ #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
+ #define RAPTOR_SERIALIZER_NTRIPLES 1
+ 
+-#define RAPTOR_WWW_LIBCURL 1
++//#define RAPTOR_WWW_LIBCURL 1
++#define RAPTOR_WWW_LIBXML 1
+ 
+ 
+ #include <windows.h>
diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch
deleted file mode 100644
index b57d985a435a..000000000000
--- a/redland/rasqal-0.9.15.patch
+++ /dev/null
@@ -1,420 +0,0 @@
---- misc/rasqal-0.9.15/LICENSE.txt	Sun Apr 22 23:09:08 2007
-+++ misc/build/rasqal-0.9.15/LICENSE.txt	Mon Jun 16 15:55:45 2008
-@@ -61,3 +61,15 @@
- 
-    Copyright (C) 2003-2007 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- 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,103 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: rasqal-0.9.15.patch,v $
-+#
-+# $Revision: 1.2.6.2 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=rasqal
-+LIBTARGET=NO
-+UWINAPILIB=

-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.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 --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/rasqal_datetime.obj \
-+   $(SLO)$/rasqal_decimal.obj \
-+   $(SLO)$/rasqal_engine.obj \
-+   $(SLO)$/rasqal_expr.obj \
-+   $(SLO)$/rasqal_feature.obj \
-+   $(SLO)$/rasqal_general.obj \
-+   $(SLO)$/rasqal_graph_pattern.obj \
-+   $(SLO)$/rasqal_literal.obj \
-+   $(SLO)$/rasqal_map.obj \
-+   $(SLO)$/rasqal_query_results.obj \
-+   $(SLO)$/rasqal_query.obj \
-+   $(SLO)$/rasqal_raptor.obj \
-+   $(SLO)$/rasqal_result_formats.obj \
-+   $(SLO)$/rasqal_xsd_datatypes.obj \
-+   $(SLO)$/rdql_lexer.obj \
-+   $(SLO)$/rdql_parser.obj \
-+   $(SLO)$/sparql_lexer.obj \
-+   $(SLO)$/sparql_parser.obj \
-+   $(SLO)$/strcasecmp.obj \
-+
-+
-+#   $(SLO)$/rasqal_redland.obj \
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= lib$(TARGET)
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+.IF "$(GUI)"=="OS2"
-+SHL1VERSIONMAP=$(PRJ)$/rasqal$/rasqal2.map
-+.ENDIF
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+
-+
-+#$(LIBXML2LIB) \
-+#    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- misc/rasqal-0.9.15/src/rasqal-config.in	Sun Apr 22 22:58:51 2007
-+++ misc/build/rasqal-0.9.15/src/rasqal-config.in	Mon Jun 16 15:55:45 2008
-@@ -22,13 +22,22 @@
- # 
- #
- 
--prefix=@prefix@
-+prefix=${SOLARVERSION}/${INPATH}
-+exec_prefix=${SOLARVERSION}/${INPATH}
-+#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+# HACK: map to build directory
-+includedir=../../../../inc
-+libdir=../../../../lib
-+includes=-I${includedir}
- 
--if test "@includedir@" != /usr/include ; then
--  includes="-I@includedir@"
--else
--  includes=
--fi
-+#prefix=@prefix@
-+#
-+#if test "@includedir@" != /usr/include ; then
-+#  includes="-I@includedir@"
-+#else
-+#  includes=
-+#fi
- 
- 
- usage()
-@@ -109,7 +118,8 @@
-   echo $includes
- fi
- if test "$echo_libs" = "yes"; then
--  echo -L@libdir@ -lrasqal
-+#  echo -L@libdir@ -lrasqal
-+  echo -L${libdir} -lrasqal
- fi
- if test "$echo_libtool_libs" = "yes"; then
-   echo @libdir@/@RASQAL_LIBTOOLLIBS@
---- misc/rasqal-0.9.15/src/win32_rasqal_config.h	Mon Apr 23 09:18:27 2007
-+++ misc/build/rasqal-0.9.15/src/win32_rasqal_config.h	Mon Jun 16 15:55:45 2008
-@@ -39,10 +39,13 @@
- 
- #define HAVE_STDLIB_H 1
- 
-+#define HAVE_ERRNO_H 1
-+
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -87,6 +90,9 @@
- #include <io.h>
- #include <memory.h>
- 
-+// argh! stupid winnt.h...
-+#undef DELETE
-+
- /* This is a SPARQL token define */
- #ifdef OPTIONAL
- #undef OPTIONAL
-@@ -118,8 +124,14 @@
- /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
- 
- /* Use PCRE regex library */
--#define RASQAL_REGEX_PCRE 1
-+//#define RASQAL_REGEX_PCRE 1
- 
-+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
-+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
-+#define HAVE_LIBXML_XMLSCHEMAS_H 1
-+
-+#define RASQAL_DECIMAL_NONE 1
-+
- #ifdef _DEBUG
- #define RASQAL_DEBUG 1
- #endif
---- misc/rasqal-0.9.15/ltmain.sh	2006-03-12 03:49:04.000000000 +0900
-+++ misc/build/rasqal-0.9.15/ltmain.sh	2008-07-06 14:30:56.975375000 +0900
-@@ -1518,6 +1518,11 @@
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
-+	  case $host_os in
-+	    mingw*)
-+	      absdir=`cygpath -m $absdir`
-+	      ;;
-+	    esac
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- 	    absdir="$dir"
-@@ -3195,9 +3200,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor - 1`
-@@ -3275,8 +3280,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	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 e739671eef13..8753580ff20e 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.8.2.2 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -48,23 +48,40 @@ all:
 
 .INCLUDE :	../redlandversion.mk
 
-RASQALVERSION=0.9.15
+RASQALVERSION=0.9.16
 
 TARFILE_NAME=rasqal-$(RASQALVERSION)
-PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
 
+OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.legal \
+    $(TARFILE_NAME).patch.autotools \
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.dmake \
+    $(TARFILE_NAME).patch.win32 \
+
+
+PATCH_FILES=$(OOO_PATCH_FILES)
+
+
 .IF "$(OS)"=="OS2"
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
-
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
+rasqal_CC=$(CC)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+rasqal_CC+=-shared-libgcc
+.ENDIF
+rasqal_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+rasqal_LIBS+=-lstdc++_s
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -100,11 +117,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
 
 CPPFLAGS+:=$(EXTRA_CFLAGS)
 LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 
 .EXPORT: CPPFLAGS
 .EXPORT: LDFLAGS
 .EXPORT: LIBXML2LIB
 .EXPORT: ZLIB3RDLIB
+.EXPORT: XSLTLIB
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
@@ -120,7 +139,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 OUT2INC+=src$/rasqal.h
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/librasqal.0.dylib src$/.libs$/librasqal.dylib
+OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
 OUT2BIN+=src/rasqal-config
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -130,12 +149,10 @@ OUT2BIN+=src/rasqal-config
 .ELSE
 # if we use dmake, this is done automagically
 .ENDIF
-
 .ELIF "$(OS)"=="OS2"
 # if we use dmake, this is done automagically
-
 .ELSE
-OUT2LIB+=src$/.libs$/librasqal.so.0 src$/.libs$/librasqal.so
+OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
 OUT2BIN+=src/rasqal-config
 .ENDIF
 
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
new file mode 100644
index 000000000000..100499dd3ed8
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -0,0 +1,38 @@
+--- misc/rasqal-0.9.16/ltmain.sh	Tue Apr 29 23:33:55 2008
++++ misc/build/rasqal-0.9.16/ltmain.sh	Wed Feb 18 13:25:00 2009
+@@ -1565,6 +1565,11 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  absdir=`cd "$dir" && pwd`
++	  case $host_os in
++	    mingw*)
++	      absdir=`cygpath -m $absdir`
++	      ;;
++	  esac
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ 	    absdir="$dir"
+@@ -3262,9 +3267,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor`
+@@ -3344,8 +3349,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
new file mode 100644
index 000000000000..adfade9670bb
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -0,0 +1,101 @@
+--- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
++++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
+@@ -1,1 +1,97 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: rasqal-0.9.16.patch,v $
++#
++# $Revision: 1.1.2.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=redland
++TARGET=rasqal
++LIBTARGET=NO
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
++
++# --- Files --------------------------------------------------------
++
++SLOFILES =	\
++   $(SLO)$/rasqal_datetime.obj \
++   $(SLO)$/rasqal_decimal.obj \
++   $(SLO)$/rasqal_engine.obj \
++   $(SLO)$/rasqal_expr.obj \
++   $(SLO)$/rasqal_feature.obj \
++   $(SLO)$/rasqal_general.obj \
++   $(SLO)$/rasqal_graph_pattern.obj \
++   $(SLO)$/rasqal_literal.obj \
++   $(SLO)$/rasqal_map.obj \
++   $(SLO)$/rasqal_query_results.obj \
++   $(SLO)$/rasqal_query.obj \
++   $(SLO)$/rasqal_raptor.obj \
++   $(SLO)$/rasqal_result_formats.obj \
++   $(SLO)$/rasqal_rowsource.obj \
++   $(SLO)$/rasqal_sparql_xml.obj \
++   $(SLO)$/rasqal_xsd_datatypes.obj \
++   $(SLO)$/rdql_lexer.obj \
++   $(SLO)$/rdql_parser.obj \
++   $(SLO)$/sparql_lexer.obj \
++   $(SLO)$/sparql_parser.obj \
++   $(SLO)$/strcasecmp.obj \
++
++
++#   $(SLO)$/rasqal_redland.obj \
++
++SHL1DEPN=   makefile.mk
++SHL1OBJS=   $(SLOFILES)
++SHL1USE_EXPORTS=name
++
++#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
++SHL1TARGET=	$(TARGET)
++SHL1IMPLIB= lib$(TARGET)
++
++#SHL1VERSIONMAP=../service/exports.map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++
++SHL1STDLIBS= \
++    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
++
++
++#$(LIBXML2LIB) \
++#    $(XSLTLIB) \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.patch.legal
new file mode 100644
index 000000000000..59b125d6b64e
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.legal
@@ -0,0 +1,18 @@
+--- misc/rasqal-0.9.16/LICENSE.txt	Fri Jun 27 04:24:52 2008
++++ misc/build/rasqal-0.9.16/LICENSE.txt	Thu Nov  6 12:06:55 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2003-2008 Dave Beckett
+    Copyright (C) 2003-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
new file mode 100644
index 000000000000..eb4d24bb9c45
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
@@ -0,0 +1,34 @@
+--- misc/rasqal-0.9.16/src/rasqal-config.in	Sun Jun 22 07:07:12 2008
++++ misc/build/rasqal-0.9.16/src/rasqal-config.in	Thu Nov  6 12:10:52 2008
+@@ -22,10 +22,19 @@
+ # 
+ #
+ 
+-prefix=@prefix@
+-includes="-I@includedir@/@PACKAGE@"
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
++# HACK: map to build directory
++includedir=../../../../inc
++libdir=../../../../lib
++includes=-I${includedir}
+ 
++#prefix=@prefix@
++#includes="-I@includedir@/@PACKAGE@"
+ 
++
+ usage()
+ {
+ 	cat<<EOF
+@@ -104,7 +113,8 @@
+   echo $includes
+ fi
+ if test "$echo_libs" = "yes"; then
+-  echo -L@libdir@ -lrasqal
++#  echo -L@libdir@ -lrasqal
++  echo -L${libdir} -lrasqal
+ fi
+ if test "$echo_libtool_libs" = "yes"; then
+   echo @libdir@/@RASQAL_LIBTOOLLIBS@
diff --git a/redland/rasqal/rasqal-0.9.16.patch.win32 b/redland/rasqal/rasqal-0.9.16.patch.win32
new file mode 100644
index 000000000000..51bad96e0e29
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.win32
@@ -0,0 +1,43 @@
+--- misc/rasqal-0.9.16/src/win32_rasqal_config.h	Fri Jun 27 04:02:09 2008
++++ misc/build/rasqal-0.9.16/src/win32_rasqal_config.h	Thu Nov  6 12:07:06 2008
+@@ -37,10 +37,13 @@
+ 
+ #define HAVE_STDLIB_H 1
+ 
++#define HAVE_ERRNO_H 1
++
+ #define HAVE_STRICMP 1
+ 
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -85,6 +88,9 @@
+ #include <io.h>
+ #include <memory.h>
+ 
++// argh! stupid winnt.h...
++#undef DELETE
++
+ /* This is a SPARQL token define */
+ #ifdef OPTIONAL
+ #undef OPTIONAL
+@@ -116,8 +122,14 @@
+ /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
+ 
+ /* Use PCRE regex library */
+-#define RASQAL_REGEX_PCRE 1
++//#define RASQAL_REGEX_PCRE 1
+ 
++#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
++#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
++#define HAVE_LIBXML_XMLSCHEMAS_H 1
++
++#define RASQAL_DECIMAL_NONE 1
++
+ #ifdef _DEBUG
+ #define RASQAL_DEBUG 1
+ #endif
diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch
deleted file mode 100644
index 764198e38108..000000000000
--- a/redland/redland-1.0.7.patch
+++ /dev/null
@@ -1,1019 +0,0 @@
---- misc/redland-1.0.7/LICENSE.txt	Wed May  2 07:45:42 2007
-+++ misc/build/redland-1.0.7/LICENSE.txt	Mon Jun 16 15:55:51 2008
-@@ -77,3 +77,15 @@
-   10. NOTICE
-   11. http://purl.org/net/dajobe/
-   12. http://www.bristol.ac.uk/
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+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	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,125 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: redland-1.0.7.patch,v $
-+#
-+# $Revision: 1.2.6.2 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=librdf
-+LIBTARGET=NO
-+UWINAPILIB=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.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 --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/rdf_concepts.obj \
-+   $(SLO)$/rdf_digest.obj \
-+   $(SLO)$/rdf_digest_md5.obj \
-+   $(SLO)$/rdf_digest_openssl.obj \
-+   $(SLO)$/rdf_digest_sha1.obj \
-+   $(SLO)$/rdf_files.obj \
-+   $(SLO)$/rdf_hash.obj \
-+   $(SLO)$/rdf_hash_cursor.obj \
-+   $(SLO)$/rdf_hash_memory.obj \
-+   $(SLO)$/rdf_heuristics.obj \
-+   $(SLO)$/rdf_init.obj \
-+   $(SLO)$/rdf_iterator.obj \
-+   $(SLO)$/rdf_list.obj \
-+   $(SLO)$/rdf_log.obj \
-+   $(SLO)$/rdf_model.obj \
-+   $(SLO)$/rdf_model_storage.obj \
-+   $(SLO)$/rdf_node.obj \
-+   $(SLO)$/rdf_parser.obj \
-+   $(SLO)$/rdf_parser_raptor.obj \
-+   $(SLO)$/rdf_query.obj \
-+   $(SLO)$/rdf_query_rasqal.obj \
-+   $(SLO)$/rdf_query_results.obj \
-+   $(SLO)$/rdf_query_triples.obj \
-+   $(SLO)$/rdf_serializer.obj \
-+   $(SLO)$/rdf_serializer_raptor.obj \
-+   $(SLO)$/rdf_statement.obj \
-+   $(SLO)$/rdf_storage.obj \
-+   $(SLO)$/rdf_storage_file.obj \
-+   $(SLO)$/rdf_storage_list.obj \
-+   $(SLO)$/rdf_storage_hashes.obj \
-+   $(SLO)$/rdf_stream.obj \
-+   $(SLO)$/rdf_uri.obj \
-+   $(SLO)$/rdf_utf8.obj \
-+
-+
-+#   $(SLO)$/rdf_hash_bdb.obj \
-+#   $(SLO)$/rdf_storage_mysql.obj \
-+#   $(SLO)$/rdf_storage_sqlite.obj \
-+
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= $(TARGET)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+.IF "$(GUI)"=="OS2"
-+SHL1VERSIONMAP=$(PRJ)$/redland$/redland2.map
-+.ENDIF
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(OPENSSLLIB) \
-+    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
-+
-+.IF "$(GUI)"=="OS2"
-+SHL1STDLIBS+= pthread.lib
-+.ENDIF
-+
-+#$(LIBXML2LIB) \
-+#    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- misc/redland-1.0.7/librdf/rdf_digest.c	Wed Dec  5 18:25:18 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_digest.c	Mon Jun 16 15:55:51 2008
-@@ -250,6 +250,8 @@
- void
- librdf_free_digest(librdf_digest *digest) 
- {
-+  if(!digest)
-+    return;
-   if(digest->context)
-     LIBRDF_FREE(digest_context, digest->context);
-   if(digest->digest)
---- misc/redland-1.0.7/librdf/rdf_hash.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_hash.c	Mon Jun 16 15:55:51 2008
-@@ -490,6 +490,8 @@
- void
- librdf_free_hash(librdf_hash* hash) 
- {
-+  if(!hash)
-+    return;
-   if(hash->context) {
-     if(hash->is_open)
-       librdf_hash_close(hash);
---- misc/redland-1.0.7/librdf/rdf_init.c	Tue Nov  6 16:26:18 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_init.c	Mon Jun 16 15:55:51 2008
-@@ -178,6 +178,9 @@
- void
- librdf_free_world(librdf_world *world)
- {
-+  if(!world)
-+    return;
-+
-   /* NOTE: raptor is always initialised as a parser and may
-    * be also used as a serializer, but it is NOT finished
-    * in the serializer_raptor registration.  Therefore, always
---- misc/redland-1.0.7/librdf/rdf_list.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_list.c	Mon Jun 16 15:55:51 2008
-@@ -108,6 +108,8 @@
- void
- librdf_free_list(librdf_list* list) 
- {
-+  if(!list)
-+    return;
-   LIBRDF_ASSERT_RETURN(list->iterator_count,
-                        "Iterators were active on freeing list", );
- 
---- misc/redland-1.0.7/librdf/rdf_model.c	Tue Oct 23 16:55:06 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_model.c	Mon Jun 16 15:55:51 2008
-@@ -393,7 +393,8 @@
-   librdf_iterator* iterator;
-   librdf_model* m;
- 
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model);
-+  if(!model)
-+    return;
- 
-   if(--model->usage)
-     return;
---- misc/redland-1.0.7/librdf/rdf_node.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_node.c	Mon Jun 16 15:55:51 2008
-@@ -726,7 +726,8 @@
-   librdf_world *world;
- #endif
- 
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node);
-+  if(!node)
-+    return;
- 
- #ifdef WITH_THREADS
-   world = node->world;
---- misc/redland-1.0.7/librdf/rdf_parser.c	Mon Dec 17 08:19:11 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_parser.c	Mon Jun 16 15:55:51 2008
-@@ -371,7 +371,8 @@
- void
- librdf_free_parser(librdf_parser *parser) 
- {
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser);
-+  if(!parser)
-+    return;
- 
-   if(parser->context) {
-     if(parser->factory->terminate)
---- misc/redland-1.0.7/librdf/rdf_query.c	Tue Oct 23 16:55:06 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_query.c	Mon Jun 16 15:55:51 2008
-@@ -388,7 +388,8 @@
- void
- librdf_free_query(librdf_query* query) 
- {
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query);
-+  if(!query)
-+    return;
- 
-   if(--query->usage)
-     return;
---- misc/redland-1.0.7/librdf/rdf_query_results.c	Fri Oct 26 04:23:36 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_query_results.c	Mon Jun 16 15:55:51 2008
-@@ -244,7 +244,8 @@
- void
- librdf_free_query_results(librdf_query_results* query_results)
- {
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results);
-+  if(!query_results)
-+    return;
- 
-   if(query_results->query->factory->free_results)
-     query_results->query->factory->free_results(query_results);
-@@ -636,6 +637,8 @@
- void
- librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) 
- {
-+  if(!formatter)
-+    return;
-   if(formatter->query_results->query->factory->free_results_formatter)
-     formatter->query_results->query->factory->free_results_formatter(formatter);
- }
---- misc/redland-1.0.7/librdf/rdf_serializer.c	Tue Oct 23 16:55:06 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_serializer.c	Mon Jun 16 15:55:51 2008
-@@ -373,7 +373,8 @@
- void
- librdf_free_serializer(librdf_serializer *serializer) 
- {
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer);
-+  if(!serializer)
-+    return;
- 
-   if(serializer->context) {
-     if(serializer->factory->terminate)
---- misc/redland-1.0.7/librdf/rdf_statement.c	Tue Nov  6 16:26:18 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_statement.c	Mon Jun 16 15:55:51 2008
-@@ -255,7 +255,8 @@
-   librdf_world *world;
- #endif
- 
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement);
-+  if(!statement)
-+    return;
- 
- #ifdef WITH_THREADS
-   world = statement->world;
---- misc/redland-1.0.7/librdf/rdf_storage.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_storage.c	Mon Jun 16 15:55:51 2008
-@@ -608,7 +608,8 @@
- void
- librdf_free_storage (librdf_storage* storage) 
- {
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage);
-+  if(!storage)
-+    return;
- 
-   if(--storage->usage)
-     return;
---- misc/redland-1.0.7/librdf/rdf_storage_hashes.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c	Mon Jun 16 15:55:51 2008
-@@ -1389,6 +1389,66 @@
-                                                     LIBRDF_STATEMENT_OBJECT);
- }
- 
-+
-+/* return -1 on failure, 1 if context contains stmt, 0 if not */
-+static int
-+librdf_storage_hashes_context_contains_statement(librdf_storage* storage,
-+    librdf_node* context_node,
-+    librdf_statement* statement)
-+{
-+  librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context;
-+  librdf_hash_datum key, value; /* on stack - not allocated */
-+  size_t size;
-+  int status;
-+
-+  if(context->contexts_index < 0) {
-+    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
-+               "Storage was created without context support");
-+    return -1;
-+  }
-+
-+  /* ENCODE KEY */
-+  size=librdf_node_encode(context_node, NULL, 0);
-+  if (!size)
-+    return -1;
-+  key.data=(char*)LIBRDF_MALLOC(cstring, size);
-+  if (!key.data)
-+    return -1;
-+  key.size=librdf_node_encode(context_node,
-+                               (unsigned char*)key.data, size);
-+  if (!key.size) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+
-+  /* ENCODE VALUE */
-+  size=librdf_statement_encode(statement, NULL, 0);
-+  if (!size) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+  value.data=(char*)LIBRDF_MALLOC(cstring, size);
-+  if (!value.data) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
-+  if (!value.size) {
-+    LIBRDF_FREE(data, value.data);
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+
-+  status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value);
-+  LIBRDF_FREE(data, value.data);
-+  LIBRDF_FREE(data, key.data);
-+
-+  /* DO NOT free statement, ownership was not passed in */
-+  return status;
-+}
-+
-+
-+
- /**
-  * librdf_storage_hashes_context_add_statement:
-  * @storage: #librdf_storage object
-@@ -1414,7 +1474,15 @@
-                "Storage was created without context support");
-     return 1;
-   }
--  
-+
-+  /* Do not add duplicate statements */
-+  status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement);
-+  if(status)
-+    if(status < 0)
-+      return 1;
-+    else
-+      return 0;
-+
-   if(librdf_storage_hashes_add_remove_statement(storage, 
-                                                 statement, context_node, 1))
-     return 1;
-@@ -1595,7 +1663,6 @@
- {
-   librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context;
-   librdf_hash_datum* v;
--  librdf_node** cnp=NULL;
- 
-   switch(flags) {
-     case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT:
-@@ -1608,20 +1675,14 @@
-           return scontext->context_node;
-       }
- 
--      /* current stuff is out of date - get new cached answers */
--      if(scontext->index_contexts) {
--        if(scontext->context_node)
--          librdf_free_node(scontext->context_node);
--        scontext->context_node=NULL;
--        cnp=&scontext->context_node;
--      }
--      
-+      /* note: scontext->context_node is still valid */
-+
-       librdf_statement_clear(&scontext->current);
- 
-       v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator);
--      
-+
-       /* decode value content and optional context */
--      if(!librdf_statement_decode_parts(&scontext->current, cnp,
-+      if(!librdf_statement_decode_parts(&scontext->current, NULL,
-                                         (unsigned char*)v->data, v->size)) {
-         return NULL;
-       }
---- misc/redland-1.0.7/librdf/rdf_storage_list.c	Thu Dec 20 22:39:42 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_storage_list.c	Mon Jun 16 15:55:51 2008
-@@ -459,6 +459,64 @@
- }
- 
- 
-+/* return -1 on failure, 1 if context contains stmt, 0 if not */
-+static int
-+librdf_storage_list_context_contains_statement(librdf_storage* storage,
-+    librdf_node* context_node,
-+    librdf_statement* statement)
-+{
-+  librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context;
-+  librdf_hash_datum key, value; /* on stack - not allocated */
-+  size_t size;
-+  int status;
-+
-+  if(!context->index_contexts) {
-+    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
-+               "Storage was created without context support");
-+    return -1;
-+  }
-+
-+  /* ENCODE KEY */
-+  size=librdf_node_encode(context_node, NULL, 0);
-+  if (!size)
-+    return -1;
-+  key.data=(char*)LIBRDF_MALLOC(cstring, size);
-+  if (!key.data)
-+    return -1;
-+  key.size=librdf_node_encode(context_node,
-+                               (unsigned char*)key.data, size);
-+  if (!key.size) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+
-+  /* ENCODE VALUE */
-+  size=librdf_statement_encode(statement, NULL, 0);
-+  if (!size) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+  value.data=(char*)LIBRDF_MALLOC(cstring, size);
-+  if (!value.data) {
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
-+  if (!value.size) {
-+    LIBRDF_FREE(data, value.data);
-+    LIBRDF_FREE(data, key.data);
-+    return -1;
-+  }
-+
-+  status=librdf_hash_exists(context->contexts, &key, &value);
-+  LIBRDF_FREE(data, value.data);
-+  LIBRDF_FREE(data, key.data);
-+
-+  /* DO NOT free statement, ownership was not passed in */
-+  return status;
-+}
-+
-+
- /**
-  * librdf_storage_list_context_add_statement:
-  * @storage: #librdf_storage object
-@@ -485,7 +543,15 @@
-                "Storage was created without context support");
-     return 1;
-   }
--  
-+
-+  /* Do not add duplicate statements */
-+  status=librdf_storage_list_context_contains_statement(storage, context_node, statement);
-+  if(status)
-+    if(status < 0)
-+      return 1;
-+    else
-+      return 0;
-+
-   /* Store statement + node in the storage_list */
-   sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node));
-   if(!sln)
---- misc/redland-1.0.7/librdf/rdf_stream.c	Mon Dec 24 00:23:10 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_stream.c	Mon Jun 16 15:55:52 2008
-@@ -126,6 +126,9 @@
- void
- librdf_free_stream(librdf_stream* stream) 
- {
-+  if(!stream)
-+    return;
-+
-   if(stream->finished_method)
-     stream->finished_method(stream->context);
- 
---- misc/redland-1.0.7/librdf/rdf_uri.c	Tue Oct 23 16:55:06 2007
-+++ misc/build/redland-1.0.7/librdf/rdf_uri.c	Mon Jun 16 15:55:52 2008
-@@ -409,7 +409,8 @@
-   librdf_world *world;
- #endif
- 
--  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri);
-+  if(!uri)
-+    return;
- 
- #ifdef WITH_THREADS
-   world = uri->world;
---- misc/redland-1.0.7/librdf/win32_rdf_config.h	Sun May  6 19:14:36 2007
-+++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h	Sat Jul 12 08:56:20 2008
-@@ -45,7 +45,8 @@
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -74,40 +75,40 @@
-  */
- 
- /* BDB has close method with 2 args */
--#define HAVE_BDB_CLOSE_2_ARGS 1
-+// #define HAVE_BDB_CLOSE_2_ARGS 1
- 
- /* BDB defines DBC */
--#define HAVE_BDB_CURSOR 1
-+// #define HAVE_BDB_CURSOR 1
- 
- /* BDB cursor method has 4 arguments */
--#define HAVE_BDB_CURSOR_4_ARGS 1
-+// #define HAVE_BDB_CURSOR_4_ARGS 1
- 
- /* BDB defines DB_TXN */
--#define HAVE_BDB_DB_TXN 1
-+// #define HAVE_BDB_DB_TXN 1
- 
- /* BDB has fd method with 2 args */
--#define HAVE_BDB_FD_2_ARGS 1
-+// #define HAVE_BDB_FD_2_ARGS 1
- 
- /* Have BDB hash support */
--#define HAVE_BDB_HASH 1
-+// #define HAVE_BDB_HASH 1
- 
- /* BDB has open method with 6 args */
- /* #undef HAVE_BDB_OPEN_6_ARGS */
- 
- /* BDB has open method with 7 args */
--#define HAVE_BDB_OPEN_7_ARGS 1
-+// #define HAVE_BDB_OPEN_7_ARGS 1
- 
- /* BDB has set_flags method */
--#define HAVE_BDB_SET_FLAGS 1
-+// #define HAVE_BDB_SET_FLAGS 1
- 
- /* BDB has dbopen method */
- /* #undef HAVE_DBOPEN */
- 
- /* BDB has db_create method */
--#define HAVE_DB_CREATE 1
-+// #define HAVE_DB_CREATE 1
- 
- /* Define to 1 if you have the <db.h> header file. */
--#define HAVE_DB_H 1
-+// #define HAVE_DB_H 1
- 
- /* Define to 1 if you have the <dlfcn.h> header file. */
- /* undef HAVE_DLFCN_H */
-@@ -143,13 +144,13 @@
- /* #undef HAVE_LIBWWW */
- 
- /* Have local MD5 digest */
--#define HAVE_LOCAL_MD5_DIGEST 1
-+// #define HAVE_LOCAL_MD5_DIGEST 1
- 
- /* Have local RIPEMD160 digest */
- /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
- 
- /* Have local SHA1 digest */
--#define HAVE_LOCAL_SHA1_DIGEST 1
-+// #define HAVE_LOCAL_SHA1_DIGEST 1
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-@@ -161,25 +162,33 @@
- #define HAVE_MKTEMP 1
- 
- /* MySQL libraries are present */
--#define HAVE_MYSQL 1
-+// #define HAVE_MYSQL 1
- 
- /* Define to 1 if you have the <openssl/crypto.h> header file. */
- /* #undef HAVE_OPENSSL_CRYPTO_H */
-+#define HAVE_OPENSSL_CRYPTO_H 1
- 
- /* Have openssl MD5 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
- 
- /* Have openssl RIPEMD160 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
- 
- /* Have openssl SHA1 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
- 
- /* Have openssl digests */
- /* #undef HAVE_OPENSSL_DIGESTS */
-+#define HAVE_OPENSSL_DIGESTS 1
- 
- /* Define to 1 if you have the <pthread.h> header file. */
- /* #undef HAVE_PTHREAD_H */
-+#ifdef __MINGW32__
-+#undef HAVE_PTHREAD_H */
-+#endif
- 
- /* Define to 1 if you have the <stdint.h> header file. */
- #define HAVE_STDINT_H 1
-@@ -248,7 +257,7 @@
- #define SIZEOF_UNSIGNED_LONG_LONG 8
- 
- /* SQLite API version */
--#define SQLITE_API 3
-+// #define SQLITE_API 3
- 
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1
-@@ -256,14 +265,17 @@
- /* Building file storage */
- #define STORAGE_FILE 1
- 
-+#define STORAGE_HASHES 1
-+#define STORAGE_MEMORY 1
-+
- /* Building MySQL storage */
--#define STORAGE_MYSQL 1
-+// #define STORAGE_MYSQL 1
- 
- /* Building PostgreSQL storage */
- /*#undef STORAGE_POSTGRESQL*/
- 
- /* Building SQLite storage */
--#define STORAGE_SQLITE 1
-+// #define STORAGE_SQLITE 1
- 
- /* Building 3store storage */
- /*#undef STORAGE_TSTORE*/
---- misc/redland-1.0.7/raptor/LICENSE.txt	Fri Mar 23 06:28:24 2007
-+++ misc/build/redland-1.0.7/raptor/LICENSE.txt	Mon Jun 16 15:55:52 2008
-@@ -61,3 +61,15 @@
- 
-    Copyright (C) 2000-2007 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+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/rasqal/LICENSE.txt	Sun Apr 22 23:09:08 2007
-+++ misc/build/redland-1.0.7/rasqal/LICENSE.txt	Mon Jun 16 15:55:52 2008
-@@ -61,3 +61,15 @@
- 
-    Copyright (C) 2003-2007 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+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/ltmain.sh	2007-11-28 06:23:09.000000000 +0900
-+++ misc/build/redland-1.0.7/ltmain.sh	2008-07-06 15:44:48.725250000 +0900
-@@ -1557,6 +1557,11 @@
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
-+	  case $host_os in
-+	    mingw*)
-+	      absdir=`cygpath -m $absdir`
-+	      ;;
-+	    esac
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- 	    absdir="$dir"
-@@ -3237,9 +3242,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3319,8 +3324,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	irix | nonstopux)
---- misc/redland-1.0.7/configure	2007-12-17 16:58:16.000000000 +0900
-+++ misc/build/redland-1.0.7/configure	2008-07-06 15:12:01.397125000 +0900
-@@ -4544,7 +4544,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4553,7 +4553,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
-     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
---- misc/redland-1.0.7/utils/rdfproc.c	2007-10-23 23:55:06.000000000 +0900
-+++ misc/build/redland-1.0.7/utils/rdfproc.c	2008-07-06 17:44:47.615875000 +0900
-@@ -30,7 +30,7 @@
- #endif
- 
- #ifdef WIN32
--#include <win32_config.h>
-+#include <win32_rdf_config.h>
- #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 e8b473769821..a1bad00117cc 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.8.2.2 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -48,23 +48,42 @@ all:
 
 .INCLUDE :	../redlandversion.mk
 
-REDLANDVERSION=1.0.7
+REDLANDVERSION=1.0.8
 
 TARFILE_NAME=redland-$(REDLANDVERSION)
-PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
 
+OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.legal \
+    $(TARFILE_NAME).patch.autotools \
+    $(TARFILE_NAME).patch.dmake \
+    $(TARFILE_NAME).patch.win32 \
+
+
+PATCH_FILES=$(OOO_PATCH_FILES) \
+    $(TARFILE_NAME).patch.free_null \
+    $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
+    $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
+
+
 .IF "$(OS)"=="OS2"
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/librdf
-
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
+redland_CC=$(CC)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+redland_CC+=-shared-libgcc
+.ENDIF
+redland_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+redland_LIBS+=-lstdc++_s
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -104,7 +123,7 @@ LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.
 
 CPPFLAGS+:=$(EXTRA_CFLAGS)
 LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand variable for (internal) xslt-config
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 
 .EXPORT: CPPFLAGS
 .EXPORT: LDFLAGS
@@ -126,7 +145,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 OUT2INC+=librdf$/*.h
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=librdf$/.libs$/librdf.0.dylib
+OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OUT2LIB+=librdf$/.libs$/*.a
@@ -134,12 +153,10 @@ OUT2BIN+=librdf$/.libs$/*.dll
 .ELSE
 # if we use dmake, this is done automagically
 .ENDIF
-
 .ELIF "$(OS)"=="OS2"
 # if we use dmake, this is done automagically
-
 .ELSE
-OUT2LIB+=librdf$/.libs$/librdf.so.0
+OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
new file mode 100644
index 000000000000..5b29d0b7708b
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.autotools
@@ -0,0 +1,58 @@
+--- misc/redland-1.0.8/configure	Fri Jul  4 18:00:39 2008
++++ misc/build/redland-1.0.8/configure	Wed Feb 18 13:27:43 2009
+@@ -4671,7 +4671,7 @@
+ 
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+@@ -4680,7 +4680,7 @@
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+   if ( file / ) >/dev/null 2>&1; then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+--- misc/redland-1.0.8/ltmain.sh	Tue Apr 29 23:33:55 2008
++++ misc/build/redland-1.0.8/ltmain.sh	Wed Feb 18 13:28:39 2009
+@@ -1565,6 +1565,11 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  absdir=`cd "$dir" && pwd`
++	  case $host_os in
++	    mingw*)
++	      absdir=`cygpath -m $absdir`
++	      ;;
++	  esac
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ 	    absdir="$dir"
+@@ -3262,9 +3267,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor`
+@@ -3344,8 +3349,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
new file mode 100644
index 000000000000..d88f9548a341
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -0,0 +1,118 @@
+--- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
++++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
+@@ -1,1 +1,114 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: redland-1.0.8.patch,v $
++#
++# $Revision: 1.1.2.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=redland
++TARGET=librdf
++LIBTARGET=NO
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++
++# --- Files --------------------------------------------------------
++
++SLOFILES =	\
++   $(SLO)$/rdf_concepts.obj \
++   $(SLO)$/rdf_digest.obj \
++   $(SLO)$/rdf_digest_md5.obj \
++   $(SLO)$/rdf_digest_openssl.obj \
++   $(SLO)$/rdf_digest_sha1.obj \
++   $(SLO)$/rdf_files.obj \
++   $(SLO)$/rdf_hash.obj \
++   $(SLO)$/rdf_hash_cursor.obj \
++   $(SLO)$/rdf_hash_memory.obj \
++   $(SLO)$/rdf_heuristics.obj \
++   $(SLO)$/rdf_init.obj \
++   $(SLO)$/rdf_iterator.obj \
++   $(SLO)$/rdf_list.obj \
++   $(SLO)$/rdf_log.obj \
++   $(SLO)$/rdf_model.obj \
++   $(SLO)$/rdf_model_storage.obj \
++   $(SLO)$/rdf_node.obj \
++   $(SLO)$/rdf_parser.obj \
++   $(SLO)$/rdf_parser_raptor.obj \
++   $(SLO)$/rdf_query.obj \
++   $(SLO)$/rdf_query_rasqal.obj \
++   $(SLO)$/rdf_query_results.obj \
++   $(SLO)$/rdf_query_triples.obj \
++   $(SLO)$/rdf_serializer.obj \
++   $(SLO)$/rdf_serializer_raptor.obj \
++   $(SLO)$/rdf_statement.obj \
++   $(SLO)$/rdf_storage.obj \
++   $(SLO)$/rdf_storage_file.obj \
++   $(SLO)$/rdf_storage_list.obj \
++   $(SLO)$/rdf_storage_hashes.obj \
++   $(SLO)$/rdf_stream.obj \
++   $(SLO)$/rdf_uri.obj \
++   $(SLO)$/rdf_utf8.obj \
++
++
++#   $(SLO)$/rdf_hash_bdb.obj \
++#   $(SLO)$/rdf_storage_mysql.obj \
++#   $(SLO)$/rdf_storage_sqlite.obj \
++
++
++SHL1DEPN=   makefile.mk
++SHL1OBJS=   $(SLOFILES)
++
++#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
++SHL1TARGET=	$(TARGET)
++SHL1IMPLIB= $(TARGET)
++SHL1USE_EXPORTS=name
++
++#SHL1VERSIONMAP=../service/exports.map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++
++SHL1STDLIBS= \
++    $(OPENSSLLIB) \
++    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
++    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
++
++
++#$(LIBXML2LIB) \
++#    $(XSLTLIB) \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
diff --git a/redland/redland/redland-1.0.8.patch.free_null b/redland/redland/redland-1.0.8.patch.free_null
new file mode 100644
index 000000000000..0524bb636b5e
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.free_null
@@ -0,0 +1,174 @@
+--- misc/redland-1.0.8/librdf/rdf_digest.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_digest.c	Thu Nov  6 12:44:39 2008
+@@ -248,6 +248,8 @@
+ void
+ librdf_free_digest(librdf_digest *digest) 
+ {
++  if(!digest)
++    return;
+   if(digest->context)
+     LIBRDF_FREE(digest_context, digest->context);
+   if(digest->digest)
+--- misc/redland-1.0.8/librdf/rdf_hash.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_hash.c	Thu Nov  6 12:44:39 2008
+@@ -488,6 +488,8 @@
+ void
+ librdf_free_hash(librdf_hash* hash) 
+ {
++  if(!hash)
++    return;
+   if(hash->context) {
+     if(hash->is_open)
+       librdf_hash_close(hash);
+--- misc/redland-1.0.8/librdf/rdf_init.c	Tue Nov  6 16:26:18 2007
++++ misc/build/redland-1.0.8/librdf/rdf_init.c	Mon Jun 16 15:55:51 2008
+@@ -178,6 +178,9 @@
+ void
+ librdf_free_world(librdf_world *world)
+ {
++  if(!world)
++    return;
++
+   /* NOTE: raptor is always initialised as a parser and may
+    * be also used as a serializer, but it is NOT finished
+    * in the serializer_raptor registration.  Therefore, always
+--- misc/redland-1.0.8/librdf/rdf_list.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_list.c	Thu Nov  6 12:44:39 2008
+@@ -106,6 +106,8 @@
+ void
+ librdf_free_list(librdf_list* list) 
+ {
++  if(!list)
++    return;
+   LIBRDF_ASSERT_RETURN(list->iterator_count,
+                        "Iterators were active on freeing list", );
+ 
+--- misc/redland-1.0.8/librdf/rdf_model.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_model.c	Thu Nov  6 12:44:39 2008
+@@ -391,7 +391,8 @@
+   librdf_iterator* iterator;
+   librdf_model* m;
+ 
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model);
++  if(!model)
++    return;
+ 
+   if(--model->usage)
+     return;
+--- misc/redland-1.0.8/librdf/rdf_node.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_node.c	Thu Nov  6 12:44:39 2008
+@@ -724,7 +724,8 @@
+   librdf_world *world;
+ #endif
+ 
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node);
++  if(!node)
++    return;
+ 
+ #ifdef WITH_THREADS
+   world = node->world;
+--- misc/redland-1.0.8/librdf/rdf_parser.c	Tue Jul  1 08:09:58 2008
++++ misc/build/redland-1.0.8/librdf/rdf_parser.c	Thu Nov  6 12:44:39 2008
+@@ -369,7 +369,8 @@
+ void
+ librdf_free_parser(librdf_parser *parser) 
+ {
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser);
++  if(!parser)
++    return;
+ 
+   if(parser->context) {
+     if(parser->factory->terminate)
+--- misc/redland-1.0.8/librdf/rdf_query.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_query.c	Thu Nov  6 12:44:39 2008
+@@ -386,7 +386,8 @@
+ void
+ librdf_free_query(librdf_query* query) 
+ {
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query);
++  if(!query)
++    return;
+ 
+   if(--query->usage)
+     return;
+--- misc/redland-1.0.8/librdf/rdf_query_results.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_query_results.c	Thu Nov  6 12:44:39 2008
+@@ -242,7 +242,8 @@
+ void
+ librdf_free_query_results(librdf_query_results* query_results)
+ {
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results);
++  if(!query_results)
++    return;
+ 
+   if(query_results->query->factory->free_results)
+     query_results->query->factory->free_results(query_results);
+@@ -634,6 +635,8 @@
+ void
+ librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) 
+ {
++  if(!formatter)
++    return;
+   if(formatter->query_results->query->factory->free_results_formatter)
+     formatter->query_results->query->factory->free_results_formatter(formatter);
+ }
+--- misc/redland-1.0.8/librdf/rdf_serializer.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_serializer.c	Thu Nov  6 12:44:39 2008
+@@ -371,7 +371,8 @@
+ void
+ librdf_free_serializer(librdf_serializer *serializer) 
+ {
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer);
++  if(!serializer)
++    return;
+ 
+   if(serializer->context) {
+     if(serializer->factory->terminate)
+--- misc/redland-1.0.8/librdf/rdf_statement.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_statement.c	Thu Nov  6 12:44:39 2008
+@@ -253,7 +253,8 @@
+   librdf_world *world;
+ #endif
+ 
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement);
++  if(!statement)
++    return;
+ 
+ #ifdef WITH_THREADS
+   world = statement->world;
+--- misc/redland-1.0.8/librdf/rdf_storage.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_storage.c	Thu Nov  6 12:44:39 2008
+@@ -610,7 +610,8 @@
+ void
+ librdf_free_storage(librdf_storage* storage) 
+ {
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage);
++  if(!storage)
++    return;
+ 
+   if(--storage->usage)
+     return;
+--- misc/redland-1.0.8/librdf/rdf_stream.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_stream.c	Thu Nov  6 12:44:39 2008
+@@ -124,6 +124,9 @@
+ void
+ librdf_free_stream(librdf_stream* stream) 
+ {
++  if(!stream)
++    return;
++
+   if(stream->finished_method)
+     stream->finished_method(stream->context);
+ 
+--- misc/redland-1.0.8/librdf/rdf_uri.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_uri.c	Thu Nov  6 12:44:39 2008
+@@ -407,7 +407,8 @@
+   librdf_world *world;
+ #endif
+ 
+-  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri);
++  if(!uri)
++    return;
+ 
+ #ifdef WITH_THREADS
+   world = uri->world;
diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.patch.legal
new file mode 100644
index 000000000000..9e9a25bef78e
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.legal
@@ -0,0 +1,54 @@
+--- misc/redland-1.0.8/LICENSE.txt	Tue Jul  1 07:55:28 2008
++++ misc/build/redland-1.0.8/LICENSE.txt	Thu Nov  6 12:44:39 2008
+@@ -76,3 +76,15 @@
+   10. NOTICE
+   11. http://www.dajobe.org/
+   12. http://www.bristol.ac.uk/
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
+--- misc/redland-1.0.8/raptor/LICENSE.txt	Sun Mar 30 06:52:22 2008
++++ misc/build/redland-1.0.8/raptor/LICENSE.txt	Thu Nov  6 12:44:39 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2000-2008 David Beckett
+    Copyright (C) 2000-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
+--- misc/redland-1.0.8/rasqal/LICENSE.txt	Fri Jun 27 04:24:52 2008
++++ misc/build/redland-1.0.8/rasqal/LICENSE.txt	Thu Nov  6 12:44:40 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2003-2008 Dave Beckett
+    Copyright (C) 2003-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement
new file mode 100644
index 000000000000..8c72946d199f
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement
@@ -0,0 +1,35 @@
+--- misc/redland-1.0.8/librdf/rdf_storage_hashes.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c	Thu Nov  6 12:44:39 2008
+@@ -1593,7 +1661,6 @@
+ {
+   librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context;
+   librdf_hash_datum* v;
+-  librdf_node** cnp=NULL;
+ 
+   switch(flags) {
+     case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT:
+@@ -1606,20 +1673,14 @@
+           return scontext->context_node;
+       }
+ 
+-      /* current stuff is out of date - get new cached answers */
+-      if(scontext->index_contexts) {
+-        if(scontext->context_node)
+-          librdf_free_node(scontext->context_node);
+-        scontext->context_node=NULL;
+-        cnp=&scontext->context_node;
+-      }
+-      
++      /* note: scontext->context_node is still valid */
++
+       librdf_statement_clear(&scontext->current);
+ 
+       v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator);
+-      
++
+       /* decode value content and optional context */
+-      if(!librdf_statement_decode_parts(&scontext->current, cnp,
++      if(!librdf_statement_decode_parts(&scontext->current, NULL,
+                                         (unsigned char*)v->data, v->size)) {
+         return NULL;
+       }
diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates
new file mode 100644
index 000000000000..d2ef7e772230
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates
@@ -0,0 +1,170 @@
+--- misc/redland-1.0.8/librdf/rdf_storage_hashes.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c	Thu Nov  6 12:44:39 2008
+@@ -1387,6 +1387,66 @@
+                                                     LIBRDF_STATEMENT_OBJECT);
+ }
+ 
++
++/* return -1 on failure, 1 if context contains stmt, 0 if not */
++static int
++librdf_storage_hashes_context_contains_statement(librdf_storage* storage,
++    librdf_node* context_node,
++    librdf_statement* statement)
++{
++  librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context;
++  librdf_hash_datum key, value; /* on stack - not allocated */
++  size_t size;
++  int status;
++
++  if(context->contexts_index < 0) {
++    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
++               "Storage was created without context support");
++    return -1;
++  }
++
++  /* ENCODE KEY */
++  size=librdf_node_encode(context_node, NULL, 0);
++  if (!size)
++    return -1;
++  key.data=(char*)LIBRDF_MALLOC(cstring, size);
++  if (!key.data)
++    return -1;
++  key.size=librdf_node_encode(context_node,
++                               (unsigned char*)key.data, size);
++  if (!key.size) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++
++  /* ENCODE VALUE */
++  size=librdf_statement_encode(statement, NULL, 0);
++  if (!size) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++  value.data=(char*)LIBRDF_MALLOC(cstring, size);
++  if (!value.data) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
++  if (!value.size) {
++    LIBRDF_FREE(data, value.data);
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++
++  status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value);
++  LIBRDF_FREE(data, value.data);
++  LIBRDF_FREE(data, key.data);
++
++  /* DO NOT free statement, ownership was not passed in */
++  return status;
++}
++
++
++
+ /**
+  * librdf_storage_hashes_context_add_statement:
+  * @storage: #librdf_storage object
+@@ -1412,7 +1472,15 @@
+                "Storage was created without context support");
+     return 1;
+   }
+-  
++
++  /* Do not add duplicate statements */
++  status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement);
++  if(status)
++    if(status < 0)
++      return 1;
++    else
++      return 0;
++
+   if(librdf_storage_hashes_add_remove_statement(storage, 
+                                                 statement, context_node, 1))
+     return 1;
+--- misc/redland-1.0.8/librdf/rdf_storage_list.c	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/rdf_storage_list.c	Thu Nov  6 12:44:39 2008
+@@ -457,6 +457,64 @@
+ }
+ 
+ 
++/* return -1 on failure, 1 if context contains stmt, 0 if not */
++static int
++librdf_storage_list_context_contains_statement(librdf_storage* storage,
++    librdf_node* context_node,
++    librdf_statement* statement)
++{
++  librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context;
++  librdf_hash_datum key, value; /* on stack - not allocated */
++  size_t size;
++  int status;
++
++  if(!context->index_contexts) {
++    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
++               "Storage was created without context support");
++    return -1;
++  }
++
++  /* ENCODE KEY */
++  size=librdf_node_encode(context_node, NULL, 0);
++  if (!size)
++    return -1;
++  key.data=(char*)LIBRDF_MALLOC(cstring, size);
++  if (!key.data)
++    return -1;
++  key.size=librdf_node_encode(context_node,
++                               (unsigned char*)key.data, size);
++  if (!key.size) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++
++  /* ENCODE VALUE */
++  size=librdf_statement_encode(statement, NULL, 0);
++  if (!size) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++  value.data=(char*)LIBRDF_MALLOC(cstring, size);
++  if (!value.data) {
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
++  if (!value.size) {
++    LIBRDF_FREE(data, value.data);
++    LIBRDF_FREE(data, key.data);
++    return -1;
++  }
++
++  status=librdf_hash_exists(context->contexts, &key, &value);
++  LIBRDF_FREE(data, value.data);
++  LIBRDF_FREE(data, key.data);
++
++  /* DO NOT free statement, ownership was not passed in */
++  return status;
++}
++
++
+ /**
+  * librdf_storage_list_context_add_statement:
+  * @storage: #librdf_storage object
+@@ -483,7 +541,15 @@
+                "Storage was created without context support");
+     return 1;
+   }
+-  
++
++  /* Do not add duplicate statements */
++  status=librdf_storage_list_context_contains_statement(storage, context_node, statement);
++  if(status)
++    if(status < 0)
++      return 1;
++    else
++      return 0;
++
+   /* Store statement + node in the storage_list */
+   sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node));
+   if(!sln)
diff --git a/redland/redland/redland-1.0.8.patch.win32 b/redland/redland/redland-1.0.8.patch.win32
new file mode 100644
index 000000000000..41d3503dcc98
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.win32
@@ -0,0 +1,154 @@
+--- misc/redland-1.0.8/librdf/win32_rdf_config.h	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/win32_rdf_config.h	Wed Feb 18 13:31:07 2009
+@@ -43,7 +43,8 @@
+ #define HAVE_STRICMP 1
+ 
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -72,40 +73,40 @@
+  */
+ 
+ /* BDB has close method with 2 args */
+-#define HAVE_BDB_CLOSE_2_ARGS 1
++// #define HAVE_BDB_CLOSE_2_ARGS 1
+ 
+ /* BDB defines DBC */
+-#define HAVE_BDB_CURSOR 1
++// #define HAVE_BDB_CURSOR 1
+ 
+ /* BDB cursor method has 4 arguments */
+-#define HAVE_BDB_CURSOR_4_ARGS 1
++// #define HAVE_BDB_CURSOR_4_ARGS 1
+ 
+ /* BDB defines DB_TXN */
+-#define HAVE_BDB_DB_TXN 1
++// #define HAVE_BDB_DB_TXN 1
+ 
+ /* BDB has fd method with 2 args */
+-#define HAVE_BDB_FD_2_ARGS 1
++// #define HAVE_BDB_FD_2_ARGS 1
+ 
+ /* Have BDB hash support */
+-#define HAVE_BDB_HASH 1
++// #define HAVE_BDB_HASH 1
+ 
+ /* BDB has open method with 6 args */
+ /* #undef HAVE_BDB_OPEN_6_ARGS */
+ 
+ /* BDB has open method with 7 args */
+-#define HAVE_BDB_OPEN_7_ARGS 1
++// #define HAVE_BDB_OPEN_7_ARGS 1
+ 
+ /* BDB has set_flags method */
+-#define HAVE_BDB_SET_FLAGS 1
++// #define HAVE_BDB_SET_FLAGS 1
+ 
+ /* BDB has dbopen method */
+ /* #undef HAVE_DBOPEN */
+ 
+ /* BDB has db_create method */
+-#define HAVE_DB_CREATE 1
++// #define HAVE_DB_CREATE 1
+ 
+ /* Define to 1 if you have the <db.h> header file. */
+-#define HAVE_DB_H 1
++// #define HAVE_DB_H 1
+ 
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ /* undef HAVE_DLFCN_H */
+@@ -141,13 +142,13 @@
+ /* #undef HAVE_LIBWWW */
+ 
+ /* Have local MD5 digest */
+-#define HAVE_LOCAL_MD5_DIGEST 1
++// #define HAVE_LOCAL_MD5_DIGEST 1
+ 
+ /* Have local RIPEMD160 digest */
+ /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
+ 
+ /* Have local SHA1 digest */
+-#define HAVE_LOCAL_SHA1_DIGEST 1
++// #define HAVE_LOCAL_SHA1_DIGEST 1
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+ #define HAVE_MEMORY_H 1
+@@ -159,25 +160,33 @@
+ #define HAVE_MKTEMP 1
+ 
+ /* MySQL libraries are present */
+-#define HAVE_MYSQL 1
++// #define HAVE_MYSQL 1
+ 
+ /* Define to 1 if you have the <openssl/crypto.h> header file. */
+ /* #undef HAVE_OPENSSL_CRYPTO_H */
++#define HAVE_OPENSSL_CRYPTO_H 1
+ 
+ /* Have openssl MD5 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
+ 
+ /* Have openssl RIPEMD160 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
+ 
+ /* Have openssl SHA1 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
+ 
+ /* Have openssl digests */
+ /* #undef HAVE_OPENSSL_DIGESTS */
++#define HAVE_OPENSSL_DIGESTS 1
+ 
+ /* Define to 1 if you have the <pthread.h> header file. */
+ /* #undef HAVE_PTHREAD_H */
++#ifdef __MINGW32__
++#undef HAVE_PTHREAD_H
++#endif
+ 
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #define HAVE_STDINT_H 1
+@@ -246,7 +255,7 @@
+ #define SIZEOF_UNSIGNED_LONG_LONG 8
+ 
+ /* SQLite API version */
+-#define SQLITE_API 3
++// #define SQLITE_API 3
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #define STDC_HEADERS 1
+@@ -254,14 +263,17 @@
+ /* Building file storage */
+ #define STORAGE_FILE 1
+ 
++#define STORAGE_HASHES 1
++#define STORAGE_MEMORY 1
++
+ /* Building MySQL storage */
+-#define STORAGE_MYSQL 1
++// #define STORAGE_MYSQL 1
+ 
+ /* Building PostgreSQL storage */
+ /*#undef STORAGE_POSTGRESQL*/
+ 
+ /* Building SQLite storage */
+-#define STORAGE_SQLITE 1
++// #define STORAGE_SQLITE 1
+ 
+ /* Building 3store storage */
+ /*#undef STORAGE_TSTORE*/
+--- misc/redland-1.0.8/utils/rdfproc.c	Tue Jul  1 05:10:25 2008
++++ misc/build/redland-1.0.8/utils/rdfproc.c	Wed Feb 18 13:26:41 2009
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ #ifdef WIN32
+-#include <win32_config.h>
++#include <win32_rdf_config.h>
+ #endif
+ 
+ #include <stdio.h>
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
index 9b7f73665c9b..e81022d1f274 100644
--- a/redland/redlandversion.mk
+++ b/redland/redlandversion.mk
@@ -30,8 +30,7 @@
 #*************************************************************************
 
 RAPTOR_MAJOR=1
-# rasqal has no stable abi
-RASQAL_MAJOR=0
+RASQAL_MAJOR=1
 # redland has no stable abi
 REDLAND_MAJOR=0