1 files changed, 29 insertions, 12 deletions
diff --git a/network/kazehakase/kazehakase.SlackBuild b/network/kazehakase/kazehakase.SlackBuild
index d930b7430e37e..c26474622c044 100644
--- a/network/kazehakase/kazehakase.SlackBuild
+++ b/network/kazehakase/kazehakase.SlackBuild
@@ -23,31 +23,38 @@
 
 
 PRGNAM=kazehakase
-VERSION=0.4.7
+VERSION=0.5.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README* TODO*"
-
 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
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+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,7 +69,7 @@ make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 ( 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
 )
 
@@ -73,14 +80,24 @@ make install DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README* TODO* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Don't overwrite system-wide config files
-for i in kzrc proxyrc; do 
-  mv $PKG/etc/$PRGNAM/$i $PKG/etc/$PRGNAM/$i.new
-done 
+cd $PKG/etc/kazehakase
+  mv kzrc kzrc.new
+  mv proxyrc proxyrc.new
+  mv smartbookmarks.xml smartbookmarks.xml.new
+  mv bookmarks.xml bookmarks.xml.new
+  mv bookmarkbar.xml bookmarkbar.xml.new
+  mv kz-ui-bookmarks.xml kz-ui-bookmarks.xml.new
+  mv kz-ui-expert.xml kz-ui-expert.xml.new
+  mv kz-ui-medium.xml kz-ui-medium.xml.new
+  mv kz-ui-beginner.xml kz-ui-beginner.xml.new
+  mv mozilla/encodings.xml mozilla/encodings.xml.new
+cd -
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc