Sat Jul 6 01:36:25 PDT 2013

1 files changed, 25 insertions, 15 deletions

diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index d4c42a962..10c6751aa 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $
+# $Id: PKGBUILD 93568 2013-07-05 17:54:59Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
-pkgname=rxvt-unicode
+pkgbase=rxvt-unicode
+pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo')
 pkgver=9.18
-pkgrel=5
-pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license=('GPL')
-depends=('libxft' 'perl' 'startup-notification')
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
+makedepends=('libxft' 'perl' 'startup-notification')
 source=(
   "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2"
   'urxvt.desktop'
@@ -32,6 +31,7 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
+  # we disable smart-resize (FS#34807)
   ./configure \
     --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
@@ -49,7 +49,7 @@ build() {
     --enable-rxvt-scroll \
     --enable-selectionscrolling \
     --enable-slipwheeling \
-    --enable-smart-resize \
+    --disable-smart-resize \
     --enable-startup-notification \
     --enable-transparency \
     --enable-unicode3 \
@@ -63,20 +63,30 @@ build() {
   make
 }
 
-package() {
-  pushd $pkgname-$pkgver
+package_rxvt-unicode() {
+  pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+  depends=('rxvt-unicode-terminfo' 'libxft' 'perl' 'startup-notification')
+  optdepends=('gtk2-perl: to use the urxvt-tabbed')
+
+  # install freedesktop menu
+  for _f in urxvt urxvtc urxvt-tabbed; do
+    install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
+  done
+  cd $pkgname-$pkgver
   # workaround terminfo installation
-  export TERMINFO="$pkgdir/usr/share/terminfo"
+  export TERMINFO="$srcdir/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"
-  popd
-  # install freedesktop menu
-  for _f in urxvt urxvtc urxvt-tabbed; do
-    install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
-  done
+}
+
+package_rxvt-unicode-terminfo() {
+  pkgdesc='Terminfo files for urxvt'
+  conflict=('rxvt-unicode<=9.18-6')
+  install -dm 755 "$pkgdir/usr/share/"
+  mv terminfo "$pkgdir/usr/share/"
 }
 
 # vim:set ts=2 sw=2 et: