pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

man2html: Clean up



Module Name:	pkgsrc-wip
Committed By:	root <root%centosdev.ceas.uwm.edu@localhost>
Pushed By:	outpaddling
Date:		Tue Mar 6 08:26:35 2018 -0600
Changeset:	e1606f2b36d566d59be5bc1dfa5690d4781e63d1

Modified Files:
	man2html/Makefile
	man2html/PLIST
	man2html/distinfo
Removed Files:
	man2html/patches/patch-man.cgi

Log Message:
man2html: Clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e1606f2b36d566d59be5bc1dfa5690d4781e63d1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 man2html/Makefile              | 17 ++++-------
 man2html/PLIST                 |  1 -
 man2html/distinfo              |  1 -
 man2html/patches/patch-man.cgi | 65 ------------------------------------------
 4 files changed, 6 insertions(+), 78 deletions(-)

diffs:
diff --git a/man2html/Makefile b/man2html/Makefile
index 0b9e6787ab..7d747457fb 100644
--- a/man2html/Makefile
+++ b/man2html/Makefile
@@ -1,35 +1,30 @@
 # $NetBSD$
-#
-###########################################################
-#                  Generated by fbsd2pkg                  #
-#              Mon May 16 16:27:37 CDT 2016               #
-###########################################################
 
 DISTNAME=	man2html${PORTVERSION}
 PKGNAME=	man2html-${PORTVERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	http://hydra.nac.uci.edu/indiv/ehood/tar/ \
+MASTER_SITES=	https://acadix.biz/Ports/distfiles/ \
+		http://hydra.nac.uci.edu/indiv/ehood/tar/ \
 		ftp://ftp.cpan.org/pub/CPAN/modules/by-authors/Earl_Hood/ \
 		http://people.freebsd.org/~demon/
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	http://www.nongnu.org/man2html/
 COMMENT=	Convert nroff(1) man pages to HTML
-# LICENSE=
+
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	perl:run
 NO_BUILD=	yes
 
-REPLACE_PERL=	man2html man.cgi
+REPLACE_PERL=	man2html
 
 PORTVERSION=	3.0.1
-CGIDIR=		${PREFIX}/www/cgi-bin
 
-INSTALLATION_DIRS=	bin ${PREFIX}/${PKGMANDIR}/man1 share/doc ${CGIDIR}
+INSTALLATION_DIRS=	bin ${PREFIX}/${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/man2html ${DESTDIR}/${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/man2html.1 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/man.cgi ${DESTDIR}${CGIDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/man2html/PLIST b/man2html/PLIST
index e94e9722c9..4f71eb2bbf 100644
--- a/man2html/PLIST
+++ b/man2html/PLIST
@@ -1,4 +1,3 @@
 @comment $NetBSD$
 bin/man2html
 man/man1/man2html.1
-www/cgi-bin/man.cgi
diff --git a/man2html/distinfo b/man2html/distinfo
index 673812e1da..80b0f37d98 100644
--- a/man2html/distinfo
+++ b/man2html/distinfo
@@ -4,4 +4,3 @@ SHA1 (man2html3.0.1.tar.gz) = 18b617783ce59491db984d23d2b0c8061bff385c
 RMD160 (man2html3.0.1.tar.gz) = f3463926acc414a5f934e2cf1fd6fd59dcc454bd
 SHA512 (man2html3.0.1.tar.gz) = 6a57ff109cfc9d8a31150990f3a2304ee46956feeead9d528344be19ac252afb47bed36a470d3a9e9505ef7134b77a1edf30f5c97e8215c2c5d235cf8aee8565
 Size (man2html3.0.1.tar.gz) = 45371 bytes
-SHA1 (patch-man.cgi) = 9844d0bad0731f217d516fd0e27487df0cb711a1
diff --git a/man2html/patches/patch-man.cgi b/man2html/patches/patch-man.cgi
deleted file mode 100644
index d7ca6b6167..0000000000
--- a/man2html/patches/patch-man.cgi
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
-# Alter hard-coded options
-
---- man.cgi.orig	Wed Aug 13 01:19:18 1997
-+++ man.cgi	Sat Sep 30 00:46:55 2000
-@@ -59,8 +59,8 @@
- ##  systems.  If using Tom Christiansen's Perl man program, than
- ##  define use "".
- 
--#$SectOpt	= "";
--$SectOpt	= "-s";
-+$SectOpt	= "";
-+#$SectOpt	= "-s";
- 
- ##  man2html program (needs to be a full pathname)
- 
-@@ -77,15 +77,15 @@
- 
- #@ConvArgs	= ("-compress");
- #@ConvArgs	= ("-compress", "-leftm", "1", "-topm", "8");
--@ConvArgs	= ("-compress", "-sun");
-+#@ConvArgs	= ("-compress", "-sun");
- 
- ##  Keyword search processing arguments for man2html.  Normally,
- ##  '-k' is adequate.  However, if on a Solaris system, the
- ##  '-solaris' option should be specified with '-k'.  See
- ##  man2html documentation on information about the '-solaris' option.
- 
--#@KeyWArgs	= ("-k");			# Normal
--@KeyWArgs	= ("-k", "-solaris");		# For Solaris
-+@KeyWArgs	= ("-k");			# Normal
-+#@KeyWArgs	= ("-k", "-solaris");		# For Solaris
- 
- ##  Possible manual sections.  This array is used to determine the
- ##  the choices available in an option menu.
-@@ -124,9 +124,9 @@
- ##  know about
- 
- @ManPath	= qw(
-+    /usr/share/man
-     /usr/local/man
--    /usr/openwin/man
--    /usr/man
-+    /usr/X11R6/man
- );
- 
- ##  PATH setting.  Modify as see fit.  Once useful modification
-@@ -134,7 +134,6 @@
- ##  be invoked over the systems nroff when man formats a manpage.
- 
- @Path   	= qw(
--    /opt/FSFgroff/bin
-     /bin
-     /usr/bin
- );
-@@ -270,7 +269,7 @@
- 
-     # Convert output from man to html
-     #--------------------------------
--    close(STDERR);
-+    open(STDERR, ">&/dev/null");
-     open(MANPRG, "-|") or exec($ManPrg, @manargs);
-     $Man2Html::InFH = \*MANPRG;		# set input filehandle
-     require $ManConvPrg or


Home | Main Index | Thread Index | Old Index