From 53449d93ca7456a1b7aa87b6d9669ca6a4a926a8 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 5 Jul 2014 08:10:50 +0700
Subject: academic/galculator: Updated for version 2.1.3 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/galculator/doinst.sh             |  5 +++++
 academic/galculator/galculator.SlackBuild | 33 +++++++++++++++----------------
 academic/galculator/galculator.info       | 10 +++++-----
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/academic/galculator/doinst.sh b/academic/galculator/doinst.sh
index 392c12adb9..5934a15ab1 100644
--- a/academic/galculator/doinst.sh
+++ b/academic/galculator/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/academic/galculator/galculator.SlackBuild b/academic/galculator/galculator.SlackBuild
index 34c8f27aff..6a35ff15a2 100644
--- a/academic/galculator/galculator.SlackBuild
+++ b/academic/galculator/galculator.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for galculator
 
 # Copyright 2008, 2009  Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=galculator
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,18 +55,20 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 LDFLAGS+=' -lm' \
 CFLAGS="$SLKCFLAGS" \
@@ -77,19 +80,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  || exit 1
-
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+  --build=$ARCH-slackware-linux
+make
+make install-strip DESTDIR=$PKG
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO doc/shortcuts \
+cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS doc/shortcuts \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/galculator/galculator.info b/academic/galculator/galculator.info
index 4e750de7f4..539c48b879 100644
--- a/academic/galculator/galculator.info
+++ b/academic/galculator/galculator.info
@@ -1,10 +1,10 @@
 PRGNAM="galculator"
-VERSION="2.1.2"
+VERSION="2.1.3"
 HOMEPAGE="http://galculator.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/galculator/galculator-2.1.2.tar.bz2"
-MD5SUM="01c97ec3e18c26c64af78dca9f700d43"
+DOWNLOAD="http://downloads.sourceforge.net/galculator/galculator-2.1.3.tar.bz2"
+MD5SUM="a7a333cc4c321507434fe3f8e48fcd0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
-- 
cgit v1.2.3