<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1461b862f5b0006f6a2581ffc8ff76141ef7f8e2">https://github.com/macports/macports-ports/commit/1461b862f5b0006f6a2581ffc8ff76141ef7f8e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1461b862f5b0006f6a2581ffc8ff76141ef7f8e2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 22 09:07:19 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> html2text: Update to 2.1.1
</span>---
textproc/html2text/Portfile | 16 ++--
textproc/html2text/files/mega.patch | 177 ------------------------------------
2 files changed, 6 insertions(+), 187 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/html2text/Portfile b/textproc/html2text/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dde2d5baeb6..eb07ef22b75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/html2text/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/html2text/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,15 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup grobian html2text 2.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup grobian html2text 2.1.1 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e2f07219e83927c81e55554cd41196a711acb19f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c52f16a282b69b9dc9f7b5fac7f44b15f90b74e012f0aa2d63fbf5b0fe5e5c49 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 187962
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4aea69985f4660d5b12cb41b1be3a5aa3e0d8e3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 be16ec8ceb25f8e7fe438bd6e525b717d5de51bd0797eeadda0617087f1563c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 172655
</span>
categories textproc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# conflicting licenses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/grobian/html2text/issues/39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+ BSD-old Restrictive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} opennomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span>
description Utility to convert HTML documents into plain text.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +29,6 @@ github.tarball_from archive
</span>
depends_lib port:libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles mega.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2011
configure.universal_args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/html2text/files/mega.patch b/textproc/html2text/files/mega.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d85c77ae62..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/html2text/files/mega.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,177 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Combination of several upstream fixes to make the build system work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-better with MacPorts:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Recognize --prefix configure flag and honor CXXFLAGS and LDFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Use -std=c++11 since the code requires it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Fix version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Fix always-true conditional in istr.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch won't be needed anymore with the next version of html2text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/e926db6d02b4958c5180f4a4335e9579c2feb2b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/997aaf1bcef35ea983f092c31bf49c91688e1838
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/dda4980a64d7ad9fa1e87a01768fbf7e9aceeacb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/5cabc5bcec5b6d11fffe199c3b813b6e71cb834a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/c9cba90aceb4671e24aa097ab994f650e7383e80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/c3587c648e40edc01076302071e4b5469907c9c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/2ac3b1ab27f7db7552747d8f6697aa2770e10134
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/5257328c43bc44677b3d85ca7db72b853b58128d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/1f942e4018fdac0ec971429a25729491dc7db973
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/grobian/html2text/commit/373943c0cff9126c22f41b8a6aafd88873313f5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2022-04-06 13:19:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2022-05-05 05:16:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,16 +26,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--VERSION=2.0.1_pre
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+VERSION=2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BISON = bison
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- YFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALLER = install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BINDIR = $(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDIR = $(PREFIX)/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOCDIR = $(PREFIX)/share/doc/html2text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDIR = @BINDIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDIR = @MANDIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOCDIR = @DOCDIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX = @CXX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL_DEFINITION = @BOOL_DEFINITION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBSTDCXX_LIBS = @LIBSTDCXX_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTO_PTR_BROKEN = @AUTO_PTR_BROKEN@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKEDEPEND_INCLUDES = @MAKEDEPEND_INCLUDES@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXFLAGS = -g -O2 -Wall -Wextra # automake like + warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDES = $(LIBSTDCXX_INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES = -DVERSION=$(VERSION) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -c $(H2TCPPFLAGS) $(H2TCXXFLAGS) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- html2text: $(OBJS) $(LIBSTDCXX_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) $(LDFLAGS) $(OBJS) $(H2TLIBS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(LDFLAGS) $(OBJS) $(H2TLIBS) $(H2TCXXFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-04-06 13:19:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-05-05 05:16:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,13 +19,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tue Nov 11 21:30:26 CET 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mimick autoconf behaviour of accepting variable overrides on command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# line, while also accepting options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for arg in "$@" ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${arg}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *=*) eval "${arg}" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --*=*) eval `echo "${arg}" | sed -e 's/^--//'` ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *=*) eval "${arg}" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[ -z "$PREFIX" ] && PREFIX="${prefix:-/usr/local}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[ -z "$BINDIR" ] && BINDIR="${bindir:-$PREFIX/bin}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[ -z "$DATAROOTDIR" ] && DATAROOTDIR="${datarootdir:-$PREFIX/share}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[ -z "$MANDIR" ] && MANDIR="${mandir:-$DATAROOTDIR/man}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[ -z "$DOCDIR" ] && DOCDIR="${docdir:-$DATAROOTDIR/doc/html2text}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo=echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf configure-tmp || exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,26 +44,36 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $CXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$echo 'Checking C++ compiler... \c';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cat <<EOF >$tmp_file.C;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$echo 'Checking C++11 compiler... \c'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cat <<EOF >$tmp_file.C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(int, char **) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::cout << "hello" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string w = "world";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (auto c : w)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${CXX-unknown}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in "$CXX" "g++" "CC" "cc"; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if $i -c $tmp_file.C 2>/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXX="$i";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$CXX" = unknown; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $echo "Error: Could not find a working C++ compiler.";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+foundCXX=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for i in "$CXX" "g++" "clang++" "CC" "cc"; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for f in "-std=c++11" "-std=c++0x" ""; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ${i} ${f} -c $tmp_file.C 2>/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ foundCXX="${i} ${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test "x${foundCXX}" != "x" && break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x${foundCXX}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $echo "Error: Could not find a working C++11 compiler."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$echo "use \"$CXX\"";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX="${foundCXX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$echo "use \"$CXX\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $SOCKET_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,6 +261,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTO_PTR_BROKEN="-DAUTO_PTR_BROKEN";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set default CXX flags if none explicitly given
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x${CXXFLAGS}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="-g -O2 -Wall" # autoconf-like default + warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create "Makefile" from "Makefile.in".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,10 +276,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOCKET_LIBRARIES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICONV_LIBRARIES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL_DEFINITION \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPLICIT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBSTDCXX_INCLUDES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBSTDCXX_LIBS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PREFIX \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BINDIR \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MANDIR \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DOCDIR \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTO_PTR_BROKEN; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do cmd="$cmd -e \"s|@$i@|\$$i|g\""; done;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in $makedirs; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- istr.h.orig 2022-04-06 13:19:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ istr.h 2022-05-05 05:16:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* crude temp hack until we properly use wchar, glibc isspace crashes on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * too large values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define isspace(X) ((X) > 0 && (X) < 256 && isspace(X))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define isspace(X) (((int)(X)) > 0 && ((int)(X)) < 256 && isspace((int)(X)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class istr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span></pre><pre style='margin:0'>
</pre>