From owner-freebsd-ports  Tue Sep 26 23:50:14 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9383C37B43C
	for <freebsd-ports@FreeBSD.org>; Tue, 26 Sep 2000 23:50:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id XAA46616;
	Tue, 26 Sep 2000 23:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from chg.ru (netserv1.chg.ru [193.233.46.3])
	by hub.freebsd.org (Postfix) with ESMTP id 1B7D637B424
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Sep 2000 23:44:33 -0700 (PDT)
Received: (from dima@localhost)
	by chg.ru (8.9.3/8.9.3) id KAA20196;
	Wed, 27 Sep 2000 10:44:25 +0400 (MSD)
	(envelope-from dima)
Message-Id: <200009270644.KAA20196@chg.ru>
Date: Wed, 27 Sep 2000 10:44:25 +0400 (MSD)
From: "Dmitry S. Sivachenko" <dima@Chg.RU>
Reply-To: dima@Chg.RU
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/21591: Fix port: textproc/man2html
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21591
>Category:       ports
>Synopsis:       Fix port: textproc/man2html
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 26 23:50:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry S. Sivachenko
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
>Environment:

	

>Description:

This patch fixes problem with man.cgi when 'Formatting page...' message was
included into real output from man.cgi.
Also change my e-mail.

Fix submitted by Michael Stowe <mstowe@baddomain.com>

	

>How-To-Repeat:

	

>Fix:
	
	

diff -Nur man2html.old/Makefile man2html/Makefile
--- man2html.old/Makefile	Mon Apr 10 01:52:51 2000
+++ man2html/Makefile	Wed Sep 27 10:36:32 2000
@@ -11,7 +11,7 @@
 MASTER_SITES=	ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	demon@gpad.ac.ru
+MAINTAINER=	dima@Chg.RU
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -20,13 +20,7 @@
 MAN1=  		man2html.1
 
 post-patch:
-
-	@ if [ -f ${CGIDIR} ] ; then \
-		@ ${MV} ${WRKSRC}/man.cgi ${WRKSRC}/man.cgi.pre_sed ; \
-		@ ${CAT} ${WRKSRC}/man.cgi.pre_sed | \
-		@ ${GREP} -Ev -e "/opt/|/openwin/" \
-		> ${WRKSRC}/man.cgi ; \
-	fi
+		${PERL} -pi -e "s#/usr/local/bin/perl#${PERL5}#" ${WRKSRC}/man.cgi
 
 do-install:
 
diff -Nur man2html.old/patches/patch-aa man2html/patches/patch-aa
--- man2html.old/patches/patch-aa	Wed Dec 23 20:23:05 1998
+++ man2html/patches/patch-aa	Wed Sep 27 10:34:58 2000
@@ -1,5 +1,5 @@
 --- man.cgi.orig	Tue Aug 12 21:19:18 1997
-+++ man.cgi	Mon Nov 30 17:18:04 1998
++++ man.cgi	Wed Sep 27 10:34:40 2000
 @@ -59,8 +59,8 @@
  ##  systems.  If using Tom Christiansen's Perl man program, than
  ##  define use "".
@@ -50,3 +50,12 @@
      /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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message