academic/galculator: Updated for version 1.3.1

4 files changed, 28 insertions, 21 deletions

diff --git a/academic/galculator/README b/academic/galculator/README
index f34f336019..5667b63ab4 100644
--- a/academic/galculator/README
+++ b/academic/galculator/README
@@ -1,4 +1,3 @@
 galculator is a GTK 2 based calculator with ordinary notation/reverse polish 
 notation, a formula entry mode, different number bases (DEC, HEX, OCT, BIN) 
 and different units of angular measure (DEG, RAD, GRAD).
-
diff --git a/academic/galculator/galculator.SlackBuild b/academic/galculator/galculator.SlackBuild
index 0d4d2f1e78..bd12d4fa24 100644
--- a/academic/galculator/galculator.SlackBuild
+++ b/academic/galculator/galculator.SlackBuild
@@ -2,16 +2,16 @@
 
 # Slackware build script for galculator
 
-# Written by MagicMan <MagicMan07@bluebottle.com>
+# Written by Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # No Guarantees. Use this SlackBuild at your own risk.
-# Public Domain 
+# Public Domain
 
 PRGNAM=galculator
-VERSION=1.2.5.2
+VERSION=1.3.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -28,9 +28,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xvjf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -40,29 +39,30 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
+  --program-prefix="" \
+  --program-suffix="" \
+  --enable-shared=yes \
   --enable-static=no \
   || exit 1
+
 make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
-if [ -d $PKG/usr/man ]; then
 ( 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
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
-fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Fix path to icon in desktop file
-sed -i 's#^Icon=\(.\+\)$#Icon=/usr/share/icons/gnome/48x48/apps/gnome-calculator.png#' \
-  $PKG/usr/share/applications/$PRGNAM.desktop || exit 1
+( cd $PKG/usr/share/pixmaps ; ln -sf galculator/galculator_48x48.png gnome-calc2.png )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/academic/galculator/galculator.info b/academic/galculator/galculator.info
index 98cde2bb61..c42482239e 100644
--- a/academic/galculator/galculator.info
+++ b/academic/galculator/galculator.info
@@ -1,8 +1,8 @@
 PRGNAM="galculator"
-VERSION="1.2.5.2"
+VERSION="1.3.1"
 HOMEPAGE="http://galculator.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/galculator/galculator-1.2.5.2.tar.bz2"
-MD5SUM="de1cb7d75c76e4fd9f05f100f303d0a2"
-MAINTAINER="MagicMan"
-EMAIL="MagicMan07@bluebottle.com"
-APPROVED="robw810"
+DOWNLOAD="http://downloads.sourceforge.net/galculator/galculator-1.3.1.tar.bz2"
+MD5SUM="683a4f0c2cb3d1f56b4c5610fc495c5f"
+MAINTAINER="Frank Caraballo"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="rworkman"
diff --git a/academic/galculator/slack-desc b/academic/galculator/slack-desc
index 3563dc57be..53957e3ab5 100644
--- a/academic/galculator/slack-desc
+++ b/academic/galculator/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 galculator: galculator (Scientific Calculator)
 galculator:
 galculator: galculator is a GTK 2 based calculator with ordinary