Mon May 9 22:34:00 UTC 2011

12 files changed, 269 insertions, 159 deletions

diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index 81912e2d3..ae316078b 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,46 +1,50 @@
-# $Id: PKGBUILD 31025 2009-03-24 03:24:37Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=1
-pkgdesc="a2ps is an Any to PostScript filter"
+pkgrel=2
+pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
 depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
 makedepends=('gperf')
-replaces=('a2ps-lprng')
-provides=('a2ps-lprng')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
 source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \
         a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \
         a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' '93011b58e9f20a7fafa31287a51884a4'\
-         '2e493d0bc00d71eb3e8a9b6febc52b69' '09cc5ed4d3d8ff1b2103e519191e8286'\
-         '42aa39b74f6da8cf6e94185c4fc3e601' '066f9327fee6b6eca3a57d657d1097d1')
-sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'\
-          '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'\
-          '6aed29c1399e79f3914b408059610f9e7c0fc38e' '58fa90134f1027e3f05aeb08212cbcc10f420738')
+md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
+         '93011b58e9f20a7fafa31287a51884a4'
+         '2e493d0bc00d71eb3e8a9b6febc52b69'
+         '09cc5ed4d3d8ff1b2103e519191e8286'
+         '42aa39b74f6da8cf6e94185c4fc3e601'
+         '066f9327fee6b6eca3a57d657d1097d1')
+sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
+          '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
+          '94e35a6ad9268161bec22a56d4cfb696d635994a'
+          '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
+          '6aed29c1399e79f3914b408059610f9e7c0fc38e'
+          '58fa90134f1027e3f05aeb08212cbcc10f420738')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch || return 1
-  patch -p1 < ../a2ps-4.13c-emacs.patch || return 1
-  patch -p1 < ../a2ps-4.13-manpage-chmod.patch || return 1
-  patch -p1 < ../a2ps-4.14-check-mempcpy.patch || return 1
-  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch || return 1
-  libtoolize --force --copy || return 1
-  autoreconf -I m4 || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
+  patch -p1 < ../a2ps-4.13c-emacs.patch
+  patch -p1 < ../a2ps-4.13-manpage-chmod.patch
+  patch -p1 < ../a2ps-4.14-check-mempcpy.patch
+  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  libtoolize --force --copy
+  autoreconf -I m4
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
-              --includedir=/usr/include --enable-nls || return 1
-  export LANG=C
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  sed -i "s:^countdictstack: \0:" ${pkgdir}/usr/bin/psset || return 1
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+    --includedir=/usr/include --enable-nls
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
 }
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 0c27e8ee9..25e794422 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 115423 2011-03-17 21:56:46Z andrea $
+# $Id: PKGBUILD 122696 2011-05-06 06:26:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.0
-pkgrel=4
-pkgdesc="A media player for KDE"
+pkgver=2.4.1
+pkgrel=1
+pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2' 'FDL')
+license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             'libmygpo-qt')
 optdepends=("libgpod: support for Apple iPod audio devices"
-	"libmtp: support for portable media devices"
-	"loudmouth: backend needed by mp3tunes for syncing"
-    "ifuse: support for Apple iPod Touch and iPhone")
+	        "libmtp: support for portable media devices"
+        	"loudmouth: backend needed by mp3tunes for syncing"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdb6ddc8e38d0982a0786ff8ac96d923')
+md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
 
 build() {
   cd ${srcdir}
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 851c25f4e..b559d2c54 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 112958 2011-03-08 00:19:22Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 122962 2011-05-07 14:45:29Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0
-_pkgver=9.8.0
+pkgver=9.8.0.P1
+_pkgver=9.8.0-P1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
@@ -30,7 +31,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('33019694ef3119d9daa1e8ff5117a6688e188528'
+sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29'
           'ee52947062c1582858187716b776afa3613608fb'
           '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
           '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index 396793f7f..ac8f2a431 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id $
+# $Id: PKGBUILD 123124 2011-05-08 20:39:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=cagibi
-pkgver=0.1.1
+pkgver=0.2.0
 pkgrel=1
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('qt')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2db2424dc436bc436011185de09be9da')
+md5sums=('af66d89337ef80e8a868d3bb9dd92328')
 
 build() {
   cd ${srcdir}
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 9a920ce73..e0d1b48a0 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123046 2011-05-07 19:01:26Z ibiru $
+# $Id: PKGBUILD 123094 2011-05-08 12:20:20Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=dconf
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
@@ -11,12 +11,16 @@ depends=('glib2')
 makedepends=('vala' 'gobject-introspection' 'gtk3')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
+       fix-crash-when-user-database-is-not-present.patch)
+sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd'
+            'c78ea8db69a1be1286846282897f99e843e14d1e450beee4339d5500b2f0f73d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/fix-crash-when-user-database-is-not-present.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dconf
   make
diff --git a/extra/dconf/fix-crash-when-user-database-is-not-present.patch b/extra/dconf/fix-crash-when-user-database-is-not-present.patch
new file mode 100644
index 000000000..ce748492b
--- /dev/null
+++ b/extra/dconf/fix-crash-when-user-database-is-not-present.patch
@@ -0,0 +1,29 @@
+From c80896f5644ec0a07822047dd7e899da63b42e89 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Sun, 08 May 2011 12:08:38 +0000
+Subject: Fix crash when user database is not present
+
+If we fail to open the database in the user's home directory then the
+variable will be NULL.  The refactor of the read function for lockdown
+support missed this check, resulting in a rather dramatic crash on fresh
+accounts.
+---
+diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
+index ec99116..087d780 100644
+--- a/engine/dconf-engine.c
++++ b/engine/dconf-engine.c
+@@ -452,7 +452,11 @@ dconf_engine_read_internal (DConfEngine  *engine,
+       break;
+ 
+   while (i < limit && value == NULL)
+-    value = gvdb_table_get_value (engine->gvdbs[i++], key);
++    {
++      if (engine->gvdbs[i] != NULL)
++        value = gvdb_table_get_value (engine->gvdbs[i], key);
++      i++;
++    }
+ 
+   g_static_mutex_unlock (&engine->lock);
+ 
+--
+cgit v0.9
diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD
index 5b0dffc02..723543918 100644
--- a/extra/fluxter/PKGBUILD
+++ b/extra/fluxter/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 30062 2009-03-16 01:14:26Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <ben@benmazer.ner>
+# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxter
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A workspace pager for fluxbox"
 arch=('i686' 'x86_64')
 url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html"
 license=('GPL')
-depends=('gcc-libs' 'libx11' 'libsm')
-source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6d18553220e8fc33c54762d2e7d31528')
-sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc')
+depends=('gcc-libs' 'libx11')
+source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \
+        fluxter-0.1.0-asneeded.patch)
+md5sums=('6d18553220e8fc33c54762d2e7d31528'
+         '3deb4e816d12a262455bc8281fa82577')
+sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc'
+          '2fc912d40233577b34cb6c641e066863e487fab0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../fluxter-0.1.0-asneeded.patch
+  autoreconf
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fluxter/fluxter-0.1.0-asneeded.patch b/extra/fluxter/fluxter-0.1.0-asneeded.patch
new file mode 100644
index 000000000..8b6826074
--- /dev/null
+++ b/extra/fluxter/fluxter-0.1.0-asneeded.patch
@@ -0,0 +1,43 @@
+--- Makefile.am
++++ Makefile.am
+@@ -17,4 +17,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-fluxter_LDADD = @X_LIBS@
++fluxter_LDADD = @LIBS@
+--- configure.in
++++ configure.in
+@@ -18,14 +18,12 @@
+ [
+  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CFLAGS" = "" && CFLAGS="-Wall"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -71,12 +69,12 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 2a4a5adc3..107b62f24 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 30070 2009-03-16 01:26:56Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 123180 2011-05-09 03:18:04Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=3
-pkgdesc="LibStroke is a stroke (mouse gesture) translation library"
+pkgrel=4
+pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
 makedepends=('libx11' 'gtk')
 options=('!libtool')
-source=(http://etla.net/libstroke/$pkgname-$pkgver.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch)
-md5sums=('51b9a4e309ac15cfcab96191eed03cb2' '60bbaf355355c3c66c8015b0f7feca85'\
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch)
+md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
+         '60bbaf355355c3c66c8015b0f7feca85'
          '96413a77e1d39d1a3223e8eb6be8ef01')
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
           'ee5a3635c31dba00b070a942c512cc0d53056188')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../libgstroke-Makefile.am.patch || return 1
-  patch -p1 < ../libstroke-Makefile.am.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../libgstroke-Makefile.am.patch
+  patch -p1 < ../libstroke-Makefile.am.patch
 
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake --add-missing --force --copy || return 1
+  libtoolize --force --copy
+  aclocal
+  autoconf
+  automake --add-missing --force --copy
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 2e29fc7ac..f58b92149 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,90 +1,102 @@
-# $Id: PKGBUILD 114320 2011-03-12 12:41:32Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
-pkgbase=('pidgin')
-pkgname=('libpurple' 'pidgin' 'finch')
+pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.7.11
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
-             'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager')
+makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
+             'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
+             'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
+             'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('07c2a2535b4d7436b5ec7685fe063fec')
 
 build() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    sed -i "s#env python#env python2#" */plugins/*.py
-    sed -i "s#env python#env python2#" libpurple/purple-{remote,notifications-example,url-handler}
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --disable-schemas-install \
-                --disable-meanwhile \
-                --disable-gnutls \
-                --enable-cyrus-sasl \
-                --disable-doxygen \
-                --enable-nm \
-		--with-python=/usr/bin/python2 \
-                --with-system-ssl-certs=/etc/ssl/certs
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use Python 2
+  sed -i 's/env python$/\02/' */plugins/*.py \
+    libpurple/purple-{remote,notifications-example,url-handler}
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-schemas-install \
+    --disable-meanwhile \
+    --disable-gnutls \
+    --enable-cyrus-sasl \
+    --disable-doxygen \
+    --enable-nm \
+    --with-python=/usr/bin/python2 \
+    --with-system-ssl-certs=/etc/ssl/certs
     make
 }
-package_libpurple(){
-    pkgdesc="IM library extracted from Pidgin"
-    depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plugins')
-    optdepends=('dbus-python: for purple-remote and purple-url-handler')
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-
-    for dir in libpurple share/sounds share/ca-certs m4macros po
-    do
-        make -C "${dir}" DESTDIR="${pkgdir}" install
-    done
-#    rm -rf "$pkgdir/etc" || return 1
-}
 
 package_pidgin(){
-    pkgdesc="Multi-protocol instant messaging client"
-    depends=("libpurple=$pkgver" 'startup-notification' 'gtkspell' 'libxss' 'hicolor-icon-theme' 'gstreamer0.10')
-    optdepends=('aspell: for spelling correction'
-                'avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'gstreamer0.10-good-plugins: video and voice support'
-                'tk: Tcl/Tk scripting support')
+  pkgdesc="Multi-protocol instant messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'startup-notification' 'gtkspell'
+           'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction'
+              'ca-certificates: SSL CA certificates'
+              'gstreamer0.10-good-plugins: video and voice support'
+              'tk: Tcl/Tk scripting support')
+  install=pidgin.install
 
-    install=pidgin.install
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd "$srcdir/pidgin-$pkgver"
+  
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
 
-    make -C pidgin DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
+  make -C pidgin DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
 
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+  rm "$pkgdir/usr/share/man/man1/finch.1"
+}
 
-    install -D -m 0644 pidgin.desktop "${pkgdir}"/usr/share/applications/pidgin.desktop
+package_libpurple(){
+  pkgdesc="IM library extracted from Pidgin"
+  depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss'
+           'cyrus-sasl-plugins')
+  optdepends=('avahi: Bonjour protocol support'
+              'dbus-python: for purple-remote and purple-url-handler')
+  
+  cd "$srcdir/pidgin-$pkgver"
 
-    rm -f "${pkgdir}"/usr/share/man/man1/finch.1
+  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+    make -C "$_dir" DESTDIR="$pkgdir" install
+  done
 }
+
 package_finch(){
-    pkgdesc="A ncurses-based messaging client"
-    depends=("libpurple=$pkgver" 'python2' 'gstreamer0.10')
-    optdepends=('avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'tk: Tcl/Tk scripting support')
-
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-    make -C finch DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
-
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
-    rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1
+  pkgdesc="A ncurses-based messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
+  optdepends=('avahi: Bonjour protocol support'
+              'ca-certificates: SSL CA certificates'
+              'tk: Tcl/Tk scripting support')
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C finch DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir"/usr/share/man/man1/pidgin.1
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 0cf39707c..f309599b4 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115648 2011-03-18 18:01:46Z heftig $
+# $Id: PKGBUILD 123129 2011-05-08 21:00:10Z heftig $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
 _topver=7.3
-_patchlevel=138
+_patchlevel=177
 pkgver=${_topver}.${_patchlevel}
-__hgrev=ea399ac2c1b9
+__hgrev=60890b26cb17
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
diff --git a/extra/xmahjongg/PKGBUILD b/extra/xmahjongg/PKGBUILD
index a7f489e82..56df4a23f 100644
--- a/extra/xmahjongg/PKGBUILD
+++ b/extra/xmahjongg/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 36409 2009-04-22 04:45:25Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Roberto Carvajal <rcarvajal@users.sf.net>
+# $Id: PKGBUILD 123155 2011-05-09 00:53:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmahjongg
 pkgver=3.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Mahjongg game for X-Window"
 arch=('i686' 'x86_64')
 url="http://www.lcdf.org/xmahjongg/"
 license=('GPL')
-depends=('gcc-libs' 'libsm' 'libx11')
-source=(http://www.lcdf.org/$pkgname/$pkgname-$pkgver.tar.gz)
+depends=('gcc-libs' 'libx11')
+source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('9db5bf1b329b410220b7976cd9b3d374')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }