5 files changed, 74 insertions, 66 deletions
diff --git a/system/heirloom-doctools/README b/system/heirloom-doctools/README
index 4676635b9f..a4cbf8bfa6 100644
--- a/system/heirloom-doctools/README
+++ b/system/heirloom-doctools/README
@@ -8,20 +8,9 @@ which are a variant of ditroff, which, in turn, descends to the
 historical Unix troff that generated output for the C/A/T 
 phototypesetter.
 
-Tarball / CVS version:
-This SlackBuild can be used for the tarball-version, but also for 
-a cvs checkout version. To use the cvs version use:
-
-$ cvs -d:pserver:anonymous@heirloom.cvs.sourceforge.net:/cvsroot/heirloom login
-CVS password:<just type return>
-$ cvs -d:pserver:anonymous@heirloom.cvs.sourceforge.net:/cvsroot/heirloom co -P heirloom-doctools
-
-in this directory and call the SlackBuild with
-VERSION=latest ./heirloom-doctools.SlackBuild
-
 Path settings:
 The files get installed into /opt/heirloom . The included
 /etc/profile.d/heirloom.sh script sets the PATH to include this
 directory _in front of_ the usual paths, so that troff points
 to the heirloom version, not the gnu version. To enable this
-behaviour, make the heirloom.sh script executable. 
+behaviour, make the /etc/profile.d/heirloom.sh script executable.
diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild
index b7ae0f2953..cb77cb258a 100644
--- a/system/heirloom-doctools/heirloom-doctools.SlackBuild
+++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=heirloom-doctools
-VERSION=${VERSION:-080407}
+VERSION=${VERSION:-141029}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,20 +60,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-if [ "$VERSION" = "latest" ]; then
-	cp -r $CWD/$PRGNAM .
-	cd $PRGNAM
-else
-	tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
-	cd $PRGNAM-$VERSION
-fi
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
+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 {} \;
+ \( -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 {} \;
 
 patch < $CWD/patches/mk.config.patch-$VERSION
 
@@ -93,6 +88,9 @@ else
 cp -ar \
   README \
   LICENSE \
+  LICENSE.d \
+  CHANGES \
+  CHANGES_GR \
   $PKG/usr/doc/$PRGNAM-$VERSION
 fi
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info
index bbb33c6f54..51ffe76b12 100644
--- a/system/heirloom-doctools/heirloom-doctools.info
+++ b/system/heirloom-doctools/heirloom-doctools.info
@@ -1,8 +1,8 @@
 PRGNAM="heirloom-doctools"
-VERSION="080407"
-HOMEPAGE="http://heirloom.sourceforge.net/doctools.html"
-DOWNLOAD="http://downloads.sourceforge.net/heirloom/heirloom-doctools-080407.tar.bz2"
-MD5SUM="0fa9000c1508b793e533c6ffcaa0f647"
+VERSION="141029"
+HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html"
+DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/141029/heirloom-doctools-141029.tar.bz2"
+MD5SUM="023125f064b3093d24b46f10080c0bbb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/heirloom-doctools/patches/mk.config.patch-080407 b/system/heirloom-doctools/patches/mk.config.patch-080407
deleted file mode 100644
index ac84179f25..0000000000
--- a/system/heirloom-doctools/patches/mk.config.patch-080407
+++ /dev/null
@@ -1,38 +0,0 @@
---- mk.config	2008-04-07 20:42:01.000000000 +0200
-+++ mk.config.tarball	2013-03-25 00:42:05.491153492 +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.
diff --git a/system/heirloom-doctools/patches/mk.config.patch-141029 b/system/heirloom-doctools/patches/mk.config.patch-141029
new file mode 100644
index 0000000000..f7205fcede
--- /dev/null
+++ b/system/heirloom-doctools/patches/mk.config.patch-141029
@@ -0,0 +1,59 @@
+--- 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.