Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 06 Sep 2004 17:23:51 -0400
From:      Serge Gagnon <ser_gagnon@sympatico.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71438: Update ports: misc/gman add dependency & fix netbrowse option
Message-ID:  <E1C4Qxr-000JEE-KL@quenix1.dyndns.org>
Resent-Message-ID: <200409062130.i86LUN0u082109@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71438
>Category:       ports
>Synopsis:       Update ports: misc/gman add dependency & fix netbrowse option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 06 21:30:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Serge Gagnon
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat Aug 14 15:29:18 EDT 2004 root@quenix.dnsalias.org:/usr/obj/usr/src/sys/OCEAN i386


>Description:

	o gman start "xterm" instead of "x-terminal-emulator"
	o same as above for "mozilla" "dillo"
	o I have added a RUN_DEPEND to dillo
	o fix gman.pl so localbrowse and netbrowse now work
	(I know absolutely nothing at perl. If you think that is
	not correct, tell me

	Fix include a patch for misc/gman/Makefile.
	The three other files have to be put in gman/files

>How-To-Repeat:
>Fix:


--- patch-Makefile.diff begins here ---
--- misc/gman/Makefile.orig	Sun Aug 29 09:01:44 2004
+++ misc/gman/Makefile	Mon Sep  6 17:05:00 2004
@@ -24,6 +24,7 @@
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview
+RUN_DEPENDS=    dillo:${PORTSDIR}/www/dillo
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
--- patch-Makefile.diff ends here ---

--- patch-gman.c begins here ---
--- gman.c.orig	Sun Aug 29 09:05:32 2004
+++ gman.c	Sun Aug 29 09:06:27 2004
@@ -89,9 +89,9 @@
 	context->set_default_value("show_status_bar","int",(void*)0);
 	context->set_default_value("show_warning","int",(void*)0);
 	context->set_default_value("show_mode","int",(void*)0); // 0 = xterm, 1 = ghostview
-	context->set_default_value("xterm_command","char*",(void*)"x-terminal-emulator");
-	context->set_default_value("gv_command","char*",(void*)"gv");
-	context->set_default_value("browser_command","char*",(void*)"mozilla"); // kfm also works
+	context->set_default_value("xterm_command","char*",(void*)"xterm");
+	context->set_default_value("gv_command","char*",(void*)"ghostview");
+	context->set_default_value("browser_command","char*",(void*)"dillo"); // kfm also works
 	context->set_default_value("cgi_host","char*",(void*)"localhost");
 	context->set_default_value("cgi_location","char*",(void*)"/cgi-bin/gman.pl");
 	context->set_default_value("print_command","char*",(void*)"lpr"); // not in use
--- patch-gman.c ends here ---

--- patch-gman.pl begins here ---
--- gman.pl.orig	Mon Sep  6 16:55:42 2004
+++ gman.pl	Mon Sep  6 16:55:45 2004
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
-use strict;
 
 if (@ARGV != 2) {
   print <<_EOF_;
 Content-type: text/html
 
+<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <html><head><title>gman.pl: invalid use</title></head>
 <body>
 <h1>gman.pl cannot be used without arguments.</h1>
@@ -14,35 +14,43 @@
 }
 
 my $section = $ARGV[0]; # should also have some sanity check
+my $cut = "/usr/bin/cut -f 1 -d \" \" ";
 my $name = $ARGV[1];
-my $man2html = "/usr/lib/cgi-bin/man2html";
-my $path = `man -w $section $name`; chomp $path; $path =~ s/\s*$//;
+my $man = "/usr/bin/man";
+my $man2html = "/usr/local/bin/man2html -nodepage ";
+my $path = `$man -w $section $name |$cut`; chomp $path; $path =~ s/\s*$//;
 
 unless (-s "$path") {
   warn "not -s $path\n";
   $name = lc $name;
-  $path = `man -w $section $name`; chomp $path; $path =~ s/\s*$//;
+  $path = `$man -w $section $name |$cut`; chomp $path; $path =~ s/\s*$//;
 }
 unless (-s "$path") {
   warn "not -s $path\n";
 	print <<end_of_line;
 Content-type: text/html
 
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML><HEAD>
-<TITLE>404 Not Found</TITLE>
-</HEAD><BODY>
+<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html><head>
+<title>404 Not Found</title>
+</head><body>
 <H1>Not Found</H1>
 The requested man page $name($section) was not found on this server.
-</BODY></HTML>
+</body></html>
 end_of_line
-	die;
+;
 }
 
-my $page = `$man2html $path`;
+my $page = `$man $section $name |$man2html`;
 
 # $page =~ s/^Content-type: text\/html\n\n// if (not run as cgi...);
 
-$page =~ s/(This document was created by\n<a HREF=\".*\">man2html<\/a>)(,\nusing the manual pages.<br>)/$1 for <a href=\"\/cgi-bin\/gman.pl?1+gman\">gman<\/a>$2/io;
+print <<eof;
+Content-type: text/html
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML//EN">
+eof
+;
 
 print $page;
+
--- patch-gman.pl ends here ---

--- patch-mandata.c begins here ---
--- mandata.c.orig	Sun Aug 29 09:29:38 2004
+++ mandata.c	Sun Aug 29 09:33:45 2004
@@ -241,11 +241,11 @@
 	char buffer2[BUFFER_SIZE];
 	switch ((int)context->get_value("show_mode")) {
 	case 0:
-		sprintf(buffer,"%s -T '%s manual page' -n GMan -e man ",
+		sprintf(buffer,"%s -T '%s manual page' -n GMan -e man %s",
 				(char*)context->get_value("xterm_command"),
-				get_display_name(buffer1));
-		len = strlen(buffer);
-		attach(buffer+len,man_path->GetPath(),file_name);
+				get_display_name(buffer1), get_display_name(buffer1));
+/*		len = strlen(buffer);
+		attach(buffer+len,man_path->GetPath(),file_name); */
 		//g_warning(buffer);
 		if(!fork())
 		{
@@ -256,9 +256,9 @@
 		break;
 	case 1:
 		sprintf(loc_name," ~/.gman.%s.ps ",get_display_name(buffer1));
-		sprintf(buffer,"man -t ");
-		len = strlen(buffer);
-		attach(buffer+len,man_path->GetPath(),file_name);
+		sprintf(buffer,"man -t %s", get_display_name(buffer1));
+/*		len = strlen(buffer);
+		attach(buffer+len,man_path->GetPath(),file_name); */
 		strcat(buffer," >> ");
 		strcat(buffer,loc_name);
 		strcat(buffer," ; ");
@@ -306,7 +306,7 @@
 	case 2:
 		sprintf(loc_name," ~/.gman.%s.html ",get_display_name(buffer1));
 		//g_warning(loc_name);
-		strcpy(buffer,"/usr/lib/cgi-bin/gman.pl ");
+		strcpy(buffer,"/usr/local/www/cgi-bin/gman.pl ");
 		strcat(buffer," ");
 		strcat(buffer,get_section_name(buffer2));
 		strcat(buffer," ");
--- patch-mandata.c ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1C4Qxr-000JEE-KL>