[arch-commits] Commit in galculator/trunk (PKGBUILD)

[Martin Wimpress]

    Date: Wednesday, March 19, 2014 @ 19:00:57
  Author: flexiondotorg
Revision: 107794

upgpkg: galculator 2.1.3-2 - Replaces mate-calc

Modified:
  galculator/trunk/PKGBUILD

----------+
 PKGBUILD |   36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 17:27:05 UTC (rev 107793)
+++ PKGBUILD	2014-03-19 18:00:57 UTC (rev 107794)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer : Martin Wimpress <code at flexion.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,37 +8,40 @@
 pkgbase=galculator
 pkgname=(galculator galculator-gtk2)
 pkgver=2.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64')
 url='http://galculator.sourceforge.net/'
 license=('GPL')
-depends=('gtk3' 'gtk2')
+depends=('gtk2' 'gtk3')
 makedepends=('intltool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
+install=${pkgname}.install
+source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
 sha256sums=('91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235')
 
 build() {
   # GTK3 version
-  cd $pkgname-$pkgver
-  [ -e gtk3 ] || mkdir gtk3
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  [ -d gtk3 ] || mkdir gtk3
   cd gtk3
-  ../configure --prefix=/usr
+  ../configure \
+    --prefix=/usr
   make
 
   # GTK2 version
-  cd $srcdir/$pkgname-$pkgver
-  [ -e gtk2 ] || mkdir gtk2
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  [ -d gtk2 ] || mkdir gtk2
   cd gtk2
-  ../configure --prefix=/usr --disable-gtk3
+  ../configure \
+    --prefix=/usr \
+    --disable-gtk3
   make
 }
 
 package_galculator() {
   depends=('gtk3')
-
-  cd $pkgbase-$pkgver/gtk3
+  
+  cd "${pkgbase}-${pkgver}/gtk3"
   make DESTDIR="$pkgdir" install
 }
 
@@ -44,8 +48,10 @@
 package_galculator-gtk2() {
   pkgdesc+=' (GTK2 version)'
   depends=('gtk2')
-  conflicts=('galculator')
+  groups=('mate-extra')
+  replaces=('mate-calc')
+  conflicts=('galculator' 'mate-calc')
 
-  cd $pkgbase-$pkgver/gtk2
+  cd "${pkgbase}-${pkgver}/gtk2"
   make DESTDIR="$pkgdir" install
 }