5 files changed, 34 insertions, 55 deletions
diff --git a/system/info2man/README b/system/info2man/README
index 7573dd917c..2cc5940532 100644
--- a/system/info2man/README
+++ b/system/info2man/README
@@ -2,4 +2,4 @@ info2man (convert GNU info files into man pages)
 
 info2pod converts GNU info data to POD format for easy transcription to
 various formats like HTML. info2man is a wrapper for info2pod to convert
-info files into nroff -man format.
+info files into nroff/man format.
diff --git a/system/info2man/flush.pl b/system/info2man/flush.pl
deleted file mode 100644
index 8aa6d5580c..0000000000
--- a/system/info2man/flush.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This library is no longer being maintained, and is included for backward
-# compatibility with Perl 4 programs which may require it.
-#
-# In particular, this should not be used as an example of modern Perl
-# programming techniques.
-#
-# Suggested alternative: IO::Handle
-#
-;# Usage: &flush(FILEHANDLE)
-;# flushes the named filehandle
-
-;# Usage: &printflush(FILEHANDLE, "prompt: ")
-;# prints arguments and flushes filehandle
-
-sub flush {
-    local($old) = select(shift);
-    $| = 1;
-    print "";
-    $| = 0;
-    select($old);
-}
-
-sub printflush {
-    local($old) = select(shift);
-    $| = 1;
-    print @_;
-    $| = 0;
-    select($old);
-}
-
-1;
diff --git a/system/info2man/info2man.SlackBuild b/system/info2man/info2man.SlackBuild
index 385cfd6ff8..54c56d52ca 100644
--- a/system/info2man/info2man.SlackBuild
+++ b/system/info2man/info2man.SlackBuild
@@ -6,8 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# The version number below is the modification time of the newest file
-# in the source tarball.
+# 20201102 bkw: update for v1.1_9 (debian's 1.1-9)
 
 # 20140907 bkw: original site blocks downloads based on user-agent. Host
 # the src on my own server. Only the .info file changed, not the script, so
@@ -15,7 +14,7 @@
 # Original download link: http://www.cskk.ezoshosting.com/cs/css/info2man.tar.gz
 
 PRGNAM=info2man
-VERSION=${VERSION:-20040717}
+VERSION=${VERSION:-1.1_9}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -27,36 +26,46 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+# Trying to teach myself to use bash string stuff instead of echoing
+# to 'cut' or whatever. But this is really hard to remember and read:
+SRCVER=${VERSION%%_*}
+DEBVER=${VERSION##*_}
+
 PERLMODDIR=/usr/share/info2pod
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM.tar.gz
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_${SRCVER}-${DEBVER}.debian.tar.xz
 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 640 -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 {} \+
+
+# Apply debian patches
+for i in $( cat debian/patches/series); do
+  patch -p1 < debian/patches/$i
+done
 
-# make the script use its own private perl module dir, so we don't
+# Make the script use its own private perl module dir, so we don't
 # pollute /usr/lib/perl5.
 sed -i -e '2iuse lib "'$PERLMODDIR'";' info2pod
 
-# this uses an ancient Perl 4 module called flush.pl. The damn thing is less
-# than 1KB in size, so I included it in the SlackBuild tarball. It came from
-# here: http://www.opensource.apple.com/source/perl/perl-21/perl/lib/flush.pl
-
 mkdir -p $PKG/usr/bin $PKG/$PERLMODDIR
 install -m0755 -oroot -groot $PRGNAM $PKG/usr/bin
 install -m0755 -oroot -groot info2pod $PKG/usr/bin
-install -m0644 -oroot -groot $CWD/flush.pl $PKG/$PERLMODDIR
 cp -r cs $PKG/$PERLMODDIR/cs
 
+# Include debian's man pages
+mkdir -p $PKG/usr/man/man1
+gzip -9c < debian/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+gzip -9c < debian/info2pod.1 > $PKG/usr/man/man1/info2pod.1.gz
+
+# 1.1_9 has 0README.txt, but it's mostly install instructions,
+# plus a bunch of cruft culled from the original author's other
+# projects. Don't bother.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/info2man/info2man.info b/system/info2man/info2man.info
index 4b94899821..d2349216cc 100644
--- a/system/info2man/info2man.info
+++ b/system/info2man/info2man.info
@@ -1,8 +1,10 @@
 PRGNAM="info2man"
-VERSION="20040717"
+VERSION="1.1_9"
 HOMEPAGE="https://packages.debian.org/sid/info2man"
-DOWNLOAD="https://slackware.uk/~urchlay/src/info2man.tar.gz"
-MD5SUM="303b9bf313e88558ff577806398f6c4c"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1-9.debian.tar.xz"
+MD5SUM="37e9cd74683e1832a4f27ad5c7961a7b \
+        0610fec52815b003df8732d3ab21f0f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/info2man/slack-desc b/system/info2man/slack-desc
index c70b27f087..4ba295af51 100644
--- a/system/info2man/slack-desc
+++ b/system/info2man/slack-desc
@@ -10,7 +10,7 @@ info2man: info2man (convert GNU info files into man pages)
 info2man:
 info2man: info2pod converts GNU info data to POD format for easy transcription
 info2man: to various formats like HTML. info2man is a wrapper for info2pod to
-info2man: convert info files into nroff -man format.
+info2man: convert info files into nroff/man format.
 info2man:
 info2man:
 info2man: