5 files changed, 28 insertions, 33 deletions
diff --git a/graphics/gpicview/README b/graphics/gpicview/README
index 0c8554d8ff008..fc689df6a0cc5 100644
--- a/graphics/gpicview/README
+++ b/graphics/gpicview/README
@@ -1,5 +1,5 @@
-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 simple user interface make
+it a good choice for default viewer.
diff --git a/graphics/gpicview/doinst.sh b/graphics/gpicview/doinst.sh
index 5dc6bb58c008d..140e33222297c 100644
--- a/graphics/gpicview/doinst.sh
+++ b/graphics/gpicview/doinst.sh
@@ -1,3 +1,3 @@
-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/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild
index af4983a6bd687..e1175f0217997 100644
--- a/graphics/gpicview/gpicview.SlackBuild
+++ b/graphics/gpicview/gpicview.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpicview
-VERSION=0.1.9
+VERSION=${VERSION:-0.1.11}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,21 +33,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS ChangeLog COPYING 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -61,25 +60,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --program-prefix="" \
-  --program-suffix="" \
-  --enable-shared=yes \
   --enable-static=no \
+  --build=$ARCH-slackware-linux \
   || exit 1
 
 make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
-find $PKG -type f -size 0c -exec rm {} \; 2>/dev/null
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 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
diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info
index ece5ebe09c8a2..c28e2bd8bd499 100644
--- a/graphics/gpicview/gpicview.info
+++ b/graphics/gpicview/gpicview.info
@@ -1,8 +1,8 @@
 PRGNAM="gpicview"
-VERSION="0.1.9"
+VERSION="0.1.11"
 HOMEPAGE="http://lxde.sourceforge.net/gpicview/"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.1.9.tar.gz"
-MD5SUM="c37161f93676e4c2cc60965c878bdc68"
+DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.1.11.tar.gz"
+MD5SUM="9d52a5d970f3057978b98fe511b55121"
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="David Somero"
+APPROVED="dsomero"
diff --git a/graphics/gpicview/slack-desc b/graphics/gpicview/slack-desc
index a7374257da70d..c41a8c8291267 100644
--- a/graphics/gpicview/slack-desc
+++ b/graphics/gpicview/slack-desc
@@ -1,18 +1,18 @@
 # 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)
 gpicview:
-gpicview: A Simple And Fast Image Viewer With Low Memory Usage. This
-gpicview: little program is not aimed to be powerful or feature-rich.
-gpicview: It's aimed to replace the default image viewer of current
-gpicview: desktop systems. Fast-startup, low memory usage, and simple
-gpicview: user interface make it a good choice for default viewer.
+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: