Easter Bunny brings new redland tarballs

upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16: - new raptor depends on libxml2 version 2.6.27 and thus will _not_ build against system libxml2 on Mac OS X 10.4/10.5 - stop delivering raptor-config/rasqal-config, set env vars instead (which unfortunately requires patching configures, TODO: upstream that) - remove redundant configure flags - stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux) - disable new rasqal build deps: --with-uuid-library=internal --with-digest-library=internal - disable redland "libltdl" nonsense via --disable-modular - fortunately openssl digest support has been removed too - drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead - drop raptor-1.4.18.autotools.patch: + FreeBSD parts moved to raptor-freebsd.patch.1 + Android parts obsolete + don't know about the MinGW part (TODO) - from drop raptor-1.4.18.mingw.patch dropped the part defining parsers to be built, done via --enable-parsers - drop redland/raptor/raptor-1.4.18.cross.patch: the vsnprintf check is now done at runtime, and expat has been removed - drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch: presumably don't need special check for V7BETA since it's released now - drop raptor-1.4.18.rindex.patch, index/rindex no longer used - drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7 - drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9 - drop raptor-1.4.18.{libxml,libxslt}.patch: TODO - drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch: we don't care any more about Sun legal dept. - drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead - drop rasqal-0.9.16.autotools.patch: + FreeBSD parts moved to rasqal-freebsd.patch.1 + Android parts obsolete + MinGW part only for cygwin build - drop redland-1.0.8.autotools.patch: + FreeBSD parts moved to redland-freebsd.patch.1 + Android parts obsolete + don't know about the MinGW part (TODO) - drop redland-1.0.8.ooo_build.patch, hopefully not necessary to disable utils build Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a Reviewed-on: https://gerrit.libreoffice.org/3154 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-04-01 12:41:18 +02:00
parent 78bec2b6f4
commit d719c01c2f
69 changed files with 6850 additions and 1728 deletions
--- a/Repository.mk
+++ b/Repository.mk
@@ -535,7 +535,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
    propertyhdl \
    propertyhdl_x64 \
    qslnkmsi \
-    raptor \
+    raptor2 \
    rasqal \
    reg4allmsdoc \
    regactivex \
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -878,7 +878,7 @@ else # !SYSTEM_REDLAND

 define gb_LinkTarget__use_redland_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,redland)/librdf \
+	-I$(call gb_UnpackedTarball_get_dir,redland)/src \
 	$$(INCLUDE) \
 )

@@ -913,7 +913,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\

 ifeq ($(OS),MACOSX)

-$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.1 libraptor-lo.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))
+$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.$(RASQAL_MAJOR) libraptor2-lo.$(RAPTOR_MAJOR),-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))

 endif

@@ -924,14 +924,14 @@ else # ANDROID
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	rdf \
 	rasqal \
-	raptor \
+	raptor2 \
 ))

 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	rdf \
 	rasqal \
-	raptor \
+	raptor2 \
 	crypto \
 )

--- a/configure.ac
+++ b/configure.ac
@@ -8581,8 +8581,8 @@ if test "$with_system_redland" = "yes"; then
    libo_MINGW_TRY_DLL([RASQAL], [librasqal])
    libo_MINGW_TRY_DLL([SQLITE3], [libsqlite3])
 else
-    RAPTOR_MAJOR="1"
-    RASQAL_MAJOR="1"
+    RAPTOR_MAJOR="0"
+    RASQAL_MAJOR="3"
    REDLAND_MAJOR="0"
 fi
 AC_SUBST(RAPTOR_MAJOR)
--- a/download.lst
+++ b/download.lst
@@ -73,9 +73,9 @@ export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
-export RAPTOR_TARBALL := 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-export RASQAL_TARBALL := fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-export REDLAND_TARBALL := ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
+export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
+export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -11,24 +11,23 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor))

 $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor))

-$(eval $(call gb_ExternalPackage_add_file,raptor,bin/raptor-config,src/raptor-config))
-
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.1.dylib,src/.libs/libraptor-lo.1.dylib))
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dylib,src/.libs/libraptor-lo.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
 else ifneq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a))
 else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dll.a,src/.libs/libraptor.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor-1.dll,src/.libs/libraptor-1.dll))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.dll.a,src/.libs/libraptor2.dll.a))
+$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll))
 else ifneq ($(filter WNT,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
-$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor.dll,src/.libs/libraptor.dll))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a))
+$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.so.1,src/.libs/libraptor-lo.so.1.1.0))
-$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.so,src/.libs/libraptor-lo.so.1.1.0))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
 endif

+$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor2.h,src/raptor2.h))
 $(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor.h,src/raptor.h))

 # vim: set noet sw=4 ts=4:
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -11,22 +11,20 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal))

 $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal))

-$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/rasqal-config,src/rasqal-config))
-
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.1.dylib,src/.libs/librasqal-lo.1.dylib))
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
 else ifneq ($(filter IOS ANDROID,$(OS)),)
 $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
 else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
 $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dll.a,src/.libs/librasqal.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal-1.dll,src/.libs/librasqal-1.dll))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll))
 else ifneq ($(filter WNT,$(OS)),)
 $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
 $(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.1,src/.libs/librasqal-lo.so.1.0.0))
-$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.1.0.0))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
 endif

 $(eval $(call gb_ExternalPackage_add_file,rasqal,inc/external/rasqal.h,src/rasqal.h))
--- a/redland/ExternalPackage_redland.mk
+++ b/redland/ExternalPackage_redland.mk
@@ -12,19 +12,19 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland))
 $(eval $(call gb_ExternalPackage_use_external_project,redland,redland))

 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.0.dylib,librdf/.libs/librdf-lo.0.dylib))
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,librdf/.libs/librdf-lo.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
 else ifneq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
 else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,librdf/.libs/librdf.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf-0.dll,librdf/.libs/librdf-0.dll))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,src/.libs/librdf.dll.a))
+$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
 else ifneq ($(filter WNT,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
-$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,librdf/.libs/librdf.dll))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
+$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,src/.libs/librdf.dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.so.0,librdf/.libs/librdf-lo.so.0.0.0))
-$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.so,librdf/.libs/librdf-lo.so.0.0.0))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.so,src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
 endif

 # vim: set noet sw=4 ts=4:
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -25,10 +25,9 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
 		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
-		./configure --disable-static --enable-shared --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 \
+		./configure --disable-static --enable-shared --disable-gtk-doc \
+			--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
+			--with-www=xml \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
 		&& $(MAKE) \
@@ -40,13 +39,11 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
 		$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
 		LDFLAGS="-L$(OUTDIR)/lib \
-		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-		./configure --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-threestone --with-regex-library=posix --with-decimal=none \
+		./configure --disable-gtk-doc \
+			 --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
 			--with-www=xml \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
@@ -57,4 +54,5 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		&& $(MAKE) \
 	)
 endif
+
 # vim: set noet sw=4 ts=4:
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\
 	build \
 ))

+# note: this can intentionally only build against internal raptor (not system)
+
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,rasqal,build):
 	$(call gb_ExternalProject_run,build,\
@@ -27,10 +29,14 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
 		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
-		./configure --disable-static --enable-shared --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 \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
+		./configure --disable-static --enable-shared --disable-gtk-doc \
+			--disable-pcre \
+			--with-decimal=none \
+			--with-uuid-library=internal \
+			--with-digest-library=internal \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
 		&& $(MAKE) \
@@ -40,22 +46,27 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
 		PATH="$(OUTDIR)/bin:$$PATH" \
-		LDFLAGS="-L$(OUTDIR)/lib \
-		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+		LDFLAGS=" \
+			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
 		$(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
-		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-		./configure --disable-gtk-doc --with-threads --with-openssl-digests \
-			--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql \
-			--without-postgresql --without-threestone --with-regex-library=posix \
-			--with-decimal=none --with-www=xml \
+		$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
+		./configure --disable-gtk-doc \
+			--with-regex-library=posix \
+			--with-decimal=none \
+			--with-uuid-library=internal \
+			--with-digest-library=internal \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 		&& $(MAKE) \
-			$(if $(filter MACOSX,$(OS)),&& $(PERL) \
-            $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
-            $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.1.dylib) \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \
 	)
 endif
+
 # vim: set noet sw=4 ts=4:
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -22,50 +22,56 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
 	build \
 ))

+# note: this can intentionally only build against internal raptor/rasqal
+
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
-		PATH="$(OUTDIR)/bin:$$PATH" \
 		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 		CPPFLAGS="-I$(OUTDIR)/inc/external" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
