development/sip: Updated for version 4.7.9

3 files changed, 33 insertions, 26 deletions

diff --git a/development/sip/sip.SlackBuild b/development/sip/sip.SlackBuild
index 82d50c3fce..73c03a91be 100644
--- a/development/sip/sip.SlackBuild
+++ b/development/sip/sip.SlackBuild
@@ -2,17 +2,17 @@
 
 # Slackware build script for SIP
 
-# Written by Aleksandar B. Samardzic <asamardzic@matf.bg.ac.yu>
+# Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
-NAME=sip
-VERSION=4.7.4
+PRGNAM=sip
+VERSION=${VERSION:-4.7.9}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # See ./README for more information
@@ -22,6 +22,8 @@ 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
@@ -29,18 +31,22 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $NAME-$VERSION
-tar xvf $CWD/$NAME-$VERSION.tar.gz
-cd $NAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 python configure.py \
--b "$PREFIX/bin" \
--d "$PREFIX/lib/python2.5/site-packages" \
--e "$PREFIX/include/python2.5" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS"
+  -b "$PREFIX/bin" \
+  -d "$PREFIX/lib/python2.5/site-packages" \
+  -e "$PREFIX/include/python2.5" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS"
 
 make
 make install DESTDIR=$PKG
@@ -50,12 +56,13 @@ make install DESTDIR=$PKG
   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
-install -m 0644 ChangeLog LICENSE NEWS README THANKS TODO \
-  doc/* $CWD/$NAME.SlackBuild $PKG/usr/doc/$NAME-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 ChangeLog LICENSE NEWS README TODO doc/* \
+  $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION
+chown -R root:root $PKG/usr/doc
 
 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/sip/sip.info b/development/sip/sip.info
index 4d8e9849d1..b17cb302fd 100644
--- a/development/sip/sip.info
+++ b/development/sip/sip.info
@@ -1,8 +1,8 @@
 PRGNAM="sip"
-VERSION="4.7.4"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-DOWNLOAD="http://www.riverbankcomputing.com/Downloads/sip4/sip-4.7.4.tar.gz"
-MD5SUM="3bae6d0fb931fe2ddcd6f6c1da245afa"
-MAINTAINER="Aleksandar B. Samardzic"
-EMAIL="asamardzic@matf.bg.ac.yu"
-APPROVED="David Somero,rworkman"
+VERSION="4.7.9"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/"
+DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.7.9.tar.gz"
+MD5SUM="597d7ff7edb42a18421c806ffd18a136"
+MAINTAINER="Aleksandar Samardzic"
+EMAIL="asamardzic@gmail.com"
+APPROVED="dsomero"
diff --git a/development/sip/slack-desc b/development/sip/slack-desc
index 32f90f12d5..eb87ff5597 100644
--- a/development/sip/slack-desc
+++ b/development/sip/slack-desc
@@ -13,7 +13,7 @@ sip: for C and C++ libraries. It was originally developed to create
 sip: PyQt, the Python bindings for the Qt toolkit, but can be used to
 sip: create bindings for any C or C++ library.
 sip:
-sip: Homepage: http://www.riverbankcomputing.co.uk/sip/
+sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 sip:
 sip:
 sip: