1 files changed, 10 insertions, 12 deletions
diff --git a/libraries/yaz/yaz.SlackBuild b/libraries/yaz/yaz.SlackBuild
index 2100a9c62453f..7261c5ef4efc3 100644
--- a/libraries/yaz/yaz.SlackBuild
+++ b/libraries/yaz/yaz.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
  
 # SlackBuild script for yaz
-# Written by Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
+# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yaz
-VERSION=3.0.26
+VERSION=${VERSION:-3.0.36}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,17 +34,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Exit on most errors
-set -e
-
-DOCFILES="LICENSE NEWS README TODO ChangeLog"
-
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+# Exit on most errors
 set -e
 
 rm -rf $PKG
@@ -54,7 +50,11 @@ 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 .
+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 {} \;  
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -62,8 +62,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
   --disable-debug
 
 make
@@ -75,11 +73,11 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/yaz $PKG/usr/doc/$PRGNAM-$VERSION/html
 rm -rf $PKG/usr/share/doc
+cp -a LICENSE NEWS README TODO ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc