office/htmldoc: Updated for version 1.9.8.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 17 insertions, 17 deletions

diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild
index f88d47c057e2a..4cd6246b801c4 100644
--- a/office/htmldoc/htmldoc.SlackBuild
+++ b/office/htmldoc/htmldoc.SlackBuild
@@ -29,9 +29,18 @@
 # Feb 01 2017: Alfredo
 # Update script for html-1.8.29, fix the problem with /usr/share/htmldoc/data
 # not being copied into the package
+#
+#
+# May 01 2020: organixpear
+# Update script for htmldoc-1.9.8
+# This was a needed update as htmldoc-1.8.29 was 3 years out of date
+# and the build would fail on recent versions (current) of Slackware.
+# gnutls support was also found to be working in htmldoc-1.9.8 so
+# support was added. Misc updates and cleanups to install commands.
+#
 
 PRGNAM=htmldoc
-VERSION=${VERSION:-1.8.29}
+VERSION=${VERSION:-1.9.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,7 +57,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme"
+DOCFILES="CHANGES.md README.md COPYING"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -70,7 +79,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -113,22 +122,14 @@ make all
 # Copy some files who are not automatically installed (main binary, .desktop, icons, etc..)
 mkdir -p $PKG/usr/bin
 install -m 755 htmldoc/$PRGNAM $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-cp -a doc/$PRGNAM.1 $PKG/usr/man/man1
 mkdir -p $PKG/usr/share/applications
 cp -a desktop/$PRGNAM.desktop $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/mimelnk/application
-cp -a desktop/vnd.htmldoc-book.desktop $PKG/usr/share/mimelnk/application
 mkdir -p $PKG/usr/share/mime/packages
 cp -a desktop/htmldoc.xml $PKG/usr/share/mime/packages
-mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128}/apps/
-cp -a desktop/htmldoc-16.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
-cp -a desktop/htmldoc-24.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128,256x256}/apps/
 cp -a desktop/htmldoc-32.png $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
-cp -a desktop/htmldoc-48.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png
-cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png
 cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
+cp -a desktop/htmldoc-256.png $PKG/usr/share/icons/hicolor/256x256/apps/$PRGNAM.png
 mkdir -p $PKG/usr/share/htmldoc/
 cp -a fonts  $PKG/usr/share/htmldoc/
 cp -a data  $PKG/usr/share/htmldoc/
@@ -137,7 +138,6 @@ cp -a data  $PKG/usr/share/htmldoc/
 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
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 # Just in case ..
diff --git a/office/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info
index 5bdd183509d68..310daf33e402f 100644
--- a/office/htmldoc/htmldoc.info
+++ b/office/htmldoc/htmldoc.info
@@ -1,8 +1,8 @@
 PRGNAM="htmldoc"
-VERSION="1.8.29"
+VERSION="1.9.8"
 HOMEPAGE="https://www.msweet.org/htmldoc/index.html"
-DOWNLOAD="http://www.mirrorservice.org/sites/distfiles.finkmirrors.net/md5/dd2a05e2608d4f34db13c17a6667bb5e/htmldoc-1.8.29-source.tar.bz2"
-MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e"
+DOWNLOAD="https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.8/htmldoc-1.9.8-source.tar.gz"
+MD5SUM="71c7d0dd3b4e01cfc9b9e932b8b58f01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"