Wed Oct 23 01:09:43 PDT 2013

17 files changed, 77 insertions, 219 deletions

diff --git a/extra/gtkspell/PKGBUILD b/extra/gtkspell/PKGBUILD
index 5dc2fef2d..9346533ae 100644
--- a/extra/gtkspell/PKGBUILD
+++ b/extra/gtkspell/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 150411 2012-02-17 12:37:06Z allan $
+# $Id: PKGBUILD 197111 2013-10-22 07:52:45Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Contributer: Ben <ben@benmazer.net>
 
 pkgname=gtkspell
 pkgver=2.0.16
-pkgrel=2
+pkgrel=3
 url="http://gtkspell.sourceforge.net/"
-pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
+pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk2' 'enchant')
@@ -17,7 +17,7 @@ md5sums=('f75dcc9338f182c571b321d37c606a94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
deleted file mode 100644
index 14a367a94..000000000
--- a/extra/lablgtk/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=lablgtk
-pkgver=1.2.7
-pkgrel=9
-pkgdesc=" An Objective Caml interface to gtk+"
-arch=(i686 x86_64)
-url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
-license=('LGPL')
-depends=('gtk')
-makedepends=('ocaml')
-options=('!makeflags')
-source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar.gz)
-md5sums=('73a797e3a459190fdcaa8288935f6fb9')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make configure 
-  make 
-  make opt 
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make  PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \
-    INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install
-  rm -r "$pkgdir"/usr/bin
-}
diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD
index de97c2ba4..bb3146ee4 100644
--- a/extra/libart-lgpl/PKGBUILD
+++ b/extra/libart-lgpl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150419 2012-02-17 12:52:28Z allan $
+# $Id: PKGBUILD 197113 2013-10-22 07:55:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libart-lgpl
 pkgver=2.3.21
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for high-performance 2D graphics"
 url="http://www.levien.com/libart/"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa')
 
 build() {
   cd "${srcdir}/libart_lgpl-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD
index 98a6836f5..d562768e0 100644
--- a/extra/libavc1394/PKGBUILD
+++ b/extra/libavc1394/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $
+# $Id: PKGBUILD 197115 2013-10-22 07:58:26Z jgc $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=libavc1394
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands."
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/libavc1394/"
@@ -16,7 +16,7 @@ md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
   make
 }
 
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index c44ac22e9..1878f8cb1 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 158970 2012-05-13 20:58:29Z jgc $
+# $Id: PKGBUILD 197118 2013-10-22 08:29:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libcaca
 pkgver=0.99.beta18
-pkgrel=1
+pkgrel=2
 pkgdesc="Color AsCii Art library"
 arch=('i686' 'x86_64')
-license=('LGPL')
+license=('custom:WTFPL')
 url="http://caca.zoy.org/wiki/libcaca"
 depends=('imlib2' 'ncurses')
 options=(!libtool !emptydirs)
@@ -14,14 +14,15 @@ source=(http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz)
 md5sums=('93d35dbdb0527d4c94df3e9a02e865cc')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --enable-shared --disable-doc \
