6 files changed, 7 insertions, 145 deletions
diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild
index 6febdcd52c0e..e3247f65f33a 100644
--- a/system/heirloom-doctools/heirloom-doctools.SlackBuild
+++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for heirloom-doctools
 
-# Copyright 2013 - 2015 Ruben Schuller
+# Copyright 2013 - 2017 Ruben Schuller
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=heirloom-doctools
-VERSION=${VERSION:-150406}
+VERSION=${VERSION:-160308}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ 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.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info
index 73debbfab795..58f132757dec 100644
--- a/system/heirloom-doctools/heirloom-doctools.info
+++ b/system/heirloom-doctools/heirloom-doctools.info
@@ -1,10 +1,10 @@
 PRGNAM="heirloom-doctools"
-VERSION="150406"
+VERSION="160308"
 HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html"
-DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/150406/heirloom-doctools-150406.tar.bz2"
-MD5SUM="a612aa02565610f2eab5a26f2da261fe"
+DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/archive/160308/heirloom-doctools-160308.tar.gz"
+MD5SUM="f9759a099fca6b3021da33b94b1f37a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ruben Schuller"
-EMAIL="ruben@orgizm.net"
+EMAIL="sb@rbn.im"
diff --git a/system/heirloom-doctools/patches/mk.config.patch-141029 b/system/heirloom-doctools/patches/mk.config.patch-141029
deleted file mode 100644
index f7205fcede47..000000000000
--- a/system/heirloom-doctools/patches/mk.config.patch-141029
+++ /dev/null
@@ -1,59 +0,0 @@
---- mk.config	2014-12-07 12:21:28.266555391 +0100
-+++ mk.config.new	2014-12-07 12:12:19.892411011 +0100
-@@ -6,17 +6,17 @@
- #
- # Packaging prefix.
- #
--PREFIX=/usr/local
-+PREFIX=/opt/heirloom
- 
- #
- # Where to place binaries.
- #
--BINDIR=$(PREFIX)/ucb
-+BINDIR=$(PREFIX)/bin
- 
- #
- # Where to place libraries.
- #
--LIBDIR=$(PREFIX)/ucblib
-+LIBDIR=$(PREFIX)/lib
- 
- #
- # Where to place ASCII charts and the like.
-@@ -26,7 +26,7 @@
- #
- # Where to place manual pages.
- #
--MANDIR=$(PREFIX)/share/man
-+MANDIR=$(PREFIX)/man
- 
- #
- # Where to place the troff macro packages.
-@@ -68,7 +68,7 @@
- #
- # Binaries are stripped with this command after installation.
- #
--STRIP=strip -s -R .comment -R .note
-+STRIP=strip
- 
- #
- # The C compiler.
-@@ -83,7 +83,7 @@
- #
- # Compiler flags.
- #
--CFLAGS=-O
-+#CFLAGS=-O
- 
- #
- # C preprocessor flags.
-@@ -101,7 +101,7 @@
- #
- # Linker flags.
- #
--LDFLAGS=
-+#LDFLAGS=
- 
- #
- # Additional libraries to link with.
diff --git a/system/heirloom-doctools/patches/mk.config.patch-150406 b/system/heirloom-doctools/patches/mk.config.patch-150406
deleted file mode 100644
index 493eef5be7b7..000000000000
--- a/system/heirloom-doctools/patches/mk.config.patch-150406
+++ /dev/null
@@ -1,32 +0,0 @@
---- mk.config	2014-12-18 11:47:38.598721584 +0100
-+++ mk.config.new	2014-12-18 11:54:05.831880503 +0100
-@@ -6,17 +6,17 @@
- #
- # Packaging prefix.
- #
--PREFIX=/usr/local
-+PREFIX=/opt/heirloom
- 
- #
- # Where to place binaries.
- #
--BINDIR=$(PREFIX)/ucb
-+BINDIR=$(PREFIX)/bin
- 
- #
- # Where to place libraries.
- #
--LIBDIR=$(PREFIX)/ucblib
-+LIBDIR=$(PREFIX)/lib
- 
- #
- # Where to place ASCII charts and the like.
-@@ -26,7 +26,7 @@
- #
- # Where to place manual pages.
- #
--MANDIR=$(PREFIX)/share/heirloom-doctools/man
-+MANDIR=$(PREFIX)/man
- 
- #
- # Where to place the troff macro packages.
diff --git a/system/heirloom-doctools/patches/mk.config.patch-141217 b/system/heirloom-doctools/patches/mk.config.patch-160308
index 493eef5be7b7..493eef5be7b7 100644
--- a/system/heirloom-doctools/patches/mk.config.patch-141217
+++ b/system/heirloom-doctools/patches/mk.config.patch-160308
diff --git a/system/heirloom-doctools/patches/mk.config.patch-latest b/system/heirloom-doctools/patches/mk.config.patch-latest
deleted file mode 100644
index 58c7540cb0dc..000000000000
--- a/system/heirloom-doctools/patches/mk.config.patch-latest
+++ /dev/null
@@ -1,47 +0,0 @@
---- heirloom-doctools/mk.config	2008-04-07 20:55:15.000000000 +0200
-+++ heirloom-doctools/mk.config.new	2013-03-22 19:18:29.311264770 +0100
-@@ -1,22 +1,22 @@
- #
- # A BSD-compatible install command.
- #
--INSTALL=/usr/ucb/install
-+INSTALL=/usr/bin/install
- 
- #
- # Packaging prefix.
- #
--PREFIX=/usr
-+PREFIX=/opt/heirloom
- 
- #
- # Where to place binaries.
- #
--BINDIR=$(PREFIX)/ucb
-+BINDIR=$(PREFIX)/bin
- 
- #
- # Where to place libraries.
- #
--LIBDIR=$(PREFIX)/ucblib
-+LIBDIR=$(PREFIX)/lib
- 
- #
- # Where to place ASCII charts and the like.
-@@ -26,7 +26,7 @@
- #
- # Where to place manual pages.
- #
--MANDIR=$(PREFIX)/share/man/5man
-+MANDIR=$(PREFIX)/man
- 
- #
- # Where to place the troff macro packages.
-@@ -111,7 +111,7 @@
- #
- # A Bourne-compatible shell.
- #
--SHELL=/sbin/sh
-+SHELL=/bin/sh
- 
- #
- # Run ranlib if it is in the current path. This should take care