Updated to CVS 20101125 for Slackware 13.1

1 files changed, 130 insertions, 93 deletions

diff --git a/sendxmpp/build/sendxmpp.SlackBuild b/sendxmpp/build/sendxmpp.SlackBuild
index 0effdd62..ed6f2843 100755
--- a/sendxmpp/build/sendxmpp.SlackBuild
+++ b/sendxmpp/build/sendxmpp.SlackBuild
@@ -1,49 +1,103 @@
 #!/bin/sh
 # $Id$
-# Written 2004,2007 by Eric Hameleers <alien@slackware.com>
+# Copyright 2004, 2007, 2010  Eric Hameleers, Eindhoven, NL
+# 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:       sendxmpp
-# Descr:     send xmpp -jabber- messages from the command line
-# URL:       http://sendxmpp.platon.sk/
-# Needs:     Getopt::Long and Net::XMPP
-# Changelog:
-# 0.0.6-1:   07/Dec/2004 by Eric Hameleers <alien@slackware.com>
-#            * Initial build.
-# 0.0.8-1:   27/Mar/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        sendxmpp
+# Descr:      send xmpp -jabber- messages from the command line
+# URL:        http://sendxmpp.platon.sk/
+# Needs:      
+# Changelog:  
+# 0.0.6-1:    07/Dec/2004 by Eric Hameleers <alien@slackware.com>
+#             * Initial build.
+# 0.0.8-1:    27/Mar/2007 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 20101125-1: 26/Nov/2010 by Eric Hameleers <alien@slackware.com>
+#             * Initial build.
 # 
-# Run 'sh sendxmpp.SlackBuild --cleanup' to build a Slackware package.
-# The package (.tgz) plus descriptive .txt file are created in /tmp .
-# Install using 'installpkg'. 
+# Run 'sh sendxmpp.SlackBuild' to build a Slackware package.
+# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
 
 PRGNAM=sendxmpp
-VERSION=${VERSION:-0.0.8}
-ARCH=noarch
+VERSION=${VERSION:-20101125}
+[ "$VERSION" = "HEAD"  ] && SRCVER=$(date +%Y%m%d) || SRCVER=$VERSION
 BUILD=${BUILD:-1}
+ARCH=noarch
+TAG=${TAG:-alien}
 
 DOCS="Changes MANIFEST README"
 
 # Where do we look for sources?
-CWD=`pwd`
-SRCDIR=`dirname $0`
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # 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.gz"
-SRCURL="http://sendxmpp.platon.sk/${PRGNAM}-${VERSION}.tar.gz"
+SOURCE="$SRCDIR/${PRGNAM}-${SRCVER}.tar.gz"
+#SRCURL="http://sendxmpp.platon.sk/${PRGNAM}-${SRCVER}.tar.gz"
+SRCURL=""
+
+# Use the src_checkout() function if no downloadable tarball exists.
+# This function checks out sources from SVN/CVS and creates a tarball of them.
+src_checkout() {
+  # Param #1 : index in the SOURCE[] array.
+  # Param #2 : full path to where SOURCE[$1] tarball should be created.
+  # Determine the tarball extension:
+  PEXT=$(echo "${2}" | sed -r -e 's/.*[^.].(tar.xz|tar.gz|tar.bz2|tgz).*/\1/')
+  case "$PEXT" in
+    "tar.xz") TARCOMP="J" ;;
+    "tar.gz") TARCOMP="z" ;;
+    "tgz") TARCOMP="z" ;;
+    "tar.bz2") TARCOMP="j" ;;
+    *) echo "Archive can only have extension 'tar.xz', '.tar.gz' '.tar.bz2' or '.tgz'" ; exit 1 ;;
+  esac
+  case ${1} in
+  0) # CVS checkout:
+     if [ "${VERSION}" == "HEAD" ]; then
+       mkdir $TMP/${PRGNAM}_temp_$$ \
+         && cd $TMP/${PRGNAM}_temp_$$ \
+         && cvs -d :pserver:anonymous@cvs.platon.sk:/home/cvs checkout sendxmpp \
+         && mv sendxmpp $PRGNAM-${SRCVER} \
+         && find $PRGNAM-${SRCVER} -type d -name '.cvs' -depth | xargs rm -rf \
+         && chown -R root:root $PRGNAM-${SRCVER} \
+         && tar -${TARCOMP}cf ${2} $PRGNAM-${SRCVER} \
+         && cd ..
+       rm -rf $TMP/${PRGNAM}_temp_$$
+     fi
+     ;;
+  *) # Do nothing
+     ;;
+  esac
+}
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -51,47 +105,44 @@ SRCURL="http://sendxmpp.platon.sk/${PRGNAM}-${VERSION}.tar.gz"
 
 # Exit the script on errors:
 set -e
-trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 # Catch unitialized variables:
 set -u
 P1=${1:-1}
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-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:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ ! -d $PKG ]; then
-  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
-
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
 
-# --- SOURCE FILE AVAILABILITY ---
+# Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+                          # remove old log files
 
+# Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename ${SOURCE})"
   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."
+    echo "Will download file to $(dirname $SOURCE)"
+    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Fail to download '$(basename ${SOURCE})'. Aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
   else
-    echo "File '`basename ${SOURCE}`' not available... aborting the build."
+    # Try if we have a SVN/CVS download routine for ${SOURCE}
+    echo "Will checkout sources to $(dirname $SOURCE)"
+    src_checkout 0 "${SOURCE}" 2>&1 > $OUTPUT/checkout-$(basename ${SOURCE}).log
+  fi
+  if [ ! -f "${SOURCE}" -o ! -s "${SOURCE}" ]; then
+    echo "File '$(basename ${SOURCE})' not available. Aborting the build."
     exit 1
   fi
 fi
@@ -104,72 +155,58 @@ fi
 # --- PACKAGE BUILDING ---
 
 echo "++"
-echo "|| $PRGNAM-$VERSION"
+echo "|| $PRGNAM-$SRCVER"
 echo "++"
 
 cd $TMP/tmp-$PRGNAM
-
-# Source extraction and compilation:
-tar xzvf ${SOURCE}
-chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
-cd ${PRGNAM}-${VERSION}
+echo "Extracting the source archive(s) for $PRGNAM..."
+tar -xvf ${SOURCE}
+cd ${PRGNAM}-${SRCVER}
+chown -R root:root .
+chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
-
 perl Makefile.PL 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 echo "" >> $OUTPUT/make-${PRGNAM}.log
 make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-mkdir -p $PKG/usr
-if `which installwatch > /dev/null 2>&1`; then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
-# Documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PRGNAM-$SRCVER
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$SRCVER || true
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$SRCVER/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$SRCVER
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
-# Move and compress the man page(s):
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
-[ -d $PKG/usr/man ] && \
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
 
 # Remove Perl special files and empty directories:
 cd $PKG
 find . -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
-find . -type d -depth -exec rmdir {} \; 2>/dev/null
+find . -type d -depth -exec rmdir {} \; 2>/dev/null || true
 cd -
 
-# 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 -
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Package description:
+# Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
-fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
 
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi