diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index f6eab02942b8..e80dc5679ddd 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -2,47 +2,28 @@
# $FreeBSD$
PORTNAME= html2text
-PORTVERSION= 1.3.2a
+PORTVERSION= 2.0.0
+DISTVERSIONPREFIX= v
CATEGORIES= textproc
-MASTER_SITES= SUNSITE/apps/www/converters \
- http://www.mbayer.de/html2text/downloads/
-MAINTAINER= ports@FreeBSD.org
+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///' ${WRKSRC}/${fle}
-.endfor
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/html2text ${STAGEDIR}${PREFIX}/bin
- ${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
+ ${INSTALL_MAN} ${WRKSRC}/html2text.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${STAGEDIR}${MANPREFIX}/man/man5
.include
diff --git a/textproc/html2text/distinfo b/textproc/html2text/distinfo
index e5623a5d818e..77ecbdadb682 100644
--- a/textproc/html2text/distinfo
+++ b/textproc/html2text/distinfo
@@ -1,2 +1,3 @@
-SHA256 (html2text-1.3.2a.tar.gz) = 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392
-SIZE (html2text-1.3.2a.tar.gz) = 130088
+TIMESTAMP = 1601529583
+SHA256 (grobian-html2text-v2.0.0_GH0.tar.gz) = 061125bfac658c6d89fa55e9519d90c5eeb3ba97b2105748ee62f3a3fa2449de
+SIZE (grobian-html2text-v2.0.0_GH0.tar.gz) = 162901
diff --git a/textproc/html2text/files/patch-configure b/textproc/html2text/files/patch-configure
deleted file mode 100644
index 0775b06e9872..000000000000
--- a/textproc/html2text/files/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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 <$tmp_file.C;
- #include
- #include
- using namespace std;
--void func() { map x; }
-+int main(void) {
-+ map 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';
diff --git a/textproc/html2text/pkg-descr b/textproc/html2text/pkg-descr
index 8278b98c1a20..f2dc92ad632b 100644
--- a/textproc/html2text/pkg-descr
+++ b/textproc/html2text/pkg-descr
@@ -11,4 +11,4 @@ accepts also syntactically incorrect input, attempting to interpret it
"reasonably". The rendering is largely customisable through an RC
file.
-WWW: http://www.mbayer.de/html2text/
+WWW: https://github.com/grobian/html2text