From c79a4c8e2d1524384c270c9264f68c066a0460d9 Mon Sep 17 00:00:00 2001
From: Ruben Schuller <code@rbn.im>
Date: Tue, 6 Jul 2021 01:47:10 +0200
Subject: system/heirloom-doctools: Updated for version 191015.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 .../heirloom-doctools/heirloom-doctools.SlackBuild | 22 ++++++++++++---
 system/heirloom-doctools/heirloom-doctools.info    |  8 +++---
 .../patches/mk.config.patch-160308                 | 32 ----------------------
 .../patches/mk.config.patch-191015                 | 32 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 40 deletions(-)
 delete mode 100644 system/heirloom-doctools/patches/mk.config.patch-160308
 create mode 100644 system/heirloom-doctools/patches/mk.config.patch-191015

diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild
index 4a07552240d0..ede6da59c2f4 100644
--- a/system/heirloom-doctools/heirloom-doctools.SlackBuild
+++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=heirloom-doctools
-VERSION=${VERSION:-160308}
+VERSION=${VERSION:-191015}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -82,8 +82,22 @@ find -L . \
 
 patch < $CWD/patches/mk.config.patch-$VERSION
 
-make
-make install ROOT=$PKG
+# with new bison this doesn't work anymore so we need berkeley yacc
+# also with newer gcc we need -fcommon as tryglf is defined multiple
+# times.
+SLKCFLAGS="$SLKCFLAGS -fcommon"
+
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure
+
+# we still need to build with -j1
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make -j1
+make -j1 install ROOT=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info
index 58f132757dec..135de49a9190 100644
--- a/system/heirloom-doctools/heirloom-doctools.info
+++ b/system/heirloom-doctools/heirloom-doctools.info
@@ -1,10 +1,10 @@
 PRGNAM="heirloom-doctools"
-VERSION="160308"
+VERSION="191015"
 HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html"
-DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/archive/160308/heirloom-doctools-160308.tar.gz"
-MD5SUM="f9759a099fca6b3021da33b94b1f37a9"
+DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/191015/heirloom-doctools-191015.tar.bz2"
+MD5SUM="fd32287f39d4e8ceae4783527742ea52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="byacc"
 MAINTAINER="Ruben Schuller"
 EMAIL="sb@rbn.im"
diff --git a/system/heirloom-doctools/patches/mk.config.patch-160308 b/system/heirloom-doctools/patches/mk.config.patch-160308
deleted file mode 100644
index 493eef5be7b7..000000000000
--- a/system/heirloom-doctools/patches/mk.config.patch-160308
+++ /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-191015 b/system/heirloom-doctools/patches/mk.config.patch-191015
new file mode 100644
index 000000000000..493eef5be7b7
--- /dev/null
+++ b/system/heirloom-doctools/patches/mk.config.patch-191015
@@ -0,0 +1,32 @@
+--- 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.
-- 
cgit v1.2.3