graphics/feh: Updated for verson 1.14.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 54 insertions, 60 deletions

diff --git a/graphics/feh/README b/graphics/feh/README
index 6a3976c60763..16a78c11d5d1 100644
--- a/graphics/feh/README
+++ b/graphics/feh/README
@@ -1,9 +1,8 @@
-feh is an image viewer at heart, though it does other cool stuff 
+feh is an image viewer at heart, though it does other cool stuff.
 feh features include simple image viewing, multiple image viewing
 (slideshow), multiple image viewing in multiwindows, image viewing
 in fullscreen, image list mode, loadable/unloadable listing,
 recursive file opening, saving/loading filelists, loading images
 via http, reloading after delay, montage creation, and more.
- 
-NOTE:  feh requires giblib and imlib2, both available on SlackBuilds.org.  
-       When compiling, the order must be imlib2, then giblib, then feh.
+
+feh requires giblib and imlib2.
diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild
index ec17638bf378..9791a2f0c333 100644
--- a/graphics/feh/feh.SlackBuild
+++ b/graphics/feh/feh.SlackBuild
@@ -1,44 +1,41 @@
 #!/bin/sh
 
-# Slackware build script for feh 
+# Slackware build script for feh
 
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
+# Copyright 2011 Grigorios Bouzakis <grbzks@xsmail.com>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=feh
-VERSION=1.3.4
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.14}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -56,12 +53,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="COPYING"
+
+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.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,30 +70,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr
+make install \
+  DESTDIR=$PKG \
+  PREFIX=/usr \
+  man_dir=$PKG/usr/man \
+  doc_dir=$PKG/usr/doc/$PRGNAM-$VERSION \
+  example_dir=$PKG/usr/doc/$PRGNAM-$VERSION/examples
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# The Makefile already copies most of the docs; this does the rest
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a cam $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/feh/feh.info b/graphics/feh/feh.info
index fbcd8de560f6..7890708d8256 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -1,10 +1,10 @@
 PRGNAM="feh"
-VERSION="1.3.4"
-HOMEPAGE="http://linuxbrit.co.uk/feh/"
-DOWNLOAD="http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz"
-MD5SUM="3d35ba3d2f0693b019800787f1103891"
+VERSION="1.14"
+HOMEPAGE="http://feh.finalrewind.org"
+DOWNLOAD="http://feh.finalrewind.org/feh-1.14.tar.bz2"
+MD5SUM="6ece7e3f49d75b0cffc9ad1e7fc91739"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Chess Griffin"
-EMAIL="chess@chessgriffin.com"
-APPROVED="dsomero"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
+APPROVED="rworkman"
diff --git a/graphics/feh/slack-desc b/graphics/feh/slack-desc
index b525311f713b..ee823ce3a3f2 100644
--- a/graphics/feh/slack-desc
+++ b/graphics/feh/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----------------------------------------------------------|
 feh: feh (image viewer)
 feh:
 feh: feh features include simple image viewing, multiple image viewing
@@ -13,7 +13,7 @@ feh: (slideshow), multiple image viewing in multiwindows, image viewing
 feh: in fullscreen, image list mode, loadable/unloadable listing,
 feh: recursive file opening, saving/loading filelists, loading images
 feh: via http, reloading after delay, montage creation, and more.
-feh: 
-feh: Homepage:  http://linuxbrit.co.uk/feh/
-feh: 
-feh: 
+feh:
+feh: Homepage: http://feh.finalrewind.org
+feh:
+feh: