summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/feh/README1
-rw-r--r--graphics/feh/feh.SlackBuild14
-rw-r--r--graphics/feh/feh.info2
-rw-r--r--graphics/feh/slack-desc10
4 files changed, 16 insertions, 11 deletions
diff --git a/graphics/feh/README b/graphics/feh/README
index da570ce69d..6a3976c607 100644
--- a/graphics/feh/README
+++ b/graphics/feh/README
@@ -7,4 +7,3 @@ 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.
-
diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild
index ccfd4ff316..79d297d847 100644
--- a/graphics/feh/feh.SlackBuild
+++ b/graphics/feh/feh.SlackBuild
@@ -1,16 +1,14 @@
#!/bin/sh
# Slackware build script for feh
-
# Written by Chess Griffin <chess at chessgriffin dot com>
-# Modified by the SlackBuilds.org project
-PRGNAM=feh
-VERSION=1.3.4
+PRGNAM=feh
+VERSION=1.3.4
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -27,7 +25,6 @@ cd $TMP || exit 1
rm -rf $PRGNAM-$VERSION
tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
cd $PRGNAM-$VERSION || exit 1
-
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -45,13 +42,14 @@ make install-strip DESTDIR=$PKG || exit 1
if [ -d $PKG/usr/man ]; then
( 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
+ for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
)
fi
# 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 cam $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a cam $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 8f93cac30c..0de8ae1025 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz"
MD5SUM="3d35ba3d2f0693b019800787f1103891"
MAINTAINER="Chess Griffin"
EMAIL="chess@chessgriffin.com"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/graphics/feh/slack-desc b/graphics/feh/slack-desc
index 3bf29c55ed..b525311f71 100644
--- a/graphics/feh/slack-desc
+++ b/graphics/feh/slack-desc
@@ -1,4 +1,12 @@
-feh: feh is an image viewer at heart, though it does other cool stuff
+# 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 ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+feh: feh (image viewer)
feh:
feh: feh features include simple image viewing, multiple image viewing
feh: (slideshow), multiple image viewing in multiwindows, image viewing