New release, rewrote the SlackBuild as well.

1 files changed, 90 insertions, 56 deletions

diff --git a/mcabber/build/mcabber.SlackBuild b/mcabber/build/mcabber.SlackBuild
index a3b119ca..c7411e89 100755
--- a/mcabber/build/mcabber.SlackBuild
+++ b/mcabber/build/mcabber.SlackBuild
@@ -9,7 +9,7 @@
 # By:        Eric Hameleers <alien@sox.homeip.net>
 # For:       mcabber
 # URL:       http://www.lilotux.net/~mikael/mcabber/
-# Needs:     openssl, ncurses
+# Needs:     openssl, ncurses, gpgme
 # Changelog:
 # 0.6.5-1:   17/Aug/2005 by Eric Hameleers <alien@sox.homeip.net>
 #            * Initial build.
@@ -35,6 +35,9 @@
 #            * New release.
 # 0.8.3-1:   19/nov/2006 by Eric Hameleers <alien@slackware.com>
 #            * New release. Lots of new features, read the changelog.
+# 0.9.0-1:   16/dec/2006 by Eric Hameleers <alien@slackware.com>
+#            * New release. Gpg encryption supported. Updated the SlackBuild.
+# 
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -44,22 +47,39 @@
 
 # --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=mcabber
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.9.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
 DOCS="AUTHORS COPYING ChangeLog NEWS README TODO mcabberrc.example \
       doc/mcabber.1.txt doc/mcabber.1.html doc/manpage.css contrib"
 
-SOURCE="${PRGNAM}-${VERSION}.tar.bz2"
+# 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}
+
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
 SRCURL="http://www.lilotux.net/~mikael/${PRGNAM}/files/${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
@@ -67,21 +87,24 @@ else
   MOPT=cpu
 fi
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-fi
-
-PKG=$TMP/package-$PRGNAM
+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=""
+           ;;
+  x86_64)  SLKCFLAGS="-O2"
+           SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+           ;;
+esac
 
 if [ ! -d $TMP/tmp-$PRGNAM ]; then
   mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$1" != "--oldbuild" ]; then
+elif [ "$P1" != "--oldbuild" ]; then
   # If the "--oldbuild" parameter is present, we keep
   #  the old build files and continue;
   # By default we remove the remnants of previous build and continue:
@@ -89,21 +112,37 @@ elif [ "$1" != "--oldbuild" ]; then
 fi
 
 if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
+  mkdir -p $PKG  # place for the package to be built
+else
+  rm -rf $PKG/*  # We always erase old package's contents:
+fi
+
+if [ ! -d $OUTPUT ]; then
+  mkdir -p $OUTPUT  # place for the package to be saved
 fi
 
-# Download the sources if requested
-if [ "x${SOURCE}" != "x" ] && ! [ -f ${CWD}/${SOURCE} ]; then
-  echo "Source '${SOURCE}' not available yet... will download now:"
-  wget -nv -O ${CWD}/${SOURCE} "${SRCURL}"
-  if [ $? -ne 0 ]; then
-    echo "Downloading '${SOURCE}' failed... aborting the build."
-    mv -f ${CWD}/${SOURCE} ${CWD}/${SOURCE}.FAIL
+
+# --- 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 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 ]; 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
 
-if [ "$1" == "--download" ]; then
+if [ "$P1" == "--download" ]; then
   echo "Download complete."
   exit 0
 fi
@@ -115,17 +154,11 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG   # place for the package to be built
-else
-  rm -rf $PKG/*   # cleanup target before the build
-fi
-
 cd $PKG
 
 # Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
+if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
+  explodepkg $SRCDIR/_$PRGNAM.tar.gz
 fi
 
 cd $TMP/tmp-$PRGNAM
@@ -133,19 +166,13 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the source archive for $PRGNAM..."
-if `file $CWD/${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf $CWD/${SOURCE}
+if `file ${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE}
 else
-  tar -xzvf $CWD/${SOURCE}
-fi
-if [ $? -ne 0 ]; then
-  echo "Error in unpacking '${SOURCE}!' Aborting..."
-  exit $?
+  tar -xzvf ${SOURCE}
 fi
 
 cd ${PRGNAM}-${VERSION}
-# Small patch for 0.8.0, will be fixed in next release:
-#patch -p1 < $CWD/fix_configure_ncurses.diff
 
 chown -R root:root *
 find . -perm 777 -exec chmod 755 {} \;
@@ -155,14 +182,19 @@ find . -perm 777 -exec chmod 755 {} \;
 
 echo Building ...
 
+LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
             --datarootdir=/usr \
             --datadir=/usr/share \
-            2>&1 | tee $CWD/configure-${PRGNAM}.log
-make 2>&1 | tee $CWD/make-${PRGNAM}.log
+            --program-prefix="" \
+            --program-suffix="" \
+            $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
@@ -170,9 +202,9 @@ make 2>&1 | tee $CWD/make-${PRGNAM}.log
 # Use installwatch if available:
 which installwatch > /dev/null 2>&1
 if [ $? == 0 ]; then
-  installwatch -o $CWD/install-${PRGNAM}.log make DESTDIR=$PKG install
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
-  make DESTDIR=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 # Install wrapper script:
@@ -283,9 +315,9 @@ chmod -R o-w $PKG
 # --- 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/slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
 
 
@@ -293,10 +325,12 @@ fi
 
 # Build the package:
 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 $PKG/install/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
+)
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
 
 # --- CLEANUP ---