From nobody Wed Jul 13 15:14:46 2022 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 98CAE1D063F4; Wed, 13 Jul 2022 15:14:46 +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 4Ljh4Q3t7vz3Kmb; Wed, 13 Jul 2022 15:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657725286; 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=aVwi1jIzJN4X4gS90eWnB1kJUBpvyW9qcK3eJ2jknrQ=; b=dq+PP9h23cgLUbz+++JOmX05RiJqZWXMrw7LUuI8n8NUzLj0rKnTGpg7355K7bQEj29mA3 At/tEANsaURHmvQnemaSU5fxb+2KaQlAFdctZnz0h1NUTarxq7+fhkPHbcR0TxAJs9mURR xm5khAElpgsMwdAoV7sbII61Fv5XYzC5+BDr2YLT7gMPek+ElOn2L22NSlsdMEuAJKFoYI XSgp0sog6PcwK1himwM8sYtoYDjFYtIHxOsYsdz2Zv3bvtasXdMeMcNcr3vk1OduE9IySY ZNMTz3tIWJtlbjhxLDY7xnzU5ve5m0qtBiYOTOQDmDSRstW/+kCm2mXW5KH5+w== 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 4Ljh4Q2vryzSFc; Wed, 13 Jul 2022 15:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DFEkcs029654; Wed, 13 Jul 2022 15:14:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DFEknn029652; Wed, 13 Jul 2022 15:14:46 GMT (envelope-from git) Date: Wed, 13 Jul 2022 15:14:46 GMT Message-Id: <202207131514.26DFEknn029652@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Sivachenko Subject: git: ac72b8223719 - main - textproc/man2html: update to 3.1.20220109 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: demon X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac72b82237192fc59fa098d6b858593b8f84fa84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657725286; 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=aVwi1jIzJN4X4gS90eWnB1kJUBpvyW9qcK3eJ2jknrQ=; b=BBCYf7piVMKAev/DlRrBWQedAIhecZPe1PDBR4mYXtym+zPuXOdQoTO8TX/eQtTa7ksEgJ ajKz0UbfLzil22iox7YVFi909vUsdczu+zWLqUJ0IdCXOBQAhaCOve91xj2Lk4WQSqyX9z ivKsZKjy+qE9j2htlN+9blEwR5OG4r6vO+wQLT8VxX7dfrAwRKnQazKX4ef3T74Cu7O07t 8DdhbdnZ5KW/xr7GUQJja+on7gHq5iOj1xrI8pBkXFi3KhEvHgJlYN3D6f3l9tDdLDA1kH 6e6wKPnnvMKtPATlrx1KL+y5OQSIb5fMbioa4zrFPJSQHIBhnnj+2FJR3RxhIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657725286; a=rsa-sha256; cv=none; b=b0CM1DVCsqw/We5rn8W+mVzyxvq/IToAmla/Xu31z6KCm3A0haNdcYeB+voxGz1nZs4qG/ le7gzq7h4vNqUkj9+L6EFyG/GYzhOrUiGMG8FXrNZo1xGZ29bkmTftxrMthdFupPLGJufl 7zcXkar8gNaGrKtb2eybaOzJXpbLol7jbqhVO9lwDmCs4wfc3ag8nOEkK1OvrPEuBW2NLD K7P9HulugLTdEOGKGSMhN0cWsyaxtAHi1KZe3AhrDwlZtNwZDWDr3Olc1wF6X6zF3QK87I mifsa48P7PEqXKQgy5d15ak9fwx4a5HIUb6d74dADbWbPx5jx4rjdqW3H/YUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac72b82237192fc59fa098d6b858593b8f84fa84 commit ac72b82237192fc59fa098d6b858593b8f84fa84 Author: Dmitry Sivachenko AuthorDate: 2022-07-13 15:13:11 +0000 Commit: Dmitry Sivachenko CommitDate: 2022-07-13 15:14:39 +0000 textproc/man2html: update to 3.1.20220109 PR: 265144 Submitted by: Robert Clausecker --- textproc/man2html/Makefile | 30 +++++++++++++++++++----------- textproc/man2html/distinfo | 3 +++ textproc/man2html/files/patch-man.cgi | 16 ++++++++-------- textproc/man2html/pkg-descr | 2 +- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile index 88b3e647b05a..eaf4685c169d 100644 --- a/textproc/man2html/Makefile +++ b/textproc/man2html/Makefile @@ -1,31 +1,39 @@ # Created by: Dima Sivachenko PORTNAME= man2html -PORTVERSION= 3.0.1 -PORTREVISION= 2 +PORTVERSION= 3.1.20220109 CATEGORIES= textproc -MASTER_SITES= http://hydra.nac.uci.edu/indiv/ehood/tar/ \ - ftp://ftp.cpan.org/pub/CPAN/modules/by-authors/Earl_Hood/ \ - http://people.freebsd.org/~demon/ -DISTNAME= ${PORTNAME}${PORTVERSION} +MASTER_SITES= https://invisible-island.net/archives/scripts/:dickey \ + http://people.freebsd.org/~demon/:demon \ + http://fuz.su/~fuz/distfiles/man2html/:demon +DISTNAME= other-scripts-${PORTVERSION:E} +DISTFILES= ${DISTNAME}.tgz:dickey \ + man2html3.0.1.tar.gz:demon # for cgi script and man page -MAINTAINER= demon@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Convert nroff(1) man pages to HTML LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING -USES= perl5 +USES= perl5 tar:tgz shebangfix USE_PERL5= run -NO_BUILD= yes +SHEBANG_FILES= man2html man.cgi + NO_ARCH= yes +NO_BUILD= yes CGIDIR= ${PREFIX}/www/cgi-bin PLIST_FILES= bin/man2html man/man1/man2html.1.gz www/cgi-bin/man.cgi +# New upstream doesn't ship the man page and CGI script +# Rip it from the 3.0.1 tarball. +post-extract: + @${MV} ${WRKDIR}/man2html3.0.1/doc/man2html.1 ${WRKSRC}/ + @${MV} ${WRKDIR}/man2html3.0.1/man.cgi ${WRKSRC}/ + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/man2html ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/man2html.1 ${STAGEDIR}/${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man2html.1 ${STAGEDIR}/${PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${CGIDIR} ${INSTALL_SCRIPT} ${WRKSRC}/man.cgi ${STAGEDIR}${CGIDIR} diff --git a/textproc/man2html/distinfo b/textproc/man2html/distinfo index c4659008e3b9..43e8711db076 100644 --- a/textproc/man2html/distinfo +++ b/textproc/man2html/distinfo @@ -1,2 +1,5 @@ +TIMESTAMP = 1657507856 +SHA256 (other-scripts-20220109.tgz) = 78f5e7eabfb34f2f18a59f22d20c629eae33848679be477c5317502574a49622 +SIZE (other-scripts-20220109.tgz) = 110040 SHA256 (man2html3.0.1.tar.gz) = a3dd7fdd80785c14c2f5fa54a59bf93ca5f86f026612f68770a0507a3d4e5a29 SIZE (man2html3.0.1.tar.gz) = 45371 diff --git a/textproc/man2html/files/patch-man.cgi b/textproc/man2html/files/patch-man.cgi index e61412256bb8..0e24c5959637 100644 --- a/textproc/man2html/files/patch-man.cgi +++ b/textproc/man2html/files/patch-man.cgi @@ -1,6 +1,6 @@ ---- man.cgi.orig Wed Aug 13 01:19:18 1997 -+++ man.cgi Sat Sep 30 00:46:55 2000 -@@ -59,8 +59,8 @@ +--- man.cgi.orig 1997-08-12 17:19:18 UTC ++++ man.cgi +@@ -59,8 +59,8 @@ $ManPrg = '/usr/bin/man'; ## systems. If using Tom Christiansen's Perl man program, than ## define use "". @@ -11,7 +11,7 @@ ## man2html program (needs to be a full pathname) -@@ -77,15 +77,15 @@ +@@ -77,15 +77,15 @@ $DoCgiurl = 1; #@ConvArgs = ("-compress"); #@ConvArgs = ("-compress", "-leftm", "1", "-topm", "8"); @@ -30,7 +30,7 @@ ## Possible manual sections. This array is used to determine the ## the choices available in an option menu. -@@ -124,9 +124,9 @@ +@@ -124,9 +124,9 @@ $ArgSep = '&'; ## know about @ManPath = qw( @@ -38,11 +38,11 @@ /usr/local/man - /usr/openwin/man - /usr/man -+ /usr/X11R6/man ++ /usr/local/share/man ); ## PATH setting. Modify as see fit. Once useful modification -@@ -134,7 +134,6 @@ +@@ -134,7 +134,6 @@ $ArgSep = '&'; ## be invoked over the systems nroff when man formats a manpage. @Path = qw( @@ -50,7 +50,7 @@ /bin /usr/bin ); -@@ -270,7 +269,7 @@ +@@ -270,7 +269,7 @@ sub doit { # Convert output from man to html #-------------------------------- diff --git a/textproc/man2html/pkg-descr b/textproc/man2html/pkg-descr index 0236eac52941..db48609f82ca 100644 --- a/textproc/man2html/pkg-descr +++ b/textproc/man2html/pkg-descr @@ -1,3 +1,3 @@ Convert UNIX nroff(1) manual pages to HTML format. -WWW: http://www.nongnu.org/man2html/ +WWW: https://dickey.his.com/scripts/man2html.html