redland: initial import

10 files changed, 1181 insertions, 0 deletions

diff --git a/redland/LICENSE.txt b/redland/LICENSE.txt
new file mode 100644
index 000000000000..a3a5fa8901e5
--- /dev/null
+++ b/redland/LICENSE.txt
@@ -0,0 +1,11 @@
+
+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/README b/redland/README
new file mode 100644
index 000000000000..57397ccc10d7
--- /dev/null
+++ b/redland/README
@@ -0,0 +1,21 @@
+Redland RDF library (librdf)
+
+Module: external/redland
+
+Upstream URL: http://librdf.org/
+
+License: Triple-licensed: LGPL v2+/GPL v2+/Apache v2
+         Note that Sun distributes this software only under LGPL v2
+         (see LICENSE.txt)
+
+Description:
+This module contains the third-party Redland RDF / librdf library, which
+is needed to support data in RDF (Resource Description Framework) format.
+It consists of 3 parts:
+- raptor:  parsers and serializers for numerous RDF file formats
+- rasqal:  query engine which supports SPARQL queries
+- redland: librdf integrates raptor and rasqal, and provides numerous storage
+           engines for storing RDF graphs (in memory, SQL, ...)
+
+Libraries: libraptor, librasqal, librdf
+
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
new file mode 100644
index 000000000000..29716493d584
--- /dev/null
+++ b/redland/prj/build.lst
@@ -0,0 +1,5 @@
+rl	redland	: soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
+rl	redland				usr1	-	all	rl_mkout	NULL
+rl	redland\raptor		nmake	-	all	rl_raptor	NULL
+rl	redland\rasqal		nmake	-	all	rl_rasqal	rl_raptor NULL
+rl	redland\redland		nmake	-	all	rl_redland	rl_raptor rl_rasqal NULL
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
new file mode 100644
index 000000000000..622e83e038f5
--- /dev/null
+++ b/redland/prj/d.lst
@@ -0,0 +1,6 @@
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
diff --git a/redland/raptor-1.4.17.patch b/redland/raptor-1.4.17.patch
new file mode 100644
index 000000000000..bdefaa0835be
--- /dev/null
+++ b/redland/raptor-1.4.17.patch
@@ -0,0 +1,82 @@
+diff -cr misc/raptor-1.4.17/LICENSE.txt misc/build/raptor-1.4.17/LICENSE.txt
+*** misc/raptor-1.4.17/LICENSE.txt	Sun Mar 30 06:52:22 2008
+--- misc/build/raptor-1.4.17/LICENSE.txt	Fri Jun  6 18:38:51 2008
+***************
+*** 60,62 ****
+--- 60,74 ----
+  
+     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 -cr misc/raptor-1.4.17/src/raptor-config.in misc/build/raptor-1.4.17/src/raptor-config.in
+*** misc/raptor-1.4.17/src/raptor-config.in	2007-01-06 05:02:00.000000000 +0100
+--- misc/build/raptor-1.4.17/src/raptor-config.in	2008-04-07 16:55:00.542937115 +0200
+***************
+*** 21,34 ****
+  # 
+  #
+  
+! prefix=@prefix@
+! exec_prefix=@exec_prefix@
+  
+! if test "@includedir@" != /usr/include ; then
+!   includes="-I@includedir@"
+! else
+!   includes=
+! fi
+  
+  
+  usage()
+--- 21,43 ----
+  # 
+  #
+  
+! 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@
+! #exec_prefix=@exec_prefix@
+! #
+! #if test "@includedir@" != /usr/include ; then
+! #  includes="-I@includedir@"
+! #else
+! #  includes=
+! #fi
+  
+  
+  usage()
+***************
+*** 130,136 ****
+    done
+  fi
+  if test "$echo_libs" = "yes"; then
+!   echo -L@libdir@ -lraptor
+  fi
+  if test "$echo_libtool_libs" = "yes"; then
+    echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+--- 139,146 ----
+    done
+  fi
+  if test "$echo_libs" = "yes"; then
+! #  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/makefile.mk b/redland/raptor/makefile.mk
new file mode 100644
index 000000000000..84b7b225ff67
--- /dev/null
+++ b/redland/raptor/makefile.mk
@@ -0,0 +1,135 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=raptor
+TARGET=so_raptor
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_REDLAND)" == "YES"
+all:
+    @echo "An already available installation of Redland RDF should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+RAPTORVERSION=1.4.17
+
+TARFILE_NAME=$(PRJNAME)-$(RAPTORVERSION)
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
+
+
+.IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+#CONFIGURE_DIR=
+#CONFIGURE_ACTION=.$/configure
+#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump"
+#BUILD_ACTION=$(GNUMAKE)
+#BUILD_DIR=$(CONFIGURE_DIR)
+all:
+    @echo "FIXME: somebody port me to mingw please..."
+    exit 1
+.ELSE
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
+.ENDIF
+.ELSE # "WNT"
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+
+.IF "$(SYSBASE)"!=""
+CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
+# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto
+LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
+.ENDIF
+.ENDIF			# "$(SYSBASE)"!=""
+
+CPPFLAGS+:=$(EXTRA_CFLAGS)
+LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB:=$(XSLTLIB)
+
+.EXPORT: CPPFLAGS
+.EXPORT: LDFLAGS
+.EXPORT: LIBXML2LIB
+.EXPORT: ZLIB3RDLIB
+.EXPORT: XSLTLIB
+
+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
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+#INSTALL_ACTION=$(GNUMAKE) install
+#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
+.ENDIF
+
+
+OUT2INC+=src$/raptor.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=src$/.libs$/libraptor*.dylib
+OUT2BIN+=src/raptor-config
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
+OUT2BIN+=src/raptor-config
+.ELSE
+# if we use dmake, this is done automagically
+.ENDIF
+.ELSE
+OUT2LIB+=src$/.libs$/libraptor*.so*
+OUT2BIN+=src/raptor-config
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/redland/rasqal-0.9.15.patch b/redland/rasqal-0.9.15.patch
new file mode 100644
index 000000000000..03ee6dda062c
--- /dev/null
+++ b/redland/rasqal-0.9.15.patch
@@ -0,0 +1,80 @@
+diff -cr misc/rasqal-0.9.15/LICENSE.txt misc/build/rasqal-0.9.15/LICENSE.txt
+*** misc/rasqal-0.9.15/LICENSE.txt	Sun Apr 22 23:09:08 2007
+--- misc/build/rasqal-0.9.15/LICENSE.txt	Fri Jun  6 18:39:51 2008
+***************
+*** 61,63 ****
+--- 61,75 ----
+  
+     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.
++ 
+diff -cr misc/rasqal-0.9.15/src/rasqal-config.in misc/build/rasqal-0.9.15/src/rasqal-config.in
+*** misc/rasqal-0.9.15/src/rasqal-config.in	2007-04-22 22:58:51.000000000 +0200
+--- misc/build/rasqal-0.9.15/src/rasqal-config.in	2008-04-07 17:18:52.033946868 +0200
+***************
+*** 22,34 ****
+  # 
+  #
+  
+! prefix=@prefix@
+  
+! if test "@includedir@" != /usr/include ; then
+!   includes="-I@includedir@"
+! else
+!   includes=
+! fi
+  
+  
+  usage()
+--- 22,43 ----
+  # 
+  #
+  
+! 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@
+! #
+! #if test "@includedir@" != /usr/include ; then
+! #  includes="-I@includedir@"
+! #else
+! #  includes=
+! #fi
+  
+  
+  usage()
+***************
+*** 109,115 ****
+    echo $includes
+  fi
+  if test "$echo_libs" = "yes"; then
+!   echo -L@libdir@ -lrasqal
+  fi
+  if test "$echo_libtool_libs" = "yes"; then
+    echo @libdir@/@RASQAL_LIBTOOLLIBS@
+--- 118,125 ----
+    echo $includes
+  fi
+  if test "$echo_libs" = "yes"; then
+! #  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/makefile.mk b/redland/rasqal/makefile.mk
new file mode 100644
index 000000000000..7dacd1fcf1d5
--- /dev/null
+++ b/redland/rasqal/makefile.mk
@@ -0,0 +1,135 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=rasqal
+TARGET=so_rasqal
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_REDLAND)" == "YES"
+all:
+    @echo "An already available installation of Redland RDF should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+RASQALVERSION=0.9.15
+
+TARFILE_NAME=$(PRJNAME)-$(RASQALVERSION)
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
+
+
+.IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+#CONFIGURE_DIR=
+#CONFIGURE_ACTION=.$/configure
+#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump"
+#BUILD_ACTION=$(GNUMAKE)
+#BUILD_DIR=$(CONFIGURE_DIR)
+all:
+    @echo "FIXME: somebody port me to mingw please..."
+    exit 1
+.ELSE
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
+.ENDIF
+.ELSE # "WNT"
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+
+.IF "$(SYSBASE)"!=""
+CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
+# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto
+LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
+.ENDIF
+.ENDIF			# "$(SYSBASE)"!=""
+
+CPPFLAGS+:=$(EXTRA_CFLAGS)
+LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB:=$(XSLTLIB)
+
+.EXPORT: CPPFLAGS
+.EXPORT: LDFLAGS
+.EXPORT: LIBXML2LIB
+.EXPORT: ZLIB3RDLIB
+.EXPORT: XSLTLIB
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH
+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
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+#INSTALL_ACTION=$(GNUMAKE) install
+#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
+.ENDIF
+
+
+OUT2INC+=src$/rasqal.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=src$/.libs$/librasqal*.dylib
+OUT2BIN+=src/rasqal-config
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
+OUT2BIN+=src/rasqal-config
+.ELSE
+# if we use dmake, this is done automagically
+.ENDIF
+.ELSE
+OUT2LIB+=src$/.libs$/librasqal*.so*
+OUT2BIN+=src/rasqal-config
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/redland/redland-1.0.7.patch b/redland/redland-1.0.7.patch
new file mode 100644
index 000000000000..23c7fb759a7d
--- /dev/null
+++ b/redland/redland-1.0.7.patch
@@ -0,0 +1,574 @@
+diff -cr misc/redland-1.0.7/LICENSE.txt misc/build/redland-1.0.7/LICENSE.txt
+*** misc/redland-1.0.7/LICENSE.txt	Wed May  2 07:45:42 2007
+--- misc/build/redland-1.0.7/LICENSE.txt	Fri Jun  6 18:40:18 2008
+***************
+*** 77,79 ****
+--- 77,91 ----
+    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.
++ 
+diff -cr misc/redland-1.0.7/raptor/LICENSE.txt misc/build/redland-1.0.7/raptor/LICENSE.txt
+*** misc/redland-1.0.7/raptor/LICENSE.txt	Fri Mar 23 06:28:24 2007
+--- misc/build/redland-1.0.7/raptor/LICENSE.txt	Fri Jun  6 18:40:37 2008
+***************
+*** 61,63 ****
+--- 61,75 ----
+  
+     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.
++ 
+diff -cr misc/redland-1.0.7/rasqal/LICENSE.txt misc/build/redland-1.0.7/rasqal/LICENSE.txt
+*** misc/redland-1.0.7/rasqal/LICENSE.txt	Sun Apr 22 23:09:08 2007
+--- misc/build/redland-1.0.7/rasqal/LICENSE.txt	Fri Jun  6 18:40:54 2008
+***************
+*** 61,63 ****
+--- 61,75 ----
+  
+     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.
++ 
+diff -cr misc/redland-1.0.7/librdf/rdf_digest.c misc/build/redland-1.0.7/librdf/rdf_digest.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 250,255 ****
+--- 250,257 ----
+  void
+  librdf_free_digest(librdf_digest *digest) 
+  {
++   if(!digest)
++     return;
+    if(digest->context)
+      LIBRDF_FREE(digest_context, digest->context);
+    if(digest->digest)
+diff -cr misc/redland-1.0.7/librdf/rdf_hash.c misc/build/redland-1.0.7/librdf/rdf_hash.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 490,495 ****
+--- 490,497 ----
+  void
+  librdf_free_hash(librdf_hash* hash) 
+  {
++   if(!hash)
++     return;
+    if(hash->context) {
+      if(hash->is_open)
+        librdf_hash_close(hash);
+diff -cr misc/redland-1.0.7/librdf/rdf_init.c misc/build/redland-1.0.7/librdf/rdf_init.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 178,183 ****
+--- 178,186 ----
+  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
+diff -cr misc/redland-1.0.7/librdf/rdf_list.c misc/build/redland-1.0.7/librdf/rdf_list.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 108,113 ****
+--- 108,115 ----
+  void
+  librdf_free_list(librdf_list* list) 
+  {
++   if(!list)
++     return;
+    LIBRDF_ASSERT_RETURN(list->iterator_count,
+                         "Iterators were active on freeing list", );
+  
+diff -cr misc/redland-1.0.7/librdf/rdf_model.c misc/build/redland-1.0.7/librdf/rdf_model.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 393,399 ****
+    librdf_iterator* iterator;
+    librdf_model* m;
+  
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model);
+  
+    if(--model->usage)
+      return;
+--- 393,400 ----
+    librdf_iterator* iterator;
+    librdf_model* m;
+  
+!   if(!model)
+!     return;
+  
+    if(--model->usage)
+      return;
+diff -cr misc/redland-1.0.7/librdf/rdf_node.c misc/build/redland-1.0.7/librdf/rdf_node.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 726,732 ****
+    librdf_world *world;
+  #endif
+  
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node);
+  
+  #ifdef WITH_THREADS
+    world = node->world;
+--- 726,733 ----
+    librdf_world *world;
+  #endif
+  
+!   if(!node)
+!     return;
+  
+  #ifdef WITH_THREADS
+    world = node->world;
+diff -cr misc/redland-1.0.7/librdf/rdf_parser.c misc/build/redland-1.0.7/librdf/rdf_parser.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 371,377 ****
+  void
+  librdf_free_parser(librdf_parser *parser) 
+  {
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser);
+  
+    if(parser->context) {
+      if(parser->factory->terminate)
+--- 371,378 ----
+  void
+  librdf_free_parser(librdf_parser *parser) 
+  {
+!   if(!parser)
+!     return;
+  
+    if(parser->context) {
+      if(parser->factory->terminate)
+diff -cr misc/redland-1.0.7/librdf/rdf_query.c misc/build/redland-1.0.7/librdf/rdf_query.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 388,394 ****
+  void
+  librdf_free_query(librdf_query* query) 
+  {
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query);
+  
+    if(--query->usage)
+      return;
+--- 388,395 ----
+  void
+  librdf_free_query(librdf_query* query) 
+  {
+!   if(!query)
+!     return;
+  
+    if(--query->usage)
+      return;
+diff -cr misc/redland-1.0.7/librdf/rdf_query_results.c misc/build/redland-1.0.7/librdf/rdf_query_results.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 244,250 ****
+  void
+  librdf_free_query_results(librdf_query_results* query_results)
+  {
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results);
+  
+    if(query_results->query->factory->free_results)
+      query_results->query->factory->free_results(query_results);
+--- 244,251 ----
+  void
+  librdf_free_query_results(librdf_query_results* query_results)
+  {
+!   if(!query_results)
+!     return;
+  
+    if(query_results->query->factory->free_results)
+      query_results->query->factory->free_results(query_results);
+***************
+*** 636,641 ****
+--- 637,644 ----
+  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);
+  }
+diff -cr misc/redland-1.0.7/librdf/rdf_serializer.c misc/build/redland-1.0.7/librdf/rdf_serializer.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 373,379 ****
+  void
+  librdf_free_serializer(librdf_serializer *serializer) 
+  {
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer);
+  
+    if(serializer->context) {
+      if(serializer->factory->terminate)
+--- 373,380 ----
+  void
+  librdf_free_serializer(librdf_serializer *serializer) 
+  {
+!   if(!serializer)
+!     return;
+  
+    if(serializer->context) {
+      if(serializer->factory->terminate)
+diff -cr misc/redland-1.0.7/librdf/rdf_statement.c misc/build/redland-1.0.7/librdf/rdf_statement.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 255,261 ****
+    librdf_world *world;
+  #endif
+  
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement);
+  
+  #ifdef WITH_THREADS
+    world = statement->world;
+--- 255,262 ----
+    librdf_world *world;
+  #endif
+  
+!   if(!statement)
+!     return;
+  
+  #ifdef WITH_THREADS
+    world = statement->world;
+diff -cr misc/redland-1.0.7/librdf/rdf_storage.c misc/build/redland-1.0.7/librdf/rdf_storage.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 608,614 ****
+  void
+  librdf_free_storage (librdf_storage* storage) 
+  {
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage);
+  
+    if(--storage->usage)
+      return;
+--- 608,615 ----
+  void
+  librdf_free_storage (librdf_storage* storage) 
+  {
+!   if(!storage)
+!     return;
+  
+    if(--storage->usage)
+      return;
+diff -cr misc/redland-1.0.7/librdf/rdf_storage_hashes.c misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c
+*** 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	Tue May  6 14:06:56 2008
+***************
+*** 1389,1394 ****
+--- 1389,1454 ----
+                                                      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,1420 ****
+                 "Storage was created without context support");
+      return 1;
+    }
+!   
+    if(librdf_storage_hashes_add_remove_statement(storage, 
+                                                  statement, context_node, 1))
+      return 1;
+--- 1474,1488 ----
+                 "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,1601 ****
+  {
+    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:
+--- 1595,1600 ----
+***************
+*** 1608,1627 ****
+            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;
+!       }
+!       
+        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,
+                                          (unsigned char*)v->data, v->size)) {
+          return NULL;
+        }
+--- 1607,1620 ----
+            return 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, NULL,
+                                          (unsigned char*)v->data, v->size)) {
+          return NULL;
+        }
+diff -cr misc/redland-1.0.7/librdf/rdf_storage_list.c misc/build/redland-1.0.7/librdf/rdf_storage_list.c
+*** 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 Apr 28 13:27:21 2008
+***************
+*** 459,464 ****
+--- 459,522 ----
+  }
+  
+  
++ /* 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,491 ****
+                 "Storage was created without context support");
+      return 1;
+    }
+!   
+    /* 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)
+--- 543,557 ----
+                 "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 -cr misc/redland-1.0.7/librdf/rdf_stream.c misc/build/redland-1.0.7/librdf/rdf_stream.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 126,131 ****
+--- 126,134 ----
+  void
+  librdf_free_stream(librdf_stream* stream) 
+  {
++   if(!stream)
++     return;
++ 
+    if(stream->finished_method)
+      stream->finished_method(stream->context);
+  
+diff -cr misc/redland-1.0.7/librdf/rdf_uri.c misc/build/redland-1.0.7/librdf/rdf_uri.c
+*** 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 Apr 28 13:27:03 2008
+***************
+*** 409,415 ****
+    librdf_world *world;
+  #endif
+  
+!   LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri);
+  
+  #ifdef WITH_THREADS
+    world = uri->world;
+--- 409,416 ----
+    librdf_world *world;
+  #endif
+  
+!   if(!uri)
+!     return;
+  
+  #ifdef WITH_THREADS
+    world = uri->world;
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
new file mode 100644
index 000000000000..92b16e31b9ab
--- /dev/null
+++ b/redland/redland/makefile.mk
@@ -0,0 +1,132 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: mst $ $Date: 2008-06-16 11:38:21 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=redland
+TARGET=so_redland
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_REDLAND)" == "YES"
+all:
+    @echo "An already available installation of Redland RDF should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+REDLANDVERSION=1.0.7
+
+TARFILE_NAME=$(PRJNAME)-$(REDLANDVERSION)
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
+
+
+.IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+#CONFIGURE_DIR=
+#CONFIGURE_ACTION=.$/configure
+#CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump"
+#BUILD_ACTION=$(GNUMAKE)
+#BUILD_DIR=$(CONFIGURE_DIR)
+all:
+    @echo "FIXME: somebody port me to mingw please..."
+    exit 1
+.ELSE
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+.ENDIF
+.ELSE # "WNT"
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+
+.IF "$(SYSBASE)"!=""
+CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
+# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto
+LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
+.ENDIF
+.ENDIF			# "$(SYSBASE)"!=""
+
+CPPFLAGS+:=$(EXTRA_CFLAGS)
+LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB:=$(XSLTLIB)
+
+.EXPORT: CPPFLAGS
+.EXPORT: LDFLAGS
+.EXPORT: LIBXML2LIB
+.EXPORT: ZLIB3RDLIB
+.EXPORT: XSLTLIB
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --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_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+#INSTALL_ACTION=$(GNUMAKE) install
+#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
+.ENDIF
+
+
+OUT2INC+=librdf$/*.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=librdf$/.libs$/librdf*.dylib
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=librdf$/.libs$/*.a
+OUT2BIN+=librdf$/.libs$/*.dll
+.ELSE
+# if we use dmake, this is done automagically
+.ENDIF
+.ELSE
+OUT2LIB+=librdf$/.libs$/librdf*.so*
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+