academic/xdrawchem: Updated for version 1.9.9

4 files changed, 18 insertions, 17 deletions

diff --git a/academic/xdrawchem/README b/academic/xdrawchem/README
index 5062d0ff719e..9e6abd78d30c 100644
--- a/academic/xdrawchem/README
+++ b/academic/xdrawchem/README
@@ -5,5 +5,5 @@ and write MDL Molfiles, and read ChemDraw text and binary files, to
 allow sharing between XDrawChem and other chemistry applications, 
 and it can create images in popular formats like PNG and EPS. 
 
-XDrawChem needs the openbabel library for which there is a build 
-script at SlackBuilds.org.
\ No newline at end of file
+XDrawChem needs the openbabel library, for which there is a build 
+script at SlackBuilds.org.
diff --git a/academic/xdrawchem/slack-desc b/academic/xdrawchem/slack-desc
index ce9535441cd4..7b79db04e723 100644
--- a/academic/xdrawchem/slack-desc
+++ b/academic/xdrawchem/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler------------------------------------------------------|
+         |-----handy-ruler---------------------------------------------------|
 xdrawchem: XDrawChem (Molecule Drawing Program)
 xdrawchem: 
 xdrawchem: XDrawChem is a two-dimensional molecule drawing program for Unix 
@@ -14,6 +14,6 @@ xdrawchem: drawing programs such as ChemDraw (TM, CambridgeSoft). It can read
 xdrawchem: and write MDL Molfiles, and read ChemDraw text and binary files, to 
 xdrawchem: allow sharing between XDrawChem and other chemistry applications, 
 xdrawchem: and it can create images in popular formats like PNG and EPS. 
+xdrawchem: 
 xdrawchem: Homepage:  http://xdrawchem.sourceforge.net/
-xdrawchem: ** XDrawChem requires the OpenBabel library. **
 xdrawchem: 
diff --git a/academic/xdrawchem/xdrawchem.SlackBuild b/academic/xdrawchem/xdrawchem.SlackBuild
index c25fed996a27..c5bfe15e0d9a 100644
--- a/academic/xdrawchem/xdrawchem.SlackBuild
+++ b/academic/xdrawchem/xdrawchem.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xdrawchem
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2008  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=xdrawchem
 VERSION=1.9.9
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,10 +41,10 @@ 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-w+r .
 
@@ -58,13 +57,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 # Install icon and desktop file
-install -D -m 0644 $CWD/xdrawchem.desktop  $PKG/usr/share/applications/xdrawchem.desktop
+install -D -m 0644 $CWD/xdrawchem.desktop \
+  $PKG/usr/share/applications/xdrawchem.desktop
 install -D -m 0644 xdrawchem/xdc.xpm $PKG/usr/share/pixmaps/xdc.xpm 
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,4 +85,4 @@ 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 -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/academic/xdrawchem/xdrawchem.info b/academic/xdrawchem/xdrawchem.info
index 73126a3ddbda..54fad094f2ba 100644
--- a/academic/xdrawchem/xdrawchem.info
+++ b/academic/xdrawchem/xdrawchem.info
@@ -1,7 +1,7 @@
 PRGNAM="xdrawchem"
 VERSION="1.9.9"
 HOMEPAGE="http://xdrawchem.sourceforge.net"
-DOWNLOAD="http://dl.sourceforge.net/xdrawchem/xdrawchem-1.9.9.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/xdrawchem/xdrawchem-1.9.9.tar.gz"
 MD5SUM="6343d031b3ea19a6606831c89b8006b2"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"