Index: branches/2020Q4/textproc/html2text/Makefile
===================================================================
--- branches/2020Q4/textproc/html2text/Makefile	(revision 550869)
+++ branches/2020Q4/textproc/html2text/Makefile	(revision 550870)
@@ -1,29 +1,49 @@
 # Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
 
 PORTNAME=	html2text
-PORTVERSION=	2.0.0
-DISTVERSIONPREFIX=	v
+PORTVERSION=	1.3.2a
+PORTEPOCH=	1
 CATEGORIES=	textproc
+MASTER_SITES=	SUNSITE/apps/www/converters \
+		http://www.mbayer.de/html2text/downloads/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Converts HTML documents into plain text
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	grobian
-
 HAS_CONFIGURE=	yes
 
+PORTDOCS=	CHANGES CREDITS KNOWN_BUGS README TODO
 PLIST_FILES=	bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz
 
 CONFLICTS=	py27-html2text-[0-9]*
 
+PORTSCOUT=	skipb:0 skipv:1.3.2
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e '/echo=/s/ -e//' ${WRKSRC}/configure
+.for fle in Makefile.in libstd/Makefile.in
+	@${REINPLACE_CMD} -e '/^DEBUG/s/^/#/; \
+		 /^CXXFLAGS/s/=/+=/' ${WRKSRC}/${fle}
+.endfor
+.for fle in Area.h HTMLControl.h Properties.h format.h
+	@${REINPLACE_CMD} -e 's/<istream>/<iostream>/' ${WRKSRC}/${fle}
+.endfor
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/html2text.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/html2textrc.5.gz ${STAGEDIR}${MANPREFIX}/man/man5
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
Index: branches/2020Q4/textproc/html2text/distinfo
===================================================================
--- branches/2020Q4/textproc/html2text/distinfo	(revision 550869)
+++ branches/2020Q4/textproc/html2text/distinfo	(revision 550870)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601529583
-SHA256 (grobian-html2text-v2.0.0_GH0.tar.gz) = 061125bfac658c6d89fa55e9519d90c5eeb3ba97b2105748ee62f3a3fa2449de
-SIZE (grobian-html2text-v2.0.0_GH0.tar.gz) = 162901
+TIMESTAMP = 1601581641
+SHA256 (html2text-1.3.2a.tar.gz) = 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392
+SIZE (html2text-1.3.2a.tar.gz) = 130088
Index: branches/2020Q4/textproc/html2text/files/patch-configure
===================================================================
--- branches/2020Q4/textproc/html2text/files/patch-configure	(nonexistent)
+++ branches/2020Q4/textproc/html2text/files/patch-configure	(revision 550870)
@@ -0,0 +1,34 @@
+--- configure.orig	2004-01-12 15:47:18 UTC
++++ configure
+@@ -38,8 +38,7 @@ int main(int, char **) {
+   return 0;
+ }
+ EOF
+-CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
++for i in "$CXX" "c++"; do
+   if $i -c $tmp_file.C 2>/dev/null; then
+     CXX="$i";
+     break;
+@@ -205,12 +204,19 @@ cat <<EOF >$tmp_file.C;
+ #include <new>
+ #include <vector>
+ using namespace std;
+-void func() { map<string, string> x; }
++int main(void) {
++  map<string, string> x;
++  return 0;
++}
+ EOF
+-if $CXX -c $tmp_file.C 2>/dev/null; then
++if $CXX $tmp_file.C 2>/dev/null; then
+   LIBSTDCXX_INCLUDES="";
+   LIBSTDCXX_LIBS="";
+   $echo 'works; no need to make "./libstd"';
++elif $CXX $tmp_file.C -lstdc++ 2>/dev/null; then
++  LIBSTDCXX_INCLUDES="";
++  LIBSTDCXX_LIBS="-lstdc++";
++  $echo 'works with libstdc++; no need to make "./libstd"';
+ else
+   LIBSTDCXX_INCLUDES='-Ilibstd/include';
+   LIBSTDCXX_LIBS='libstd/libstd.a';

Property changes on: branches/2020Q4/textproc/html2text/files/patch-configure
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/textproc/html2text/pkg-descr
===================================================================
--- branches/2020Q4/textproc/html2text/pkg-descr	(revision 550869)
+++ branches/2020Q4/textproc/html2text/pkg-descr	(revision 550870)
@@ -1,14 +1,14 @@
 html2text is  a command  line utility, written  in C++,  that converts
 HTML documents (HTML 3.2) into plain text (ISO 8859-1).
 
 Each HTML  document is loaded from  a location indicated by  an URI or
 read from  standard input, and formatted  into a stream of  plain text
 characters that is written to  standard output or into an output-file.
 The input-URI may  specify a remote site, from that  the documents are
 loaded with  the Hypertext  Transfer Protocol  (HTTP). The  program is
 even  able to  preserve the  original  positions of  table fields  and
 accepts also syntactically incorrect input, attempting to interpret it
 "reasonably".  The rendering  is  largely customisable  through an  RC
 file.
 
-WWW: https://github.com/grobian/html2text
+WWW: http://www.mbayer.de/html2text/
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 550869)
+++ branches/2020Q4	(revision 550870)

Property changes on: branches/2020Q4
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r550869