development/swig: Updated for version 1.3.35

3 files changed, 32 insertions, 26 deletions

diff --git a/development/swig/slack-desc b/development/swig/slack-desc
index 19fb9e9ac6..df8d53514b 100644
--- a/development/swig/slack-desc
+++ b/development/swig/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+    |-----handy-ruler--------------------------------------------------------|
 swig: swig (interface compiler to connect C/C++ with scripting languages)
 swig:
 swig: SWIG is an interface compiler that connects programs written in C and
diff --git a/development/swig/swig.SlackBuild b/development/swig/swig.SlackBuild
index 8d66e67b9a..6c81bd3bd4 100644
--- a/development/swig/swig.SlackBuild
+++ b/development/swig/swig.SlackBuild
@@ -9,30 +9,35 @@
 
 # Modified by the SlackBuilds.org project
 
-NAME=swig
-VERSION=1.3.31
+PRGNAM=swig
+VERSION=1.3.35
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${PKG:-$TMP/package-$PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-rm -rf $PKG $TMP/$NAME-$VERSION
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-tar -zxvf $CWD/$NAME-$VERSION.tar.gz || exit 1
-cd $NAME-$VERSION || exit 1
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -40,26 +45,27 @@ CXXFLAGS="$SLKCFLAGS" \
   --exec-prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  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
 )
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ANNOUNCE CHANGES* FUTURE INSTALL LICENSE NEW README TODO Examples/ \
- Doc/Manual Doc/Devel  $PKG/usr/doc/$NAME-$VERSION
-cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+ Doc/Manual Doc/Devel  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Fix permissions and wipe the pdf bloat
-find $PKG/usr/doc/$NAME-$VERSION -type f -exec chmod 0644 {} \;
-find $PKG/usr/doc/$NAME-$VERSION -name "*.pdf" -exec rm {} \;
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.pdf" -exec rm {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/development/swig/swig.info b/development/swig/swig.info
index 5e175f3c31..2ffabc210e 100644
--- a/development/swig/swig.info
+++ b/development/swig/swig.info
@@ -1,8 +1,8 @@
 PRGNAM="swig"
-VERSION="1.3.31"
+VERSION="1.3.35"
 HOMEPAGE="http://www.swig.org/"
-DOWNLOAD="http://dl.sourceforge.net/swig/swig-1.3.31.tar.gz"
-MD5SUM="4a0bae63e3713e89b26db7209b6a7e05"
+DOWNLOAD="http://downloads.sourceforge.net/swig/swig-1.3.35.tar.gz"
+MD5SUM="9c2ca2332ebcdab55aa98518111d7cc9"
 MAINTAINER="hollywoodb"
 EMAIL="hollywoodb@fastmail.fm"
-APPROVED="rworkman,BP{k}"
+APPROVED="rworkman"