Update for Slackware 12.0

1 files changed, 169 insertions, 77 deletions

diff --git a/ifplugd/build/libdaemon.SlackBuild b/ifplugd/build/libdaemon.SlackBuild
index 614ca58e..1e98fe11 100755
--- a/ifplugd/build/libdaemon.SlackBuild
+++ b/ifplugd/build/libdaemon.SlackBuild
@@ -1,116 +1,208 @@
 #!/bin/sh
-# Copyright (c) 2006 Eric Hameleers <alien@sox.homeip.net>
-# Distributed under the terms of the GNU General Public License, Version 2
-# ------------------------------------------------------------------------------
+# $Id$
+# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
 #
-# Slackware SlackBuild script
+#   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:       libdaemon
+# Descr:     daemonising routines
 # URL:       http://0pointer.de/lennart/projects/libdaemon/
-# Needs:     n/a
+# Needs:     
 # Changelog:
 # 0.6-1:     13/apr/2004 by Eric Hameleers
 #            * Initial build
 # 0.8-1:     07/oct/2005 by Eric Hameleers
-#            * Initial build
-#
-# ------------------------------------------------------------------------------
-#
-# Issue 'sh SlackBuild --cleanup' to build a Slackware 8.1 package.
+#            * Upgrade.
+# 0.12-1:    25/Jul/2007 by Eric Hameleers <alien@slackware.com>
+#            * Upgrade.
+# 
+# Run 'sh libdaemon.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
-# Install using 'installpkg'.
+# Install using 'installpkg'. 
 #
-# ------------------------------------------------------------------------------
-
-
-# --- INIT ---
+# -----------------------------------------------------------------------------
 
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=libdaemon
-VERSION=0.8
-ARCH=i486
-BUILD=1
+VERSION=${VERSION:-0.12}
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1}
 
-PKG=$TMP/package-$PRGNAM
+DOCS="LICENSE doc/README doc/README.html doc/reference examples"
+
+# Where do we look for sources?
+CWD=`pwd`
+SRCDIR=`dirname $0`
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Input URL: http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://0pointer.de/lennart/projects/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+
+##
+## --- 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
+  MOPT=cpu
 fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
+
+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
 
-# Clean up left-overs
-rm -r $PKG/*
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
+fi
 
 # --- PACKAGE BUILDING ---
 
-# Explode the package framework:
-cd $PKG
-explodepkg $CWD/_$PRGNAM.tar.gz
-
-echo "+=================+"
-echo "| $PRGNAM-$VERSION |"
-echo "+=================+"
-
 cd $TMP/tmp-$PRGNAM
+echo "Extracting the source archive(s) for $PRGNAM..."
+if `file ${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE}
+elif `file ${SOURCE} | grep -q ": gzip"`; then
+  tar -xzvf ${SOURCE}
+fi
+cd ${PRGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+ 
+echo Building ...
+LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
+            --localstatedir=/var \
+            --sysconfdir=/etc \
+            --program-prefix="" \
+            --program-suffix="" \
+            --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, 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 DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+fi
 
-echo "Extracting the source tarball..."
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-
-cd $PRGNAM-$VERSION
-chown -R root.root .
-
-./configure  --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  | tee $CWD/config.log
-make 2>&1 | tee $CWD/make.log
-installwatch -o $CWD/install.log make DESTDIR=$PKG install
-
-
-# --- DOCUMENTATION ---
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a LICENSE doc/README doc/README.html doc/reference \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 mv $PKG/usr/doc/$PRGNAM-$VERSION/reference/man $PKG/usr/
-cp -a examples/{Makefile,testd.c} $PKG/usr/doc/$PRGNAM-$VERSION/examples
-chown root.root $PKG/usr/doc/$PRGNAM-$VERSION/*
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-gzip -9f $PKG/usr/man/*/*
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chown -R root.root $PKG
-chown  root.bin $PKG/usr/{bin,sbin}/*
-chmod -R o-w $PKG
-
-
-# --- PACKAGE DESCRIPTION ---
-
-mkdir -p $PKG/install 2>/dev/null
-cat $CWD/${PRGNAM}.slack-desc > $PKG/install/slack-desc
+# 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
 
+# 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 -
 
-# --- BUILDING ---
+# Add a package description:
+mkdir -p $PKG/install
+cat $SRCDIR/${PRGNAM.}slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz
-(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
-
-cd $CWD
+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
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi