Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/gtranslator/PKGBUILD
	community-testing/gtranslator/gtranslator.changelog
	extra/emelfm2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-diskperf-plugin/PKGBUILD
	extra/xfce4-mount-plugin/PKGBUILD
	extra/xfce4-wavelan-plugin/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	testing/anjuta-extras/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/gdl/PKGBUILD
	testing/lv2/PKGBUILD

15 files changed, 164 insertions, 115 deletions

diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD
index 25e678531..d98d75a1c 100644
--- a/extra/emelfm2/PKGBUILD
+++ b/extra/emelfm2/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 151556 2012-02-27 17:34:40Z giovanni $
+# $Id: PKGBUILD 156677 2012-04-22 23:01:54Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: contrasutra
 
 pkgname=emelfm2
-pkgver=0.8.0
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A file manager that implements the popular two-pane design"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://emelfm2.net/"
 depends=('gtk2')
-license=('GPL')
-source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2"
-        'emelfm2-0.8.0-dsofix.patch')
-md5sums=('8490d501e19009860f53ac6a98db74c1'
-         '0a6252eda0c3a98ba693148dfdd6ccba')
+license=('GPL3')
+source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5528bdd7001451dbdba95bf26ee588be9a0b86da')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/emelfm2-0.8.0-dsofix.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX=/usr
-  make PREFIX=${pkgdir}/usr install
-  make PREFIX=${pkgdir}/usr install_i18n
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="${pkgdir}/usr" install install_i18n
 
-  install -m 755 ${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png \
-      ${pkgdir}/usr/share/pixmaps/emelfm2.png
+  install -m 755 "${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png" \
+      "${pkgdir}/usr/share/pixmaps/emelfm2.png"
   sed -e '/Icon=/ s^emelfm2/emelfm2_48.png^emelfm2.png^' \
       -e '/Categories=/ s^;$^;Application;Utility;^' \
-      -i ${pkgdir}/usr/share/applications/emelfm2.desktop
+      -i "${pkgdir}/usr/share/applications/emelfm2.desktop"
 }
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index d84d3602b..166deaa04 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149155 2012-02-06 01:09:56Z eric $
+# $Id: PKGBUILD 156673 2012-04-22 21:38:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fvwm
-pkgver=2.6.4
+pkgver=2.6.5
 pkgrel=1
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ conflicts=('fvwm-devel')
 replaces=('fvwm-devel')
 options=('!emptydirs' '!makeflags')
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
-sha1sums=('635b803de5af8677c7f5b91a82b450799cfe3ce2'
+sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8'
           '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
 
 build() {
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 40bc1648a..7b4e3c2d4 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155767 2012-04-06 09:23:08Z andyrtr $
+# $Id: PKGBUILD 156663 2012-04-22 16:04:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.18
+pkgver=3.0.19
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
 makedepends=('strace')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('f46539a39857012ccc338a59beb4ac46'
-         'fbca6ee827d8db0cea0f9b670b2f5c6c')
+md5sums=('05e85d18955edd5c0fe40fbb7ef168bd'
+         '52c7b7ecf7032322321bf667d86eb084')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,10 +27,10 @@ build() {
   make
 }
 
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make -k check # passes all  || /bin/true
-#}
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check # passes all  || /bin/true
+}
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 5595aeb26..e4596b429 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155915 2012-04-09 08:06:09Z giovanni $
+# $Id: PKGBUILD 156577 2012-04-21 07:39:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.8
+pkgver=1.40.9
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('5a58c9900affd16013e091a89dcddf58')
+md5sums=('243aa6d549888c265616f2a082777a56')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ldns/Makefile.patch b/extra/ldns/Makefile.patch
new file mode 100644
index 000000000..d98291ac9
--- /dev/null
+++ b/extra/ldns/Makefile.patch
@@ -0,0 +1,20 @@
+--- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
++++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
+@@ -130,7 +130,7 @@
+ 		exit -1 ; \
+ 	fi
+ drill/drill: $(DRILL_LOBJS) $(LIB)
+-	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
++	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
+ 
+ install-drill: drill/drill
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+@@ -157,7 +157,7 @@
+ 		exit -1 ; \
+ 	fi
+ $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
+-	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
+ 
+ $(TESTNS): $(TESTNS_LOBJS) $(LIB)
+ 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/extra/ldns/PKGBUILD b/extra/ldns/PKGBUILD
new file mode 100644
index 000000000..e228c5355
--- /dev/null
+++ b/extra/ldns/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 156644 2012-04-22 07:34:09Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: mathieui <mathieui@mathieui.net>
+# Contributor: jiribb <jiribb@gmail.com>
+
+pkgname=ldns
+pkgver=1.6.12
+pkgrel=1
+pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools'
+url='http://www.nlnetlabs.nl/projects/ldns/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+options=('!libtool')
+depends=('openssl')
+makedepends=('libpcap')
+optdepends=('libpcap: ldns-dpa tool')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'Makefile.patch')
+sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
+          '01bce260e9639d9cd26109a689dddf2498e5026a')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../Makefile.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-static=no \
+		--disable-rpath \
+		--with-drill \
+		--with-examples \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 3c3de23bd..56d5eef06 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 156047 2012-04-12 08:06:44Z ibiru $
+# $Id: PKGBUILD 156598 2012-04-21 13:33:33Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.0
+pkgver=0.15.10
 pkgrel=1
+epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('212d910f6c06f06ef1b54d7e2dd68de18f6d9c73')
+sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index 8b6c4d15e..0f4425672 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 151318 2012-02-25 13:42:09Z allan $
+# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.2
-pkgrel=2
+pkgver=0.9.4
+pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs')
 makedepends=('libgsf>=1.14.20')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('da43f18da732f6156cef145d06613960')
+md5sums=('d30d1726c3b113db70daaae423dd4448')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index b3b1cfdc7..66ecfa5f9 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156477 2012-04-19 09:35:14Z giovanni $
+# $Id: PKGBUILD 156579 2012-04-21 07:48:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.04.18
+pkgver=2012.04.21
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('52248a7081e2989777258df4e37be966')
+md5sums=('2e06ec6343be2c8355ce9fd3289f7c87')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index cc46ffee0..8159e9582 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $
+# $Id: PKGBUILD 156655 2012-04-22 13:28:46Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev')
+pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.6.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
@@ -38,6 +38,14 @@ package_wireshark-cli() {
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
   rm "${pkgdir}/usr/bin/wireshark"
+
+  # Headers
+  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+  done
 }
 
 package_wireshark-gtk() {
@@ -55,17 +63,3 @@ package_wireshark-gtk() {
   done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
-
-package_wireshark-dev() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files"
-  depends=('wireshark-cli')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
-
-  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
-  done
-}
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index 54eaad736..a95bd61d9 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,30 +1,24 @@
-# $Id: PKGBUILD 151509 2012-02-26 21:57:00Z foutrelis $
+# $Id: PKGBUILD 156575 2012-04-21 05:17:50Z eric $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=1.0.0
-pkgrel=3
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
-        show-time-when-on-battery.patch)
-sha256sums=('c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f'
-            '7cabd72a462406295e438a2aae89c09af9f759b5c257f7ecd19ae02c81250575')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fix FS#27438: Remaining time not shown on some systems
-  patch -Np1 -i "$srcdir/show-time-when-on-battery.patch"
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 54721ce7a..0b83f16fb 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 149264 2012-02-06 17:00:23Z foutrelis $
+# $Id: PKGBUILD 156693 2012-04-23 00:17:10Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-diskperf-plugin
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
 arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
+license=('BSD')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4') # 'libxfce4ui')
+depends=('xfce4-panel')
 makedepends=('intltool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/2.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c6ece8123c762ee203cbc6fd5450b503')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b6053881f3ddff90a0a0baa655c84b27')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Work around DSO linking issue
-  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -31,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index db5ec0194..7464bd8ea 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 149250 2012-02-06 16:29:16Z foutrelis $
+# $Id: PKGBUILD 156689 2012-04-22 23:46:49Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mount-plugin
-pkgver=0.5.5
-pkgrel=2
-pkgdesc="plugin for the Xfce4 panel to mount and unmount volumes"
+pkgver=0.6.1
+pkgrel=1
+pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
+license=('GPL')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel')
 makedepends=('intltool')
+options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1d237468fe23e4e8c29195d9b99c4c5d')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0b9dee13886639aea8b4ca3158b9cdf7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -28,6 +29,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD
index 838faae0d..2797c31be 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 149266 2012-02-06 17:02:00Z foutrelis $
+# $Id: PKGBUILD 156573 2012-04-21 04:42:41Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-wavelan-plugin
-pkgver=0.5.6
-pkgrel=2
-pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel"
+pkgver=0.5.10
+pkgrel=1
+pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
+depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b23a4c9c2a206242ee4db8186dd01801')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a4cd20ef471123936e762a139f1025e1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Work around DSO linking issue
-  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -32,7 +29,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD
index 78512b848..ac04185ec 100644
--- a/extra/xorg-xmodmap/PKGBUILD
+++ b/extra/xorg-xmodmap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154170 2012-03-23 20:52:44Z andyrtr $
+# $Id: PKGBUILD 156637 2012-04-21 23:46:44Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xmodmap
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Utility for modifying keymaps and button mappings"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libx11')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2)
-sha1sums=('0d235069c87f365902cd36ac8b2ccb01205fa9fb')
+sha1sums=('9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef')
 
 build() {
   cd "${srcdir}/xmodmap-${pkgver}"