From owner-svn-ports-branches@freebsd.org Thu Oct 1 19:50:03 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C133C43215A; Thu, 1 Oct 2020 19:50:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2Ny34hw7z4cG0; Thu, 1 Oct 2020 19:50:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8503015EF7; Thu, 1 Oct 2020 19:50:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 091Jo3Tn050126; Thu, 1 Oct 2020 19:50:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 091Jo2Dm050123; Thu, 1 Oct 2020 19:50:02 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202010011950.091Jo2Dm050123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 1 Oct 2020 19:50:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r550870 - in branches/2020Q4/textproc/html2text: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in branches/2020Q4/textproc/html2text: . files X-SVN-Commit-Revision: 550870 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 19:50:03 -0000 Author: bapt Date: Thu Oct 1 19:50:02 2020 New Revision: 550870 URL: https://svnweb.freebsd.org/changeset/ports/550870 Log: MFH: r550869 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 Added: branches/2020Q4/textproc/html2text/files/ - copied from r550869, head/textproc/html2text/files/ Modified: branches/2020Q4/textproc/html2text/Makefile branches/2020Q4/textproc/html2text/distinfo branches/2020Q4/textproc/html2text/pkg-descr Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/textproc/html2text/Makefile ============================================================================== --- branches/2020Q4/textproc/html2text/Makefile Thu Oct 1 19:47:54 2020 (r550869) +++ branches/2020Q4/textproc/html2text/Makefile Thu Oct 1 19:50:02 2020 (r550870) @@ -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///' ${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 Modified: branches/2020Q4/textproc/html2text/distinfo ============================================================================== --- branches/2020Q4/textproc/html2text/distinfo Thu Oct 1 19:47:54 2020 (r550869) +++ branches/2020Q4/textproc/html2text/distinfo Thu Oct 1 19:50:02 2020 (r550870) @@ -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: branches/2020Q4/textproc/html2text/pkg-descr ============================================================================== --- branches/2020Q4/textproc/html2text/pkg-descr Thu Oct 1 19:47:54 2020 (r550869) +++ branches/2020Q4/textproc/html2text/pkg-descr Thu Oct 1 19:50:02 2020 (r550870) @@ -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/