-    --disable-cxx --disable-gl --disable-csharp
+    --disable-cxx --disable-gl --disable-csharp --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libcaca/COPYING"
 }
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index e750c3440..8e08525b4 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 180144 2013-03-18 09:10:25Z jgc $
+# $Id: PKGBUILD 197120 2013-10-22 08:46:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdc1394
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
-depends=('libraw1394' 'libusb')
+depends=('libraw1394' 'libusbx')
 options=('!libtool' '!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('5c4b78bb8265d6dc971433ec1da381ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libdc1394/rename-usb_init.patch b/extra/libdc1394/rename-usb_init.patch
deleted file mode 100644
index 44e1a5de3..000000000
--- a/extra/libdc1394/rename-usb_init.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001
-From: Damien Douxchamps <ddsf@douxchamps.net>
-Date: Sun, 21 Aug 2011 16:03:22 +0900
-Subject: [PATCH] fix usb_init function name conflict
-
----
- libdc1394/dc1394/control.c     |    2 +-
- libdc1394/dc1394/internal.h    |    2 +-
- libdc1394/dc1394/usb/control.c |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
-index c62e0e2..f250f6a 100644
---- a/libdc1394/dc1394/control.c
-+++ b/libdc1394/dc1394/control.c
-@@ -1955,7 +1955,7 @@ dc1394_new (void)
-     windows_init (d);
- #endif
- #ifdef HAVE_LIBUSB
--    usb_init (d);
-+    dc1394_usb_init (d);
- #endif
- 
-     int i;
-diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
-index b4d295a..c59e5d3 100644
---- a/libdc1394/dc1394/internal.h
-+++ b/libdc1394/dc1394/internal.h
-@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
- void linux_init(dc1394_t *d);
- void macosx_init(dc1394_t *d);
- void windows_init(dc1394_t *d);
--void usb_init(dc1394_t *d);
-+void dc1394_usb_init(dc1394_t *d);
- 
- void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
-         const char * name);
-diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
-index 6509452..19a21a6 100644
---- a/libdc1394/dc1394/usb/control.c
-+++ b/libdc1394/dc1394/usb/control.c
-@@ -378,7 +378,7 @@ usb_dispatch = {
- };
- 
- void
--usb_init(dc1394_t * d)
-+dc1394_usb_init(dc1394_t * d)
- {
-     register_platform (d, &usb_dispatch, "usb");
- }
--- 
-1.7.4.1
-
diff --git a/extra/libdc1394/videodev-compile-fix.patch b/extra/libdc1394/videodev-compile-fix.patch
deleted file mode 100644
index 8f234b152..000000000
--- a/extra/libdc1394/videodev-compile-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
-From: David Moore <david.moore@gmail.com>
-Date: Sun, 27 Mar 2011 22:48:15 -0700
-Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-
----
- libdc1394/configure.in         |    3 +++
- libdc1394/examples/Makefile.am |    2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/libdc1394/configure.in
-+++ b/libdc1394/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/libdc1394/examples/Makefile.am
-+++ b/libdc1394/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif
--- 
-1.7.4.1
-
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index bc42228f3..1ce53f975 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137736 2011-09-10 14:39:31Z pierre $
+# $Id: PKGBUILD 197123 2013-10-22 09:00:16Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libdca
 pkgver=0.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,18 +16,16 @@ source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgnam
 md5sums=('dab6b2795c66a82a6fcd4f8343343021')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1
   ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz"
   ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz"
-  # remove dangling symlink
-  rm "${pkgdir}/usr/lib/libdts.a"
 }
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 75121fc8f..8dd699e8b 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,45 +1,44 @@
-# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 197109 2013-10-22 05:48:33Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.3.0
-pkgrel=2
-pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
-arch=('i686' 'x86_64')
-url="http://libjpeg-turbo.virtualgl.org/"
+pkgrel=3
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
 license=('GPL' 'custom')
-depends=('glibc')
+arch=('i686' 'x86_64')
 makedepends=('nasm')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
+
 provides=('libjpeg=8.0.2' 'turbojpeg')
 conflicts=('libjpeg' 'turbojpeg')
 replaces=('libjpeg' 'turbojpeg')
 options=('!libtool')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
+	make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make test
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make test
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \
-    exampledir=/usr/share/doc/libjpeg-turbo install
-  
-  # provide jpegint.h as it is required by various software
-  install -m644 jpegint.h "$pkgdir/usr/include/"
-  
-  install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/"
-  ln -s ../../doc/libjpeg-turbo/README \
-    "$pkgdir/usr/share/licenses/libjpeg-turbo/README"
-  ln -s ../../doc/libjpeg-turbo/README-turbo.txt \
-    "$pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		DESTDIR="${pkgdir}" \
+		docdir="/usr/share/doc/${pkgname}" \
+		exampledir="/usr/share/doc/${pkgname}" \
+		install
+	
+	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
+	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
 }
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index abf407220..f46993815 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196771 2013-10-18 14:56:57Z andrea $
+# $Id: PKGBUILD 197140 2013-10-22 17:14:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.5
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -24,9 +24,9 @@ optdepends=('qtchooser: set the default Qt toolkit'
             'libxfixes: Xfixes support'
             'icu: Unicode support')
 install="${pkgname}.install"
-options=('!libtool')
 replaces=('qt<=4.8.4')
 conflicts=('qt')
+options=('staticlibs') # libQtUiTools builds as static only
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index f0571dd7e..86b1a20bd 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196795 2013-10-19 12:27:27Z andrea $
+# $Id: PKGBUILD 197132 2013-10-22 10:32:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -21,7 +21,7 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.1.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,7 +32,6 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
             'openal' 'gtk2' 'libxkbcommon')
 groups=('qt' 'qt5')
-options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 22e7cd0bc..ae227ef59 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.27
+pkgver=1.1.29
 pkgrel=1
 pkgdesc='The Apache Tomcat Native Library'
 arch=('i686' 'x86_64')
@@ -10,9 +10,9 @@ url='http://tomcat.apache.org/'
 license=('APACHE')
 depends=('apr' 'openssl')
 makedepends=('java-environment')
-options=(!emptydirs)
+options=('!emptydirs')
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4')
+sha256sums=('25fc6f3d65aeb3ac93142a4b536587b1231ac925eaf32a40f55c92a0991cf232')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD
index 6d84309a9..5ac53741f 100644
--- a/extra/vc/PKGBUILD
+++ b/extra/vc/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 197078 2013-10-21 16:10:43Z andrea $
+# $Id: PKGBUILD 197134 2013-10-22 12:37:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: PedsXing <pedsxing at gmx dot net>
 
 pkgname=vc
 pkgver=0.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A library to ease explicit vectorization of C++ code"
 url='http://code.compeng.uni-frankfurt.de/projects/vc/'
 arch=('x86_64' 'i686')
 license=('LGPL3')
 makedepends=('cmake')
+options=('staticlibs')
 source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz")
 md5sums=('a55e2871a33dbcbbe444c22ccef47dbd')
 
 prepare() {
-  mkdir build 
+  mkdir build
 }
 
 build() {
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 23ee5f0b2..b098d36e5 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194330 2013-09-13 15:52:26Z andrea $
+# $Id: PKGBUILD 197128 2013-10-22 10:14:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
@@ -6,12 +6,11 @@ pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
 epoch=1
 pkgver=6.1.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
 makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
 md5sums=('88885e84e8f7b61e59516f696b1d3be5')
 
@@ -59,9 +58,8 @@ package_virtuoso() {
   # 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}
+  rm "${pkgdir}"/usr/lib/virtodbc.so
+  rm "${pkgdir}"/usr/lib/virtodbc_r.so
+  rm "${pkgdir}"/usr/lib/virtodbcu.so
+  rm "${pkgdir}"/usr/lib/virtodbcu_r.so
 }
diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD
index 9d4c663f6..bb4acad26 100644
--- a/extra/wv/PKGBUILD
+++ b/extra/wv/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 184449 2013-05-06 19:40:11Z foutrelis $
+# $Id: PKGBUILD 197126 2013-10-22 09:56:53Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 pkgname=wv
 pkgver=1.2.9
-pkgrel=2
+pkgrel=3
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/wvware"
 license=('GPL')
-depends=('libgsf' 'libpng' 'sh')
-makedepends=('pkg-config')
+depends=(libgsf libpng sh)
 options=('!libtool')
-source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
+sha1sums=('db4717a151742dbdb492318f104504a92075543a')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man
+    --mandir=/usr/share/man --disable-static
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/wv/fix-soname.patch b/extra/wv/fix-soname.patch
deleted file mode 100644
index 81dff86e6..000000000
--- a/extra/wv/fix-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
---- wv-1.2.7.orig//configure	2009-09-21 12:22:46.000000000 +0200
-+++ wv-1.2.7//configure	2010-06-08 12:00:27.948857203 +0200
-@@ -2082,8 +2082,8 @@
- WV_MAJOR_VERSION=1
- WV_MINOR_VERSION=2
- WV_MICRO_VERSION=7
--WV_INTERFACE_AGE=3
--WV_BINARY_AGE=3
-+WV_INTERFACE_AGE=4
-+WV_BINARY_AGE=4
- WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
- 
-