-		LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
-		./configure --disable-static --disable-gtk-doc --with-openssl-digests \
-			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-			--without-bdb --without-sqlite --without-mysql --without-postgresql \
-			--without-threestore --with-regex-library=posix --with-decimal=none \
-			--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
+		./configure --disable-static --disable-gtk-doc \
+			--disable-modular \
+			--without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestore --without-virtuoso \
+			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
-		&& cd librdf \
 		&& $(MAKE) \
 	)
 else
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-		PATH="$(OUTDIR)/bin:$$PATH" \
 		LDFLAGS="-L$(OUTDIR)/lib \
-		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 		$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
-		$(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.1.dylib:$(OUTDIR)/lib/libraptor-lo.1.dylib \
+		$(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.$(RAPTOR_MAJOR).dylib:$(OUTDIR)/lib/libraptor-lo.$(RAPTOR_MAJOR).dylib \
 		$(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \
 		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
-		./configure --disable-gtk-doc --with-openssl-digests \
-			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-			--without-bdb --without-sqlite --without-mysql --without-postgresql \
-			--without-threestone --with-regex-library=posix --with-decimal=none \
-			--with-www=xml \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
+		./configure --disable-gtk-doc \
+			--disable-modular \
+			--without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestone --without-virtuoso \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 			$(if $(filter-out ANDROID,$(OS)),--with-threads) \
-		&& cd librdf \
 		&& $(MAKE) \
-			$(if $(filter MACOSX,$(OS)),&& $(PERL) \
-            $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
-            $(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.0.dylib) \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.$(RASQAL_MAJOR).dylib) \
 	)
 endif
+
 # vim: set noet sw=4 ts=4:
--- a/redland/LICENSE.txt
+++ b/redland/LICENSE.txt
@@ -1,11 +0,0 @@
-
-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.
-
--- a/redland/Library_raptor.mk
+++ b/redland/Library_raptor.mk
@@ -7,22 +7,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #

-$(eval $(call gb_Library_Library,raptor))
+$(eval $(call gb_Library_Library,raptor2))

-$(eval $(call gb_Library_use_unpacked,raptor,raptor))
+$(eval $(call gb_Library_use_unpacked,raptor2,raptor))

-$(eval $(call gb_Library_use_externals,raptor,\
+$(eval $(call gb_Library_use_externals,raptor2,\
 	libxml2 \
 	libxslt \
 ))

-$(eval $(call gb_Library_set_warnings_not_errors,raptor))
+$(eval $(call gb_Library_set_warnings_not_errors,raptor2))

 #$(eval $(call gb_Library_add_ldflags,raptor,\
 	/DEF:$(SRCDIR)/redland/raptor/raptor.def \
 ))

-$(eval $(call gb_Library_add_defs,raptor,\
+$(eval $(call gb_Library_add_defs,raptor2,\
+	-DHAVE_CONFIG_H \
 	-DRAPTOR_INTERNAL \
 	-DWIN32 \
 	-DNDEBUG \
@@ -31,52 +32,48 @@ $(eval $(call gb_Library_add_defs,raptor,\
 	-DWIN32_EXPORTS \
 ))

-$(eval $(call gb_Library_add_generated_cobjects,raptor,\
-	UnpackedTarball/raptor/src/n3_lexer \
-	UnpackedTarball/raptor/src/n3_parser \
+$(eval $(call gb_Library_add_generated_cobjects,raptor2,\
 	UnpackedTarball/raptor/src/ntriples_parse \
 	UnpackedTarball/raptor/src/parsedate \
-	UnpackedTarball/raptor/src/raptor_feature \
+	UnpackedTarball/raptor/src/raptor_abbrev \
+	UnpackedTarball/raptor/src/raptor_avltree \
+	UnpackedTarball/raptor/src/raptor_concepts \
 	UnpackedTarball/raptor/src/raptor_general \
 	UnpackedTarball/raptor/src/raptor_guess \
-	UnpackedTarball/raptor/src/raptor_identifier \
 	UnpackedTarball/raptor/src/raptor_iostream \
+	UnpackedTarball/raptor/src/raptor_json_writer \
 	UnpackedTarball/raptor/src/raptor_libxml \
 	UnpackedTarball/raptor/src/raptor_locator \
+	UnpackedTarball/raptor/src/raptor_log \
+	UnpackedTarball/raptor/src/raptor_memstr \
 	UnpackedTarball/raptor/src/raptor_namespace \
-	UnpackedTarball/raptor/src/raptor_nfc \
-	UnpackedTarball/raptor/src/raptor_nfc_data \
+	UnpackedTarball/raptor/src/raptor_option \
 	UnpackedTarball/raptor/src/raptor_parse \
 	UnpackedTarball/raptor/src/raptor_qname \
 	UnpackedTarball/raptor/src/raptor_rdfxml \
 	UnpackedTarball/raptor/src/raptor_rfc2396 \
-	UnpackedTarball/raptor/src/raptor_rss \
-	UnpackedTarball/raptor/src/raptor_rss_common \
 	UnpackedTarball/raptor/src/raptor_sax2 \
 	UnpackedTarball/raptor/src/raptor_sequence \
 	UnpackedTarball/raptor/src/raptor_serialize \
 	UnpackedTarball/raptor/src/raptor_serialize_ntriples \
 	UnpackedTarball/raptor/src/raptor_serialize_rdfxml \
 	UnpackedTarball/raptor/src/raptor_serialize_rdfxmla \
-	UnpackedTarball/raptor/src/raptor_serialize_simple \
 	UnpackedTarball/raptor/src/raptor_set \
+	UnpackedTarball/raptor/src/raptor_statement \
 	UnpackedTarball/raptor/src/raptor_stringbuffer \
+	UnpackedTarball/raptor/src/raptor_syntax_description \
+	UnpackedTarball/raptor/src/raptor_term \
+	UnpackedTarball/raptor/src/raptor_turtle_writer \
+	UnpackedTarball/raptor/src/raptor_unicode \
 	UnpackedTarball/raptor/src/raptor_uri \
-	UnpackedTarball/raptor/src/raptor_utf8 \
-	UnpackedTarball/raptor/src/raptor_win32 \
 	UnpackedTarball/raptor/src/raptor_www \
-	UnpackedTarball/raptor/src/raptor_www_libxml \
 	UnpackedTarball/raptor/src/raptor_xml \
 	UnpackedTarball/raptor/src/raptor_xml_writer \
-	UnpackedTarball/raptor/src/raptor_xsd \
+	UnpackedTarball/raptor/src/snprintf \
 	UnpackedTarball/raptor/src/strcasecmp \
 	UnpackedTarball/raptor/src/turtle_common \
 	UnpackedTarball/raptor/src/turtle_lexer \
 	UnpackedTarball/raptor/src/turtle_parser \
-	UnpackedTarball/raptor/src/raptor_abbrev \
-	UnpackedTarball/raptor/src/raptor_avltree \
-	UnpackedTarball/raptor/src/raptor_statement \
-	UnpackedTarball/raptor/src/raptor_turtle_writer \
 ))


--- a/redland/Library_rasqal.mk
+++ b/redland/Library_rasqal.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,rasqal))

 $(eval $(call gb_Library_use_external,rasqal,raptor_headers))

-$(eval $(call gb_Library_use_libraries,rasqal,raptor))
+$(eval $(call gb_Library_use_libraries,rasqal,raptor2))

 #$(eval $(call gb_Library_add_ldflags,rasqal,\
 	/DEF:$(SRCDIR)/redland/rasqal/rasqal.def \
@@ -31,28 +31,85 @@ $(eval $(call gb_Library_add_defs,rasqal,\
 	-D_MT \
 ))

+$(eval $(call gb_Library_set_include,rasqal,\
+	-I$(WORKDIR)/UnpackedTarball/rasqal/libmtwist \
+	$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_generated_cobjects,rasqal,\
+	UnpackedTarball/rasqal/libmtwist/mt \
+	UnpackedTarball/rasqal/libmtwist/seed \
+	UnpackedTarball/rasqal/src/rasqal_algebra \
+	UnpackedTarball/rasqal/src/rasqal_bindings \
+	UnpackedTarball/rasqal/src/rasqal_data_graph \
+	UnpackedTarball/rasqal/src/rasqal_dataset \
 	UnpackedTarball/rasqal/src/rasqal_datetime \
 	UnpackedTarball/rasqal/src/rasqal_decimal \
+	UnpackedTarball/rasqal/src/rasqal_digest \
+	UnpackedTarball/rasqal/src/rasqal_digest_md5 \
+	UnpackedTarball/rasqal/src/rasqal_digest_sha1 \
+	UnpackedTarball/rasqal/src/rasqal_double \
 	UnpackedTarball/rasqal/src/rasqal_engine \
+	UnpackedTarball/rasqal/src/rasqal_engine_algebra \
+	UnpackedTarball/rasqal/src/rasqal_engine_sort \
 	UnpackedTarball/rasqal/src/rasqal_expr \
+	UnpackedTarball/rasqal/src/rasqal_expr_datetimes \
+	UnpackedTarball/rasqal/src/rasqal_expr_evaluate \
+	UnpackedTarball/rasqal/src/rasqal_expr_numerics \
+	UnpackedTarball/rasqal/src/rasqal_expr_strings \
 	UnpackedTarball/rasqal/src/rasqal_feature \
+	UnpackedTarball/rasqal/src/rasqal_format_html \
+	UnpackedTarball/rasqal/src/rasqal_format_json \
+	UnpackedTarball/rasqal/src/rasqal_format_rdf \
+	UnpackedTarball/rasqal/src/rasqal_format_sparql_xml \
+	UnpackedTarball/rasqal/src/rasqal_format_sv \
+	UnpackedTarball/rasqal/src/rasqal_format_table \
+	UnpackedTarball/rasqal/src/rasqal_formula \
 	UnpackedTarball/rasqal/src/rasqal_general \
 	UnpackedTarball/rasqal/src/rasqal_graph_pattern \
+	UnpackedTarball/rasqal/src/rasqal_iostream \
 	UnpackedTarball/rasqal/src/rasqal_literal \
 	UnpackedTarball/rasqal/src/rasqal_map \
-	UnpackedTarball/rasqal/src/rasqal_query_results \
+	UnpackedTarball/rasqal/src/rasqal_prefix \
+	UnpackedTarball/rasqal/src/rasqal_projection \
 	UnpackedTarball/rasqal/src/rasqal_query \
+	UnpackedTarball/rasqal/src/rasqal_query_results \
+	UnpackedTarball/rasqal/src/rasqal_query_transform \
+	UnpackedTarball/rasqal/src/rasqal_query_write \
+	UnpackedTarball/rasqal/src/rasqal_random \
 	UnpackedTarball/rasqal/src/rasqal_raptor \
+	UnpackedTarball/rasqal/src/rasqal_regex \
 	UnpackedTarball/rasqal/src/rasqal_result_formats \
+	UnpackedTarball/rasqal/src/rasqal_row \
+	UnpackedTarball/rasqal/src/rasqal_row_compatible \
 	UnpackedTarball/rasqal/src/rasqal_rowsource \
-	UnpackedTarball/rasqal/src/rasqal_sparql_xml \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_aggregation \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_assignment \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_distinct \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_empty \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_filter \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_graph \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_groupby \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_having \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_join \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_project \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_rowsequence \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_slice \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_sort \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_triples \
+	UnpackedTarball/rasqal/src/rasqal_rowsource_union \
+	UnpackedTarball/rasqal/src/rasqal_service \
+	UnpackedTarball/rasqal/src/rasqal_solution_modifier \
+	UnpackedTarball/rasqal/src/rasqal_triple \
+	UnpackedTarball/rasqal/src/rasqal_triples_source \
+	UnpackedTarball/rasqal/src/rasqal_update \
+	UnpackedTarball/rasqal/src/rasqal_variable \
 	UnpackedTarball/rasqal/src/rasqal_xsd_datatypes \
-	UnpackedTarball/rasqal/src/rdql_lexer \
-	UnpackedTarball/rasqal/src/rdql_parser \
+	UnpackedTarball/rasqal/src/snprintf \
 	UnpackedTarball/rasqal/src/sparql_lexer \
 	UnpackedTarball/rasqal/src/sparql_parser \
-	UnpackedTarball/rasqal/src/strcasecmp \
+	UnpackedTarball/rasqal/src/timegm \
+	UnpackedTarball/rasqal/src/gettimeofday \
 ))


--- a/redland/Library_rdf.mk
+++ b/redland/Library_rdf.mk
@@ -14,13 +14,11 @@ $(eval $(call gb_Library_use_unpacked,rdf,redland))
 $(eval $(call gb_Library_set_warnings_not_errors,rdf))

 $(eval $(call gb_Library_use_libraries,rdf,\
-	raptor \
+	raptor2 \
 	rasqal \
 ))

 $(eval $(call gb_Library_use_externals,rdf,\
-	openssl \
-	openssl_headers \
 	raptor_headers \
 	rasqal_headers \
 ))
@@ -39,39 +37,41 @@ $(eval $(call gb_Library_add_defs,rdf,\
 ))

 $(eval $(call gb_Library_add_generated_cobjects,rdf,\
-	UnpackedTarball/redland/librdf/rdf_concepts \
-	UnpackedTarball/redland/librdf/rdf_digest \
-	UnpackedTarball/redland/librdf/rdf_digest_md5 \
-	UnpackedTarball/redland/librdf/rdf_digest_openssl \
-	UnpackedTarball/redland/librdf/rdf_digest_sha1 \
-	UnpackedTarball/redland/librdf/rdf_files \
-	UnpackedTarball/redland/librdf/rdf_hash \
-	UnpackedTarball/redland/librdf/rdf_hash_cursor \
-	UnpackedTarball/redland/librdf/rdf_hash_memory \
-	UnpackedTarball/redland/librdf/rdf_heuristics \
-	UnpackedTarball/redland/librdf/rdf_init \
-	UnpackedTarball/redland/librdf/rdf_iterator \
-	UnpackedTarball/redland/librdf/rdf_list \
-	UnpackedTarball/redland/librdf/rdf_log \
-	UnpackedTarball/redland/librdf/rdf_model \
-	UnpackedTarball/redland/librdf/rdf_model_storage \
-	UnpackedTarball/redland/librdf/rdf_node \
-	UnpackedTarball/redland/librdf/rdf_parser \
-	UnpackedTarball/redland/librdf/rdf_parser_raptor \
-	UnpackedTarball/redland/librdf/rdf_query \
-	UnpackedTarball/redland/librdf/rdf_query_rasqal \
-	UnpackedTarball/redland/librdf/rdf_query_results \
-	UnpackedTarball/redland/librdf/rdf_query_triples \
-	UnpackedTarball/redland/librdf/rdf_serializer \
-	UnpackedTarball/redland/librdf/rdf_serializer_raptor \
-	UnpackedTarball/redland/librdf/rdf_statement \
-	UnpackedTarball/redland/librdf/rdf_storage \
-	UnpackedTarball/redland/librdf/rdf_storage_file \
-	UnpackedTarball/redland/librdf/rdf_storage_list \
-	UnpackedTarball/redland/librdf/rdf_storage_hashes \
-	UnpackedTarball/redland/librdf/rdf_stream \
-	UnpackedTarball/redland/librdf/rdf_uri \
-	UnpackedTarball/redland/librdf/rdf_utf8 \
+	UnpackedTarball/redland/src/rdf_concepts \
+	UnpackedTarball/redland/src/rdf_digest \
+	UnpackedTarball/redland/src/rdf_digest_md5 \
+	UnpackedTarball/redland/src/rdf_digest_sha1 \
+	UnpackedTarball/redland/src/rdf_files \
+	UnpackedTarball/redland/src/rdf_hash \
+	UnpackedTarball/redland/src/rdf_hash_cursor \
+	UnpackedTarball/redland/src/rdf_hash_memory \
+	UnpackedTarball/redland/src/rdf_heuristics \
+	UnpackedTarball/redland/src/rdf_init \
+	UnpackedTarball/redland/src/rdf_iterator \
+	UnpackedTarball/redland/src/rdf_list \
+	UnpackedTarball/redland/src/rdf_log \
+	UnpackedTarball/redland/src/rdf_model \
+	UnpackedTarball/redland/src/rdf_model_storage \
+	UnpackedTarball/redland/src/rdf_node \
+	UnpackedTarball/redland/src/rdf_node_common \
+	UnpackedTarball/redland/src/rdf_parser \
+	UnpackedTarball/redland/src/rdf_parser_raptor \
+	UnpackedTarball/redland/src/rdf_raptor \
+	UnpackedTarball/redland/src/rdf_query \
+	UnpackedTarball/redland/src/rdf_query_rasqal \
+	UnpackedTarball/redland/src/rdf_query_results \
+	UnpackedTarball/redland/src/rdf_serializer \
+	UnpackedTarball/redland/src/rdf_serializer_raptor \
+	UnpackedTarball/redland/src/rdf_statement \
+	UnpackedTarball/redland/src/rdf_statement_common \
+	UnpackedTarball/redland/src/rdf_storage \
+	UnpackedTarball/redland/src/rdf_storage_file \
+	UnpackedTarball/redland/src/rdf_storage_list \
+	UnpackedTarball/redland/src/rdf_storage_hashes \
+	UnpackedTarball/redland/src/rdf_storage_trees \
+	UnpackedTarball/redland/src/rdf_stream \
+	UnpackedTarball/redland/src/rdf_uri \
+	UnpackedTarball/redland/src/rdf_utf8 \
 ))

 # vim: set noet sw=4 ts=4:
--- a/redland/README
+++ b/redland/README
@@ -3,7 +3,6 @@ Redland RDF library (librdf) from [http://librdf.org/]
 == License ==
 [git:redland/LICENSE.txt]
 Triple-licensed: LGPL v2+/GPL v2+/Apache v2
-Note that Sun distributes this software only under LGPL v2

 == Description ==
 This module contains the third-party Redland RDF / librdf library, which
--- a/redland/UnpackedTarball_raptor.mk
+++ b/redland/UnpackedTarball_raptor.mk
@@ -11,21 +11,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))

 $(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL)))

+# configure generated files for MSVC
+$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,redland/raptor/raptor2.h))
+$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,redland/raptor/raptor_config.h))
+
 $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
-	redland/raptor/raptor-1.4.18.legal.patch \
-	redland/raptor/raptor-1.4.18.autotools.patch \
-	redland/raptor/raptor-1.4.18.ooo_build.patch \
-	redland/raptor/raptor-1.4.18.win32.patch \
-	redland/raptor/raptor-1.4.18.fixes.patch \
-	redland/raptor/raptor-1.4.18.rindex.patch \
-	redland/raptor/raptor-1.4.18.aix.patch \
-	redland/raptor/raptor-1.4.18.entities.patch \
-	$(if $(filter-out WNT,$(OS)),redland/raptor/raptor-1.4.18.bundled-soname.patch) \
-	$(if $(filter YES,$(CROSS_COMPILING)),redland/raptor/raptor-1.4.18.cross.patch) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),redland/raptor/raptor-1.4.18.libxml.patch) \
-	$(if $(filter YES,$(SYSTEM_LIBXSLT)),redland/raptor/raptor-1.4.18.libxslt.patch) \
-	$(if $(filter ANDROID,$(OS)),redland/raptor/raptor-1.4.18.no-soname.patch) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-1.4.18.mingw.patch) \
+	redland/raptor/raptor-freebsd.patch.1 \
+	$(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-mingw.patch.1) \
+	$(if $(filter-out WNT,$(OS)),redland/raptor/raptor-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),redland/raptor/raptor-android.patch.1) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/redland/UnpackedTarball_rasqal.mk
+++ b/redland/UnpackedTarball_rasqal.mk
@@ -11,15 +11,17 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal))

 $(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL)))

+# configure generated files for MSVC
+$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,redland/rasqal/rasqal.h))
+
 $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
-	redland/rasqal/rasqal-0.9.16.legal.patch \
-	redland/rasqal/rasqal-0.9.16.autotools.patch \
-	redland/rasqal/rasqal-0.9.16.ooo_build.patch \
-	redland/rasqal/rasqal-0.9.16.win32.patch \
-	redland/rasqal/rasqal-0.9.16.aix.patch \
-	$(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-0.9.16.bundled-soname.patch) \
-	$(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-0.9.16.no-soname.patch) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-0.9.16.mingw.patch) \
+	redland/rasqal/rasqal-pkgconfig.patch.1 \
+	redland/rasqal/rasqal-freebsd.patch.1 \
+	redland/rasqal/rasqal-msvc.patch.1 \
+	redland/rasqal/rasqal-aix.patch.1 \
+	$(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/redland/UnpackedTarball_redland.mk
+++ b/redland/UnpackedTarball_redland.mk
@@ -11,15 +11,16 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,redland))

 $(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL)))

+# configure generated files for MSVC
+$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,redland/redland/librdf.h))
+
 $(eval $(call gb_UnpackedTarball_add_patches,redland,\
-	redland/redland/redland-1.0.8.legal.patch \
-	redland/redland/redland-1.0.8.autotools.patch \
-	redland/redland/redland-1.0.8.ooo_build.patch \
-	redland/redland/redland-1.0.8.win32.patch \
-	redland/redland/redland-1.0.8.aix.patch \
-	$(if $(filter-out WNT,$(OS)),redland/redland/redland-1.0.8.bundled-soname.patch) \
-	$(if $(filter ANDROID,$(OS)),redland/redland/redland-1.0.8.no-soname.patch) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-1.0.8.mingw.patch) \
+	redland/redland/redland-pkgconfig.patch.1 \
+	redland/redland/redland-freebsd.patch.1 \
+	redland/redland/redland-msvc.patch.1 \
+	$(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/redland/raptor/raptor-1.4.18.aix.patch
+++ b/redland/raptor/raptor-1.4.18.aix.patch
@@ -1,21 +0,0 @@
--- misc/raptor-1.4.18/config.guess	2010-09-16 03:07:14.000000000 -0500
-+++ misc/raptor-1.4.18/config.guess	2010-09-16 03:08:00.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
-    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
--- a/redland/raptor/raptor-1.4.18.autotools.patch
+++ b/redland/raptor/raptor-1.4.18.autotools.patch
@@ -1,66 +0,0 @@
--- misc/raptor-1.4.18/config.sub	2008-04-03 05:15:09.000000000 +0200
-+++ misc/raptor-1.4.18/config.sub	2011-09-27 10:01:06.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1250,7 +1250,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- 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)
--- a/redland/raptor/raptor-1.4.18.bundled-soname.patch
+++ b/redland/raptor/raptor-1.4.18.bundled-soname.patch
@@ -1,11 +0,0 @@
--- misc/raptor-1.4.18/src/Makefile.in
-+++ misc/raptor-1.4.18/src/Makefile.in
-@@ -404,7 +404,7 @@
- 	$(am__append_20) $(am__append_21) $(am__append_22) \
- 	$(am__append_23) $(am__append_24) $(am__append_25) \
- 	$(am__append_26)
-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
- libraptor_la_LIBADD = @LTLIBOBJS@
- EXTRA_DIST = \
- raptor-config.in \
--- a/redland/raptor/raptor-1.4.18.cross.patch
+++ b/redland/raptor/raptor-1.4.18.cross.patch
@@ -1,35 +0,0 @@
--- misc/raptor-1.4.18/configure
-+++ misc/raptor-1.4.18/configure
-@@ -22643,11 +22643,13 @@
-   { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
- echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
-   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_C99_VSNPRINTF 1
-+_ACEOF
-+
-+    { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23367,11 +23369,8 @@
-     { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
- echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
-     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-+  { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
--- a/redland/raptor/raptor-1.4.18.entities.patch
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -1,394 +0,0 @@
--- misc/raptor-1.4.18/src/raptor.h.old	2008-06-20 07:47:38.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor.h	2012-02-15 16:54:21.000000000 +0100
-@@ -376,6 +376,7 @@ typedef struct {
-  * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
-  * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples)
-  * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI.  If given, generate an Atom Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found.
-+ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external entities.
-  * @RAPTOR_FEATURE_LAST: Internal
-  *
-  * Raptor parser, serializer or XML writer features.
-@@ -416,7 +417,8 @@ typedef enum {
-   RAPTOR_FEATURE_JSON_EXTRA_DATA,
-   RAPTOR_FEATURE_RSS_TRIPLES,
-   RAPTOR_FEATURE_ATOM_ENTRY_URI,
-  RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_ATOM_ENTRY_URI
-+  RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
-+  RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES
- } raptor_feature;
- 
- 
--- misc/raptor-1.4.18/src/raptor_feature.c.old	2008-06-05 08:54:16.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_feature.c	2012-02-15 16:55:09.000000000 +0100
-@@ -89,7 +89,8 @@ static const struct
-   { RAPTOR_FEATURE_JSON_CALLBACK     , 6,  "jsonCallback", "JSON serializer callback" },
-   { RAPTOR_FEATURE_JSON_EXTRA_DATA   , 6,  "jsonExtraData", "JSON serializer extra data" },
-   { RAPTOR_FEATURE_RSS_TRIPLES       , 6,  "rssTriples", "Atom/RSS serializer writes extra RDF triples" },
-  { RAPTOR_FEATURE_ATOM_ENTRY_URI    , 6,  "atomEntryUri", "Atom serializer Entry URI" }
-+  { RAPTOR_FEATURE_ATOM_ENTRY_URI    , 6,  "atomEntryUri", "Atom serializer Entry URI" },
-+  { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, "loadExternalEntities", "Load external XML entities." }
- };
- 
- 
--- misc/raptor-1.4.18/src/raptor_internal.h.old	2008-06-03 07:04:09.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_internal.h	2012-02-15 16:52:08.000000000 +0100
-@@ -983,6 +983,14 @@ struct raptor_sax2_s {
- 
-   /* base URI for resolving relative URIs or xml:base URIs */
-   raptor_uri* base_uri;
-+
-+  /* call SAX2 handlers if non-0 */
-+  int enabled;
-+
-+  /* FEATURE: 
-+   * non 0 if XML entities should be loaded
-+   */
-+  int feature_load_external_entities;
- };
- 
- int raptor_sax2_init(void);
--- misc/raptor-1.4.18/src/raptor_libxml.c.old	2008-06-14 05:35:27.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_libxml.c	2012-02-15 16:52:08.000000000 +0100
-@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u
- 
- static xmlParserInputPtr
- raptor_libxml_resolveEntity(void* user_data, 
-                            const xmlChar *publicId, const xmlChar *systemId) {
-  raptor_sax2* sax2=(raptor_sax2*)user_data;
-  return libxml2_resolveEntity(sax2->xc, publicId, systemId);
-+                            const xmlChar *publicId, const xmlChar *systemId)
-+{
-+  raptor_sax2* sax2 = (raptor_sax2*)user_data;
-+  xmlParserCtxtPtr ctxt = sax2->xc;
-+  const unsigned char *uri_string = NULL;
-+  xmlParserInputPtr entity_input;
-+  int load_entity = 0;
-+
-+  if(ctxt->input)
-+    uri_string = (const unsigned char *)ctxt->input->filename;
-+
-+  if(!uri_string)
-+    uri_string = (const unsigned char *)ctxt->directory;
-+
-+  load_entity = sax2->feature_load_external_entities;
-+
-+  if(load_entity) {
-+    entity_input = xmlLoadExternalEntity((const char*)uri_string,
-+                                         (const char*)publicId,
-+                                         ctxt);
-+  } else {
-+    RAPTOR_DEBUG4("Not loading entity URI %s by policy for publicId '%s' systemId '%s'\n", uri_string, publicId, systemId);
-+  }
-+  
-+  return entity_input;
- }
- 
- 
- static xmlEntityPtr
-raptor_libxml_getEntity(void* user_data, const xmlChar *name) {
-  raptor_sax2* sax2=(raptor_sax2*)user_data;
-  return libxml2_getEntity(sax2->xc, name);
-}
-+raptor_libxml_getEntity(void* user_data, const xmlChar *name)
-+{
-+  raptor_sax2* sax2 = (raptor_sax2*)user_data;
-+  xmlParserCtxtPtr xc = sax2->xc;
-+  xmlEntityPtr ret = NULL;
-+
-+  if(!xc)
-+    return NULL;
-+
-+  if(!xc->inSubset) {
-+    /* looks for hardcoded set of entity names - lt, gt etc. */
-+    ret = xmlGetPredefinedEntity(name);
-+    if(ret) {
-+      RAPTOR_DEBUG2("Entity '%s' found in predefined set\n", name);
-+      return ret;
-+    }
-+  }
- 
-+  /* This section uses xmlGetDocEntity which looks for entities in
-+   * memory only, never from a file or URI 
-+   */
-+  if(xc->myDoc && (xc->myDoc->standalone == 1)) {
-+    RAPTOR_DEBUG2("Entity '%s' document is standalone\n", name);
-+    /* Document is standalone: no entities are required to interpret doc */
-+    if(xc->inSubset == 2) {
-+      xc->myDoc->standalone = 0;
-+      ret = xmlGetDocEntity(xc->myDoc, name);
-+      xc->myDoc->standalone = 1;
-+    } else {
-+      ret = xmlGetDocEntity(xc->myDoc, name);
-+      if(!ret) {
-+        xc->myDoc->standalone = 0;
-+        ret = xmlGetDocEntity(xc->myDoc, name);
-+        xc->myDoc->standalone = 1;
-+      }
-+    }
-+  } else {
-+    ret = xmlGetDocEntity(xc->myDoc, name);
-+  }
-+
-+  if(ret && !ret->children &&
-+    (ret->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY)) {
-+    /* Entity is an external general parsed entity. It may be in a
-+     * catalog file, user file or user URI
-+     */
-+    int val = 0;
-+    xmlNodePtr children;
-+    int load_entity = 0;
-+
-+    load_entity = sax2->feature_load_external_entities;
-+
-+    if(!load_entity) {
-+      RAPTOR_DEBUG2("Not getting entity URI %s by policy\n", ret->URI);
-+      children = xmlNewText((const xmlChar*)"");
-+    } else {
-+      /* Disable SAX2 handlers so that the SAX2 events do not all get
-+       * sent to callbacks during dealing with the entity parsing.
-+       */
-+      sax2->enabled = 0;
-+      val = xmlParseCtxtExternalEntity(xc, ret->URI, ret->ExternalID, &children);
-+      sax2->enabled = 1;
-+    }
-+    
-+    if(!val) {
-+      xmlAddChildList((xmlNodePtr)ret, children);
-+    } else {
-+      xc->validate = 0;
-+      return NULL;
-+    }
-+    
-+    ret->owner = 1;
-+
-+/* ret->checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6
-+   in libxml2 before 2.6.27 it does not exist and ret->children != 0 will be
-+   tested instead, which is true due to xmlAddChildList above */
-+#if LIBXML_VERSION >= 20627 || !defined(__APPLE__)
-+    /* Mark this entity as having been checked - never do this again */
-+    if(!ret->checked)
-+      ret->checked = 1;
-+#else
-+    if (atoi(xmlParserVersion) >= 20627) {
-+        int *const pChecked = (&ret->owner) + 1;
-+        if (!*pChecked) /* owner precedes checked and is also of type int */
-+          *pChecked = 1;
-+    }
-+#endif
-+  }
-+
-+  return ret;
-+}
-+  
- 
- static xmlEntityPtr
- raptor_libxml_getParameterEntity(void* user_data, const xmlChar *name) {
--- misc/raptor-1.4.18/src/raptor_parse.c.old	2008-06-15 09:18:50.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_parse.c	2012-02-15 16:52:08.000000000 +0100
-@@ -1294,6 +1294,7 @@ raptor_set_feature(raptor_parser *parser
-     case RAPTOR_FEATURE_MICROFORMATS:
-     case RAPTOR_FEATURE_HTML_LINK:
-     case RAPTOR_FEATURE_WWW_TIMEOUT:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
-       parser->features[(int)feature]=value;
-       break;
- 
-@@ -1414,6 +1415,7 @@ raptor_get_feature(raptor_parser *parser
-     case RAPTOR_FEATURE_MICROFORMATS:
-     case RAPTOR_FEATURE_HTML_LINK:
-     case RAPTOR_FEATURE_WWW_TIMEOUT:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
-       result=(parser->features[(int)feature] != 0);
-       break;
- 
--- misc/raptor-1.4.18/src/raptor_rdfxml.c.old	2008-06-15 10:12:06.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_rdfxml.c	2012-02-15 16:52:08.000000000 +0100
-@@ -1124,6 +1124,9 @@ raptor_rdfxml_parse_start(raptor_parser*
-   raptor_sax2_set_feature(rdf_xml_parser->sax2, 
-                           RAPTOR_FEATURE_NO_NET,
-                           rdf_parser->features[RAPTOR_FEATURE_NO_NET]);
-+  raptor_sax2_set_feature(rdf_xml_parser->sax2, 
-+                          RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
-+                          rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]);
-   
-   raptor_sax2_parse_start(rdf_xml_parser->sax2, uri);
- 
--- misc/raptor-1.4.18/src/raptor_rss.c.old	2008-05-21 22:25:57.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_rss.c	2012-02-15 16:52:08.000000000 +0100
-@@ -251,6 +251,9 @@ raptor_rss_parse_start(raptor_parser *rd
-   raptor_sax2_set_feature(rss_parser->sax2, 
-                           RAPTOR_FEATURE_NO_NET,
-                           rdf_parser->features[RAPTOR_FEATURE_NO_NET]);
-+  raptor_sax2_set_feature(rss_parser->sax2, 
-+                          RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
-+                          rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]);
-   
-   raptor_sax2_parse_start(rss_parser->sax2, uri);
- 
--- misc/raptor-1.4.18/src/raptor_sax2.c.old	2008-06-15 10:12:20.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_sax2.c	2012-02-15 16:52:08.000000000 +0100
-@@ -96,6 +96,8 @@ raptor_new_sax2(void* user_data, raptor_
- 
-   sax2->user_data=user_data;
- 
-+  sax2->enabled = 1;
-+
-   sax2->locator=error_handlers->locator;
-   
-   sax2->error_handlers=error_handlers;
-@@ -687,6 +689,10 @@ raptor_sax2_set_feature(raptor_sax2 *sax
-       sax2->feature_no_net=value;
-       break;
- 
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
-+      sax2->feature_load_external_entities=value;
-+      break;
-+
-     case RAPTOR_FEATURE_SCANNING:
-     case RAPTOR_FEATURE_ASSUME_IS_RDF:
-     case RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES:
-@@ -767,6 +773,9 @@ raptor_sax2_start_element(void* user_dat
-   unsigned char *xml_language=NULL;
-   raptor_uri *xml_base=NULL;
- 
-+  if(!sax2->enabled)
-+    return;
-+
- #ifdef RAPTOR_XML_EXPAT
- #ifdef EXPAT_UTF8_BOM_CRASH
-   sax2->tokens_count++;
-@@ -990,6 +999,9 @@ raptor_sax2_end_element(void* user_data,
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-   raptor_xml_element* xml_element;
- 
-+  if(!sax2->enabled)
-+    return;
-+
- #ifdef RAPTOR_XML_EXPAT
- #ifdef EXPAT_UTF8_BOM_CRASH
-   sax2->tokens_count++;
-@@ -1025,6 +1037,10 @@ void
- raptor_sax2_characters(void* user_data, const unsigned char *s, int len)
- {
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-+
-+  if(!sax2->enabled)
-+    return;
-+
-   if(sax2->characters_handler)
-     sax2->characters_handler(sax2->user_data, sax2->current_element, s, len);
- }
-@@ -1035,6 +1051,10 @@ void
- raptor_sax2_cdata(void* user_data, const unsigned char *s, int len)
- {
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-+
-+  if(!sax2->enabled)
-+    return;
-+
- #ifdef RAPTOR_XML_EXPAT
- #ifdef EXPAT_UTF8_BOM_CRASH
-   sax2->tokens_count++;
-@@ -1051,6 +1071,10 @@ void
- raptor_sax2_comment(void* user_data, const unsigned char *s)
- {
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-+
-+  if(!sax2->enabled)
-+    return;
-+
-   if(sax2->comment_handler)
-     sax2->comment_handler(sax2->user_data, sax2->current_element, s);
- }
-@@ -1066,6 +1090,10 @@ raptor_sax2_unparsed_entity_decl(void* u
-                                  const unsigned char* notationName)
- {
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-+
-+  if(!sax2->enabled)
-+    return;
-+
-   if(sax2->unparsed_entity_decl_handler)
-     sax2->unparsed_entity_decl_handler(sax2->user_data,
-                                        entityName, base, systemId, 
-@@ -1082,6 +1110,10 @@ raptor_sax2_external_entity_ref(void* us
-                                 const unsigned char* publicId)
- {
-   raptor_sax2* sax2=(raptor_sax2*)user_data;
-+
-+  if(!sax2->enabled)
-+    return 0;
-+
-   if(sax2->external_entity_ref_handler)
-     return sax2->external_entity_ref_handler(sax2->user_data,
-                                              context, base, systemId, publicId);
--- misc/raptor-1.4.18/src/raptor_serialize.c.old	2008-06-20 02:55:31.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_serialize.c	2012-02-15 16:52:08.000000000 +0100
-@@ -859,6 +859,7 @@ raptor_serializer_set_feature(raptor_ser
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
-@@ -965,6 +966,7 @@ raptor_serializer_set_feature_string(rap
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
-@@ -1102,6 +1104,7 @@ raptor_serializer_get_feature(raptor_ser
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
-@@ -1201,6 +1204,7 @@ raptor_serializer_get_feature_string(rap
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
--- misc/raptor-1.4.18/src/raptor_turtle_writer.c.old	2008-06-20 07:47:48.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_turtle_writer.c	2012-02-15 16:52:08.000000000 +0100
-@@ -723,6 +723,7 @@ raptor_turtle_writer_set_feature(raptor_
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_RELATIVE_URIS:
-@@ -836,6 +837,7 @@ raptor_turtle_writer_get_feature(raptor_
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_RELATIVE_URIS:
--- misc/raptor-1.4.18/src/raptor_xml_writer.c.old	2008-06-03 07:05:56.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_xml_writer.c	2012-02-15 16:52:08.000000000 +0100
-@@ -906,6 +906,7 @@ raptor_xml_writer_set_feature(raptor_xml
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_RELATIVE_URIS:
-@@ -1026,6 +1027,7 @@ raptor_xml_writer_get_feature(raptor_xml
- 
-     /* Shared */
-     case RAPTOR_FEATURE_NO_NET:
-+    case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES:
- 
-     /* XML writer features */
-     case RAPTOR_FEATURE_RELATIVE_URIS:
--- a/redland/raptor/raptor-1.4.18.fixes.patch
+++ b/redland/raptor/raptor-1.4.18.fixes.patch
@@ -1,42 +0,0 @@
--- misc/raptor-1.4.18/src/raptor_abbrev.c	2008-06-15 09:34:06.000000000 +0200
-+++ misc/raptor-1.4.18/src/raptor_abbrev.c	2011-05-18 18:58:35.440435467 +0200
-@@ -124,6 +124,7 @@
-         case RAPTOR_IDENTIFIER_TYPE_UNKNOWN: 
-         default:
-           RAPTOR_FREE(raptor_abbrev_node, node);
-+          node = NULL;
-     }
-     
-   }
--- misc/raptor-1.4.18/src/raptor_parse.c	2008-06-15 09:18:50.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_parse.c	2011-05-18 18:58:32.143702301 +0200
-@@ -1870,7 +1870,7 @@
-         ((char*)buffer)[FIRSTN]=c;
-     }
- 
-    if(i > MAX_PARSERS) {
-+    if(i >= MAX_PARSERS) {
-       raptor_finish();
-       RAPTOR_FATAL2("Number of parsers greater than static buffer size %d\n",
-                     MAX_PARSERS);
--- misc/raptor-1.4.18/src/raptor_rdfxml.c	2008-06-15 10:12:06.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c	2011-05-18 18:58:30.031671100 +0200
-@@ -404,7 +404,7 @@
- static const char *
- raptor_rdfxml_element_content_type_as_string(raptor_rdfxml_element_content_type type) 
- {
-  if(type > RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
-+  if(type >= RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
-     return "INVALID";
-   return rdf_content_type_info[type].name;
- }
--- misc/raptor-1.4.18/src/raptor_serialize_dot.c	2008-06-15 09:34:29.000000000 +0200
-+++ misc/build/raptor-1.4.18/src/raptor_serialize_dot.c	2011-05-18 18:58:33.986920218 +0200
-@@ -266,6 +266,7 @@
-       case RAPTOR_IDENTIFIER_TYPE_UNKNOWN: 
-       default:
-         RAPTOR_FREE(raptor_dot_serializer_node, node);
-+        node = NULL;
-     }
-     
-   }
--- a/redland/raptor/raptor-1.4.18.legal.patch
+++ b/redland/raptor/raptor-1.4.18.legal.patch
@@ -1,18 +0,0 @@
--- misc/raptor-1.4.18/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/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.
-+
--- a/redland/raptor/raptor-1.4.18.libxml.patch
+++ b/redland/raptor/raptor-1.4.18.libxml.patch
@@ -1,117 +0,0 @@
--- misc/raptor-1.4.18/configure	2011-06-05 11:55:18.000000000 -0400
-+++ misc/raptor-1.4.18/configure	2011-06-05 11:55:46.000000000 -0400
-@@ -23470,73 +23470,6 @@
- LIBS="$oLIBS"
- 
- 
-# Check whether --with-xml2-config was given.
-if test "${with_xml2_config+set}" = set; then
-  withval=$with_xml2_config; xml2_config="$withval"
-else
-  xml2_config=""
-fi
-
-
-if test "X$xml2_config" != "X" ; then
-  { echo "$as_me:$LINENO: checking for $xml2_config" >&5
-echo $ECHO_N "checking for $xml2_config... $ECHO_C" >&6; }
-
-  if test -f $xml2_config ; then
-    XML_CONFIG=$xml2_config
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  else
-    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
-echo "${ECHO_T}no - searching PATH" >&6; }
-  fi
-fi
-if test "X$XML_CONFIG" = "X"; then
-  for ac_prog in xml2-config
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_XML_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$XML_CONFIG"; then
-  ac_cv_prog_XML_CONFIG="$XML_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_XML_CONFIG="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-XML_CONFIG=$ac_cv_prog_XML_CONFIG
-if test -n "$XML_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
-echo "${ECHO_T}$XML_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$XML_CONFIG" && break
-done
-
-fi
-
-
- # Check whether --with-xslt-config was given.
- if test "${with_xslt_config+set}" = set; then
-   withval=$with_xslt_config; xslt_config="$withval"
-@@ -23719,8 +23652,8 @@
- 
- oCPPFLAGS="$CPPFLAGS"
- oLIBS="$LIBS"
-if test "X$XML_CONFIG" != X; then
-  LIBS="$LIBS `$XML_CONFIG --libs`"
-+if test 0; then
-+  LIBS="$LIBS $LIBXML_LIBS"
-   { echo "$as_me:$LINENO: checking for xmlCreatePushParserCtxt" >&5
- echo $ECHO_N "checking for xmlCreatePushParserCtxt... $ECHO_C" >&6; }
- if test "${ac_cv_func_xmlCreatePushParserCtxt+set}" = set; then
-@@ -23813,18 +23746,6 @@
-   if test $have_xmlCreatePushParserCtxt = yes; then
-     have_libxml_lib=1
-     have_libxml=1
-    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
-    LIBXML_VERSION=`$XML_CONFIG --version`
-    libxml_version_dec=`echo $LIBXML_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    libxml_min_version_dec=`echo $libxml_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    { echo "$as_me:$LINENO: result: yes - version $LIBXML_VERSION" >&5
-echo "${ECHO_T}yes - version $LIBXML_VERSION" >&6; }
-    if test $libxml_version_dec -lt $libxml_min_version_dec; then
-       { echo "$as_me:$LINENO: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&5
-echo "$as_me: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&2;}
-       have_libxml_lib=0
-       have_libxml=0
-    fi
-   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -26447,8 +26368,8 @@
-     CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
-     LIBS="$LIBS -Llibxml -llibxml"
-   else
-    LIBS="$LIBS `$XML_CONFIG --libs`"
-    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
-+    LIBS="$LIBS $LIBXML_LIBS"
-+    CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
-   fi
-   RAPTOR_XML_PARSER=libxml
- fi
--- a/redland/raptor/raptor-1.4.18.libxslt.patch
+++ b/redland/raptor/raptor-1.4.18.libxslt.patch
@@ -1,116 +0,0 @@
--- misc/raptor-1.4.18/configure	2011-06-05 11:57:41.000000000 -0400
-+++ misc/raptor-1.4.18/configure	2011-06-05 11:58:11.000000000 -0400
-@@ -23470,73 +23470,6 @@
- LIBS="$oLIBS"
- 
- 
-# Check whether --with-xslt-config was given.
-if test "${with_xslt_config+set}" = set; then
-  withval=$with_xslt_config; xslt_config="$withval"
-else
-  xslt_config=""
-fi
-
-
-if test "X$xslt_config" != "X" ; then
-  { echo "$as_me:$LINENO: checking for $xslt_config" >&5
-echo $ECHO_N "checking for $xslt_config... $ECHO_C" >&6; }
-
-  if test -f $xslt_config ; then
-    XSLT_CONFIG=$xslt_config
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  else
-    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
-echo "${ECHO_T}no - searching PATH" >&6; }
-  fi
-fi
-if test "X$XSLT_CONFIG" = "X"; then
-  for ac_prog in xslt-config
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_XSLT_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$XSLT_CONFIG"; then
-  ac_cv_prog_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_XSLT_CONFIG="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-XSLT_CONFIG=$ac_cv_prog_XSLT_CONFIG
-if test -n "$XSLT_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
-echo "${ECHO_T}$XSLT_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$XSLT_CONFIG" && break
-done
-
-fi
-
-
- # Check whether --with-curl-config was given.
- if test "${with_curl_config+set}" = set; then
-   withval=$with_curl_config; curl_config="$withval"
-@@ -24702,8 +24635,8 @@
- 
- oCPPFLAGS="$CPPFLAGS"
- oLIBS="$LIBS"
-if test "X$XSLT_CONFIG" != X; then
-  LIBS="$LIBS `$XSLT_CONFIG --libs`"
-+if test 0; then
-+  LIBS="$LIBS $LIBXSLT_LIBS"
-   { echo "$as_me:$LINENO: checking for xsltSaveResultToString" >&5
- echo $ECHO_N "checking for xsltSaveResultToString... $ECHO_C" >&6; }
- if test "${ac_cv_func_xsltSaveResultToString+set}" = set; then
-@@ -24795,17 +24728,6 @@
- echo $ECHO_N "checking for system libxslt library... $ECHO_C" >&6; }
-   if test $have_xsltSaveResultToString = yes; then
-     have_libxslt=1
-    CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
-    LIBXSLT_VERSION=`$XSLT_CONFIG --version`
-    libxslt_version_dec=`echo $LIBXSLT_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    libxslt_min_version_dec=`echo $libxslt_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    { echo "$as_me:$LINENO: result: yes - version $LIBXSLT_VERSION" >&5
-echo "${ECHO_T}yes - version $LIBXSLT_VERSION" >&6; }
-    if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
-       { echo "$as_me:$LINENO: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&5
-echo "$as_me: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&2;}
-       have_libxslt=0
-    fi
-   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -26395,8 +26317,8 @@
- fi
- 
- if test $need_libxslt = 1; then
-  LIBS="$LIBS `$XSLT_CONFIG --libs`"
-  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
-+  LIBS="$LIBS $LIBXSLT_LIBS"
-+  CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS"
- fi
- 
- RAPTOR_LIBTOOLLIBS=libraptor.la
--- a/redland/raptor/raptor-1.4.18.mingw.patch
+++ b/redland/raptor/raptor-1.4.18.mingw.patch
@@ -1,41 +0,0 @@
--- misc/raptor-1.4.18/configure	2008-06-15 17:25:55.000000000 +0900
-+++ misc/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
--- misc/raptor-1.4.18/src/Makefile.in
-+++ misc/build/raptor-1.4.18/src/Makefile.in
-@@ -404,7 +404,7 @@
- 	$(am__append_20) $(am__append_21) $(am__append_22) \
- 	$(am__append_23) $(am__append_24) $(am__append_25) \
- 	$(am__append_26)
-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
- libraptor_la_LIBADD = @LTLIBOBJS@
- EXTRA_DIST = \
- raptor-config.in \
--- a/redland/raptor/raptor-1.4.18.no-soname.patch
+++ b/redland/raptor/raptor-1.4.18.no-soname.patch
@@ -1,11 +0,0 @@
--- misc/raptor-1.4.18/configure
-+++ misc/raptor-1.4.18/configure
-@@ -7848,7 +7848,7 @@
- 	*)
- 	  tmp_sharedflag='-shared' ;;
- 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
- 
- 	if test $supports_anon_versioning = yes; then
- 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--- a/redland/raptor/raptor-1.4.18.ooo_build.patch
+++ b/redland/raptor/raptor-1.4.18.ooo_build.patch
@@ -1,43 +0,0 @@
--- misc/raptor-1.4.18/src/raptor-config.in	Sat Jan  6 05:02:00 2007
-+++ misc/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@
--- a/redland/raptor/raptor-1.4.18.rindex.patch
+++ b/redland/raptor/raptor-1.4.18.rindex.patch
@@ -1,62 +0,0 @@
--- misc/raptor-1.4.18/librdfa/curie.c	2008-06-14 07:33:37.000000000 +0200
-+++ misc/raptor-1.4.18/librdfa/curie.c	2011-09-27 14:48:34.000000000 +0200
-@@ -122,7 +122,7 @@
-       {
-          // if we have a relative URI, chop off the name of the file
-          // and replace it with the relative pathname
-         char* end_index = rindex(context->base, '/');
-+         char* end_index = strrchr(context->base, '/');
- 
-          if(end_index != NULL)
-          {
-@@ -130,7 +130,7 @@
-             char* end_index2;
- 
-             tmpstr = rdfa_replace_string(tmpstr, context->base);
-            end_index2= rindex(tmpstr, '/');
-+            end_index2= strrchr(tmpstr, '/');
-             end_index2++;
-             *end_index2 = '\0';
- 
--- misc/raptor-1.4.18/librdfa/rdfa.c	2008-06-16 04:02:58.000000000 +0200
-+++ misc/build/raptor-1.4.18/librdfa/rdfa.c	2011-09-27 15:03:12.000000000 +0200
-@@ -163,7 +163,7 @@
-       {
-          char* href_start = strstr(base_start, "href=");
-          char* uri_start = href_start + 6;
-         char* uri_end = index(uri_start, '"');
-+         char* uri_end = strchr(uri_start, '"');
- 
-          if((uri_start != NULL) && (uri_end != NULL))
-          {
-@@ -898,8 +898,8 @@
-       if(context->xml_literal != NULL)
-       {
-          // get the data between the first tag and the last tag
-         content_start = index(context->xml_literal, '>');
-         content_end = rindex(context->xml_literal, '<');
-+         content_start = strchr(context->xml_literal, '>');
-+         content_end = strrchr(context->xml_literal, '<');
-          
-          if((content_start != NULL) && (content_end != NULL))
-          {
--- misc/raptor-1.4.18/librdfa/triple.c	2008-06-14 07:33:37.000000000 +0200
-+++ misc/build/raptor-1.4.18/librdfa/triple.c	2011-09-27 15:02:59.000000000 +0200
-@@ -437,7 +437,7 @@
-       current_object_literal = context->content;
-       type = RDF_TYPE_PLAIN_LITERAL;
-    }
-   else if(index(context->xml_literal, '<') == NULL)
-+   else if(strchr(context->xml_literal, '<') == NULL)
-    {      
-       current_object_literal = context->plain_literal;
-       type = RDF_TYPE_PLAIN_LITERAL;
-@@ -467,7 +467,7 @@
-    // [current element], i.e., not including the element itself, and
-    // giving it a datatype of rdf:XMLLiteral.
-    if((current_object_literal == NULL) &&
-      (index(context->xml_literal, '<') != NULL) &&
-+      (strchr(context->xml_literal, '<') != NULL) &&
-       ((context->datatype == NULL) ||
-        (strcmp(context->datatype,
-                "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0)))
--- a/redland/raptor/raptor-1.4.18.win32.patch
+++ b/redland/raptor/raptor-1.4.18.win32.patch
@@ -1,78 +0,0 @@
--- misc/raptor-1.4.18/src/win32_raptor_config.h	Wed Apr  2 06:50:14 2008
-+++ misc/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>
--- a/redland/raptor/raptor-android.patch.1
+++ b/redland/raptor/raptor-android.patch.1
@@ -0,0 +1,13 @@
+No sonames on Android
+
+--- a/configure	2013-03-29 19:46:34.922901756 +0100
+++ b/configure	2013-03-29 19:46:56.051901574 +0100
+@@ -9866,7 +9866,7 @@
+ 	*Sun\ F*)			# Sun Fortran 8.3
+ 	  tmp_sharedflag='-G' ;;
+ 	esac
+-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+ 
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
--- a/redland/raptor/raptor-bundled-soname.patch.1
+++ b/redland/raptor/raptor-bundled-soname.patch.1
@@ -0,0 +1,13 @@
+rhbz#809466 change soname of bundled redland libs
+
+--- a/src/Makefile.in    2013-03-29 19:11:27.944919859 +0100
+++ b/src/Makefile.in	2013-03-29 19:17:42.173916644 +0100
+@@ -507,7 +507,7 @@
+ 	$(am__append_21) $(am__append_22) $(am__append_23) \
+ 	$(am__append_24) $(am__append_25) $(am__append_26) \
+ 	$(am__append_27) $(am__append_28)
+-libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
+libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo \
+ @RAPTOR_LDFLAGS@ $(MEM_LIBS)
+ 
+ libraptor2_la_LIBADD = @LTLIBOBJS@
--- a/redland/raptor/raptor-freebsd.patch.1
+++ b/redland/raptor/raptor-freebsd.patch.1
@@ -0,0 +1,28 @@
+Usual patch to produce Linux-like .so files on FreeBSD
+
+--- a/build/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
+++ b/build/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
+@@ -7341,9 +7341,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|qnx|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`
+@@ -7420,8 +7420,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
--- a/redland/raptor/raptor-mingw.patch.1
+++ b/redland/raptor/raptor-mingw.patch.1
@@ -0,0 +1,13 @@
+MinGW: libtool falls back to static lib unless -no-undefined given
+
+--- a/src/Makefile.in	2013-03-29 19:11:27.944919859 +0100
+++ b/src/Makefile.in	2013-03-29 20:05:02.140892243 +0100
+@@ -507,7 +507,7 @@
+ 	$(am__append_21) $(am__append_22) $(am__append_23) \
+ 	$(am__append_24) $(am__append_25) $(am__append_26) \
+ 	$(am__append_27) $(am__append_28)
+-libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
+libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined \
+ @RAPTOR_LDFLAGS@ $(MEM_LIBS)
+ 
+ libraptor2_la_LIBADD = @LTLIBOBJS@
--- a/redland/raptor/raptor2.h
+++ b/redland/raptor/raptor2.h
--- a/redland/raptor/raptor_config.h
+++ b/redland/raptor/raptor_config.h
@@ -0,0 +1,393 @@
+/* src/raptor_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* have to check C99 vsnprintf at runtime because cross compiling */
+#undef CHECK_VSNPRINTF_RUNTIME
+
+/* vsnprintf has C99 compatible return value */
+#undef HAVE_C99_VSNPRINTF
+
+/* Have curl/curl.h */
+#undef HAVE_CURL_CURL_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_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. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <fetch.h> header file. */
+#undef HAVE_FETCH_H
+
+/* Define to 1 if you have the `getopt' function. */
+#undef HAVE_GETOPT
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* INN parsedate function present */
+#undef HAVE_INN_PARSEDATE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the <libxml/hash.h> header file. */
+#define HAVE_LIBXML_HASH_H 1
+
+/* Define to 1 if you have the <libxml/HTMLparser.h> header file. */
+#define HAVE_LIBXML_HTMLPARSER_H 1
+
+/* Define to 1 if you have the <libxml/nanohttp.h> header file. */
+#define HAVE_LIBXML_NANOHTTP_H 1
+
+/* Define to 1 if you have the <libxml/parser.h> header file. */
+#define HAVE_LIBXML_PARSER_H 1
+
+/* Define to 1 if you have the <libxml/SAX2.h> header file. */
+#define HAVE_LIBXML_SAX2_H 1
+
+/* Define to 1 if you have the <libxslt/xslt.h> header file. */
+#define HAVE_LIBXSLT_XSLT_H 1
+
+/* 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. */
+#undef HAVE_MEMORY_H
+
+/* Raptor raptor_parse_date available */
+#undef HAVE_RAPTOR_PARSE_DATE
+
+/* Define to 1 if you have the `setjmp' function. */
+#undef HAVE_SETJMP
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#undef HAVE_SETJMP_H
+
+/* Define to 1 if you have the `stat' function. */
+#undef HAVE_STAT
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* 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. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `stricmp' function. */
+#define HAVE_STRICMP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* 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
+
+/* YAJL has API version 2 */
+#undef HAVE_YAJL2
+
+/* Define to 1 if you have the <yajl/yajl_parse.h> header file. */
+#undef HAVE_YAJL_YAJL_PARSE_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define to 1 if maintainer mode is enabled. */
+#undef MAINTAINER_MODE
+
+/* need 'extern int optind' declaration? */
+#undef NEED_OPTIND_DECLARATION
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if debug messages are enabled. */
+#undef RAPTOR_DEBUG
+
+/* Use ICU for Unicode NFC check */
+#undef RAPTOR_ICU_NFC
+
+/* does libxml struct xmlEntity have a field etype */
+#define RAPTOR_LIBXML_ENTITY_ETYPE 1
+
+/* does libxml struct xmlEntity have a field name_length */
+#undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH
+
+/* does libxml have HTML_PARSE_NONET */
+#define RAPTOR_LIBXML_HTML_PARSE_NONET 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
+
+/* does libxml have XML_PARSE_NONET */
+#define RAPTOR_LIBXML_XML_PARSE_NONET 1
+
+/* Minimum supported package version */
+#define RAPTOR_MIN_VERSION_DECIMAL 20000
+
+/* Building GRDDL parser */
+#undef RAPTOR_PARSER_GRDDL
+
+/* Building guess parser */
+#undef RAPTOR_PARSER_GUESS
+
+/* Building JSON parser */
+#undef RAPTOR_PARSER_JSON
+
+/* Building N-Quads parser */
+#undef RAPTOR_PARSER_NQUADS
+
+/* Building N-Triples parser */
+#define RAPTOR_PARSER_NTRIPLES 1
+
+/* Building RDFA parser */
+#undef RAPTOR_PARSER_RDFA
+
+/* Building RDF/XML parser */
+#define RAPTOR_PARSER_RDFXML 1
+
+/* Building RSS Tag Soup parser */
+#undef RAPTOR_PARSER_RSS
+
+/* Building TRiG parser */
+#undef RAPTOR_PARSER_TRIG
+
+/* Building Turtle parser */
+#undef RAPTOR_PARSER_TURTLE
+
+/* Building Atom 1.0 serializer */
+#undef RAPTOR_SERIALIZER_ATOM
+
+/* Building GraphViz DOT serializer */
+#undef RAPTOR_SERIALIZER_DOT
+
+/* Building HTML Table serializer */
+#undef RAPTOR_SERIALIZER_HTML
+
+/* Building JSON serializer */
+#undef RAPTOR_SERIALIZER_JSON
+
+/* Building N-Quads serializer */
+#undef RAPTOR_SERIALIZER_NQUADS
+
+/* 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 */
+#undef RAPTOR_SERIALIZER_RSS_1_0
+
+/* Building Turtle serializer */
+#undef RAPTOR_SERIALIZER_TURTLE
+
+/* Release version as a decimal */
+#define RAPTOR_VERSION_DECIMAL 20009
+
+/* Major version number */
+#define RAPTOR_VERSION_MAJOR 2
+
+/* Minor version number */
+#define RAPTOR_VERSION_MINOR 0
+
+/* Release version number */
+#define RAPTOR_VERSION_RELEASE 9
+
+/* 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
+
+/* Check XML 1.1 Names */
+#undef RAPTOR_XML_1_1
+
+/* Use libxml XML parser */
+#define RAPTOR_XML_LIBXML 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Version number of package */
+#define VERSION "2.0.9"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+// from raptor_config_cmake.h.in ////////////////////////////////////////////
+
+#ifdef WIN32
+#  define WIN32_LEAN_AND_MEAN
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#  define _CRT_NONSTDC_NO_DEPRECATE
+#  endif
+#  ifndef _CRT_SECURE_NO_DEPRECATE
+#  define _CRT_SECURE_NO_DEPRECATE
+#  endif
+
+#  ifdef _MSC_VER
+#    if _MSC_VER >= 1300
+#      define __func__    __FUNCTION__
+#    else
+       /* better than nothing */
+#      define raptor_str(s)  #s
+#      define __func__    "func@" __FILE__ ":" raptor_str(__LINE__)
+#    endif
+#  endif
+
+#  define RAPTOR_INLINE  __inline
+
+#  define S_ISTYPE(mode, mask)  (((mode) & _S_IFMT) == (mask))
+#  define S_ISDIR(mode)    S_ISTYPE((mode), _S_IFDIR)
+#  define S_ISREG(mode)    S_ISTYPE((mode), _S_IFREG)
+
+   /* Mode bits for access() */
+#  define R_OK 04
+#  define W_OK 02
+
+#  if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS)
+#    define access(p,m)    _access(p,m)
+#  endif
+#  ifndef HAVE_STRCASECMP
+#    if defined(HAVE__STRICMP)
+#      define strcasecmp(a,b)  _stricmp(a,b)
+#    elif defined(HAVE_STRICMP)
+#      define strcasecmp(a,b)  stricmp(a,b)
+#    endif
+#  endif
+#  if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF)
+#    define snprintf    _snprintf
+#  endif
+#  if !defined(HAVE_VSNPRINTF) && defined(HAVE__VSNPRINTF)
+#    define vsnprintf    _vsnprintf
+#  endif
+
+   /* These prevent parsedate.c from declaring malloc() and free() */
+#  define YYMALLOC malloc
+#  define YYFREE   free
+#endif
+
+
--- a/redland/rasqal/rasqal-0.9.16.aix.patch
+++ b/redland/rasqal/rasqal-0.9.16.aix.patch
@@ -1,44 +0,0 @@
--- misc/rasqal-0.9.16/config.guess	2010-09-16 03:13:19.000000000 -0500
-+++ misc/build/rasqal-0.9.16/config.guess	2010-09-16 03:15:05.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
-    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
--- misc/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:53:30.000000000 -0500
-+++ misc/build/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:54:47.000000000 -0500
-@@ -36,8 +36,20 @@
- #include <stdlib.h>
- #endif
- #include <stdarg.h>
-+#ifdef _AIX
-+#  ifndef isnan
-+#   define isnan(x) \
-+      (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
-+       : sizeof (x) == sizeof (double) ? isnan_d (x) \
-+       : isnan_f (x))
-+  static inline int isnan_f  (float       x) { return x != x; }
-+  static inline int isnan_d  (double      x) { return x != x; }
-+  static inline int isnan_ld (long double x) { return x != x; }
-+#  endif
-+#else
- /* for isnan() */
- #include <math.h>
-+#endif
- 
- #ifdef RASQAL_REGEX_PCRE
- #include <pcre.h>
--- a/redland/rasqal/rasqal-0.9.16.autotools.patch
+++ b/redland/rasqal/rasqal-0.9.16.autotools.patch
@@ -1,58 +0,0 @@
--- misc/rasqal-0.9.16/config.sub	2008-06-28 19:57:26.000000000 +0200
-+++ misc/build/rasqal-0.9.16/config.sub	2011-09-27 15:08:16.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1262,7 +1262,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- 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)
--- a/redland/rasqal/rasqal-0.9.16.bundled-soname.patch
+++ b/redland/rasqal/rasqal-0.9.16.bundled-soname.patch
@@ -1,11 +0,0 @@
--- misc/rasqal-0.9.16/src/Makefile.in
-+++ misc/build/rasqal-0.9.16/src/Makefile.in
-@@ -355,7 +355,7 @@
- 	rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
- 	rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
- 	$(am__append_4) $(am__append_5)
-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
-+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo
- librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
- librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
- EXTRA_DIST = \
--- a/redland/rasqal/rasqal-0.9.16.legal.patch
+++ b/redland/rasqal/rasqal-0.9.16.legal.patch
@@ -1,18 +0,0 @@
--- 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.
-+
--- a/redland/rasqal/rasqal-0.9.16.mingw.patch
+++ b/redland/rasqal/rasqal-0.9.16.mingw.patch
@@ -1,11 +0,0 @@
--- misc/rasqal-0.9.16/src/Makefile.in
-+++ misc/build/rasqal-0.9.16/src/Makefile.in
-@@ -355,7 +355,7 @@
- 	rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
- 	rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
- 	$(am__append_4) $(am__append_5)
-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
-+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
- librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
- librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
- EXTRA_DIST = \
--- a/redland/rasqal/rasqal-0.9.16.no-soname.patch
+++ b/redland/rasqal/rasqal-0.9.16.no-soname.patch
@@ -1,11 +0,0 @@
--- misc/rasqal-0.9.16/configure
-+++ misc/build/rasqal-0.9.16/configure
-@@ -7848,7 +7848,7 @@
- 	*)
- 	  tmp_sharedflag='-shared' ;;
- 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
- 
- 	if test $supports_anon_versioning = yes; then
- 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--- a/redland/rasqal/rasqal-0.9.16.ooo_build.patch
+++ b/redland/rasqal/rasqal-0.9.16.ooo_build.patch
@@ -1,56 +0,0 @@
--- 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@
--- misc/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:21.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:56.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- noinst_SCRIPTS = rasqal-src-config
- 
-SUBDIRS=src utils tests docs data win32
-+SUBDIRS=src tests docs data win32
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = rasqal.pc
--- misc/rasqal-0.9.16/Makefile.in	2010-02-12 08:43:19.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.in	2010-02-12 08:44:03.000000000 +0000
-@@ -242,7 +242,7 @@
- with_raptor = @with_raptor@
- with_redland = @with_redland@
- noinst_SCRIPTS = rasqal-src-config
-SUBDIRS = src utils tests docs data win32
-+SUBDIRS = src tests docs data win32
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = rasqal.pc
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
--- a/redland/rasqal/rasqal-0.9.16.win32.patch
+++ b/redland/rasqal/rasqal-0.9.16.win32.patch
@@ -1,43 +0,0 @@
--- 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
--- a/redland/rasqal/rasqal-aix.patch.1
+++ b/redland/rasqal/rasqal-aix.patch.1
@@ -0,0 +1,25 @@
+--- a/src/rasqal_literal.c	2013-03-29 21:22:57.413852072 +0100
+++ b/src/rasqal_literal.c	2013-03-29 21:23:34.092851757 +0100
+@@ -46,10 +46,22 @@
+ #include <stddef.h>
+ #endif
+ #include <stdarg.h>
+#ifdef _AIX
+#  ifndef isnan
+#   define isnan(x) \
+      (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
+       : sizeof (x) == sizeof (double) ? isnan_d (x) \
+       : isnan_f (x))
+  static inline int isnan_f  (float       x) { return x != x; }
+  static inline int isnan_d  (double      x) { return x != x; }
+  static inline int isnan_ld (long double x) { return x != x; }
+#  endif
+#else
+ /* for isnan() */
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+ #endif
+#endif
+ /* for INT_MIN and INT_MAX */
+ #ifdef HAVE_LIMITS_H
+ #include <limits.h>
--- a/redland/rasqal/rasqal-android.patch.1
+++ b/redland/rasqal/rasqal-android.patch.1
@@ -0,0 +1,14 @@
+No sonames on Android
+
+--- a/configure	2013-03-29 19:46:34.922901756 +0100
+++ b/configure	2013-03-29 19:46:56.051901574 +0100
+@@ -9809,7 +9809,7 @@
+ 	*Sun\ F*)			# Sun Fortran 8.3
+ 	  tmp_sharedflag='-G' ;;
+ 	esac
+-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+ 
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+
--- a/redland/rasqal/rasqal-bundled-soname.patch.1
+++ b/redland/rasqal/rasqal-bundled-soname.patch.1
@@ -0,0 +1,13 @@
+rhbz#809466 change soname of bundled redland libs
+
+--- a/src/Makefile.in	2013-03-29 21:44:58.115840724 +0100
+++ b/src/Makefile.in	2013-03-29 21:45:01.252840697 +0100
+@@ -621,7 +621,7 @@
+ 	$(am__append_2) $(am__append_3) $(am__append_4) \
+ 	$(am__append_5) $(am__append_6) $(am__append_8)
+ nodist_librasqal_la_SOURCES = $(am__append_7)
+-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo
+ librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
+ librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
+ EXTRA_DIST = \
--- a/redland/rasqal/rasqal-freebsd.patch.1
+++ b/redland/rasqal/rasqal-freebsd.patch.1
@@ -0,0 +1,28 @@
+Usual patch to produce Linux-like .so files on FreeBSD
+
+--- a/build/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
+++ b/build/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
+@@ -7341,9 +7341,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|qnx|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`
+@@ -7420,8 +7420,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
--- a/redland/rasqal/rasqal-mingw.patch.1
+++ b/redland/rasqal/rasqal-mingw.patch.1
@@ -0,0 +1,13 @@
+MinGW: libtool falls back to static lib unless -no-undefined given
+
+--- a/src/Makefile.in	2013-03-29 21:44:58.115840724 +0100
+++ b/src/Makefile.in	2013-03-29 21:46:43.024839823 +0100
+@@ -621,7 +621,7 @@
+ 	$(am__append_2) $(am__append_3) $(am__append_4) \
+ 	$(am__append_5) $(am__append_6) $(am__append_8)
+ nodist_librasqal_la_SOURCES = $(am__append_7)
+-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
+ librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
+ librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
+ EXTRA_DIST = \
--- a/redland/rasqal/rasqal-msvc.patch.1
+++ b/redland/rasqal/rasqal-msvc.patch.1
@@ -0,0 +1,87 @@
+--- a/src/win32_rasqal_config.h	Fri Jun 27 04:02:09 2008
+++ b/src/win32_rasqal_config.h	Thu Nov  6 12:07:06 2008
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ #define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+ 
+ /* getopt is not in standard win32 C library - define if we have it */
+ /* #define HAVE_GETOPT_H 1 */
+@@ -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
+@@ -101,7 +102,6 @@
+  * Defines that come from config.h
+  */
+ 
+-#include <windows.h>
+ #include <io.h>
+ #include <memory.h>
+ 
+@@ -116,8 +122,16 @@
+ /* #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
+#define RASQAL_UUID_INTERNAL 1
+#define RASQAL_DIGEST_INTERNAL 1
+
+ #ifdef _DEBUG
+ #define RASQAL_DEBUG 1
+ #endif
+--- a/src/rasqal_digest_md5.c	2013-04-01 00:18:47.913835564 +0200
+++ b/src/rasqal_digest_md5.c	2013-04-01 00:18:52.657835523 +0200
+@@ -50,7 +50,6 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <stdint.h>
+ #include <stdarg.h>
+ 
+ #include "rasqal.h"
+--- a/src/rasqal_digest_sha1.c	2013-04-01 00:19:04.655835420 +0200
+++ b/src/rasqal_digest_sha1.c	2013-04-01 00:19:10.448835370 +0200
+@@ -93,7 +93,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+-#include <stdint.h>
+ 
+ #include "rasqal.h"
+ #include "rasqal_internal.h"
+--- a/src/rasqal_internal.h	2013-04-01 00:18:11.090835880 +0200
+++ b/src/rasqal_internal.h	2013-04-01 00:18:13.610835859 +0200
+@@ -26,6 +26,13 @@
+ #ifndef RASQAL_INTERNAL_H
+ #define RASQAL_INTERNAL_H
+ 
+#if defined(_MSC_VER) && _MSC_VER < 1600
+typedef unsigned __int32 uint32_t;
+typedef __int16 int16_t;
+#else
+#include <stdint.h>
+#endif
+
+ #ifdef __cplusplus
+ extern "C" {
+ #define RASQAL_EXTERN_C extern "C"
--- a/redland/rasqal/rasqal-pkgconfig.patch.1
+++ b/redland/rasqal/rasqal-pkgconfig.patch.1
@@ -0,0 +1,512 @@
+Let the pkg-config stuff be overridden by variables
+
+--- a/configure.ac	2013-03-29 23:57:59.782772145 +0100
+++ b/configure.ac	2013-03-30 00:09:41.823766113 +0100
+@@ -394,25 +394,15 @@
+ RAPTOR_MIN_VERSION=2.0.7
+ 
+ 
+-AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
+-if test "X$PKG_CONFIG" = X; then
+-  AC_MSG_ERROR(pkg-config not found. configuring raptor V2 requires it.  Get it from http://pkg-config.freedesktop.org/)
+-fi
+PKG_PROG_PKG_CONFIG
+ 
+-AC_MSG_CHECKING(for raptor)
+-if $PKG_CONFIG raptor2 --exists; then
+PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= $RAPTOR_MIN_VERSION],[
+   RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+-  AC_MSG_RESULT(system $RAPTOR_VERSION)
+-
+-  if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
+-    :
+-  else
+-    AC_MSG_ERROR(Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION)
+-  fi
+-else
+-  AC_MSG_RESULT(not found)
+],[
+   AC_MSG_ERROR(Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
+-fi
+])
+AC_SUBST(RAPTOR2_CFLAGS)
+AC_SUBST(RAPTOR2_LIBS)
+ 
+ RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+ AC_SUBST(RAPTOR_VERSION_DEC)
+@@ -879,8 +867,8 @@
+ 
+ 
+ 
+-RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
+-RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
+ RAPPER_PATH=""
+ 
+ if test $need_regex_pcre = 1; then
+--- a/configure	2013-03-31 00:36:31.396795267 +0100
+++ b/configure	2013-03-31 00:36:42.820795169 +0100
+@@ -652,8 +652,6 @@
+ GTKDOC_MKPDF
+ GTKDOC_REBASE
+ GTKDOC_CHECK
+-PKG_CONFIG_LIBDIR
+-PKG_CONFIG_PATH
+ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V
+@@ -687,6 +685,10 @@
+ PCRE_CONFIG
+ RAPTOR_MIN_VERSION
+ RAPTOR_VERSION_DEC
+RAPTOR2_LIBS
+RAPTOR2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+ PKG_CONFIG
+ GETTIMEOFDAY_FALSE
+ GETTIMEOFDAY_TRUE
+@@ -872,6 +874,8 @@
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+RAPTOR2_CFLAGS
+RAPTOR2_LIBS
+ GTKDOC_DEPS_CFLAGS
+ GTKDOC_DEPS_LIBS'
+ 
+@@ -1554,6 +1558,10 @@
+               directories to add to pkg-config's search path
+   PKG_CONFIG_LIBDIR
+               path overriding pkg-config's built-in search path
+  RAPTOR2_CFLAGS
+              C compiler flags for RAPTOR2, overriding pkg-config
+  RAPTOR2_LIBS
+              linker flags for RAPTOR2, overriding pkg-config
+   GTKDOC_DEPS_CFLAGS
+               C compiler flags for GTKDOC_DEPS, overriding pkg-config
+   GTKDOC_DEPS_LIBS
+@@ -13818,26 +13826,35 @@
+ RAPTOR_MIN_VERSION=2.0.7
+ 
+ 
+-for ac_prog in pkg-config
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="$ac_prog"
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -13845,9 +13862,10 @@
+   done
+ IFS=$as_save_IFS
+ 
+  ;;
+esac
+ fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+@@ -13857,31 +13875,158 @@
+ fi
+ 
+ 
+-  test -n "$PKG_CONFIG" && break
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+ done
+  done
+IFS=$as_save_IFS
+ 
+-if test "X$PKG_CONFIG" = X; then
+-  as_fn_error $? "pkg-config not found. configuring raptor V2 requires it.  Get it from http://pkg-config.freedesktop.org/" "$LINENO" 5
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor" >&5
+-$as_echo_n "checking for raptor... " >&6; }
+-if $PKG_CONFIG raptor2 --exists; then
+-  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: system $RAPTOR_VERSION" >&5
+-$as_echo "system $RAPTOR_VERSION" >&6; }
+-
+-  if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
+-    :
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+   else
+-    as_fn_error $? "Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION" "$LINENO" 5
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+   fi
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAPTOR2" >&5
+$as_echo_n "checking for RAPTOR2... " >&6; }
+
+if test -n "$RAPTOR2_CFLAGS"; then
+    pkg_cv_RAPTOR2_CFLAGS="$RAPTOR2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RAPTOR2_CFLAGS=`$PKG_CONFIG --cflags "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$RAPTOR2_LIBS"; then
+    pkg_cv_RAPTOR2_LIBS="$RAPTOR2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RAPTOR2_LIBS=`$PKG_CONFIG --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
+        else
+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$RAPTOR2_PKG_ERRORS" >&5
+
+
+  as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+   as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
+
+else
+	RAPTOR2_CFLAGS=$pkg_cv_RAPTOR2_CFLAGS
+	RAPTOR2_LIBS=$pkg_cv_RAPTOR2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+
+ fi
+ 
+
+
+ RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+ 
+ 
+@@ -14883,8 +15028,8 @@
+ 
+ 
+ 
+-RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
+-RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
+ RAPPER_PATH=""
+ 
+ if test $need_regex_pcre = 1; then
+@@ -15579,126 +15724,6 @@
+ 
+ 
+ 
+-
+-
+-
+-
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+-	if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+-  ac_pt_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_PKG_CONFIG" = x; then
+-    PKG_CONFIG=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_pt_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
+-
+-fi
+-if test -n "$PKG_CONFIG"; then
+-	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		PKG_CONFIG=""
+-	fi
+-fi
+-
+-
+-
+     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+ set dummy gtkdoc-check; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+--- a/utils/Makefile.am	2013-03-31 00:39:54.396793523 +0100
+++ b/utils/Makefile.am	2013-03-31 00:34:47.293796162 +0100
+@@ -37,22 +37,22 @@
+ roqet_SOURCES += getopt.c rasqal_getopt.h
+ endif
+ roqet_LDADD = $(top_builddir)/src/librasqal.la
+-roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+roqet_LDFLAGS = @RAPTOR2_LIBS@
+ 
+ check_query_SOURCES = check_query.c
+ if GETOPT
+ check_query_SOURCES += getopt.c rasqal_getopt.h
+ endif
+ check_query_LDADD = $(top_builddir)/src/librasqal.la
+-check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+check_query_LDFLAGS = @RAPTOR2_LIBS@
+ 
+ srxread_SOURCES = srxread.c
+ srxread_LDADD = $(top_builddir)/src/librasqal.la
+-srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+srxread_LDFLAGS = @RAPTOR2_LIBS@
+ 
+ srxwrite_SOURCES = srxwrite.c
+ srxwrite_LDADD = $(top_builddir)/src/librasqal.la
+-srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
+ 
+ EXTRA_DIST= \
+ $(man_MANS) \
+--- a/utils/Makefile.in	2013-03-31 00:40:02.603793453 +0100
+++ b/utils/Makefile.in	2013-03-31 00:35:44.498795670 +0100
+@@ -359,16 +359,16 @@
+ AM_CFLAGS = $(MEM)
+ roqet_SOURCES = roqet.c $(am__append_1)
+ roqet_LDADD = $(top_builddir)/src/librasqal.la
+-roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+roqet_LDFLAGS = @RAPTOR2_LIBS@
+ check_query_SOURCES = check_query.c $(am__append_2)
+ check_query_LDADD = $(top_builddir)/src/librasqal.la
+-check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+check_query_LDFLAGS = @RAPTOR2_LIBS@
+ srxread_SOURCES = srxread.c
+ srxread_LDADD = $(top_builddir)/src/librasqal.la
+-srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+srxread_LDFLAGS = @RAPTOR2_LIBS@
+ srxwrite_SOURCES = srxwrite.c
+ srxwrite_LDADD = $(top_builddir)/src/librasqal.la
+-srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
+ EXTRA_DIST = \
+ $(man_MANS) \
+ roqet.html
--- a/redland/rasqal/rasqal.h
+++ b/redland/rasqal/rasqal.h
--- a/redland/redland/librdf.h
+++ b/redland/redland/librdf.h
@@ -0,0 +1,434 @@
+/* -*- Mode: c; c-basic-offset: 2 -*-
+ *
+ * redland.h - Redland RDF Application Framework public API
+ *
+ * Copyright (C) 2000-2011, David Beckett http://www.dajobe.org/
+ * Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac.uk/
+ *
+ * This package is Free Software and part of Redland http://librdf.org/
+ *
+ * It is licensed under the following three licenses as alternatives:
+ *   1. GNU Lesser General Public License (LGPL) V2.1 or any newer version
+ *   2. GNU General Public License (GPL) V2 or any newer version
+ *   3. Apache License, V2.0 or any newer version
+ *
+ * You may not use this file except in compliance with at least one of
+ * the above three licenses.
+ *
+ * See LICENSE.html or LICENSE.txt at the top of this package for the
+ * complete terms and further detail along with the license texts for
+ * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively.
+ *
+ *
+ */
+
+
+#ifndef LIBRDF_H
+#define LIBRDF_H
+
+#ifndef LIBRDF_OBJC_FRAMEWORK
+/* raptor */
+#include <raptor2.h>
+/* rasqal: uses raptor */
+#include <rasqal.h>
+/* librdf: uses rasqal and raptor */
+#else
+#include <Redland/raptor2.h>
+#include <Redland/rasqal.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+
+#ifndef REDLAND_API
+#  ifdef WIN32
+#    ifdef __GNUC__
+#      undef _declspec
+#      define _declspec(x) __declspec(x)
+#    endif
+#    ifdef REDLAND_STATIC
+#      define REDLAND_API
+#    else
+#      ifdef LIBRDF_INTERNAL
+#        define REDLAND_API _declspec(dllexport)
+#      else
+#        define REDLAND_API _declspec(dllimport)
+#      endif
+#    endif
+#  else
+#    define REDLAND_API
+#  endif
+#endif
+
+#ifndef REDLAND_CALLBACK_STDCALL
+#  if defined(WIN32) && defined(USE_STDCALL_CALLBACKS)
+#    define REDLAND_CALLBACK_STDCALL _stdcall
+#  else
+#    define REDLAND_CALLBACK_STDCALL
+#  endif
+#endif
+
+/* Use gcc 3.1+ feature to allow marking of deprecated API calls.
+ * This gives a warning during compiling.
+ */
+#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+#define REDLAND_DEPRECATED __attribute__((deprecated))
+#define REDLAND_NORETURN __attribute__((__noreturn__))
+#else
+#define REDLAND_DEPRECATED
+#define REDLAND_NORETURN
+#endif
+
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
+  __attribute__((__format__(__printf__, string_index, first_to_check_index)))
+#else
+#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index)
+#endif
+
+
+/* Public defines */
+
+/**
+ * LIBRDF_VERSION:
+ *
+ * Redland librdf library version number
+ *
+ * Format: major * 10000 + minor * 100 + release
+ */
+#define LIBRDF_VERSION 10016
+
+/**
+ * LIBRDF_VERSION_STRING:
+ *
+ * Redland librdf library version string
+ */
+#define LIBRDF_VERSION_STRING "1.0.16"
+
+/**
+ * LIBRDF_VERSION_MAJOR:
+ *
+ * Redland librdf library major version
+ */
+#define LIBRDF_VERSION_MAJOR 1
+
+/**
+ * LIBRDF_VERSION_MINOR:
+ *
+ * Redland librdf library minor version
+ */
+#define LIBRDF_VERSION_MINOR 0
+
+/**
+ * LIBRDF_VERSION_RELEASE:
+ *
+ * Redland librdf library release
+ */
+#define LIBRDF_VERSION_RELEASE 16
+
+
+
+/* Public typedefs (references to private structures) */
+
+/**
+ * librdf_world:
+ *
+ * Redland world class.
+ */
+typedef struct librdf_world_s librdf_world;
+
+/**
+ * librdf_hash:
+ *
+ * Redland hash class.
+ */
+typedef struct librdf_hash_s librdf_hash;
+
+/**
+ * librdf_hash_cursor:
+ *
+ * Redland hash cursor class.
+ */
+typedef struct librdf_hash_cursor_s librdf_hash_cursor;
+
+/**
+ * librdf_digest:
+ *
+ * Redland content digest class.
+ */
+typedef struct librdf_digest_s librdf_digest;
+
+/**
+ * librdf_digest_factory:
+ *
+ * Redland digest factory class.
+ */
+typedef struct librdf_digest_factory_s librdf_digest_factory;
+
+/**
+ * librdf_uri:
+ *
+ * Redland URI class.
+ */
+typedef struct raptor_uri_s librdf_uri;
+
+/**
+ * librdf_list:
+ *
+ * Redland list class.
+ */
+typedef struct librdf_list_s librdf_list;
+
+/**
+ * librdf_iterator:
+ *
+ * Redland iterator class.
+ */
+typedef struct librdf_iterator_s librdf_iterator;
+
+/**
+ * librdf_node:
+ *
+ * Redland node class.
+ */
+typedef raptor_term librdf_node;
+
+/**
+ * librdf_statement:
+ *
+ * Redland statement class.
+ */
+typedef raptor_statement librdf_statement;
+
+/**
+ * librdf_model:
+ *
+ * Redland model class.
+ */
+typedef struct librdf_model_s librdf_model;
+
+/**
+ * librdf_model_factory:
+ *
+ * Redland model factory class.
+ */
+typedef struct librdf_model_factory_s librdf_model_factory;
+
+/**
+ * librdf_storage:
+ *
+ * Redland storage class.
+ */
+typedef struct librdf_storage_s librdf_storage;
+
+/**
+ * librdf_storage_factory:
+ *
+ * Redland storage factory class.
+ */
+typedef struct librdf_storage_factory_s librdf_storage_factory;
+
+/**
+ * librdf_stream:
+ *
+ * Redland stream class.
+ */
+typedef struct librdf_stream_s librdf_stream;
+
+/**
+ * librdf_parser:
+ *
+ * Redland parser class.
+ */
+typedef struct librdf_parser_s librdf_parser;
+
+/**
+ * librdf_parser_factory:
+ *
+ * Redland parser factory class.
+ */
+typedef struct librdf_parser_factory_s librdf_parser_factory;
+
+/**
+ * librdf_query:
+ *
+ * Redland query class.
+ */
+typedef struct librdf_query_s librdf_query;
+
+/**
+ * librdf_query_factory:
+ *
+ * Redland query factory class.
+ */
+typedef struct librdf_query_factory_s librdf_query_factory;
+
+/**
+ * librdf_query_results:
+ *
+ * Redland query results class.
+ */
+typedef struct librdf_query_results_s librdf_query_results;
+
+/**
+ * librdf_query_results_formatter:
+ *
+ * Redland query results formatter class.
+ */
+typedef struct librdf_query_results_formatter_s librdf_query_results_formatter;
+
+/**
+ * librdf_serializer:
+ *
+ * Redland serializer class.
+ */
+typedef struct librdf_serializer_s librdf_serializer;
+
+/**
+ * librdf_serializer_factory:
+ *
+ * Redland serializer factory class.
+ */
+typedef struct librdf_serializer_factory_s librdf_serializer_factory;
+
+
+/* Public statics */
+
+/**
+ * librdf_short_copyright_string:
+ *
+ * Short copyright string (one line).
+ */
+REDLAND_API
+extern const char * const librdf_short_copyright_string;
+
+/**
+ * librdf_copyright_string:
+ *
+ * Copyright string (multiple lines).
+ */
+REDLAND_API
+extern const char * const librdf_copyright_string;
+
+/**
+ * librdf_version_string:
+ *
+ * Redland librdf version as a string.
+ */
+REDLAND_API
+extern const char * const librdf_version_string;
+
+/**
+ * librdf_version_major:
+ *
+ * Redland librdf major version number.
+ */
+REDLAND_API
+extern const unsigned int librdf_version_major;
+
+/**
+ * librdf_version_minor:
+ *
+ * Redland librdf minor version number.
+ */
+REDLAND_API
+extern const unsigned int librdf_version_minor;
+
+/**
+ * librdf_version_release:
+ *
+ * Redland librdf release version number.
+ */
+REDLAND_API
+extern const unsigned int librdf_version_release;
+
+/**
+ * librdf_version_decimal:
+ *
+ * Redland librdf version as a decimal number.
+ *
+ * Format: major * 10000 + minor * 100 + release
+ */
+REDLAND_API
+extern const unsigned int librdf_version_decimal;
+
+/**
+ * librdf_license_string:
+ *
+ * Redland librdf license string.
+ */
+REDLAND_API
+extern const char * const librdf_license_string;
+
+/**
+ * librdf_home_url_string:
+ *
+ * Redland librdf home page URL.
+ */
+REDLAND_API
+extern const char * const librdf_home_url_string;
+
+/* Required for va_list in error handler function registrations
+ * which are in the public API
+ */
+#include <stdarg.h>
+
+
+/* internal interfaces  */
+#ifdef LIBRDF_INTERNAL
+#include <rdf_internal.h>
+#endif
+
+/* public interfaces */
+
+/* FIXME: Should be replaced with automatically pulled
+ * definitions from the listed rdf_*.h header files.
+ */
+
+#ifndef LIBRDF_OBJC_FRAMEWORK
+#include <rdf_log.h>
+#include <rdf_digest.h>
+#include <rdf_hash.h>
+#include <rdf_init.h>
+#include <rdf_iterator.h>
+#include <rdf_uri.h>
+#include <rdf_node.h>
+#include <rdf_concepts.h>
+#include <rdf_statement.h>
+#include <rdf_model.h>
+#include <rdf_storage.h>
+#include <rdf_parser.h>
+#include <rdf_raptor.h>
+#include <rdf_serializer.h>
+#include <rdf_stream.h>
+#include <rdf_query.h>
+#include <rdf_utf8.h>
+#else
+#include <Redland/rdf_log.h>
+#include <Redland/rdf_digest.h>
+#include <Redland/rdf_hash.h>
+#include <Redland/rdf_init.h>
+#include <Redland/rdf_iterator.h>
+#include <Redland/rdf_uri.h>
+#include <Redland/rdf_node.h>
+#include <Redland/rdf_concepts.h>
+#include <Redland/rdf_statement.h>
+#include <Redland/rdf_model.h>
+#include <Redland/rdf_storage.h>
+#include <Redland/rdf_parser.h>
+#include <Redland/rdf_raptor.h>
+#include <Redland/rdf_serializer.h>
+#include <Redland/rdf_stream.h>
+#include <Redland/rdf_query.h>
+#include <Redland/rdf_utf8.h>
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/redland/redland/redland-1.0.8.aix.patch
+++ b/redland/redland/redland-1.0.8.aix.patch
@@ -1,21 +0,0 @@
--- misc/redland-1.0.8/config.guess	2010-09-16 03:21:03.000000000 -0500
-+++ misc/build/redland-1.0.8/config.guess	2010-09-16 03:22:33.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
-    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
--- a/redland/redland/redland-1.0.8.autotools.patch
+++ b/redland/redland/redland-1.0.8.autotools.patch
@@ -1,78 +0,0 @@
--- misc/redland-1.0.8/config.sub	2008-06-28 19:57:26.000000000 +0200
-+++ misc/build/redland-1.0.8/config.sub	2011-09-27 15:16:38.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1262,7 +1262,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- 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)
--- a/redland/redland/redland-1.0.8.bundled-soname.patch
+++ b/redland/redland/redland-1.0.8.bundled-soname.patch
@@ -1,11 +0,0 @@
--- misc/redland-1.0.8/librdf/Makefile.in
-+++ misc/build/redland-1.0.8/librdf/Makefile.in
-@@ -463,7 +463,7 @@
- rdf_parser_raptor.c
- 
- EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
-+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \
- @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
- 
- pkgdata_DATA = $(am__append_11)
--- a/redland/redland/redland-1.0.8.legal.patch
+++ b/redland/redland/redland-1.0.8.legal.patch
@@ -1,54 +0,0 @@
--- 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.
-+
--- a/redland/redland/redland-1.0.8.mingw.patch
+++ b/redland/redland/redland-1.0.8.mingw.patch
@@ -1,11 +0,0 @@
--- misc/redland-1.0.8/librdf/Makefile.in
-+++ misc/build/redland-1.0.8/librdf/Makefile.in
-@@ -463,7 +463,7 @@
- rdf_parser_raptor.c
- 
- EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
-+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
- @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
- 
- pkgdata_DATA = $(am__append_11)
--- a/redland/redland/redland-1.0.8.no-soname.patch
+++ b/redland/redland/redland-1.0.8.no-soname.patch
@@ -1,11 +0,0 @@
--- misc/redland-1.0.8/configure
-+++ misc/build/redland-1.0.8/configure
-@@ -7848,7 +7848,7 @@
- 	*)
- 	  tmp_sharedflag='-shared' ;;
- 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
- 
- 	if test $supports_anon_versioning = yes; then
- 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--- a/redland/redland/redland-1.0.8.ooo_build.patch
+++ b/redland/redland/redland-1.0.8.ooo_build.patch
@@ -1,22 +0,0 @@
--- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
-@@ -48,7 +48,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
- 
- EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
--- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
-@@ -283,7 +283,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
- README      NEWS      LICENSE.txt  TODO \
--- a/redland/redland/redland-android.patch.1
+++ b/redland/redland/redland-android.patch.1
@@ -0,0 +1,14 @@
+No sonames on Android
+
+--- a/configure	2013-03-29 19:46:34.922901756 +0100
+++ b/configure	2013-03-29 19:46:56.051901574 +0100
+@@ -10267,7 +10267,7 @@
+ 	*Sun\ F*)			# Sun Fortran 8.3
+ 	  tmp_sharedflag='-G' ;;
+ 	esac
+-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+ 
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+
--- a/redland/redland/redland-bundled-soname.patch.1
+++ b/redland/redland/redland-bundled-soname.patch.1
@@ -0,0 +1,13 @@
+rhbz#809466 change soname of bundled redland libs
+
+--- a/src/Makefile.in	2013-03-30 17:43:48.127008037 +0100
+++ b/src/Makefile.in	2013-03-30 17:44:19.294007769 +0100
+@@ -625,7 +625,7 @@
+ rdf_parser_raptor.c
+ 
+ EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
+-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \
+ @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@
+ 
+ pkgdata_DATA = $(am__append_13)
--- a/redland/redland/redland-freebsd.patch.1
+++ b/redland/redland/redland-freebsd.patch.1
@@ -0,0 +1,28 @@
+Usual patch to produce Linux-like .so files on FreeBSD
+
+--- a/build/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
+++ b/build/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
+@@ -7341,9 +7341,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|qnx|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`
+@@ -7420,8 +7420,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
--- a/redland/redland/redland-mingw.patch.1
+++ b/redland/redland/redland-mingw.patch.1
@@ -0,0 +1,13 @@
+MinGW: libtool falls back to static lib unless -no-undefined given
+
+--- redland/src/Makefile.in.old	2013-03-30 17:43:48.127008037 +0100
+++ redland/src/Makefile.in	2013-03-30 17:47:15.753006253 +0100
+@@ -625,7 +625,7 @@
+ rdf_parser_raptor.c
+ 
+ EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
+-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
+ @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@
+ 
+ pkgdata_DATA = $(am__append_13)
--- a/redland/redland/redland-1.0.8.win32.patch
+++ b/redland/redland/redland-1.0.8.win32.patch
@@ -1,5 +1,5 @@
--- 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
+--- a/src/win32_rdf_config.h	Tue Jul  1 05:10:26 2008
+++ b/src/win32_rdf_config.h	Wed Feb 18 13:31:07 2009
@@ -43,7 +43,8 @@
 #define HAVE_STRICMP 1
 
@@ -77,7 +77,7 @@
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
-@@ -159,25 +160,33 @@
+@@ -159,25 +160,28 @@
 #define HAVE_MKTEMP 1
 
 /* MySQL libraries are present */
@@ -86,23 +86,18 @@
 
 /* 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 */
@@ -116,8 +111,8 @@
 #define SIZEOF_UNSIGNED_LONG_LONG 8
 
 /* SQLite API version */
-#define SQLITE_API 3
-+// #define SQLITE_API 3
+-#define REDLAND_SQLITE_API 3
+// #define REDLAND_SQLITE_API 3
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -129,8 +124,7 @@
 +#define STORAGE_MEMORY 1
 +
 /* Building MySQL storage */
-#define STORAGE_MYSQL 1
-+// #define STORAGE_MYSQL 1
+ /* #define STORAGE_MYSQL 1 */
 
 /* Building PostgreSQL storage */
 /*#undef STORAGE_POSTGRESQL*/
@@ -141,14 +135,12 @@
 
 /* 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
+@@ -273,7 +273,7 @@
+ #define VERSION "1.0.16"
 
- #ifdef WIN32
-#include <win32_config.h>
-+#include <win32_rdf_config.h>
- #endif
+ /* Use POSIX threads */
+-#define WITH_THREADS
+#undef WITH_THREADS
 
- #include <stdio.h>
+ /* Define to 1 if your processor stores words with the most significant byte
+    first (like Motorola and SPARC, unlike Intel and VAX). */
--- a/redland/redland/redland-pkgconfig.patch.1
+++ b/redland/redland/redland-pkgconfig.patch.1
@@ -0,0 +1,619 @@
+--- a/configure.ac	2013-03-30 19:17:11.040959896 +0100
+++ b/configure.ac	2013-03-30 19:47:16.304944385 +0100
+@@ -122,7 +122,7 @@
+ 
+ AC_CHECK_PROGS(PERL, perl)
+ # Gnome
+-AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
+PKG_PROG_PKG_CONFIG
+ 
+ 
+ AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+@@ -520,62 +520,39 @@
+ 
+ # Check for rasqal before raptor so that we can see if rasqal was already
+ # built with raptor2 and can then enforce raptor2 is required
+-AC_MSG_CHECKING(for rasqal)
+ 
+ RASQAL_MIN_VERSION=0.9.25
+ RASQAL_MAX_VERSION=0.9.99
+ AC_SUBST(RASQAL_MIN_VERSION)
+ AC_SUBST(RASQAL_MAX_VERSION)
+-if $PKG_CONFIG rasqal --exists; then
+-  :
+-else
+PKG_CHECK_MODULES([RASQAL],[rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION],[
+  RASQAL_VERSION=`$PKG_CONFIG rasqal --modversion 2>/dev/null`
+],[
+   AC_MSG_ERROR(Rasqal is not installed - see http://librdf.org/rasqal/ to get a version in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION)
+-fi
+-
+-RASQAL_VERSION=`$PKG_CONFIG rasqal --modversion 2>/dev/null`
+-
+-if $PKG_CONFIG rasqal --atleast-version=$RASQAL_MIN_VERSION --max-version=$RASQAL_MAX_VERSION; then
+-  :
+-else
+-  AC_MSG_ERROR(Installed rasqal $RASQAL_VERSION is not in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION)
+-fi
+])
+ 
+-LIBRDF_EXTERNAL_CPPFLAGS="`$PKG_CONFIG rasqal --cflags` $LIBRDF_EXTERNAL_CPPFLAGS"
+-LIBRDF_EXTERNAL_LIBS="`$PKG_CONFIG rasqal --libs` $LIBRDF_EXTERNAL_LIBS"
+LIBRDF_EXTERNAL_CPPFLAGS="$RASQAL_CFLAGS $LIBRDF_EXTERNAL_CPPFLAGS"
+LIBRDF_EXTERNAL_LIBS="$RASQAL_LIBS $LIBRDF_EXTERNAL_LIBS"
+ 
+ rdf_query="rasqal(system $RASQAL_VERSION)"
+-AC_MSG_RESULT(system $RASQAL_VERSION)
+ 
+ 
+ # Check for raptor
+ RAPTOR_MIN_VERSION=2.0.7
+ 
+-
+-
+-AC_MSG_CHECKING(for raptor)
+-
+-if $PKG_CONFIG raptor2 --exists; then
+-  :
+-else
+PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= $RAPTOR_MIN_VERSION],[
+  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+],[
+   AC_MSG_ERROR(Raptor2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
+-fi
+-
+-RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+-
+-if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
+-  :
+-else
+-  AC_MSG_ERROR(Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION)
+-fi
+])
+ 
+-LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS `$PKG_CONFIG raptor2 --libs`"
+-LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS `$PKG_CONFIG rasqal --libs`"
+LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS $RAPTOR2_LIBS"
+LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS $RASQAL_LIBS"
+ 
+-LIBRDF_EXTERNAL_CPPFLAGS="`$PKG_CONFIG raptor2 --cflags` $LIBRDF_EXTERNAL_CPPFLAGS"
+LIBRDF_EXTERNAL_CPPFLAGS="$RAPTOR2_CFLAGS $LIBRDF_EXTERNAL_CPPFLAGS"
+ LIBRDF_EXTERNAL_LIBS="$LIBRDF_DIRECT_LIBS $LIBRDF_EXTERNAL_LIBS"
+ 
+ rdf_parsers_available="$parser_available raptor(system $RAPTOR_VERSION)"
+-AC_MSG_RESULT(system $RAPTOR_VERSION)
+ 
+ AC_SUBST(RAPTOR_MIN_VERSION)
+ 
+--- a/configure	2013-03-30 19:51:46.680942062 +0100
+++ b/configure	2013-03-30 19:48:15.487943876 +0100
+@@ -660,8 +660,6 @@
+ GTKDOC_MKPDF
+ GTKDOC_REBASE
+ GTKDOC_CHECK
+-PKG_CONFIG_LIBDIR
+-PKG_CONFIG_PATH
+ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V
+@@ -725,6 +723,10 @@
+ HASH_OBJS
+ HAVE_RAPTOR2_API
+ RAPTOR_MIN_VERSION
+RAPTOR2_LIBS
+RAPTOR2_CFLAGS
+RASQAL_LIBS
+RASQAL_CFLAGS
+ RASQAL_MAX_VERSION
+ RASQAL_MIN_VERSION
+ GETOPT_FALSE
+@@ -732,6 +734,8 @@
+ MEMCMP_FALSE
+ MEMCMP_TRUE
+ RECHO
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+ PKG_CONFIG
+ PERL
+ TAR
+@@ -930,6 +934,10 @@
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+RASQAL_CFLAGS
+RASQAL_LIBS
+RAPTOR2_CFLAGS
+RAPTOR2_LIBS
+ GTKDOC_DEPS_CFLAGS
+ GTKDOC_DEPS_LIBS'
+ ac_subdirs_all='libltdl'
+@@ -1631,6 +1639,13 @@
+               directories to add to pkg-config's search path
+   PKG_CONFIG_LIBDIR
+               path overriding pkg-config's built-in search path
+  RASQAL_CFLAGS
+              C compiler flags for RASQAL, overriding pkg-config
+  RASQAL_LIBS linker flags for RASQAL, overriding pkg-config
+  RAPTOR2_CFLAGS
+              C compiler flags for RAPTOR2, overriding pkg-config
+  RAPTOR2_LIBS
+              linker flags for RAPTOR2, overriding pkg-config
+   GTKDOC_DEPS_CFLAGS
+               C compiler flags for GTKDOC_DEPS, overriding pkg-config
+   GTKDOC_DEPS_LIBS
+@@ -14088,26 +14103,35 @@
+ done
+ 
+ # Gnome
+-for ac_prog in pkg-config
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="$ac_prog"
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -14115,9 +14139,10 @@
+   done
+ IFS=$as_save_IFS
+ 
+  ;;
+esac
+ fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+@@ -14127,9 +14152,77 @@
+ fi
+ 
+ 
+-  test -n "$PKG_CONFIG" && break
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+ done
+  done
+IFS=$as_save_IFS
+ 
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+ 
+ 
+ 
+@@ -15525,66 +15618,183 @@
+ 
+ # Check for rasqal before raptor so that we can see if rasqal was already
+ # built with raptor2 and can then enforce raptor2 is required
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rasqal" >&5
+-$as_echo_n "checking for rasqal... " >&6; }
+ 
+ RASQAL_MIN_VERSION=0.9.25
+ RASQAL_MAX_VERSION=0.9.99
+ 
+ 
+-if $PKG_CONFIG rasqal --exists; then
+-  :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RASQAL" >&5
+$as_echo_n "checking for RASQAL... " >&6; }
+
+if test -n "$RASQAL_CFLAGS"; then
+    pkg_cv_RASQAL_CFLAGS="$RASQAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rasqal >= \$RASQAL_MIN_VERSION rasqal <= \$RASQAL_MAX_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RASQAL_CFLAGS=`$PKG_CONFIG --cflags "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+ else
+-  as_fn_error $? "Rasqal is not installed - see http://librdf.org/rasqal/ to get a version in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION" "$LINENO" 5
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$RASQAL_LIBS"; then
+    pkg_cv_RASQAL_LIBS="$RASQAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rasqal >= \$RASQAL_MIN_VERSION rasqal <= \$RASQAL_MAX_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RASQAL_LIBS=`$PKG_CONFIG --libs "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+ fi
+ 
+-RASQAL_VERSION=`$PKG_CONFIG rasqal --modversion 2>/dev/null`
+ 
+-if $PKG_CONFIG rasqal --atleast-version=$RASQAL_MIN_VERSION --max-version=$RASQAL_MAX_VERSION; then
+-  :
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+ else
+-  as_fn_error $? "Installed rasqal $RASQAL_VERSION is not in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION" "$LINENO" 5
+        _pkg_short_errors_supported=no
+ fi
+        if test $_pkg_short_errors_supported = yes; then
+	        RASQAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION" 2>&1`
+        else
+	        RASQAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "rasqal >= $RASQAL_MIN_VERSION rasqal <= $RASQAL_MAX_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$RASQAL_PKG_ERRORS" >&5
+ 
+-LIBRDF_EXTERNAL_CPPFLAGS="`$PKG_CONFIG rasqal --cflags` $LIBRDF_EXTERNAL_CPPFLAGS"
+-LIBRDF_EXTERNAL_LIBS="`$PKG_CONFIG rasqal --libs` $LIBRDF_EXTERNAL_LIBS"
+
+  as_fn_error $? "Rasqal is not installed - see http://librdf.org/rasqal/ to get a version in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+  as_fn_error $? "Rasqal is not installed - see http://librdf.org/rasqal/ to get a version in range $RASQAL_MIN_VERSION to $RASQAL_MAX_VERSION" "$LINENO" 5
+
+else
+	RASQAL_CFLAGS=$pkg_cv_RASQAL_CFLAGS
+	RASQAL_LIBS=$pkg_cv_RASQAL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  RASQAL_VERSION=`$PKG_CONFIG rasqal --modversion 2>/dev/null`
+
+fi
+
+LIBRDF_EXTERNAL_CPPFLAGS="$RASQAL_CFLAGS $LIBRDF_EXTERNAL_CPPFLAGS"
+LIBRDF_EXTERNAL_LIBS="$RASQAL_LIBS $LIBRDF_EXTERNAL_LIBS"
+ 
+ rdf_query="rasqal(system $RASQAL_VERSION)"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: system $RASQAL_VERSION" >&5
+-$as_echo "system $RASQAL_VERSION" >&6; }
+ 
+ 
+ # Check for raptor
+ RAPTOR_MIN_VERSION=2.0.7
+ 
+ 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAPTOR2" >&5
+$as_echo_n "checking for RAPTOR2... " >&6; }
+
+if test -n "$RAPTOR2_CFLAGS"; then
+    pkg_cv_RAPTOR2_CFLAGS="$RAPTOR2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RAPTOR2_CFLAGS=`$PKG_CONFIG --cflags "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$RAPTOR2_LIBS"; then
+    pkg_cv_RAPTOR2_LIBS="$RAPTOR2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_RAPTOR2_LIBS=`$PKG_CONFIG --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor" >&5
+-$as_echo_n "checking for raptor... " >&6; }
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ 
+-if $PKG_CONFIG raptor2 --exists; then
+-  :
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+ else
+-  as_fn_error $? "Raptor2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
+        _pkg_short_errors_supported=no
+ fi
+        if test $_pkg_short_errors_supported = yes; then
+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
+        else
+	        RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$RAPTOR2_PKG_ERRORS" >&5
+ 
+-RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+ 
+-if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
+-  :
+  as_fn_error $? "Raptor2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+  as_fn_error $? "Raptor2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
+
+ else
+-  as_fn_error $? "Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION" "$LINENO" 5
+	RAPTOR2_CFLAGS=$pkg_cv_RAPTOR2_CFLAGS
+	RAPTOR2_LIBS=$pkg_cv_RAPTOR2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
+
+ fi
+ 
+-LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS `$PKG_CONFIG raptor2 --libs`"
+-LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS `$PKG_CONFIG rasqal --libs`"
+LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS $RAPTOR2_LIBS"
+LIBRDF_DIRECT_LIBS="$LIBRDF_DIRECT_LIBS $RASQAL_LIBS"
+ 
+-LIBRDF_EXTERNAL_CPPFLAGS="`$PKG_CONFIG raptor2 --cflags` $LIBRDF_EXTERNAL_CPPFLAGS"
+LIBRDF_EXTERNAL_CPPFLAGS="$RAPTOR2_CFLAGS $LIBRDF_EXTERNAL_CPPFLAGS"
+ LIBRDF_EXTERNAL_LIBS="$LIBRDF_DIRECT_LIBS $LIBRDF_EXTERNAL_LIBS"
+ 
+ rdf_parsers_available="$parser_available raptor(system $RAPTOR_VERSION)"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: system $RAPTOR_VERSION" >&5
+-$as_echo "system $RAPTOR_VERSION" >&6; }
+ 
+ 
+ 
+@@ -17014,126 +17224,6 @@
+ 
+ 
+ 
+-
+-
+-
+-
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+-	if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+-  ac_pt_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_PKG_CONFIG" = x; then
+-    PKG_CONFIG=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_pt_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
+-
+-fi
+-if test -n "$PKG_CONFIG"; then
+-	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		PKG_CONFIG=""
+-	fi
+-fi
+-
+-
+-
+     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+ set dummy gtkdoc-check; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1515,15 +1515,15 @@ File gid_File_Lib_Raptor
    Dir = SCP2_OOO_BIN_DIR;
  #ifdef UNX
    #ifdef MACOSX
-       Name = STRING(CONCAT4(libraptor-lo,.,RAPTOR_MAJOR,UNXSUFFIX));
+       Name = STRING(CONCAT4(libraptor2-lo,.,RAPTOR_MAJOR,UNXSUFFIX));
    #else
-       Name = STRING(CONCAT4(libraptor-lo,UNXSUFFIX,.,RAPTOR_MAJOR));
+       Name = STRING(CONCAT4(libraptor2-lo,UNXSUFFIX,.,RAPTOR_MAJOR));
    #endif
  #else
   #ifdef _gcc3
-    Name = "libraptor-1.dll";
+    Name = "libraptor2-1.dll";
   #else
-    Name = "raptor.dll";
+    Name = "raptor2.dll";
   #endif
  #endif
 End