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

Conflicts:
	community/gnustep-make/PKGBUILD
	extra/foomatic/PKGBUILD
	extra/gnutls/PKGBUILD
	libre/gstreamer0.10-bad-libre/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	staging/libreoffice/PKGBUILD
	testing/udev/PKGBUILD

21 files changed, 163 insertions, 97 deletions

diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
index 2885e3ca4..66e433311 100644
--- a/community/cdrtools/PKGBUILD
+++ b/community/cdrtools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68902 2012-04-05 11:43:49Z stativ $
+# $Id: PKGBUILD 68938 2012-04-06 10:10:47Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cdrtools
 pkgver=3.01a07
-pkgrel=2
+pkgrel=3
 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
 arch=('i686' 'x86_64')
 url="http://cdrecord.berlios.de/private/cdrecord.html"
@@ -27,13 +27,11 @@ build() {
 
 package() {
   cd "$srcdir"/cdrtools-${pkgver%%a*}
-  export GMAKE_NOWARN=true
 
+  export GMAKE_NOWARN=true
   make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
   rm -rf "$pkgdir"/usr/include
   rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
-  find "$pkgdir" -type d -perm 775 -exec chmod 755 '{}' ';'
-  find "$pkgdir" -type f -perm 4711 -exec chmod 755 '{}' ';'
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD
index 621807b71..e7191f550 100644
--- a/community/gnustep-make/PKGBUILD
+++ b/community/gnustep-make/PKGBUILD
@@ -1,5 +1,6 @@
 # Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 56053 2011-09-29 17:24:54Z spupykin $
+# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
+# $Id$
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index ba9ae1152..23dd8c8c0 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 68856 2012-04-03 23:02:20Z arodseth $
+# $Id: PKGBUILD 68945 2012-04-06 12:14:22Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
-# Contributor: Mike "str1ngs" Rosset
+# Contributor: Mike Rosset <mike.rosset@gmail.com>
+# Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
 pkgver=1
-pkgrel=4
+pkgrel=5
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed' 'gawk')
-makedepends=('mercurial' 'inetutils')
+depends=('perl' 'ed' 'gawk' 'mercurial')
+makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
 source=("$pkgname"
         "$pkgname.sh")
-md5sums=('c14a33c0d138f9cd19264a8dd0b809a7'
-         'e7087d190fd519db3be5adb3a51194cc')
+sha1sums=('655754d95688294b0cf2334a1155432884f92859'
+          'a760c32cbad5a013f384a086efb3b8b8fd88794f')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
@@ -58,16 +59,23 @@ build() {
 package() {
   cd "$srcdir/release-build"
 
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/go/LICENSE
-  install -Dm644 misc/bash/go $pkgdir/etc/bash_completion.d/go
+  install -Dm644 LICENSE \
+    "$pkgdir/usr/share/licenses/go/LICENSE"
+  install -Dm644 misc/bash/go \
+    "$pkgdir/etc/bash_completion.d/go"
   install -Dm644 misc/emacs/go-mode-load.el \
-    $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el
+    "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el"
   install -Dm644 misc/emacs/go-mode.el \
-    $pkgdir/usr/share/emacs/site-lisp/go-mode.el
-  install -Dm644 misc/vim/ftdetect/gofiletype.vim \
-    $pkgdir/usr/share/vim/vimfiles/ftdetect/gofiletype.vim
-  install -Dm644 misc/vim/syntax/go.vim \
-    $pkgdir/usr/share/vim/vimfiles/syntax/go.vim
+    "$pkgdir/usr/share/emacs/site-lisp/go-mode.el"
+  install -Dm644 misc/zsh/go \
+    "$pkgdir/usr/share/zsh/site-functions/_go"
+
+  for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \
+    ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \
+    syntax/go.vim syntax/godoc.vim plugin/godoc.vim;
+  do
+    install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f"
+  done
 
   mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
 
diff --git a/community/go/go.install b/community/go/go.install
index 9a87b9d11..decdeccf5 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -1,10 +1,10 @@
 post_upgrade() {
   # Backup any previous /usr/lib/go/bin directory
-  if [ -e /usr/lib/go/bin ]; then
+  if [ -d /usr/lib/go/bin -a ! -L /usr/lib/go/bin ]; then
     mv /usr/lib/go/bin /usr/lib/go/bin.pacnew
   fi
 
-  # Point /usr/lib/go/bin to /usr/bin
+  # Point /usr/lib/go/bin to /usr/bin instead
   #
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index 593c314cc..761ace052 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,17 +1,18 @@
+# $Id: PKGBUILD 68957 2012-04-06 14:24:01Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3lock
-pkgver=2.2
-pkgrel=2
+pkgver=2.4
+pkgrel=1
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
-depends=('xcb-util' 'xcb-util-image' 'xcb-util-keysyms' 'pam')
+depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11')
 options=('docs')
 source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
-md5sums=('6179a1611e333c8baf54093b57d50687')
+md5sums=('728e2654d886ef97449708f0135e9fa5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index 4556016c0..7578dfe8d 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61262 2011-12-27 10:18:54Z ttopper $
+# $Id: PKGBUILD 68961 2012-04-06 14:39:04Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3status
 pkgver=2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Generates status bar to use with dzen2 or xmobar"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3.zekjur.net/i3status/"
@@ -11,6 +11,7 @@ license=('BSD')
 groups=('i3')
 depends=('wireless_tools' 'confuse' 'alsa-lib')
 makedepends=('asciidoc')
+backup=('etc/i3status.conf')
 install=i3status.install
 options=('docs')
 source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index b5d0288c4..f8e685e90 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=1
+pkgrel=2
 _jumbover=5
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -42,7 +42,7 @@ build() {
 	sed -i 's|#include <des.h>|#include "des/des.h"|' KRB5_std.h
 
 	# enable OMP
-	sed -i 's|#OMPFLAGS = -fopenmp|OMPFLAGS = -fopenmp|' Makefile
+	sed -i 's|#OMPFLAGS = -fopenmp$|OMPFLAGS = -fopenmp|' Makefile
 
 	# build john
 	if [ "$CARCH" == "x86_64" ]; then
@@ -67,6 +67,7 @@ package() {
           ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \
           ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dynamic.conf ${pkgdir}/etc/john/
 
 	# install binaries
 	install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index a112d3534..ab5b60a27 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66498 2012-02-25 18:39:15Z jlichtblau $
+# $Id: PKGBUILD 68974 2012-04-06 18:12:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libraw
-pkgver=0.14.5
+pkgver=0.14.6
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('lcms')
 options=('!makeflags')
 changelog=$pkgname.changelog
 source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz)
-sha256sums=('f8b17f5fd0c2801f05dfb7cdee7c55e399094cdb53d521be0cd6d5317291f080')
+sha256sums=('dad1ebe182584630d4b0fa8801bfefb83ebccf83d89be2f0e1ca3abcfa0ea80d')
 
 build() {
   cd ${srcdir}/LibRaw-${pkgver}
diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog
index 311ba4dbc..4a34b34b0 100644
--- a/community/libraw/libraw.changelog
+++ b/community/libraw/libraw.changelog
@@ -1,3 +1,6 @@
+2012-04-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* libraw 0.14.6-1
+
 2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* libraw 0.14.5-1
 
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 50eb8784f..c61f0fb87 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65305 2012-02-20 20:13:42Z ttopper $
+# $Id: PKGBUILD 68955 2012-04-06 14:13:47Z ttopper $
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.8.0
+pkgver=15.8.2
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'm4: for complex operations using the matho script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('8a9b136e2b38e9712b76b5ffeb6e209f')
+md5sums=('f7ebe7974f0bb26541bcae60932f1a74')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD
index 64aba857b..5f8e747bf 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60369 2011-12-12 10:37:01Z ttopper $
+# $Id: PKGBUILD 68959 2012-04-06 14:33:52Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Daniel Hommel <dhommel@gmail.com>
 
 pkgname=mksh
-pkgver=R40d
+pkgver=R40e
 pkgrel=1
 pkgdesc="The MirBSD Korn Shell - an enhanced version of the public domain ksh"
 url="http://mirbsd.de/mksh"
@@ -13,8 +13,9 @@ arch=('i686' 'x86_64')
 install=mksh.install
 source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz"
         "https://www.mirbsd.org/TaC-mksh.txt")
-md5sums=('c6428401103367730a95b99284bf47dc'
-         '5376e528781247238d103ac24aceaf3d')
+depends=('gcc-libs')
+md5sums=('d9a2df50c09692fc24d52ee9cf3bb789'
+         '0016ef61a990bcd763604da7ae2beb25')
 
 build() {
   cd "$srcdir"
diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD
index 97e6b3257..c4b6f142c 100644
--- a/community/nautilus-sound-converter/PKGBUILD
+++ b/community/nautilus-sound-converter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68256 2012-03-20 19:47:24Z bgyorgy $
+# $Id: PKGBUILD 68972 2012-04-06 16:41:18Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=nautilus-sound-converter
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Nautilus extension to convert audio files formats"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/nautilus-sound-converter/"
@@ -17,7 +17,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
 options=('!libtool')
 install=$pkgname.install
 source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz)
-sha1sums=('5319fab3b74df43b8e7c293dfdf88b754d3e9db9')
+sha1sums=('f0799af3c7f14e2cd4cf70499d9bde07ec4ab89d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index b8e6b46e6..48d0a97b8 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68211 2012-03-19 11:26:32Z svenstaro $
+# $Id: PKGBUILD 68947 2012-04-06 12:17:32Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
 pkgver=1.76
-pkgrel=3
+pkgrel=4
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oolite-linux.berlios.de"
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index 9d8063a18..0938096d5 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66304 2012-02-23 13:45:07Z allan $
+# $Id: PKGBUILD 68966 2012-04-06 15:03:02Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=1.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pragha.wikispaces.com/"
@@ -16,8 +16,8 @@ depends=('libnotify' 'libcdio' 'gstreamer0.10-base'
 optdepends=('notification-daemon: OSD notification')
 replaces=('dissonance')
 install=pragha.install
-source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('b4d2780b065e3141489dcc27c121f01b1d47227c')
+source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2")
+sha1sums=('607e54233305d6774dcd66327969533b6f2c6847')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 632fb473b..1d50429b8 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 66956 2012-03-02 19:09:35Z ttopper $
+# $Id: PKGBUILD 68963 2012-04-06 14:50:59Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('32d18b8a12f1711dc7bb5ae52300dc9eb6869e09')
-md5sums=('d879ba09c4d72546fca2e2e5f18eac07')
+sha1sums=('cd129f98982305f0c0d38228530c449253aa3327')
+md5sums=('0fb38dd5ae034345ad6615ad98c4e3aa')
 
 
 build() {
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index ce0beeac1..77c2758f4 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 67162 2012-03-05 00:37:20Z pschmitz $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 68942 2012-04-06 10:19:39Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
 pkgver=9.15
-pkgrel=1
-pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
+pkgrel=2
+pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64')
-url="http://software.schmorp.de/pkg/rxvt-unicode.html"
+url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license=('GPL')
 depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
 optdepends=('gtk2-perl: to use the urxvt-tabbed')
-changelog=ChangeLog
-source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop)
+source=(
+  "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2"
+  'urxvt.desktop'
+  'urxvtc.desktop'
+  'urxvt-tabbed.desktop'
+)
 md5sums=('15595aa326167ac5eb68c28d95432faf'
-         '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
-          '962aebc88982dbeb62a7c4a051ff567e015f61a0')
+         '88d8786d74b819450adf722180db09fd'
+         'bebf5b6b399b74b557fcedbdb47cc387'
+         '2604896bb107fbb5511bfd6f46d65894')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
     --enable-256-color \
@@ -40,14 +44,21 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/terminfo"
-  export TERMINFO="${pkgdir}/usr/share/terminfo"
-  make DESTDIR="${pkgdir}" install
- # install the tabbing wrapper ( requires gtk2-perl! )
+  cd $pkgname-$pkgver
+  # workaround terminfo installation
+  export TERMINFO="$pkgdir/usr/share/terminfo"
+  install -d "$TERMINFO"
+
+  make DESTDIR="$pkgdir" install
+
+  # install the tabbing wrapper ( requires gtk2-perl! )
   sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
-  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
- # install freedesktop menu
-  install -Dm644 ../${pkgname}.desktop \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
+
+  # install freedesktop menu
+  for _f in urxvt urxvtc urxvt-tabbed; do
+    install -Dm644 ../$_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
+  done
 }
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop
new file mode 100644
index 000000000..f3efdc9b9
--- /dev/null
+++ b/community/rxvt-unicode/urxvt-tabbed.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=urxvt (tabbed)
+Comment=An unicode capable and tabbed rxvt clone
+Exec=urxvt-tabbed
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop
new file mode 100644
index 000000000..0a9baf7df
--- /dev/null
+++ b/community/rxvt-unicode/urxvt.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=urxvt
+Comment=An unicode capable rxvt clone
+Exec=urxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop
new file mode 100644
index 000000000..e39a418f6
--- /dev/null
+++ b/community/rxvt-unicode/urxvtc.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=urxvt (client)
+Comment=An unicode capable rxvt clone client for urxvtd
+Exec=urxvtc
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/community/rxvt/PKGBUILD b/community/rxvt/PKGBUILD
index 436fd7ae5..8ca75017c 100644
--- a/community/rxvt/PKGBUILD
+++ b/community/rxvt/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id$
-# Maintainer: Seblu <seblu+arch@seblu.net>
+# $Id: PKGBUILD 68943 2012-04-06 10:20:56Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Malte Rabenseifer <malte@zearan.de> 
 # Contributor: urist <9362773@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -8,7 +8,7 @@
 
 pkgname=rxvt
 pkgver=2.7.10
-pkgrel=5
+pkgrel=6
 pkgdesc='A colour vt102 terminal emulator'
 arch=('i686' 'x86_64')
 url='http://rxvt.sourceforge.net/'
@@ -19,16 +19,27 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('302c5c455e64047b02d1ef19ff749141')
 
 build() {
-	cd $pkgname-$pkgver
-	./configure --prefix=/usr
-	make
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --with-terminfo=/usr/share/terminfo \
+    --enable-mousewheel \
+    --enable-256-color \
+    --enable-linespace \
+    --enable-smart-resize \
+    --enable-transparency \
+    --enable-utmp \
+    --enable-wtmp \
+    --enable-lastlog \
+    --enable-xim
+    # --enable-slipwheeling (crash)
+  make
 }
 
 package() {
-	cd $pkgname-$pkgver
-	make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man/man1" install
-	rm "$pkgdir/usr/bin/$pkgname-$pkgver"
-	rmdir "$pkgdir/usr/include" "$pkgdir/usr/lib"
+  cd $pkgname-$pkgver
+  make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man/man1" install
+  rm "$pkgdir/usr/bin/$pkgname-$pkgver"
+  rmdir "$pkgdir/usr/include" "$pkgdir/usr/lib"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index 1caedaf50..9470c97b2 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 64239 2012-02-11 00:56:46Z tdziedzic $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 68939 2012-04-06 10:11:29Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=znc
-pkgver=0.204
+pkgver=0.206
 pkgrel=1
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
@@ -15,24 +16,23 @@ optdepends=('tcl: modtcl module'
             'python: modpython module'
             'perl: modperl module'
             'cyrus-sasl: saslauth module')
-source=("http://znc.in/releases/znc-${pkgver}.tar.gz")
-md5sums=('7c7247423fc08b0c5c62759a50a9bca3')
+source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz")
+md5sums=('b7d3f21da81abaeb553066b0e10beb53')
 
 build() {
-  cd "znc-$pkgver"
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --enable-sasl \
     --enable-tcl \
     --enable-python \
     --enable-perl \
     --enable-extra
-
   make
 }
 
 package() {
-  cd "znc-$pkgver"
-
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 ft=sh et: