academic/chemtool: Updated for version 1.6.9

5 files changed, 51 insertions, 40 deletions

diff --git a/academic/chemtool/chemtool.SlackBuild b/academic/chemtool/chemtool.SlackBuild
index c6b35eaa9b47..a17e7e693bb3 100644
--- a/academic/chemtool/chemtool.SlackBuild
+++ b/academic/chemtool/chemtool.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chemtool
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2009  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=chemtool
 VERSION=1.6.9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,16 +35,21 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
@@ -53,39 +57,39 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --program-prefix="" \
-  --program-suffix="" \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/chemtool.png $PKG/usr/share/pixmaps/chemtool.png 
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat $CWD/chemtool.png > $PKG/usr/share/pixmaps/chemtool.png 
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a examples/ ChangeLog INSTALL NEWS README TODO using_chemtool.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    find . -type f -exec chmod 0644 {} \;
-    find . -type f -exec gzip -9 {} \;
-    for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-  )
-fi
+( cd $PKG/usr/man
+  find . -type f -exec chmod 0644 {} \;
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/chemtool/chemtool.desktop b/academic/chemtool/chemtool.desktop
index faf1d0794c4f..aa2b809f7714 100644
--- a/academic/chemtool/chemtool.desktop
+++ b/academic/chemtool/chemtool.desktop
@@ -1,11 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Terminal=false
-Icon=/usr/share/pixmaps/chemtool.png
+Icon=chemtool
 Type=Application
-InitialPreference=2
-Categories=Application;Graphics;
+Categories=Graphics;
 Exec=chemtool
 MimeType=application/x-chemtool;
 Name=ChemTool
diff --git a/academic/chemtool/chemtool.info b/academic/chemtool/chemtool.info
index 97914a317729..01e1e5a24006 100644
--- a/academic/chemtool/chemtool.info
+++ b/academic/chemtool/chemtool.info
@@ -2,7 +2,9 @@ PRGNAM="chemtool"
 VERSION="1.6.9"
 HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool"
 DOWNLOAD="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.9.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="d13b16c019a9912cf0c3de07ca5bcd29"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="BP{k},rworkman"
+APPROVED="BP{k}"
diff --git a/academic/chemtool/doinst.sh b/academic/chemtool/doinst.sh
index f8e99cff18a9..9830478e8cc7 100644
--- a/academic/chemtool/doinst.sh
+++ b/academic/chemtool/doinst.sh
@@ -1,7 +1,14 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 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/chemtool/slack-desc b/academic/chemtool/slack-desc
index 86fc95d57809..f68a7cad17bb 100644
--- a/academic/chemtool/slack-desc
+++ b/academic/chemtool/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler------------------------------------------------------|
 chemtool: ChemTool  (Chemical Molecule Drawing Program)
-chemtool: 
+chemtool:
 chemtool: Chemtool is a small program for drawing chemical structures on
 chemtool: Linux and Unix systems using the GTK toolkit under X11.
-chemtool: 
-chemtool: Homepage:  http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
-chemtool: 
-chemtool: 
-chemtool: 
-chemtool: 
-chemtool: 
+chemtool:
+chemtool: Homepage: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
+chemtool:
+chemtool:
+chemtool:
+chemtool:
+chemtool: