5 files changed, 47 insertions, 21 deletions
diff --git a/network/kazehakase/README b/network/kazehakase/README
index 31dcc5742d..d4176b38dd 100644
--- a/network/kazehakase/README
+++ b/network/kazehakase/README
@@ -1,4 +1,4 @@
 Kazehakase is a GTK+2 web browser using Gecko as HTML rendering 
 engine. It supports tabbed browsing, a "remote bookmark" feature
-through RSS in a menu or a sidebar, a variable UI and customizable
+through RSS in a menu or a sidebar, a variable UI, and customizable
 mouse gestures and key accelerators.
diff --git a/network/kazehakase/doinst.sh b/network/kazehakase/doinst.sh
index 3f17567532..33f1dcfea4 100644
--- a/network/kazehakase/doinst.sh
+++ b/network/kazehakase/doinst.sh
@@ -1,18 +1,27 @@
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
+
+config etc/kazehakase/bookmarkbar.xml.new
+config etc/kazehakase/bookmarks.xml.new
+config etc/kazehakase/kz-ui-beginner.xml.new
+config etc/kazehakase/kz-ui-medium.xml.new
+config etc/kazehakase/kz-ui-expert.xml.new
+config etc/kazehakase/kz-ui-bookmarks.xml.new
 config etc/kazehakase/kzrc.new
 config etc/kazehakase/proxyrc.new
+config etc/kazehakase/smartbookmarks.xml.new
+config etc/kazehakase/mozilla/encodings.xml.new
 
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
 fi
diff --git a/network/kazehakase/kazehakase.SlackBuild b/network/kazehakase/kazehakase.SlackBuild
index d930b7430e..c26474622c 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
diff --git a/network/kazehakase/kazehakase.info b/network/kazehakase/kazehakase.info
index e8dec2ddbe..12783a32c4 100644
--- a/network/kazehakase/kazehakase.info
+++ b/network/kazehakase/kazehakase.info
@@ -1,8 +1,8 @@
 PRGNAM="kazehakase"
-VERSION="0.4.7"
+VERSION="0.5.4"
 HOMEPAGE="http://kazehakase.sourceforge.jp"
-DOWNLOAD="http://osdn.dl.sourceforge.jp/kazehakase/25610/kazehakase-0.4.7.tar.gz"
-MD5SUM="44d7105f394b982661ba0567a0d23b90"
+DOWNLOAD="http://osdn.dl.sourceforge.jp/kazehakase/30219/kazehakase-0.5.4.tar.gz"
+MD5SUM="75f8afb9ddf4493c3a1fb4eb38a044df"
 MAINTAINER="Michael Wagner"
 EMAIL="lapinours@web.de"
 APPROVED="rworkman"
diff --git a/network/kazehakase/slack-desc b/network/kazehakase/slack-desc
index 82948022d6..d480e32ea9 100644
--- a/network/kazehakase/slack-desc
+++ b/network/kazehakase/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---------------------------------------------------|
 kazehakase: Kazehakase (GTK+2 web browser)
 kazehakase:
 kazehakase: Kazehakase is a GTK+2 web browser using Gecko as HTML rendering