Mon May 9 22:34:00 UTC 2011

1 files changed, 78 insertions, 66 deletions

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
 }