Mon Apr 21 03:59:45 UTC 2014

15 files changed, 223 insertions, 131 deletions

diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 4c9809f48..01a9bf6be 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 109373 2014-04-14 09:42:06Z spupykin $
+# $Id: PKGBUILD 109871 2014-04-20 11:32:13Z bluewind $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Todd Musall <tmusall@comcast.net>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Todd Musall <tmusall@comcast.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=apcupsd
 pkgver=3.14.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64)
 url="http://www.apcupsd.org"
 license=('GPL')
-depends=('gcc-libs')
+depends=('gcc-libs' 'systemd-sysvcompat')
 optdepends=('gd: for CGI'
             'gconf: for frontend'
             'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat')
-backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
-        etc/apcupsd/multimon.conf)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
+backup=(etc/apcupsd/apcupsd.conf
+        etc/apcupsd/hosts.conf
+        etc/apcupsd/multimon.conf
+        etc/apcupsd/apcupsd.css
+        etc/apcupsd/changeme
+        etc/apcupsd/commfailure
+        etc/apcupsd/commok
+        etc/apcupsd/offbattery
+        etc/apcupsd/onbattery
+        etc/apcupsd/apccontrol)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
         apcupsd.service
         apcupsd-tmpfiles.conf)
-sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
-            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
-            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
-sha256sums=('adc72de89a704881d7c7454f7f98de7d0318102b2b08fe400f4e1cc4da462b73'
-            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
-            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
 sha256sums=('1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440'
+            'SKIP'
             '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
             'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
 
@@ -43,10 +47,16 @@ build() {
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
+
 	make DESTDIR="$pkgdir" install
+
 	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
 	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+
 	chmod 755 "$pkgdir"/usr/bin/*
+
 	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
 	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+
+	rm -rf "$pkgdir/usr/share/hal"
 }
diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD
index 23c4d03c2..2ac2cd01e 100644
--- a/community/minetest/PKGBUILD
+++ b/community/minetest/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 108846 2014-04-05 05:27:19Z lcarlier $
+# $Id: PKGBUILD 109869 2014-04-20 06:28:29Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Konsta Kokkinen <kray@tsundere.fi>
 
 pkgname=minetest
 pkgver=0.4.9
-pkgrel=3
+pkgrel=4
 pkgdesc='An Infiniminer/Minecraft inspired game'
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
-depends=('sqlite' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
+depends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
 makedepends=('cmake')
 install=minetest.install
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
@@ -31,6 +31,7 @@ build() {
 
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_GETTEXT=on \
+    -DENABLE_FREETYPE=1 \
     -DENABLE_LEVELDB=on 
   make
 }
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 1d93cf379..dbbd12ae2 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211377 2014-04-18 18:01:56Z andrea $
+# $Id: PKGBUILD 211567 2014-04-20 08:16:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
 pkgver=4.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
 arch=('i686' 'x86_64')
@@ -15,14 +15,19 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
 sha1sums=('a33bc06b1f949b880903cc2ab0f19052d03ecba4')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../perlkde-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Soprano=OFF \
+    -DWITH_Nepomuk=OFF
   make
 }
 
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index 2d48654fe..0c2ef9125 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203036 2014-01-02 09:41:35Z bisson $
+# $Id: PKGBUILD 211565 2014-04-20 06:13:57Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Simon Perry <aur [at] sanxion [dot] net>
 # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com>
 
 pkgname=libsidplayfp
-pkgver=1.2.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc='Library to play Commodore 64 music derived from libsidplay2'
 url='http://sourceforge.net/projects/sidplay-residfp/'
@@ -14,7 +14,7 @@ depends=('gcc-libs')
 makedepends=('vice')
 optdepends=('vice: better SID support')
 source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('ebe114d75e9d9fd1e22dc1db27f48d248b0be628')
+sha1sums=('2c3e7a3db73f3d64ce6c5ef07eb61cce22eeddd1')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch b/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch
new file mode 100644
index 000000000..6cae41238
--- /dev/null
+++ b/extra/memcached/0001-don-t-drop-to-a-condition-without-holding-the-lock.patch
@@ -0,0 +1,35 @@
+From 9d635fa7f46f000d23663e0be3a900d2c51a3ed8 Mon Sep 17 00:00:00 2001
+From: dormando <dormando@rydia.net>
+Date: Sat, 19 Apr 2014 12:15:29 -0700
+Subject: [PATCH 1/2] don't drop to a condition without holding the lock
+
+I am a moran. How do you even thread.
+---
+ items.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/items.c b/items.c
+index 688ad03..3e2f71f 100644
+--- a/items.c
++++ b/items.c
+@@ -764,6 +764,7 @@ static void item_crawler_evaluate(item *search, uint32_t hv, int i) {
+ static void *item_crawler_thread(void *arg) {
+     int i;
+ 
++    pthread_mutex_lock(&lru_crawler_lock);
+     if (settings.verbose > 2)
+         fprintf(stderr, "Starting LRU crawler background thread\n");
+     while (do_run_lru_crawler_thread) {
+@@ -827,8 +828,8 @@ static void *item_crawler_thread(void *arg) {
+     STATS_LOCK();
+     stats.lru_crawler_running = false;
+     STATS_UNLOCK();
+-    pthread_mutex_unlock(&lru_crawler_lock);
+     }
++    pthread_mutex_unlock(&lru_crawler_lock);
+     if (settings.verbose > 2)
+         fprintf(stderr, "LRU crawler thread stopping\n");
+ 
+-- 
+1.9.2
+
diff --git a/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch b/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch
new file mode 100644
index 000000000..f6767362f
--- /dev/null
+++ b/extra/memcached/0002-flag-crawler-as-running-during-the-request-to-run.patch
@@ -0,0 +1,38 @@
+From d8b1047620a54443f6bdca7f0dc5ee3b4d99378e Mon Sep 17 00:00:00 2001
+From: dormando <dormando@rydia.net>
+Date: Sat, 19 Apr 2014 16:03:28 -0700
+Subject: [PATCH 2/2] flag crawler as running during the request to run
+
+... so there's no race to tell if it's running if you check after the command
+exits.
+---
+ items.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/items.c b/items.c
+index 3e2f71f..6261503 100644
+--- a/items.c
++++ b/items.c
+@@ -769,9 +769,6 @@ static void *item_crawler_thread(void *arg) {
+         fprintf(stderr, "Starting LRU crawler background thread\n");
+     while (do_run_lru_crawler_thread) {
+     pthread_cond_wait(&lru_crawler_cond, &lru_crawler_lock);
+-    STATS_LOCK();
+-    stats.lru_crawler_running = true;
+-    STATS_UNLOCK();
+ 
+     while (crawler_count) {
+         item *search = NULL;
+@@ -918,6 +915,9 @@ enum crawler_result_type lru_crawler_crawl(char *slabs) {
+     }
+     pthread_mutex_unlock(&cache_lock);
+     pthread_cond_signal(&lru_crawler_cond);
++    STATS_LOCK();
++    stats.lru_crawler_running = true;
++    STATS_UNLOCK();
+     pthread_mutex_unlock(&lru_crawler_lock);
+     return CRAWLER_OK;
+ }
+-- 
+1.9.2
+
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index d743e3091..063ce095c 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 203228 2014-01-05 23:07:05Z dan $
+# $Id: PKGBUILD 211562 2014-04-20 01:24:48Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.17
+pkgver=1.4.18
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
@@ -13,12 +13,18 @@ depends=('libevent')
 optdepends=('perl: for memcached-tool usage')
 install=memcached.install
 source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
-		memcached.service)
-sha256sums=('d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458'
-            'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
+        memcached.service
+        0001-don-t-drop-to-a-condition-without-holding-the-lock.patch
+        0002-flag-crawler-as-running-during-the-request-to-run.patch)
+sha256sums=('6a5cc8d0874f13c5043d741af83fbdc4c681316d32b8313c0dbc82ca96f97439'
+            'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d'
+            'dc25b5128e4b5f21d2a2d6186517139281e2e3bfc6142eaa72ef5840dbfc1236'
+            '07f959563571125248914392fb2a1e3f75a8692f5724c7ed98f0f16737801527')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 < ../0001-don-t-drop-to-a-condition-without-holding-the-lock.patch
+  patch -Np1 < ../0002-flag-crawler-as-running-during-the-request-to-run.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/polkit-kde/PKGBUILD b/extra/polkit-kde/PKGBUILD
index 0a576e888..475312200 100644
--- a/extra/polkit-kde/PKGBUILD
+++ b/extra/polkit-kde/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102634 2010-12-09 08:51:18Z andrea $
+# $Id: PKGBUILD 211569 2014-04-20 08:27:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=polkit-kde
 pkgver=0.99.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Daemon providing a polkit authentication UI for KDE'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1'
@@ -14,9 +14,11 @@ makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${pkgver}.tar.bz2")
 md5sums=('a02d3fddc6270a88bceaf3ba604c92f8')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-agent-1-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -25,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index efeddd0c7..f03f31969 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -1,49 +1,60 @@
-# $Id: PKGBUILD 170087 2012-11-01 01:12:40Z thomas $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 211563 2014-04-20 06:11:13Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Committer: dorphell <dorphell@gmx.net>
 
 pkgname=screen
-pkgver=4.0.3
-pkgrel=15
+pkgver=4.2.0
+pkgrel=1
 _ptygroup=5 #the UID of our PTY/TTY group
-pkgdesc="Full-screen window manager that multiplexes a physical terminal"
+pkgdesc='Full-screen window manager that multiplexes a physical terminal'
+url='http://www.gnu.org/software/screen/'
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/screen/"
 license=('GPL')
 depends=('ncurses' 'pam')
 backup=('etc/screenrc' 'etc/pam.d/screen')
+#source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"
+source=("http://download.savannah.gnu.org/releases/screen/screen-${pkgver}.tar.gz"
+        'long-term.patch'
+        'pam.d')
+sha1sums=('85a206e1e474fd608f17e88bfe5f90a55f21c51a'
+          '4ca8408ec03e97777e37f45a99cf8ab503592734'
+          '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
 options=('!makeflags')
-install=screen.install
-source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz
-        screen-4.0.3-long-term.patch
-        screen-4.0.3-caption-colors.patch
-        screen.pam)
-md5sums=('8506fd205028a96c741e4037de6e3c42'
-         '2723c3e71d5a2e5a74b6ddbc5215ef0f'
-         '191b6ced695ce2ae3a65bf02c2d4220f'
-         '74f7919d7b65436cc2ea5341fa8ca374')
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../long-term.patch
+	./autogen.sh
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch
-  patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch
-  
-  ./configure --prefix=/usr --enable-pam \
-        --with-sys-screenrc=/etc/screenrc --enable-colors256 \
-       --enable-rxvt_osc --enable-telnet \
-       --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man --infodir=/usr/share/info \
-       --with-socket-dir=/run/screens
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-colors256 \
+		--enable-pam \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--with-pty-group=$_ptygroup \
+		--with-socket-dir=/run/screens \
+		--with-sys-screenrc=/etc/screenrc \
+
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-  install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
+	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/screen
 
-  install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen
-  install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc
-  install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc
+	install -Dm644 etc/completer.zsh "${pkgdir}"/usr/share/zsh/site-functions/screen
+	install -Dm644 etc/etcscreenrc "${pkgdir}"/etc/screenrc
+	install -Dm644 etc/screenrc "${pkgdir}"/etc/skel/.screenrc
 }
diff --git a/extra/screen/install b/extra/screen/install
new file mode 100644
index 000000000..e1429f787
--- /dev/null
+++ b/extra/screen/install
@@ -0,0 +1,25 @@
+infodir=usr/share/info
+filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
+
+post_install() {
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+		install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
+}
+
+post_upgrade() {
+	post_install $1
+	if [ $(vercmp $2 4.0.3-15) -lt 0 ]; then
+		echo 'The location of the screen sockets has changed.'
+		echo 'If you need to access running screen sessions, run'
+		echo '  # SCREENDIR=/tmp/screens/S-$USER/ screen ...'
+	fi
+}
+
+pre_remove() {
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+		install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
+}
diff --git a/extra/screen/screen-4.0.3-long-term.patch b/extra/screen/long-term.patch
index 3e66acda6..b4d6ff1f2 100644
--- a/extra/screen/screen-4.0.3-long-term.patch
+++ b/extra/screen/long-term.patch
@@ -1,7 +1,7 @@
-diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
---- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
-+++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
-@@ -85,7 +85,7 @@
+diff -aur old/display.h new/display.h
+--- old/display.h	2014-04-16 11:38:41.000000000 -1000
++++ new/display.h	2014-04-17 16:20:36.992994397 -1000
+@@ -73,7 +73,7 @@
    struct win *d_other;		/* pointer to other window */
    int   d_nonblock;		/* -1 don't block if obufmax reached */
  				/* >0: block after nonblock secs */
@@ -10,15 +10,15 @@ diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
    char	*d_tentry;		/* buffer for tgetstr */
    char	d_tcinited;		/* termcap inited flag */
    int	d_width, d_height;	/* width/height of the screen */
-diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
---- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
-+++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
-@@ -202,7 +202,7 @@
+diff -aur old/screen.h new/screen.h
+--- old/screen.h	2014-04-16 11:38:41.000000000 -1000
++++ new/screen.h	2014-04-17 16:20:36.992994397 -1000
+@@ -214,7 +214,7 @@
  	  char preselect[20];
  	  int esc;		/* his new escape character unless -1 */
  	  int meta_esc;		/* his new meta esc character unless -1 */
 -	  char envterm[20 + 1];	/* terminal type */
 +	  char envterm[40 + 1];	/* terminal type */
  	  int encoding;		/* encoding of display */
+ 	  int detachfirst;      /* whether to detach remote sessions first */
  	}
-       attach;
diff --git a/extra/screen/screen.pam b/extra/screen/pam.d
index 07c42adb1..07c42adb1 100644
--- a/extra/screen/screen.pam
+++ b/extra/screen/pam.d
diff --git a/extra/screen/screen-4.0.3-caption-colors.patch b/extra/screen/screen-4.0.3-caption-colors.patch
deleted file mode 100644
index c92cb0c54..000000000
--- a/extra/screen/screen-4.0.3-caption-colors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
-From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
-Date: Tue, 26 Jan 2010 20:17:26 +0000
-Subject: Accommodate more color changes in the caption.
-
----
-diff --git a/src/screen.c b/src/screen.c
-index b1c3dfb..2cceae0 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
- #endif
- 
- static char winmsg_buf[MAXSTR];
--#define MAX_WINMSG_REND 16	/* rendition changes */
-+#define MAX_WINMSG_REND 256	/* rendition changes */
- static int winmsg_rend[MAX_WINMSG_REND];
- static int winmsg_rendpos[MAX_WINMSG_REND];
- static int winmsg_numrend;
---
-cgit v0.8.3.4
diff --git a/extra/screen/screen.install b/extra/screen/screen.install
deleted file mode 100644
index 3adc8f3f6..000000000
--- a/extra/screen/screen.install
+++ /dev/null
@@ -1,26 +0,0 @@
-infodir=usr/share/info
-filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
-
-post_install() {
-    [ -x usr/bin/install-info ] || return 0
-    for file in ${filelist[@]}; do
-        install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-    done
-}
-
-post_upgrade() {
-    post_install $1
-    if [ $(vercmp $2 4.0.3-15) -lt 0 ]; then
-        echo 'The location of the screen sockets has changed.'
-        echo 'If you need to access running screen sessions, run'
-        echo '  # SCREENDIR=/tmp/screens/S-$USER/ screen ...'
-    fi
-}
-
-pre_remove() {
-    [ -x usr/bin/install-info ] || return 0
-    for file in ${filelist[@]}; do
-        install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-    done
-}
-
diff --git a/extra/xbase/PKGBUILD b/extra/xbase/PKGBUILD
index ed992e937..75fead273 100644
--- a/extra/xbase/PKGBUILD
+++ b/extra/xbase/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198490 2013-10-30 15:10:54Z allan $
+# $Id: PKGBUILD 211573 2014-04-20 09:09:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
 pkgname=xbase
 pkgver=2.0.0
-pkgrel=2
-pkgdesc="An XBase compatible C++ class library"
+pkgrel=3
+pkgdesc="A compatible C++ class library"
 arch=('i686' 'x86_64')
 url='http://linux.techass.com/projects/xdb/'
 license=('LGPL')
@@ -19,24 +19,30 @@ md5sums=('9b29362031716a12491beb9f8cc882f2'
          '0d5a59a59eb2c79d172bd4339de35372'
          '879bf5107605eee2cbec2dca116edac6')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
 
   patch -p1 -i "${srcdir}/fix-build.patch"
   patch -p1 -i "${srcdir}/gcc43.patch"
   patch -p1 -i "${srcdir}/gcc47.patch"
- 
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  unset CPPFLAGS
+
   # Workaround to build on x86_64
   ./configure --host=i686-pc-linux-gnu --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make -k check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }