Update. The source URL changed slightly, too

1 files changed, 37 insertions, 78 deletions

diff --git a/xerces-c/build/xerces-c.SlackBuild b/xerces-c/build/xerces-c.SlackBuild
index 2ef5598d..fb9f3bbe 100755
--- a/xerces-c/build/xerces-c.SlackBuild
+++ b/xerces-c/build/xerces-c.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007,2008 Eric Hameleers <alien@slackware.com>
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
@@ -13,6 +13,8 @@
 # Changelog:
 # 2.7.0-1:   21/Jan/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 2.8.0-1:   09/Jan/2008 by Eric Hameleers <alien@slackware.com>
+#            * Initial build.
 # 
 # Run 'sh xerces-c.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -20,12 +22,11 @@
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
 
 PRGNAM=xerces-c
-SRCVER=${SRCVER:-2_7_0}
-VERSION=${VERSION:-2.7.0}
+SRCVER=${SRCVER:-2_8_0}
+VERSION=${VERSION:-2.8.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
@@ -42,9 +43,9 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
+# Input URL: http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
 SOURCE="$SRCDIR/${PRGNAM}-${SRCVER}.tar.gz"
-SRCURL="http://www.apache.org/dist/xml/${PRGNAM}/source/${PRGNAM}-src_${SRCVER}.tar.gz"
+SRCURL="http://www.apache.org/dist/xerces/c/sources/${PRGNAM}-src_${SRCVER}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -85,36 +86,21 @@ case "$ARCH" in
              ;;
 esac
 
-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
-
-
-# --- SOURCE FILE AVAILABILITY ---
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # 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 -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 ]; then
+    wget -nv -T 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
@@ -136,18 +122,7 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-cd $PKG
-
-# Explode the package framework:
-if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
-  explodepkg $SRCDIR/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
-
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
 echo "Extracting the source archive(s) for $PRGNAM..."
 if `file ${SOURCE} | grep -q ": bzip2"`; then
   tar -xjvf ${SOURCE}
@@ -156,67 +131,54 @@ else
 fi
 mv ${PRGNAM}-src_${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-
-# --- BUILDING ---
-
 echo Building ...
 
 export LDFLAGS="$SLKLDFLAGS" 
 export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
 export XERCESCROOT=$TMP/tmp-$PRGNAM/${PRGNAM}-${VERSION}
 
-pushd $XERCESCROOT/src/xercesc
-./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -P/usr 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-pushd $XERCESCROOT/samples
-./runConfigure -plinux -cgcc -xg++ 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-popd
-popd
-
-pushd $XERCESCROOT/src/xercesc
-make PREFIX=$PKG/usr install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
-mkdir -p $PKG/usr/bin
-# We don't want the obj directory
-install `find $XERCESCROOT/bin -type f -maxdepth 1` $PKG/usr/bin
-mkdir -p $PKG/usr/share/${PRGNAM}
-cp -a $XERCESCROOT/samples $PKG/usr/share/${PRGNAM}
-popd
-
+( cd  $XERCESCROOT/src/xercesc
+  ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads \
+    -P/usr 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+  ( cd $XERCESCROOT/samples
+    ./runConfigure -plinux -cgcc -xg++ \
+      2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
+    make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  )
+)
 
-# --- DOCUMENTATION ---
+( cd $XERCESCROOT/src/xercesc
+  make PREFIX=$PKG/usr install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+  mkdir -p $PKG/usr/bin
+  # We don't want the obj directory
+  install `find $XERCESCROOT/bin -type f -maxdepth 1` $PKG/usr/bin
+  mkdir -p $PKG/usr/share/${PRGNAM}
+  cp -a $XERCESCROOT/samples $PKG/usr/share/${PRGNAM}
+)
 
+# Add documentation to the package:
 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/*
 
-# Strip binaries
+# 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
-
-
-# --- 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
 
-
-# --- BUILDING ---
-
 # Build the package:
 cd $PKG
 makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
@@ -224,9 +186,6 @@ makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz
 (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 ---
-
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM