update of the raptor/rasqal group

raptor/PKGBUILD

@@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=raptor
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
@@ -13,25 +13,19 @@ url="http://librdf.org/raptor"
 depends=('libxml2>=2.7.8' 'curl>=7.21.6' 'zlib>=1.2.5' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
-source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz"
-        'fix-soprano-bug.patch')
-md5sums=('46eff4b20f8752d1146a3e0c8b2168dd'
-         'fd63150d1e9f83bb59af0d86c373c8fa')
+source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
+md5sums=('0373efb8d85dc872bc7bb5b1c69299fb')
 
 build() {
-  cd ${srcdir}/raptor2-${pkgver}
+  cd "${srcdir}"/raptor2-${pkgver}
 
-  # see http://bugs.librdf.org/mantis/view.php?id=451
-  patch -p1 -i "${srcdir}"/fix-soprano-bug.patch
-
-  # fix build with curl >= 7.21.2
-  sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h
-
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr \
+    --disable-static \
+    --with-yajl=no
   make
 }
 
 package() {
-  cd ${srcdir}/raptor2-${pkgver}
-  make prefix=${pkgdir}/usr install
+  cd "${srcdir}"/raptor2-${pkgver}
+  make prefix="${pkgdir}"/usr install
 }

raptor/fix-soprano-bug.patch

@@ -1,20 +0,0 @@
-diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l
-index c2f249b..f133747 100644
---- a/src/turtle_lexer.l
-+++ b/src/turtle_lexer.l
-@@ -381,9 +381,13 @@ EXPONENT [eE][+-]?[0-9]+
-                while(1) {
-                   int c = yytext[yyleng - 1];
-                   if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
--                     c == ':' || c == '-') {
-+                     c == '=' ) {
-                     yyleng--;
--                  } else
-+                  } 
-+                  else if ( yyleng >= 2 && ( c == '-' && yytext[yyleng - 2] == ':' ) ) { 
-+                    yyleng -= 2;
-+                  }
-+                  else
-                     break;
-                 }
-                 yytext[yyleng] = '\0';

redland/PKGBUILD

@@ -7,32 +7,78 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname=redland
-pkgver=1.0.13
+pkgbase=redland
+epoch=1
+pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
+pkgver=1.0.14
 pkgrel=1
-pkgdesc="Library that provides a high-level interface to RDF data"
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('raptor>=2.0.3' 'db' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 
-         'libxslt>=1.1.26' 'mpfr>=2.4.1' 'libtool' 'rasqal>=0.9.26' 'unixodbc')
+makedepends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'db' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
         rpath.diff)
-md5sums=('96c15f36f842ad7e1c9d225e4ca97b68'
+md5sums=('3400579d137da82c4175debf9f6d53ba'
          'acc85e784f01a656bd56777f95880787')
 
 build() {
-        cd ${srcdir}/${pkgname}-${pkgver}
-         ./configure --prefix=/usr --enable-release --disable-static --disable-gtk-doc\
-                     --with-raptor=system --with-rasqal=system --with-sqlite=3
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--enable-release \
+	--disable-static \
+        --disable-gtk-doc \
+	--with-raptor=system \
+	--with-rasqal=system \
+	--with-sqlite=3
+
+  # nuke rpath
   patch -Np0 -i ${srcdir}/rpath.diff
 
   make
 }
 
-package() {
+package_redland() {
+ pkgdesc="Library that provides a high-level interface to RDF data"
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'libtool')
+ 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/usr/lib/redland
 }
+
+package_redland-storage-mysql() {
+ pkgdesc="MySQL storage support for Redland"
+ depends=('redland' 'libmysqlclient')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -dm755 ${pkgdir}/usr/lib/redland
+  install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so 
+}
+
+package_redland-storage-postgresql() {
+ pkgdesc="PostgreSQL storage support for Redland"
+ depends=('redland' 'postgresql-libs')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -dm755 ${pkgdir}/usr/lib/redland
+  install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/
+}
+
+package_redland-storage-virtuoso() {
+ pkgdesc="Virtuoso storage support for Redland"
+ depends=('redland' 'unixodbc' 'db')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -dm755 ${pkgdir}/usr/lib/redland
+  install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/
+}
+
+package_redland-storage-sqlite() {
+ pkgdesc="SQLite storage support for Redland"
+ depends=('redland' 'sqlite3' 'db')
+ 
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -dm755 ${pkgdir}/usr/lib/redland
+  install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/
+}