Thu Apr 12 00:01:12 UTC 2012

14 files changed, 287 insertions, 56 deletions

diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD
new file mode 100644
index 000000000..624c12429
--- /dev/null
+++ b/community/cmus/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 69234 2012-04-10 18:41:03Z tdziedzic $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=cmus
+pkgver=2.4.3
+pkgrel=1
+pkgdesc="A very feature-rich ncurses-based music player"
+arch=('i686' 'x86_64')
+url="http://cmus.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
+             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
+optdepends=('alsa-lib: for ALSA output plugin support'
+            'libao: for AO output plugin support'
+            'libpulse: for PulseAudio output plugin support'
+            'ffmpeg: for ffmpeg input plugin support'
+            'libmodplug: for modplug input plugin support'
+            'faad2: for input AAC plugin support'
+            'libmad: for mp3 input plugin support'
+            'libmpcdec: for musepack input plugin support'
+            'wavpack: for wavpack input plugin support'
+            'libvorbis: for vorbis input plugin support'
+            'flac: for flac input plugin support'
+            'libmp4v2: for mp4 input plugin support')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
+sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5')
+
+build() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
+}
diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD
new file mode 100644
index 000000000..a84c051f3
--- /dev/null
+++ b/community/dcron/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Paul Mattal <paul.archlinux.org>
+
+pkgname=dcron
+pkgver=4.5
+pkgrel=2
+pkgdesc="dillon's lightweight cron daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.jimpryor.net/linux/dcron.html"
+backup=('var/spool/cron/root' 'etc/conf.d/crond')
+depends=('bash')
+provides=('cron')
+conflicts=('cron')
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('078833f3281f96944fc30392b1888326')
+optdepends=('smtp-server: sending cron job output via email')
+install=$pkgname.install
+
+build() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+
+	# by default, any member of group "users" can edit their own crontab
+	make \
+		PREFIX=/usr \
+		CRONTAB_GROUP=users \
+		CRONTABS=/var/spool/cron \
+		CRONSTAMPS=/var/spool/cronstamps
+}
+
+package() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+	make DESTDIR="$pkgdir" install
+
+	# install standard configuration and scripts
+	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
+
+	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
+	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
+	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
+	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
+	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
+	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
+	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
+}
diff --git a/community/dcron/dcron.install b/community/dcron/dcron.install
new file mode 100644
index 000000000..df23d0224
--- /dev/null
+++ b/community/dcron/dcron.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+	if [ $(vercmp $2 4.0) -lt 0 ]
+	then
+		echo "Restart crond, since you're upgrading to the dcron 4.x series."
+	fi
+}
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index 41293b975..16a512f71 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
 pkgname=fb-client
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Client for paste.xinu.at"
 arch=('i686' 'x86_64')
@@ -9,8 +9,8 @@ license=('GPL3')
 depends=('curl')
 optdepends=('xclip: for automatically copying the URL into the clipboard')
 source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig})
-md5sums=('b5b33d773b3145e4e2306e970d0b5ca1'
-         '07ef0f054d05d74ad75336dc32b956e4')
+md5sums=('d228e2475eaf0141ecff7c7a18ef97a1'
+         '69e60c7c20360262a5cf0b902c0219b2')
 
 build() {
   cd "$srcdir/fb-$pkgver"
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 542bc4ef4..bea74da61 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 69204 2012-04-10 03:10:13Z spupykin $
+# $Id: PKGBUILD 69214 2012-04-10 04:17:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 _hkgname=X11
 pkgname=haskell-x11
-pkgver=1.6.0
-pkgrel=1
+pkgver=1.5.0.1
+pkgrel=3
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
@@ -16,7 +16,7 @@ depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama' 'libxrandr')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('8199520ce58e91762d31d54ed081b99c')
+md5sums=('7d69b204f773a0335828ced0e1e069f2')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
new file mode 100644
index 000000000..40dd48b42
--- /dev/null
+++ b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
@@ -0,0 +1,38 @@
+From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 10 Apr 2012 19:30:35 -0500
+Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath
+ when using --shutdown SERVER-5186 SERVER-5187"
+
+https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923
+
+Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358
+---
+ db/cmdline.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/db/cmdline.cpp b/db/cmdline.cpp
+index fd759a7..346a9ae 100644
+--- a/db/cmdline.cpp
++++ b/db/cmdline.cpp
+@@ -239,7 +239,7 @@ namespace mongo {
+             cmdLine.noUnixSocket = true;
+         }
+ 
+-        if (params.count("fork")) {
++        if (params.count("fork") && !params.count("shutdown")) {
+             if ( ! params.count( "logpath" ) ) {
+                 cout << "--fork has to be used with --logpath" << endl;
+                 ::exit(-1);
+@@ -304,7 +304,7 @@ namespace mongo {
+         }
+ 
+ #endif
+-        if (params.count("logpath")) {
++        if (params.count("logpath") && !params.count("shutdown")) {
+             if ( logpath.size() == 0 )
+                 logpath = params["logpath"].as<string>();
+             uassert( 10033 ,  "logpath has to be non-zero" , logpath.size() );
+-- 
+1.7.10
+
diff --git a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
new file mode 100644
index 000000000..aff066450
--- /dev/null
+++ b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
@@ -0,0 +1,43 @@
+From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 10 Apr 2012 19:38:58 -0500
+Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in
+ --shutdown SERVER-5358"
+
+Backported to fix https://jira.mongodb.org/browse/SERVER-5358
+
+https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b
+---
+ db/db.cpp |   16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/db/db.cpp b/db/db.cpp
+index b1d1db8..0a21f4d 100644
+--- a/db/db.cpp
++++ b/db/db.cpp
+@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) {
+                     procPath = (str::stream() << "/proc/" << pid);
+                     if (!boost::filesystem::exists(procPath))
+                         failed = true;
+-
+-                    string exePath = procPath + "/exe";
+-                    if (boost::filesystem::exists(exePath)){
+-                        char buf[256];
+-                        int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1);
+-                        buf[ret] = '\0'; // readlink doesn't terminate string
+-                        if (ret == -1) {
+-                            int e = errno;
+-                            cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e);
+-                            failed = true;
+-                        }
+-                        else if (!endsWith(buf, "mongod")){
+-                            cerr << "Process " << pid << " is running " << buf << " not mongod" << endl;
+-                            ::exit(-1);
+-                        }
+-                    }
+                 }
+                 catch (const std::exception& e){
+                     cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl;
+-- 
+1.7.10
+
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 9b84c6b69..ce9bd8180 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68267 2012-03-21 01:53:53Z tdziedzic $
+# $Id: PKGBUILD 69242 2012-04-11 01:32:02Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
 pkgver=2.0.4
-pkgrel=1
+pkgrel=3
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -18,16 +18,26 @@ backup=('etc/mongodb.conf')
 install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc'
-        'mongodb.conf')
+        'mongodb.conf'
+        '0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch'
+        '0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch')
 md5sums=('099bc701a3d190a040123c58958e8f67'
          '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318')
+         '4839fe1d638187ca3226e8267b947318'
+         'fdbf06b005b3a73a2b6caca257ec8f64'
+         '659f6538f1ee3292809f638a4a37cbad')
 
 build() {
   export SCONSFLAGS="$MAKEFLAGS"
 
   cd mongodb-src-r${pkgver}
 
+  # 0001 suggested to backport along with 0002
+  # 0002 backported for https://jira.mongodb.org/browse/SERVER-5358
+  #      also fixes https://bugs.archlinux.org/task/29050
+  patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+  patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+
   # fix python name for smoke tests
   #sed \
   #  -e 's/python/&2/' \
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 5638b68d5..950a3d992 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 62671 2012-01-24 01:58:04Z jconder $
+# $Id: PKGBUILD 69216 2012-04-10 05:27:08Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
 pkgver=0.6.21
-pkgrel=2
+pkgrel=3
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
-             'shared-mime-info' 'sqlite3' 'udev')
+             'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
         'alpm.patch')
 sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e'
-            '44e7adbff7e2255fd9712eef33df866c3a868b3758ceff4adeef209927a97716')
+            'ab6a9be1741aba6972f3327ac625b802e9404e21fe60ca0919a440e8ac9df965')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
@@ -56,7 +56,7 @@ package_packagekit() {
           'etc/PackageKit/alpm.d/pacman.conf'
           'etc/PackageKit/alpm.d/repos.list')
   depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
-           'shared-mime-info' 'sqlite3' 'udev')
+           'shared-mime-info' 'sqlite' 'udev')
   optdepends=('networkmanager')
   install='packagekit.install'
 
@@ -72,8 +72,9 @@ package_packagekit() {
   rm -rf "$pkgdir/usr/lib/python"*
   rm -rf "$pkgdir/usr/share/PackageKit/website"
 
+  mkdir -p "$pkgdir/usr/share/bash-completion/completions"
   mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \
-     "$pkgdir/etc/bash_completion.d/pkcon"
+     "$pkgdir/usr/share/bash-completion/completions/pkcon"
   touch "$pkgdir/var/log/PackageKit"
 }
 
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
index 997d252b2..904cb11d1 100644
--- a/community/packagekit/alpm.patch
+++ b/community/packagekit/alpm.patch
@@ -246,7 +246,7 @@ index 23a2724..ecd6d0f 100644
  extern gchar *xfercmd;
  extern alpm_list_t *holdpkgs;
 diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
-index 21a4c54..d62b927 100644
+index 21a4c54..c8fd13b 100644
 --- a/backends/alpm/pk-backend-config.c
 +++ b/backends/alpm/pk-backend-config.c
 @@ -28,29 +28,44 @@
@@ -594,7 +594,7 @@ index 21a4c54..d62b927 100644
  			     "unrecognised directive '%s'", key);
  		break;
  	}
-@@ -611,107 +742,100 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+@@ -611,107 +742,101 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
  	}
  }
  
@@ -611,6 +611,7 @@ index 21a4c54..d62b927 100644
  
 -	if (config->root == NULL) {
 +	if (config->root == NULL || *config->root == '\0') {
++		g_free (config->root);
  		config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT);
 +	} else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) {
 +		dir = 0;
@@ -761,7 +762,7 @@ index 21a4c54..d62b927 100644
  
  	/* backend takes ownership */
  	g_free (xfercmd);
-@@ -719,9 +843,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+@@ -719,9 +844,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
  	config->xfercmd = NULL;
  
  	if (xfercmd != NULL) {
@@ -773,7 +774,7 @@ index 21a4c54..d62b927 100644
  	}
  
  	/* backend takes ownership */
-@@ -735,41 +859,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+@@ -735,41 +860,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
  	config->syncfirsts = NULL;
  
  	/* alpm takes ownership */
@@ -1612,7 +1613,7 @@ index 65a6c11..d0cbca2 100644
  
  void
 diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
-index e9a7c94..2d057aa 100644
+index e9a7c94..c90cd7d 100644
 --- a/backends/alpm/pk-backend-packages.c
 +++ b/backends/alpm/pk-backend-packages.c
 @@ -27,13 +27,11 @@
@@ -1760,7 +1761,32 @@ index e9a7c94..2d057aa 100644
  		const alpm_list_t *i;
  
  		GString *licenses;
-@@ -286,7 +285,7 @@ pk_backend_get_details_thread (PkBackend *self)
+@@ -271,28 +270,30 @@ pk_backend_get_details_thread (PkBackend *self)
+ 			break;
+ 		}
+ 
+-		licenses = g_string_new ("");
+ 		i = alpm_pkg_get_licenses (pkg);
+-		for (; i != NULL; i = i->next) {
+-			/* assume OR although it may not be correct */
+-			g_string_append_printf (licenses, " or %s",
+-						(const gchar *) i->data);
+-		}
+-		if (licenses->len == 0) {
+-			g_string_append (licenses, " or Unknown");
++		if (i == NULL) {
++			licenses = g_string_new ("Unknown");
++		} else {
++			licenses = g_string_new ((const gchar *) i->data);
++			while ((i = i->next) != NULL) {
++				const gchar *license = (const gchar *) i->data;
++				/* assume OR although it may not be correct */
++				g_string_append_printf (licenses, " or %s",
++							license);
++			}
+ 		}
+ 
+ 		group = pk_group_enum_from_string (alpm_pkg_get_group (pkg));
  		desc = alpm_pkg_get_desc (pkg);
  		url = alpm_pkg_get_url (pkg);
  
@@ -1769,7 +1795,14 @@ index e9a7c94..2d057aa 100644
  			size = alpm_pkg_get_isize (pkg);
  		} else {
  			size = alpm_pkg_download_size (pkg);
-@@ -317,17 +316,19 @@ pk_backend_get_files_thread (PkBackend *self)
+ 		}
+ 
+-		pk_backend_details (self, *packages, licenses->str + 4, group,
++		pk_backend_details (self, *packages, licenses->str, group,
+ 				    desc, url, size);
+ 		g_string_free (licenses, TRUE);
+ 	}
+@@ -317,17 +318,19 @@ pk_backend_get_files_thread (PkBackend *self)
  	GError *error = NULL;
  
  	g_return_val_if_fail (self != NULL, FALSE);
@@ -1792,7 +1825,7 @@ index e9a7c94..2d057aa 100644
  
  		if (pk_backend_cancelled (self)) {
  			break;
-@@ -338,11 +339,13 @@ pk_backend_get_files_thread (PkBackend *self)
+@@ -338,14 +341,17 @@ pk_backend_get_files_thread (PkBackend *self)
  			break;
  		}
  
@@ -1806,10 +1839,15 @@ index e9a7c94..2d057aa 100644
 +		filelist = alpm_pkg_get_files (pkg);
 +		for (i = 0; i < filelist->count; ++i) {
 +			const gchar *file = filelist->files[i].name;
-+			g_string_append_printf (files, ";%s%s", root, file);
++			g_string_append_printf (files, "%s%s;", root, file);
  		}
  
- 		pk_backend_files (self, *packages, files->str + 1);
+-		pk_backend_files (self, *packages, files->str + 1);
++		g_string_truncate (files, MAX (files->len, 1) - 1);
++		pk_backend_files (self, *packages, files->str);
+ 		g_string_free (files, TRUE);
+ 	}
+ 
 diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h
 index 4b2d7f8..2d54684 100644
 --- a/backends/alpm/pk-backend-packages.h
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index fd95362ad..70016c238 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,54 +1,60 @@
-# $Id: PKGBUILD 68673 2012-03-31 10:11:37Z rvanharen $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 69236 2012-04-10 21:23:38Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=5
-pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
+pkgrel=6
+pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 options=('!libtool' '!emptydirs')
-
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
-makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip')
-optdepends=('tk: for gst-blox'
-            'sqlite3'
-            'sed: for examples'
-            'gtk2')
+makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip')
 install=smalltalk.install
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a36a7c9beddca08dc492b500738efc82')
+sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3')
+optdepends=('tk: for gst-blox'
+            'sqlite: database in a file'
+            'sed: for examples'
+            'gtk2: GUI toolkit')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --libexecdir=/usr/lib/smalltalk \
     --with-imagedir=/var/lib/smalltalk \
     --enable-gtk=yes \
     --with-system-libffi \
     --with-system-libsigsegv \
     --with-readline \
-    --with-tcl --with-tk \
-    --with-x --without-emacs
+    --with-tcl \
+    --with-tk \
+    --with-x \
+    --without-emacs
 
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
 #  make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 
   # fix manpage symlink
-  rm -f $pkgdir/usr/share/man/man1/gst-reload.1
-  ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1
+  rm -f "$pkgdir/usr/share/man/man1/gst-reload.1"
+  ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/smalltalk/smalltalk.install b/community/smalltalk/smalltalk.install
index 992e4edfb..3f7150d67 100644
--- a/community/smalltalk/smalltalk.install
+++ b/community/smalltalk/smalltalk.install
@@ -19,3 +19,4 @@ pre_remove() {
   done
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
index 1215b4714..6be0249c3 100644
--- a/community/vsftpd/PKGBUILD
+++ b/community/vsftpd/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 67148 2012-03-05 00:08:24Z pschmitz $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 69224 2012-04-10 09:36:37Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
-pkgver=2.3.5
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
@@ -14,22 +15,25 @@ backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
         'vsftpd.xinetd' 'vsftpd.d')
-sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
-          '2ddf92782f19dafc72439a2917acb1d7e124d149'
+sha1sums=('436da30cefa33e22a0266077ab95397e9432e297'
+          '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af'
           'c87b4ce56dac15223694a6e86c01ea813b877596'
           '24f268956c24e78be0c234c6d31f41487922eafe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   # build-time config
   sed \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
-  make CFLAGS="${CFLAGS}"
+
+  make CFLAGS="${CFLAGS} -fPIC"
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
   install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
   install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 196ce1e68..91a537576 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 67084 2012-03-03 16:12:24Z tdziedzic $
+# $Id: PKGBUILD 69222 2012-04-10 09:03:48Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
+depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-3' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')