graphics/gpicview: Updated for version 0.2.1

5 files changed, 48 insertions, 57 deletions

diff --git a/graphics/gpicview/README b/graphics/gpicview/README
index fc689df6a0cc5..82117d29a698e 100644
--- a/graphics/gpicview/README
+++ b/graphics/gpicview/README
@@ -1,5 +1,4 @@
-A Simple And Fast Image Viewer With Low Memory Usage. This little
-program is not aimed to be powerful or feature-rich. It's aimed
-to replace the default image viewer of current desktop systems.
-Fast-startup, low memory usage, and simple user interface make
-it a good choice for default viewer.
+A Simple And Fast Image Viewer With Low Memory Usage.  This little program is 
+not aimed to be powerful or feature-rich.  It's aimed to replace the default 
+image viewer of current desktop systems.  Fast-startup, low memory usage, and 
+a simple user interface make it a good choice for default viewer.
diff --git a/graphics/gpicview/doinst.sh b/graphics/gpicview/doinst.sh
index 140e33222297c..4e8ba7071dea7 100644
--- a/graphics/gpicview/doinst.sh
+++ b/graphics/gpicview/doinst.sh
@@ -1,3 +1,4 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
diff --git a/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild
index e1175f0217997..29b5c52792ffe 100644
--- a/graphics/gpicview/gpicview.SlackBuild
+++ b/graphics/gpicview/gpicview.SlackBuild
@@ -1,29 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for GPicView
-
-# Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 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.
+# slackware build script for gpicview
+# Written Evandro Alves Rodrigues evandrofisico@gmail.com
 
 PRGNAM=gpicview
-VERSION=${VERSION:-0.1.11}
+VERSION=0.2.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,18 +16,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,21 +40,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAG="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  || exit 1
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -77,4 +66,4 @@ 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}
diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info
index c28e2bd8bd499..9be7ad1b7387f 100644
--- a/graphics/gpicview/gpicview.info
+++ b/graphics/gpicview/gpicview.info
@@ -1,8 +1,10 @@
 PRGNAM="gpicview"
-VERSION="0.1.11"
+VERSION="0.2.1"
 HOMEPAGE="http://lxde.sourceforge.net/gpicview/"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.1.11.tar.gz"
-MD5SUM="9d52a5d970f3057978b98fe511b55121"
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="dsomero"
+DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.1.tar.gz"
+MD5SUM="a2de255bf9bdc40746c0dc89b3454a10"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Evandro Alves Rodrigues"
+EMAIL="evandrofisico@gmail.com"
+APPROVED="rworkman"
diff --git a/graphics/gpicview/slack-desc b/graphics/gpicview/slack-desc
index c41a8c8291267..92f7e1de3e599 100644
--- a/graphics/gpicview/slack-desc
+++ b/graphics/gpicview/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
 
-        |-----handy-ruler------------------------------------------------------|
-gpicview: GPicView (Image Viewer)
+        |-----handy-ruler--------------------------------------------------|
+gpicview: GPicView (A Simple and Fast Image Viewer for X)
+gpicview:
+gpicview: GPicView is a simple image viewer made for the lxde desktop,
+gpicview: but has minimal dependencies and low memory usage, depending
+gpicview: only on gtk+ system libraries
+gpicview:
+gpicview:
 gpicview:
-gpicview: A Simple And Fast Image Viewer With Low Memory Usage. This little
-gpicview: program is not aimed to be powerful or feature-rich. It's aimed
-gpicview: to replace the default image viewer of current desktop systems.
-gpicview: Fast-startup, low memory usage, and simple user interface make
-gpicview: it a good choice for default viewer.
 gpicview:
-gpicview: Homepage: http://lxde.sourceforge.net/gpicview/
 gpicview:
 gpicview: