From: wen heping <wenheping2000@hotmail.com>
Subject: converters/html2text: Update to 2.2.3
To: "ports@openbsd.org" <ports@openbsd.org>
Date: Sun, 14 Jul 2024 01:50:45 +0000

Hi, ports@:

   Here is a patch for converters/html2text:
   i) Update to 2.2.3
   ii) Update SITES and HOMEPAGE
   iii) Removed unneeded patches.

   It build and run well on amd64-current system.


Best regards,
wen
Index: Makefile
===================================================================
RCS file: /cvs/ports/converters/html2text/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile	20 Sep 2023 09:53:44 -0000	1.20
+++ Makefile	14 Jul 2024 01:45:09 -0000
@@ -1,21 +1,17 @@
-PORTROACH=		skipv:1.3.2
-
 COMMENT=		advanced HTML-to-text converter
 
-DISTNAME=		html2text-1.3.2a
-REVISION =		5
+DISTNAME=		html2text-2.2.3
 CATEGORIES=		converters textproc
 
 
-HOMEPAGE=		http://www.mbayer.de/html2text/
+HOMEPAGE=		https://github.com/grobian/html2text
 
 # GPL
 PERMIT_PACKAGE=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
-SITES=			http://www.mbayer.de/html2text/downloads/ \
-			ftp://ftp.ibiblio.org/pub/linux/apps/www/converters/
+SITES=			https://github.com/grobian/html2text/releases/download/v2.2.3/
 
 COMPILER =		base-clang ports-gcc base-gcc
 
@@ -23,18 +19,15 @@ CONFIGURE_STYLE=	simple
 CONFIGURE_ENV=		CXX="${CXX}"
 
 MAKE_FLAGS=	PREFIX="${PREFIX}" \
-		CXXFLAGS="-DVERSION=1.3.2a -DAUTO_PTR_BROKEN ${CXXFLAGS}"
+		CXXFLAGS="-DAUTO_PTR_BROKEN ${CXXFLAGS}"
 
 NO_TEST=	Yes
 
-post-extract:
-	gunzip ${WRKSRC}/{html2text.1,html2textrc.5}.gz
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${PREFIX}/man/man5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html2text
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/html2text
+	${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/html2text
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/converters/html2text/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo	18 Jan 2015 03:12:57 -0000	1.2
+++ distinfo	14 Jul 2024 01:45:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (html2text-1.3.2a.tar.gz) = AAs51dkQuGf/fghxd7RwoeJuKBmSDc/9WZHDP21IA5I=
-SIZE (html2text-1.3.2a.tar.gz) = 130088
+SHA256 (html2text-2.2.3.tar.gz) = hZEzUos/2JNWLkHYS8HrwfkWbdKB0PqOF+fdJjN/V1I=
+SIZE (html2text-2.2.3.tar.gz) = 329841
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in	11 Mar 2022 18:27:02 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Wed Jan 14 14:47:02 2004
-+++ Makefile.in	Thu Sep 13 21:36:17 2007
-@@ -29,9 +29,9 @@ BISONXX  = bison++
- YFLAGS   =
- 
- INSTALLER = install
--BINDIR    = /usr/local/bin
--MANDIR    = /usr/local/man
--DOCDIR    = /usr/share/doc/html2text
-+BINDIR    = $(PREFIX)/bin
-+MANDIR    = $(PREFIX)/man
-+DOCDIR    = $(PREFIX)/share/doc/html2text
- 
- CXX                 = @CXX@
- BOOL_DEFINITION     = @BOOL_DEFINITION@
-@@ -48,7 +48,7 @@ DEBUG=-O2 -g
- INCLUDES  = $(LIBSTDCXX_INCLUDES)
- DEFINES   = -DVERSION=$(VERSION) $(SYS_POLL_MISSING) $(BOOL_DEFINITION) $(EXPLICIT) $(AUTO_PTR_BROKEN)
- CPPFLAGS  = $(INCLUDES) $(DEFINES)
--CXXFLAGS  = $(CPPFLAGS) $(DEBUG)
-+CXXFLAGS  = $(CPPFLAGS)
- LDFLAGS   = $(DEBUG)
- LOADLIBES = $(LIBSTDCXX_LIBS) $(SOCKET_LIBRARIES)
- 
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	11 Mar 2022 18:27:02 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
---- configure.orig	Mon Jan 12 15:47:18 2004
-+++ configure	Sun Feb 26 20:25:48 2017
-@@ -38,6 +38,7 @@ int main(int, char **) {
-   return 0;
- }
- EOF
-+if [[ -z $CXX ]]; then
- CXX=unknown;
- for i in "CC" "g++" "cc" "$CC"; do
-   if $i -c $tmp_file.C 2>/dev/null; then
-@@ -45,6 +46,7 @@ for i in "CC" "g++" "cc" "$CC"; do
-     break;
-   fi;
- done;
-+fi;
- if test "$CXX" = unknown; then
-   $echo "Error: Could not find a working C++ compiler.";
-   exit 1;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/converters/html2text/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST	11 Mar 2022 18:27:02 -0000	1.5
+++ pkg/PLIST	14 Jul 2024 01:45:09 -0000
@@ -2,4 +2,4 @@
 @man man/man1/html2text.1
 @man man/man5/html2textrc.5
 share/doc/html2text/
-share/doc/html2text/README
+share/doc/html2text/README.md