html2text: Update to 2.4.0

Co-authored-by: Ryan Carsten Schmidt <[email protected]>

Author: trustbyte

textproc/html2text/Portfile

@@ -1,13 +1,14 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
-PortGroup           github 1.0
+PortGroup           gitlab 1.0
 
-github.setup        grobian html2text 2.3.0 v
-revision            0
-checksums           rmd160  13ddcaad6475f8be74f992b84050555e95c9b591 \
-                    sha256  8cec23ed1ff43313f2d0e4b434cd39871bc002cad947a40d4a3738d1351921f7 \
-                    size    346044
+gitlab.setup        grobian html2text 2.4.0 v
+set upload_id       8526650dd42218b3493ce7ca0a3eeb1e
+revision            1
+checksums           rmd160  b99bb417faaa8ff38223f1786628780469a73c1d \
+                    sha256  9d0a7174cacbb3f050b60facd8cba6e138944ec5020b16d1cee70cf91a59f132 \
+                    size    385497
 
 categories          textproc
 maintainers         {ryandesign @ryandesign} openmaintainer
@@ -25,11 +26,35 @@ long_description    ${name} is a command line utility, written in C++, \
                     site from which the documents are loaded via the \
                     Hypertext Transfer Protocol (HTTP).
 
-github.tarball_from releases
+master_sites        https://gitlab.com/-/project/48313341/uploads/${upload_id}/
 
-depends_lib         port:libiconv
+# Override "use_bzip2 yes" set by gitlab.setup.
+if {[vercmp [macports_version] >= 2.12]} {
+#use_gzip            yes
+use_bzip2           no
+} else {
+    # https://trac.macports.org/ticket/64960
+    depends_extract-delete \
+                    bin:lbzip2:lbzip2
+    extract.suffix  .tar.gz
+    extract {
+        foreach distfile ${distfiles} {
+            system -W ${workpath} "[findBinary tar ${portutil::autoconf::tar_command}] -xzf [shellescape ${distpath}/${distfile}]"
+        }
+    }
+}
+
+depends_build       bin:bison:bison
+
+depends_lib         port:curl \
+                    port:libiconv
+
+patchfiles          version.patch
 
 compiler.cxx_standard 2011
 
+# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
+configure.checks.implicit_function_declaration.whitelist-append strchr
+
 test.run            yes
 test.target         check

textproc/html2text/files/version.patch

@@ -0,0 +1,35 @@
+Fix VERSION expansion in -version and -help.
+
+https://gitlab.com/grobian/html2text/-/issues/69
+https://gitlab.com/grobian/html2text/-/commit/5ab68b767ffdf574658e0795db2bfa49971e6a6a
+--- html2text.cpp.orig
++++ html2text.cpp
+@@ -18,6 +18,10 @@
+  * GNU General Public License in the file COPYING for more details.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <iostream>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -66,7 +68,7 @@ main(int argc, char **argv)
+ {
+ 	if (argc == 2 && !strcmp(argv[1], "-help")) {
+ 		std::cout
+-			<< "This is html2text, version " stringify(VERSION) << std::endl
++			<< "This is html2text, version " VERSION << std::endl
+ 			<< std::endl
+ 			<< usage;
+ 		exit(0);
+@@ -74,7 +76,7 @@ main(int argc, char **argv)
+ 
+ 	if (argc == 2 && !strcmp(argv[1], "-version")) {
+ 		std::cout
+-			<< "This is html2text, version " stringify(VERSION) << std::endl
++			<< "This is html2text, version " VERSION << std::endl
+ 			<< std::endl
+ 			<< "The latest version can be found at "
+ 			<< "https://gitlab.com/grobian/html2text" << std::endl