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

Conflicts:
	community/bsdiff/PKGBUILD
	community/drivel/PKGBUILD
	community/dvdbackup/PKGBUILD
	community/gdlmm/PKGBUILD
	community/gnome-phone-manager/PKGBUILD
	community/highlight/PKGBUILD
	community/i3-wm/PKGBUILD
	community/linux-tools/PKGBUILD
	community/obconf/PKGBUILD
	community/perl-class-factory-util/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/qupzilla/PKGBUILD
	community/subtitleeditor/PKGBUILD
	community/synce-librapi/PKGBUILD
	community/synce-libsynce/PKGBUILD
	community/tilda/PKGBUILD
	core/glibc/PKGBUILD
	core/iputils/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/calligra/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kobodeluxe/PKGBUILD
	extra/libburn/PKGBUILD
	extra/libisoburn/PKGBUILD
	extra/libisofs/PKGBUILD
	extra/libsamplerate/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nasm/PKGBUILD
	extra/perl-netaddr-ip/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/putty/PKGBUILD
	extra/samba/PKGBUILD
	extra/tk/PKGBUILD
	extra/vim/PKGBUILD
	extra/xorg-xprop/PKGBUILD
	extra/xorg-xwd/PKGBUILD
	pcr/ams/PKGBUILD
	pcr/clalsadrv/PKGBUILD

1 files changed, 34 insertions, 21 deletions

diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD
index 50d2c186d..07ff0592b 100644
--- a/community/gnokii/PKGBUILD
+++ b/community/gnokii/PKGBUILD
@@ -1,47 +1,60 @@
-# $Id: PKGBUILD 92499 2013-06-07 09:28:58Z tomegun $
-# Maintainer:
+# $Id: PKGBUILD 95469 2013-08-12 20:27:17Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=gnokii
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc="Tools and user space driver for use with mobile phones"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnokii.org/"
 license=('GPL')
 depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite')
-makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb')
-optdepends=('gtk2: xgnokii GUI'
+makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool')
+optdepends=('dialog: sendsms tool'
+            'gtk2: xgnokii GUI'
             'libmariadbclient: smsd mysql backend'
             'postgresql-libs: smsd postgresql backend')
 backup=('etc/gnokiirc')
-options=('!libtool' '!makeflags')
-source=("http://www.gnokii.org/download/$pkgname/$pkgname-${pkgver}.tar.bz2"
-        'gnokii.patch')
+options=('!libtool')
+install=$pkgname.install
+source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'gnokii-config.patch'
+        'gnokii-lock.patch')
 md5sums=('d9627f4a1152d3ea7806df4532850d5f'
-         'fd1c448114c2e0de8e05981030f0e69f')
+         'b2961b52ac1f770c4704ccc50b64fde2'
+         '17b629db85a6bb2b98ca59941aa95295')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
-  # FS#13249
-  sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
+  # Set bindir location
+  patch -Np1 -i "$srcdir/gnokii-config.patch"
 
-  patch -Np1 -i "${srcdir}/gnokii.patch"
+  # Set lock path
+  patch -Np1 -i "$srcdir/gnokii-lock.patch"
 
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --enable-security \
-    --disable-unix98test
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
+              --disable-static --enable-security
   make
+  pushd xgnokii
+  make
+  popd
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+  pushd xgnokii
+  make DESTDIR="$pkgdir" install
+  popd
+
+  # Install inital config file
+  install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc"
 
-  install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc"
+  # Fix file permission
+  chmod 755 "$pkgdir/usr/bin/sendsms"
 }