Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/electricsheep/PKGBUILD
	community/bitcoin/PKGBUILD
	community/gnash/PKGBUILD
	community/mongodb/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xmoto/PKGBUILD
	core/kbd/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libpst/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/quota-tools/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xf86-video-siliconmotion/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/pacman/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/bash/PKGBUILD
	testing/bison/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus/PKGBUILD
	testing/readline/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 38 insertions, 22 deletions

diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index d505b0ee8..37fa9c3da 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,46 +1,62 @@
-# $Id: PKGBUILD 162805 2012-06-30 17:32:04Z andrea $
+# $Id: PKGBUILD 163689 2012-07-17 19:51:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
-pkgname=virtuoso
-pkgver=6.1.5.20120630
-pkgrel=1
+pkgbase=virtuoso
+pkgname=('virtuoso' 'virtuoso-base')
+pkgver=6.1.5.20120717
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
-pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
-depends=('libldap')
-makedepends=('bison' 'flex' 'gperf')
+makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2')
 options=('!libtool')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-md5sums=('1364679ffdbc6b0c16eadf6dee0e2676')
+source=("ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
+#source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
+md5sums=('bee8d6ad91e888bab8fdd177063ca084')
 
 build() {
-  cd ${srcdir}/${pkgname}-opensource-${pkgver}
+  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
 
   ./autogen.sh
-  ./configure --prefix=/usr \
-    --localstatedir=/var \
-    --sysconfdir=/etc \
-    --disable-rendezvous \
-    --disable-hslookup \
-    --disable-all-vads
+  ./configure --with-layout=debian \
+    --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
+    --with-readline
   make
 }
 
-package() {
+package_virtuoso-base() {
+  pkgdesc='A scalable cross-platform server of virtuoso (very minimal installation)'
+  depends=('libldap')
+
   # install server
-  cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso
+  cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/virtuoso
   make DESTDIR=${pkgdir} install
 
   # install driver
-  cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver
+  cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/driver
   make DESTDIR=${pkgdir} install
 
-  # Install some useful tools; rename to avoid conflicts
+  # Install some useful tools; rename to avoid conflicts with unixodbc
   for bin in isql isqlw; do
-    install -Dm755 ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/tests/$bin \
+    install -Dm755 ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/tests/$bin \
       ${pkgdir}/usr/bin/$bin-vt
   done
 }
+
+package_virtuoso() {
+  pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
+  depends=('virtuoso-base' 'libxml2')
+
+  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # remove conflicts with virtuoso-base
+  rm "${pkgdir}"/usr/bin/isql{,w-vt}
+  rm "${pkgdir}"/usr/bin/virtuoso-t
+  rm "${pkgdir}"/usr/lib/libvirtuoso-t.a
+  rm "${pkgdir}"/usr/lib/virtodbc.{a,so}
+  rm "${pkgdir}"/usr/lib/virtodbc_r.{a,so}
+  rm "${pkgdir}"/usr/lib/virtodbcu.{a,so}
+  rm "${pkgdir}"/usr/lib/virtodbcu_r.{a,so}
+}