Update to 3.1.1

1 files changed, 156 insertions, 116 deletions

diff --git a/xerces-c/build/xerces-c.SlackBuild b/xerces-c/build/xerces-c.SlackBuild
index 07c10d95..70cddb7f 100755
--- a/xerces-c/build/xerces-c.SlackBuild
+++ b/xerces-c/build/xerces-c.SlackBuild
@@ -1,112 +1,149 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007,2008 Eric Hameleers <alien@slackware.com>
+# Copyright 2007, 2008, 2014  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:       xerces-c
-# Descr:     a validating XML parser
-# URL:       http://xml.apache.org/xerces-c/
-# Needs:     
-# 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.
+# By:          Eric Hameleers <alien@slackware.com>
+# For:         xerces-c
+# Descr:       a validating XML parser
+# URL:         http://xerces.apache.org/xerces-c/
+# Build needs: 
+# Needs:       
+# 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.
+# 3.1.1-1:     16/Mar/2014 by Eric Hameleers <alien@slackware.com>
+#              * Update for Slackware 14 +
 # 
-# Run 'sh xerces-c.SlackBuild --cleanup' to build a Slackware package.
-# The package (.tgz) plus descriptive .txt file are created in /tmp .
-# Install using 'installpkg'. 
+# Run 'sh xerces-c.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'. 
 #
 # -----------------------------------------------------------------------------
 
-# Set initial variables:
-
 PRGNAM=xerces-c
-SRCVER=${SRCVER:-2_8_0}
-VERSION=${VERSION:-2.8.0}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-3.1.1}
+MAJVER=$(echo $VERSION | cut -f1 -d.)
 BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:" -j4 "}
+TAG=${TAG:-alien}
 
-DOCS="KEYS LICENSE* NOTICE Readme.html STATUS credits.txt \
-      doc/index.html doc/html"
+DOCS="CREDITS INSTALL KEYS LICENSE NOTICE README"
+
+# If you want to have example binaries for xerces-c in the package,
+# then set this variable to "yes", otherwise set to "n0":
+WITH_SAMPLES=${WITH_SAMPLES:-no}
 
 # 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}
 
-# 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/xerces/c/sources/${PRGNAM}-src_${SRCVER}.tar.gz"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://apache.cs.utah.edu/xerces/c/${MAJVER}/sources/${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
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    armv6hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  s390)      SLKCFLAGS="-O2"
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  powerpc)   SLKCFLAGS="-O2"
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
              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=""
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
              ;;
 esac
 
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
+# 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}
+
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
+
+# Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
 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
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+rm -rf $OUTPUT/{configure,make,install,error,makepkg,patch}-$PRGNAM.log
+                          # remove old log files
 
-# --- Source file availability:
+# 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 [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   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 -T 30 -O "${SOURCE}" "${SRCURL}" || true
+    echo "Will download file to $(dirname $SOURCE)"
+    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
+      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."
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
     exit 1
   fi
 fi
@@ -124,75 +161,78 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file ${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf ${SOURCE}
-else
-  tar -xzvf ${SOURCE}
-fi
-mv ${PRGNAM}-src_${SRCVER} ${PRGNAM}-${VERSION}
+tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
-echo Building ...
+if [ "${WITH_SAMPLES}" == "no" ]; then
+  sed -i -e "/^SUBDIRS/s/samples//" Makefile.in
+fi
 
-export LDFLAGS="$SLKLDFLAGS" 
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export XERCESCROOT=$TMP/tmp-$PRGNAM/${PRGNAM}-${VERSION}
-
-( 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
+echo Building ...
+LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$TARGET \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+
+make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+
+# Add samples if needed:
+if [ "${WITH_SAMPLES}" != "no" ]; then
+  mkdir -p $PKG/usr/libexec/$PRGNAM/
+  mv $PKG/usr/bin/* $PKG/usr/libexec/$PRGNAM/
+  ( cd $PKG/usr
+    for PRG in libexec/$PRGNAM/* ; do
+      ln -s ../${PRG} $PKG/usr/bin/$(basename $PRG)
+    done
   )
-)
-
-( 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:
+fi
+
+# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-# We don't want this:
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/html/apiDocs
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# We also don't want this:
-rm -rf $PKG/usr/share/xerces-c/samples/Projects/Win32
+if [ "${WITH_SAMPLES}" != "no" ]; then
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/samples
+  cp -a samples/data $PKG/usr/doc/$PRGNAM-$VERSION/samples/
+fi
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+# 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
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+# 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
 
 # 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
-(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
-
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
+