4 files changed, 31 insertions, 20 deletions
diff --git a/misc/pinfo/README b/misc/pinfo/README
index 552a60b072f6c..ad750c3d7d221 100644
--- a/misc/pinfo/README
+++ b/misc/pinfo/README
@@ -1,3 +1,5 @@
+pinfo (info file viewer)
+
 Pinfo is an info file viewer. It was created when the author, Przemek Borys,
 was very depressed trying to read gtk info entries using the standard tools.
 
diff --git a/misc/pinfo/doinst.sh b/misc/pinfo/doinst.sh
index 4fce284ce9aad..3354151c293ee 100644
--- a/misc/pinfo/doinst.sh
+++ b/misc/pinfo/doinst.sh
@@ -13,3 +13,6 @@ config() {
 
 config etc/pinforc.new
 
+if [ -x /usr/bin/install-info ]; then
+  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/pinfo.info.gz 2> /dev/null
+fi
diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild
index 45e102f2d0ef7..868bf1c597740 100644
--- a/misc/pinfo/pinfo.SlackBuild
+++ b/misc/pinfo/pinfo.SlackBuild
@@ -5,6 +5,8 @@
 # Copyright 2009 Arun Prasannan - http://arunprasannan.com
 # All rights reserved.
 #
+# Now maintained by B. Watson <yalhcru@gmail.com>.
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,8 +24,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20191221 bkw:
+# - take over maintenance.
+# - upgrade for v0.6.13... though if you really need to, you can still
+#   build 0.6.9 or 0.6.10 by setting VERSION in the environment.
+# - pinfo development moved to github, change homepage.
+# - add info dir entry in doinst.sh.
+
 PRGNAM=pinfo
-VERSION=${VERSION:-0.6.9}
+VERSION=${VERSION:-0.6.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +69,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.[bg]z* # allow old .bz2 and new .gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+[ -e configure ] || sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -77,22 +85,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-static \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/info/$PRGNAM.info $PKG/usr/man/man1/$PRGNAM.1
+rm -f $PKG/usr/info/dir
 
 # Let's not clobber the config file
 mv $PKG/etc/pinforc $PKG/etc/pinforc.new
 
-find $PKG/usr/man -type f | xargs gzip -9
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog COPYING INSTALL NEWS README TECHSTUFF \
+cp -a AUTHORS Change[lL]og* COPYING NEWS README* TECHSTUFF \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/pinfo/pinfo.info b/misc/pinfo/pinfo.info
index 234f173e8f06e..8e6cedf1fb29b 100644
--- a/misc/pinfo/pinfo.info
+++ b/misc/pinfo/pinfo.info
@@ -1,10 +1,10 @@
 PRGNAM="pinfo"
-VERSION="0.6.9"
-HOMEPAGE="https://alioth-archive.debian.org/releases/pinfo/pinfo/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/pinfo-0.6.9.tar.bz2"
-MD5SUM="e0c788467945f5f97fbacad55863e5b8"
+VERSION="0.6.13"
+HOMEPAGE="https://github.com/baszoetekouw/pinfo"
+DOWNLOAD="https://github.com/baszoetekouw/pinfo/archive/v0.6.13/pinfo-0.6.13.tar.gz"
+MD5SUM="b2671c8f6ef0aa5d7c6460c3111e2f50"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Arun Prasannan"
-EMAIL="polar@arunprasannan.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"