network/geomyidae: Update to v0.34

4 files changed, 15 insertions, 43 deletions

diff --git a/network/geomyidae/README b/network/geomyidae/README
index 049e047c6e43..8899a4b95eb9 100644
--- a/network/geomyidae/README
+++ b/network/geomyidae/README
@@ -7,6 +7,7 @@ Features:
 * search support in CGI files
 * logging (-l option) and loglevels (-v option)
 
-An rc.geomyidae is included which takes its startup options from the
-$GEOMYIDAE_ARGS environmental variable. Read
-/usr/doc/geomyidae-$VERSION/README for a list of the full options.
+An rc.geomyidae is included which takes its startup options
+from the $GEOMYIDAE_ARGS environmental variable. Read
+/usr/doc/geomyidae-$VERSION/README for a list of the full
+options.
diff --git a/network/geomyidae/geomyidae.SlackBuild b/network/geomyidae/geomyidae.SlackBuild
index c708c7ea994e..2db6aaeebc51 100644
--- a/network/geomyidae/geomyidae.SlackBuild
+++ b/network/geomyidae/geomyidae.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geomyidae
-VERSION=${VERSION:-v0.32}
+VERSION=${VERSION:-v0.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,6 +68,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i 's,PREFIX =.*,PREFIX = /usr,' Makefile
+sed -i 's,MANDIR = .*,MANDIR = ${PREFIX}/man/man8,' Makefile
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 make
@@ -77,17 +80,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.geomyidae.new > $PKG/etc/rc.d/rc.geomyidae.new
-
-mv $PKG/usr/share/man $PKG/usr
-rm -r $PKG/usr/share
+cat rc.d/rc.geomyidae > $PKG/etc/rc.d/rc.geomyidae.new
 
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE README LINKS index.gph \
+  LICENSE README LINKS index.gph gph \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/geomyidae/geomyidae.info b/network/geomyidae/geomyidae.info
index 5e3b36e65b44..68dc8ffdc683 100644
--- a/network/geomyidae/geomyidae.info
+++ b/network/geomyidae/geomyidae.info
@@ -1,10 +1,10 @@
 PRGNAM="geomyidae"
-VERSION="v0.32"
+VERSION="v0.34"
 HOMEPAGE="gopher://bitreich.org/1/scm/geomyidae/log.gph"
-DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.32.tgz"
-MD5SUM="4813053fe2b94bd572ebb002f070ecb7"
+DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz"
+MD5SUM="75c4e5864afc184514372b0a5922242d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
diff --git a/network/geomyidae/rc.geomyidae.new b/network/geomyidae/rc.geomyidae.new
deleted file mode 100644
index df491581d56e..000000000000
--- a/network/geomyidae/rc.geomyidae.new
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Array of all PIDS
-PID=($(pidof -o %PPID /usr/bin/geomyidae))
-
-case "$1" in
-    start)
-        echo "Starting geomyidae"
-        /usr/bin/geomyidae $GEOMYIDAE_ARGS 2>&1
-        if [ $? -gt 0 ]; then
-            echo "Startup failed"
-        fi
-        ;;
-    stop)
-        echo "Stopping all geomyidae processes"
-        [ -n "$PID" ] && kill ${PID[@]} >/dev/null
-        if [ $? -gt 0 ] && [ -n "$PID" ]; then
-            echo "Stopping failed for at least one process"
-        fi
-        ;;
-    restart)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-