diff --git a/misc/gman/Makefile b/misc/gman/Makefile
index 3a524f83076b..1dd674f8e778 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gman
PORTVERSION= 0.9.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/g/gman
diff --git a/misc/gman/files/patch-gman.pl b/misc/gman/files/patch-gman.pl
index 765c3dcd7d7c..097cde65a26f 100644
--- a/misc/gman/files/patch-gman.pl
+++ b/misc/gman/files/patch-gman.pl
@@ -1,27 +1,15 @@
---- gman.pl.orig 2011-08-25 13:06:54.517309488 -0700
-+++ gman.pl 2011-08-25 13:12:49.444936858 -0700
-@@ -1,10 +1,10 @@
- #!/usr/bin/perl -w
--use strict;
-
- if (@ARGV != 2) {
- print <<_EOF_;
- Content-type: text/html
-
-+
- gman.pl: invalid use
-
- gman.pl cannot be used without arguments.
-@@ -14,14 +14,16 @@
- }
+--- gman.pl.orig 2011-08-26 13:11:36.331148726 -0700
++++ gman.pl 2011-08-26 13:52:56.017429820 -0700
+@@ -15,13 +15,16 @@
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/man/man2html";
-my $path = `man -w $section $name`; chomp $path; $path =~ s/\s*$//;
++my $cut = "/usr/bin/cut -f 1 -d \" \" ";
+my $man = "/usr/bin/man";
-+my $man2html = "/usr/local/bin/man2html -nodepage ";
++my $man2html = "/usr/local/bin/man2html";
++my $man2html_args = "-nodepage ";
+my $path = `$man -w $section $name |$cut`; chomp $path; $path =~ s/\s*$//;
unless (-s "$path") {
@@ -32,7 +20,7 @@
}
unless (-s "$path") {
warn "not -s $path\n";
-@@ -29,12 +31,12 @@
+@@ -29,12 +32,12 @@
Content-type: text/html
@@ -50,21 +38,29 @@
end_of_line
die;
}
-@@ -44,15 +46,9 @@
- print <
+
-
-man2html missing
-
-man2html missing
--
--You have to install man2html in order to use this mode in gman.
-+
++
++man2html missing
++
++man2html missing
+
+ You have to install man2html in order to use this mode in gman.
-
+
end_of_line
die;
}
+
+-my $page = `$man2html $path`;
++my $page = `$man $section $name | man2html $man2html_args`;
+
+ # $page =~ s/^Content-type: text\/html\n\n// if (not run as cgi...);
+