ap/EMBOSS: Cleaned up.

ap/EMBOSS/EMBOSS.SlackBuild

@@ -1,26 +1,29 @@
 #!/bin/bash
 # Build script for Slackware
-# Damien Goutte-Gattat "gouttegd" < damien.goutte-gattat at e.ujf-grenoble.fr >
+# Copyright (C) 2009 Damien Goutte-Gattat
 #
-# Redistribution and use of this script, with or without modifications, is
-# permitted provided that the following conditions are met:
+# Redistribution and use of this script, with or without modifications,
+# is permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# Contact: Damien Goutte-Gattat <damien.goutte-gattat@e.ujf-grenoble.fr
 #
 # Latest EMBOSS sourcecode is available at:
-# http://emboss.sourceforge.net/
+# <http://emboss.sourceforge.net/>.
 
 # Source package infos
 NAMESRC=${NAMESRC:-EMBOSS}
@@ -30,7 +33,7 @@ WGET=${WGET:-ftp://emboss.open-bio.org/pub/EMBOSS/$ARCHIVE}
 
 # Built package infos
 NAMETGZ=${NAMETGZ:-EMBOSS}
-BUILD=${BUILD:-1GGD}
+BUILD=${BUILD:-2GGD}
 ARCH=${ARCH:-i486}
 TARGET=${TARGET:-i486}
 
@@ -38,13 +41,13 @@ TARGET=${TARGET:-i486}
 TMP=${TMP:-/tmp}
 OUT=${OUT:-$TMP/build}
 PKG=${PKG:-$OUT/$NAMETGZ}
-JDK=${JDK:-/usr/lib/jdk1.6.0_11}
+JDK=${JDK:-/usr/lib/jdk1.6.0_11} # JDK home directory on Slackware 12.2
 CWD=$(pwd)
 
-set -e  # Quit if a command returns non-zero
+set -e
 
 # Sanity checks
-if [ $UID -eq 0 ]; then
+if [ "$(id -u)" = "0" ]; then
     echo "You should NOT run this script as ROOT!"
     exit 1
 fi
@@ -58,6 +61,9 @@ case "$ARCH" in
 i?86)
     CPUOPT="-O2 -march=$ARCH -mtune=i686"
     ;;
+x86_64)
+    CPUOPT="-O2 -fPIC"
+    ;;
 *)
     CPUOPT="-O2"
     ;;
@@ -65,7 +71,9 @@ esac
 
 # Get and verify the source archive
 if [ ! -r $ARCHIVE ]; then
-    wget "$WGET"
+    rm -f $ARCHIVE.part
+    wget -vc "$WGET" -O $ARCHIVE.part
+    mv $ARCHIVE.part $ARCHIVE
 fi
 sha1sum -c $ARCHIVE.sha1
 NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1)
@@ -107,8 +115,7 @@ install -m 644 \
   $PKG/usr/doc/$NAME
 
 # Copy slack-desc file
-mkdir -p $PKG/install
-install -m 644 $CWD/slack-desc $PKG/install/slack-desc
+install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
 
 # Package the tree
 cd $PKG