Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Oct 2020 19:47:54 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550869 - in head/textproc/html2text: . files
Message-ID:  <202010011947.091Jlsk8049759@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Oct  1 19:47:54 2020
New Revision: 550869
URL: https://svnweb.freebsd.org/changeset/ports/550869

Log:
  Revert the upgrade to 2.0.0 it is not backward compatible
  and break minixmlto in some cases
  
  bump portepoch
  
  PR:		250028
  Reported by:	Stefan Ehmann <shoesoft@gmx.net>

Added:
  head/textproc/html2text/files/
     - copied from r550761, head/textproc/html2text/files/
Modified:
  head/textproc/html2text/Makefile
  head/textproc/html2text/distinfo
  head/textproc/html2text/pkg-descr

Modified: head/textproc/html2text/Makefile
==============================================================================
--- head/textproc/html2text/Makefile	Thu Oct  1 19:27:33 2020	(r550868)
+++ head/textproc/html2text/Makefile	Thu Oct  1 19:47:54 2020	(r550869)
@@ -2,9 +2,11 @@
 # $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
@@ -12,18 +14,36 @@ 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>

Modified: head/textproc/html2text/distinfo
==============================================================================
--- head/textproc/html2text/distinfo	Thu Oct  1 19:27:33 2020	(r550868)
+++ head/textproc/html2text/distinfo	Thu Oct  1 19:47:54 2020	(r550869)
@@ -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

Modified: head/textproc/html2text/pkg-descr
==============================================================================
--- head/textproc/html2text/pkg-descr	Thu Oct  1 19:27:33 2020	(r550868)
+++ head/textproc/html2text/pkg-descr	Thu Oct  1 19:47:54 2020	(r550869)
@@ -11,4 +11,4 @@ accepts also syntactically incorrect input, attempting
 "reasonably".  The rendering  is  largely customisable  through an  RC
 file.
 
-WWW: https://github.com/grobian/html2text
+WWW: http://www.mbayer.de/html2text/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010011947.091Jlsk8049759>