Updated script

1 files changed, 183 insertions, 149 deletions

diff --git a/psi/build/psi.SlackBuild b/psi/build/psi.SlackBuild
index 63934fe4..5d082c87 100755
--- a/psi/build/psi.SlackBuild
+++ b/psi/build/psi.SlackBuild
@@ -1,17 +1,34 @@
 #!/bin/sh
-# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
-# Distributed under the terms of the GNU General Public License, Version 2
 # $Id$
+# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
 # By:        Eric Hameleers <alien@slackware.com>
 # For:       psi
+# Descr:     Jabber client for X with Qt gui
 # URL:       http://psi-im.org/
-# Needs:     Qt 3.1.0 *multithreaded*
-#            zlib 1.1.4
-# Optional:  qca 1.0, qca-tls 1.0 (for SLL/TLS connections to the server)
+# Needs:     
 # Changelog:
 # 0.9.2-1:   07/dec/2004 by Eric Hameleers
 #            * Initial build.
@@ -32,55 +49,132 @@
 # 0.10-2:    02/mar/2006 by Eric Hameleers <alien@slackware.com>
 #            * Added missing pixmaps icon; fixed ownership of binary.
 #              Fixed building of the language pack.
+# 0.10-3:    08/Sep/2007 by Eric Hameleers <alien@slackware.com>
+#            * Updated SlackBuild, for a Slackware 12.0 package.
+#              Moved old 'qca' package files to their own package dir (qca is
+#              part of Slackware 12.0)
 # 
-# Run 'sh SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh psi.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=psi
-VERSION=0.10
+VERSION=${VERSION:-0.10}
 ARCH=${ARCH:-i486}
-BUILD=2
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-fi
+BUILD=${BUILD:-3}
 
-PKG=$TMP/package-$PRGNAM
+# We are going to download and add the following language packs for psi:
+LANG="es eo fr hu nl pl pt_BR sl vi bg mk"
+LANGURLBASE="http://psi-im.org/files/translation/${VERSION}/"
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+DOCS="COPYING ChangeLog README TODO"
+
+# Where do we look for sources?
+CWD=`pwd`
+SRCDIR=`dirname $0`
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Make sure you edit SRCURL when you change the program's VERSION
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
+SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
+
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+  MOPT=tune
 else
-  rm -rf $TMP/tmp-$PRGNAM/*
+  MOPT=cpu
 fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
-else
-  rm -rf $PKG/*
-  rm -rf $PKG-lang/*
+
+case "$ARCH" in
+  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+esac
+
+# Create working directories:
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
+
+# Source file availability:
+if ! [ -f ${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename ${SOURCE}`"
+    echo "Source '`basename ${SOURCE}`' not available yet..."
+    echo "Will download file to `dirname $SOURCE`"
+    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Downloading '`basename ${SOURCE}`' failed.. aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
+      exit 1
+    fi
+  else
+    echo "File '`basename ${SOURCE}`' not available.. aborting the build."
+    exit 1
+  fi
 fi
 
-# Get the source archive if not yet present
-if ! [ -f ${PRGNAM}-${VERSION}.tar.bz2 ]; then
-  echo "Downloading source archive for $PRGNAM - ${VERSION}"
-  URL="http://ovh.dl.sourceforge.net/sourceforge/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
-  wget -nv "$URL"
-  if [ $? -ne 0 ]; then echo "Download failed! Aborting the build."; exit 1; fi
+for lang in $LANG ; do
+  LANGURL="${LANGURLBASE}/${PRGNAM}_${lang}.qm"
+  LANGSRC="${SRCDIR}/${PRGNAM}_${lang}.qm"
+  if ! [ -f ${LANGSRC} ]; then
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || ${LANGSRC}="$OUTPUT/`basename ${LANGSRC}`"
+    echo "Source '`basename ${LANGSRC}`' not available yet..."
+    echo "Will download file to `dirname $LANGSRC`"
+    wget -nv --connect-timeout=30 -O "${LANGSRC}" "${LANGURL}" || true
+    if [ $? -ne 0 -o ! -s "${LANGSRC}" ]; then
+      echo "Downloading '`basename ${LANGSRC}`' failed.. aborting the build."
+      mv -f "${LANGSRC}" "${LANGSRC}".FAIL
+      exit 1
+    else
+      echo "File '`basename ${LANGSRC}`' not available.. aborting the build."
+      exit 1
+    fi
+  fi
+done
+
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
 fi
 
 # --- PACKAGE BUILDING ---
@@ -89,148 +183,88 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-
-cd $PKG
-
-# Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
-
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
-echo "Extracting the program tarball for $PRGNAM..."
-tar -xjvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
-
+echo "Extracting the source archive(s) for $PRGNAM..."
+if `file ${SOURCE[$i]} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE[$i]}
+elif `file ${SOURCE[$i]} | grep -q ": gzip"`; then
+  tar -xzvf ${SOURCE[$i]}
+fi
 cd ${PRGNAM}-${VERSION}
-
-chown -R root.root *
-
-
-# --- BUILDING ---
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-
+LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
-            2>&1 | tee $CWD/configure-${PRGNAM}.log
-make 2>&1 | tee $CWD/make-${PRGNAM}.log
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
+            --build=$ARCH-slackware-linux \
+            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-#
 # Install all the needed stuff to the package dir
-#
-# Use installwatch if available:
-which installwatch > /dev/null 2>&1
-if [ $? == 0 ]; then
-  installwatch -o $CWD/install-${PRGNAM}.log make INSTALL_ROOT=$PKG install
+# Use installwatch if available, to produce a logfile of the installation
+# process that is more easily readable:
+if `which installwatch > /dev/null 2>&1`; then
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
-  make INSTALL_ROOT=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 # Not only KDE wants a pixmap
 mkdir -p $PKG/usr/share/pixmaps/
 cp $PKG/usr/share/icons/hicolor/32x32/apps/psi.png $PKG/usr/share/pixmaps/
 
-# --- DOCUMENTATION ---
-
-DOCS="COPYING ChangeLog README TODO"
-
+# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R -w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# Compress the man page(s)
-gzip -9f $PKG/usr/man/*/*
-
-# Strip binaries
-( 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
-)
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-chown -R root:bin $PKG/usr/bin $PKG/usr/sbin \
-               $PKG/bin $PKG/sbin 2>/dev/null
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+fi
 
-# --- PACKAGE DESCRIPTION ---
+# Strip binaries:
+cd $PKG
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd -
 
+# Add a package description:
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $SRCDIR/${PRGNAM}.slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
 
-
-# --- BUILDING ---
-
-#
 # Separate package "psi-lang" for the language translation files
-# --- language pack build ---
-#
-LANG="es eo fr hu nl pl pt_BR sl vi bg mk"
-for NN in $LANG; do
-  if ! [ -f $CWD/${PRGNAM}_${NN}.qm ]; then
-    echo "Getting language pack '$NN' for $PRGNAM - version ${VERSION}"
-    URL="http://psi-im.org/files/translation/${VERSION}/${PRGNAM}_${NN}.qm"
-    wget -nv "$URL" -O $CWD/${PRGNAM}_${NN}.qm
-  fi
-done
-
-
 # Add some translations
 mkdir -p ${PKG}-lang/usr/share/psi
-cp $CWD/psi_*.qm ${PKG}-lang/usr/share/psi/
+cp $(dirname $LANGSRC)/psi_*.qm ${PKG}-lang/usr/share/psi/
 mkdir -p ${PKG}-lang/install
-cat <<-ENDDESC > ${PKG}-lang/install/slack-desc
-	# 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------------------------------------------------------|
-	psi-lang: psi-lang (Language pack for Psi)
-	psi-lang:
-	psi-lang: Psi is a multi-platform Jabber client.
-	psi-lang: This package adds several translations as a package to the Psi
-	psi-lang: installation (release ${VERSION})
-	psi-lang: Available are: ${LANG}
-	psi-lang:
-	psi-lang:
-	psi-lang:
-	psi-lang: Homepage is http://psi-im.org/
-	psi-lang:
-	ENDDESC
-
-cd ${PKG}-lang
-makepkg --linkadd y --chown n $TMP/${PRGNAM}-lang-$VERSION-noarch-$BUILD.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}-lang.log
-(cd $TMP && md5sum ${PRGNAM}-lang-$VERSION-noarch-$BUILD.tgz > ${PRGNAM}-lang-$VERSION-noarch-$BUILD.tgz.md5)
-cat install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-lang-$VERSION-noarch-$BUILD.txt
+cat $SRCDIR/${PRGNAM}-lang.slack-desc | sed -e "s/@@LANG@@/$LANG/" \
+  > ${PKG}-lang/install/slack-desc
 
-# --- end language pack build ---
-
-# Build the package:
+# Build the packages:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5)
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
-
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
-# --- CLEANUP ---
+cd ${PKG}-lang
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-lang-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}-lang.log
+cd $OUTPUT
+md5sum ${PRGNAM}-lang-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-lang-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+cd -
+cat ${PKG}-lang/install/slack-desc | grep "^${PRGNAM}-lang" > $OUTPUT/${PRGNAM}-lang-${VERSION}-${ARCH}-${BUILD}.txt
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
-  rm -rf $PKG-lang
+  rm -rf ${PKG}-lang
 fi