htmldoc: 1.8.28 -> 1.8.30

4 files changed, 94 insertions, 89 deletions

diff --git a/htmldoc/.footprint b/htmldoc/.footprint
index b45ded769..ed6cf7965 100644
--- a/htmldoc/.footprint
+++ b/htmldoc/.footprint
@@ -1,86 +1,93 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/htmldoc
+-r-xr-xr-x	root/root	usr/bin/htmldoc
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/htmldoc.1.gz
+-r--r--r--	root/root	usr/man/man1/htmldoc.1.gz
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-r--r--r--	root/root	usr/share/applications/htmldoc.desktop
 drwxr-xr-x	root/root	usr/share/htmldoc/
 drwxr-xr-x	root/root	usr/share/htmldoc/data/
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1250
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1251
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1252
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1253
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1254
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1255
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1256
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1257
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-1258
--rw-r--r--	root/root	usr/share/htmldoc/data/cp-874
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-1
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-14
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-15
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-2
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-3
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-4
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-5
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-6
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-7
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-8
--rw-r--r--	root/root	usr/share/htmldoc/data/iso-8859-9
--rw-r--r--	root/root	usr/share/htmldoc/data/koi8-r
--rw-r--r--	root/root	usr/share/htmldoc/data/prolog.ps
--rw-r--r--	root/root	usr/share/htmldoc/data/psglyphs
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1250
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1251
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1252
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1253
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1254
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1255
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1256
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1257
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-1258
+-r--r--r--	root/root	usr/share/htmldoc/data/cp-874
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-1
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-14
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-15
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-2
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-3
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-4
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-5
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-6
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-7
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-8
+-r--r--r--	root/root	usr/share/htmldoc/data/iso-8859-9
+-r--r--r--	root/root	usr/share/htmldoc/data/koi8-r
+-r--r--r--	root/root	usr/share/htmldoc/data/prolog.ps
+-r--r--r--	root/root	usr/share/htmldoc/data/psglyphs
 drwxr-xr-x	root/root	usr/share/htmldoc/fonts/
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-BoldOblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-BoldOblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-Oblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier-Oblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Courier.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Dingbats.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Dingbats.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-BoldOblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-BoldOblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Oblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Oblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Helvetica.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-BoldOblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-BoldOblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Oblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Oblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Monospace.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-BoldOblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-BoldOblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-Oblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans-Oblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Sans.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-BoldOblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-BoldOblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Oblique.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Oblique.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Roman.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Serif-Roman.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Symbol.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Symbol.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Bold.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Bold.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-BoldItalic.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-BoldItalic.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Italic.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Italic.pfa
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Roman.afm
--rw-r--r--	root/root	usr/share/htmldoc/fonts/Times-Roman.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-BoldOblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-BoldOblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-Oblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier-Oblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Courier.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Dingbats.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Dingbats.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-BoldOblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-BoldOblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Oblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica-Oblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Helvetica.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-BoldOblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-BoldOblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Oblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace-Oblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Monospace.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-BoldOblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-BoldOblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-Oblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans-Oblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Sans.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-BoldOblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-BoldOblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Oblique.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Oblique.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Roman.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Serif-Roman.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Symbol.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Symbol.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Bold.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Bold.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-BoldItalic.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-BoldItalic.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Italic.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Italic.pfa
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Roman.afm
+-r--r--r--	root/root	usr/share/htmldoc/fonts/Times-Roman.pfa
+drwxr-xr-x	root/root	usr/share/mime/
+drwxr-xr-x	root/root	usr/share/mime/packages/
+-r--r--r--	root/root	usr/share/mime/packages/htmldoc.xml
+drwxr-xr-x	root/root	usr/share/pixmaps/
+-r--r--r--	root/root	usr/share/pixmaps/htmldoc.xpm
diff --git a/htmldoc/.md5sum b/htmldoc/.md5sum
index 873792b6f..c1b7179bf 100644
--- a/htmldoc/.md5sum
+++ b/htmldoc/.md5sum
@@ -1,2 +1,2 @@
 27d2d8da8d58eedcdf16e63bad8c55a7  fix_random.diff
-8e4e3f49ee9b2c5af01eb81a518ce7e7  htmldoc-1.8.28-source.tar.bz2
+c8ea9f9e4bbe49bd42a597338dc2b111  htmldoc-1.8.30-source.tar.gz
diff --git a/htmldoc/.signature b/htmldoc/.signature
index ed7f63655..d9ab2759b 100644
--- a/htmldoc/.signature
+++ b/htmldoc/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38nejw2zTnNzC3UzIkn2PjWJbPb8Z9FGpVwTnxZMPjp7NBSb3sbGRfXVJaYMAZWxil+vG+PtG01XTb3PPq1zKQI=
-SHA256 (Pkgfile) = 3635cd9cd4b8a9b3139a6ed0a1bf36105bf892178265d3fec3be14e22e47a114
-SHA256 (.footprint) = d3c42f253ad6903fb16889c9d65d72bae288655b45123e6fbebcdb1292eab225
-SHA256 (htmldoc-1.8.28-source.tar.bz2) = 2a688bd820ad6f7bdebb274716102dafbf4d5fcfa20a5b8d87a56b030d184732
+RWSagIOpLGJF3wDkAXhQj9R2W9i/AT+YORRlmVCJmLP+Qz2yhgh5yPvpDSbcEQfoWi+XRcAI83kREDbV8gNgpccF+JwqMMIB1A0=
+SHA256 (Pkgfile) = 0fa2e2ff57968d0fa03831821fb322518aa950025003c484e32a187dad7cf464
+SHA256 (.footprint) = ab9356c13436d3e147118e880806e5b31d1853448d56b0c8d0c102b57a6df202
+SHA256 (htmldoc-1.8.30-source.tar.gz) = 7fb7a532f590f7ce1b7c8486d9fe30adaea3c7c32cb412ba7cf093d67cba5fc6
 SHA256 (fix_random.diff) = 9f0caf1b5d04e80186d83d10c8c1640118d27132956f64841e557767da34965c
diff --git a/htmldoc/Pkgfile b/htmldoc/Pkgfile
index 533c118b8..821ab24c8 100644
--- a/htmldoc/Pkgfile
+++ b/htmldoc/Pkgfile
@@ -1,18 +1,16 @@
 # Description: Converts HTML into Adobe PDF
-# URL:         http://www.htmldoc.org/
+# URL:         http://michaelrsweet.github.io/htmldoc
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    James Mills,, prologic at shortcircuit dot net dot au
+# Packager:    James Mills, prologic at shortcircuit dot net dot au
 # Depends on:
 
 name=htmldoc
-version=1.8.28
+version=1.8.30
 release=1
-source=(http://msweet.org/files/project1/$name-$version-source.tar.bz2
+source=(https://github.com/michaelrsweet/htmldoc/releases/download/v1.8.30/${name}-${version}-source.tar.gz
         fix_random.diff)
 
 build() {
-  cd $name-$version
-
   patch -i $SRC/fix_random.diff -p1
 
   ./configure --prefix=/usr --disable-gnutls