1 files changed, 27 insertions, 23 deletions
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
index d8f336c1e1..32760e310e 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for midori
 
 # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com>
+# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,35 +24,38 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -eu
-
 PRGNAM=midori
-VERSION=0.1.1
+VERSION=0.2.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG=_SBo}
+TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS ChangeLog INSTALL HACKING NEWS TODO"
+DOCS="AUTHORS COPYING ChangeLog EXPAT HACKING INSTALL TODO TRANSLATE docs/user/midori.txt"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION || exit 1
+cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find . \
@@ -62,30 +67,29 @@ find . \
 export CCFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 
-./waf configure --prefix=/usr
+./waf configure \
+   --prefix=/usr \
+   --libdir=/usr/lib$LIBDIRSUFFIX \
+   --docdir=/usr/doc/$PRGNAM-$VERSION \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --libdir=/usr/lib${LIBDIRSUFFIX} \
+   --enable-unique \
+   --enable-addons
 ./waf build
 ./waf install --destdir=$PKG
 
-# Standard autotools available, too.
-#./autogen.sh
-#CFLAGS="$SLKCFLAGS" \
-#CXXFLAGS="$SLKCFLAGS" \
-#./configure \
-#  --prefix=/usr \
-#  --libdir=/usr/lib \
-#  || exit 1
-
-#make || exit 1
-#make install-strip DESTDIR=$PKG || exit 1
+# Don't clobber existing configs
+mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new
+mv $PKG/etc/midori/extensions/libadblock.so/config $PKG/etc/midori/extensions/libadblock.so/config.new
 
-# Docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/midori.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/midori.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}