From nobody Wed Mar 6 13:56:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqYrg1p0Qz5Cdj2; Wed, 6 Mar 2024 13:56:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqYrg0pZRz4Q1M; Wed, 6 Mar 2024 13:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709733411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DlziDAQgieQbvnWCYj+Q6b7y/SemvAwC3zzBafhKxDY=; b=Vqy4z4+wcZ2RpGqHJsCJUD+d2fHDIkbPG48SG+ZuO3futn9S7o5W3AOWlRZdChy2iWdcqQ TqaAmhZs4JGNFjOSl/b5wGnz/MLAh+y9sN4910aNXxfTStGKCCLrchwqhj8trEaq8Ixwqj qVBCbQf+hWNWcktFA9UG110A9yJ7oho/hcfukgKj3LWFkTp+fWCg5NTfWcBwVU7r2BA7Y0 pVo3XITUeLGTdwwbIqpJDF0/Ebq3Z2WAxg2U/jHX0mMOBXYIDcCHDcGFodXHl82G5kPMp2 VCKdp/lAKiQMheGscGmweu1ErSvUAg00s4NCp02N1S3lwxWmbjwowZKUdJDCKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709733411; a=rsa-sha256; cv=none; b=Kl3fKwcDH285e7IZK8AYaPQme6ypFCmODGD9nwOvMO1AEcBncqVZpJRvJDPYkulPzxY67b hW533E58SSxFnP/SAFsP91xqyx1TMaIIWF1cXemrtqkUhsLpK8Ryr5CAzrFj6qg33YDFYe GVd8qjeY1VOU5gHOEZH9vdWB0Iigsq5nSqCMfkSScriLhbtXIt6zTmyabiIWxzzRLLmRJJ fr1htD7NbmAEnlyqtEYqKbpPRj13vvIPjJ/u0h/Ku2iIXjJegSXTc5GvBgJjGk1bNM3P4h /J9vL9Bk4bPCkLYYVdLZxhl8CLCq+cOtm5qmJDQOZjbBjMgPbJWxyBmywFKAHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709733411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DlziDAQgieQbvnWCYj+Q6b7y/SemvAwC3zzBafhKxDY=; b=YKX0wGCWC/gyd6GP7iEn26P8723k1H9qS2l+nLaX8nNAUb/KPgGqUXyvFUAR0Kgr1oA8Nm b+9mQ6ApRII2EJATBhq1NicJV03NpiGf9V9QK0c3KDXFr7HVw2tKGOgD+ZdnPBBRy0sVOM uF9gT7h5/cj+V8h6G2sLCyiM7w8gR3rqEZPdSaCVS2IRRrC3eo7EN6p13fUnpUlQx1Dn+b o44bIjKwGRQ4r+kZ/KF8adEJC/Ikna+xJVbpEu4FtrNBr+4QBemGcOspPhzykewVrJUuvp QFLC8F0Ys7PfCqVUxCL3bJjnF54GqRT5bXcMp6eXfAR4dXwfyxbPr7mlkrZUrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqYrg0PrVzsrH; Wed, 6 Mar 2024 13:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426DupZP071797; Wed, 6 Mar 2024 13:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426DuoVQ071794; Wed, 6 Mar 2024 13:56:50 GMT (envelope-from git) Date: Wed, 6 Mar 2024 13:56:50 GMT Message-Id: <202403061356.426DuoVQ071794@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d6bb92574491 - main - html2text: upgrade to 2.2.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6bb92574491851c97919e118545af76e54d9f51 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6bb92574491851c97919e118545af76e54d9f51 commit d6bb92574491851c97919e118545af76e54d9f51 Author: Baptiste Daroussin AuthorDate: 2024-03-05 15:16:50 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-06 13:56:46 +0000 html2text: upgrade to 2.2.3 While upstream has migrated now to gitlab they still don't propose proper distfile on gitlab --- textproc/html2text/Makefile | 38 +++++--------------------------- textproc/html2text/distinfo | 6 ++--- textproc/html2text/files/patch-configure | 34 ---------------------------- 3 files changed, 8 insertions(+), 70 deletions(-) diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 7b86022171b4..ba266a3dd2da 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -1,49 +1,21 @@ PORTNAME= html2text -PORTVERSION= 1.3.2a -PORTREVISION= 2 +PORTVERSION= 2.2.3 PORTEPOCH= 1 CATEGORIES= textproc -MASTER_SITES= SUNSITE/apps/www/converters \ - http://www.mbayer.de/html2text/downloads/ +MASTER_SITES= https://github.com/grobian/${PORTNAME}/releases/download/v${PORTVERSION}/ MAINTAINER= bapt@FreeBSD.org COMMENT= Converts HTML documents into plain text -WWW= http://www.mbayer.de/html2text/ +WWW= https://gitlab.com/grobian/html2text LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -HAS_CONFIGURE= yes -USE_CXXSTD= gnu++98 +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO PLIST_FILES= bin/html2text share/man/man1/html2text.1.gz share/man/man5/html2textrc.5.gz CONFLICTS= py*-html2text py*-html2text2018 # bin/html2text -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}${PREFIX}/share/man/man1 - ${INSTALL_MAN} ${WRKSRC}/html2textrc.5.gz ${STAGEDIR}${PREFIX}/share/man/man5 - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -.endfor - .include diff --git a/textproc/html2text/distinfo b/textproc/html2text/distinfo index b46b49a5ceb4..eb878ecb3e52 100644 --- a/textproc/html2text/distinfo +++ b/textproc/html2text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601581641 -SHA256 (html2text-1.3.2a.tar.gz) = 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392 -SIZE (html2text-1.3.2a.tar.gz) = 130088 +TIMESTAMP = 1709631292 +SHA256 (html2text-2.2.3.tar.gz) = 859133528b3fd893562e41d84bc1ebc1f9166dd281d0fa8e17e7dd26337f5752 +SIZE (html2text-2.2.3.tar.gz) = 329841 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';