- Fix MASTER_SITES

- Fix build on -current
- Remove obsolete WWW: line

PR:		ports/52137
Submitted by:	Ports Fury

5 files changed, 24 insertions, 23 deletions

diff --git a/misc/gman/Makefile b/misc/gman/Makefile
index 6713ac8486ff..5f0b7aab538a 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -8,9 +8,16 @@
 
 PORTNAME=	gman
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	http://stud3.tuwien.ac.at/~e0025974/distfiles/ \
-		http://homex.coolconnect.com/user/xkwang/gman/
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/g/gman
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+
+PATCH_SITES=	${MASTER_SITES}
+PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-1.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A user-friendly graphical front end for the man system
@@ -18,8 +25,11 @@ COMMENT=	A user-friendly graphical front end for the man system
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 
 MAN1=	gman.1x
 
@@ -34,8 +44,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gman ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/bin/gman.cgi
-	@${MKDIR} ${PREFIX}/www/cgi-bin/gman
-	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin/gman
+	@${MKDIR} ${PREFIX}/www/cgi-bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin
 	${INSTALL_MAN} ${WRKSRC}/gman.1x ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/gman/distinfo b/misc/gman/distinfo
index 9d6c1d033e39..05d6d7601a1e 100644
--- a/misc/gman/distinfo
+++ b/misc/gman/distinfo
@@ -1 +1,2 @@
-MD5 (gman-0.9.3.tar.gz) = 819582eb2527e36271f82f6562001b43
+MD5 (gman_0.9.3.orig.tar.gz) = 819582eb2527e36271f82f6562001b43
+MD5 (gman_0.9.3-1.diff.gz) = 09d84734400cb81df30ef1fb654b0025
diff --git a/misc/gman/files/patch-gman.c b/misc/gman/files/patch-gman.c
index 8949bb838b96..8143e8866ac1 100644
--- a/misc/gman/files/patch-gman.c
+++ b/misc/gman/files/patch-gman.c
@@ -1,20 +1,11 @@
---- gman.c.orig	Sat Mar 31 18:38:43 2001
-+++ gman.c	Sat Apr 14 05:10:14 2001
-@@ -83,7 +83,7 @@
- 	context = new AppContext();
- 	//	context->set_default_value("v_size",(void*)400);
- 	context->set_default_value("debuging","int",(void*)0);
--	context->set_default_value("man_paths","char*",(void*)"/usr/man:/usr/local/man:/usr/X11R6/man");
-+	context->set_default_value("man_paths","char*",(void*)"/usr/share/man:/usr/local/man:/usr/X11R6/man");
- 	context->set_default_value("display_section_policy","int",(void*)0);
- 	context->set_default_value("display_section","int",(void*)3);
- 	context->set_default_value("searching_mode","int",(void*)0);
-@@ -91,7 +91,7 @@
+--- gman.c.dist	Mon May 12 07:39:11 2003
++++ gman.c	Mon May 12 07:39:53 2003
+@@ -90,7 +90,7 @@
  	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*)"xterm"); // rxvt, Eterm also works
+ 	context->set_default_value("xterm_command","char*",(void*)"x-terminal-emulator");
 -	context->set_default_value("gv_command","char*",(void*)"gv");
 +	context->set_default_value("gv_command","char*",(void*)"ghostview");
- 	context->set_default_value("browser_command","char*",(void*)"netscape"); // kfm also works
+ 	context->set_default_value("browser_command","char*",(void*)"mozilla"); // kfm also works
  	context->set_default_value("cgi_host","char*",(void*)"localhost");
- 	context->set_default_value("cgi_location","char*",(void*)"/cgi-bin/gman/gman.pl");
+ 	context->set_default_value("cgi_location","char*",(void*)"/cgi-bin/gman.pl");
diff --git a/misc/gman/pkg-descr b/misc/gman/pkg-descr
index 727927a48ef0..b908a68ec595 100644
--- a/misc/gman/pkg-descr
+++ b/misc/gman/pkg-descr
@@ -3,4 +3,3 @@ designed for the new users of UNIX. It can help a newbie find specific
 information or idly browse other man pages.
 
 Author: Xinkai Wang <aakwxk@hotmail.com> 
-WWW: http://homex.coolconnect.com/user/xkwang/gman/
diff --git a/misc/gman/pkg-plist b/misc/gman/pkg-plist
index 4d366fead6b7..ffee331cb478 100644
--- a/misc/gman/pkg-plist
+++ b/misc/gman/pkg-plist
@@ -1,4 +1,4 @@
 bin/gman
 bin/gman.cgi
-www/cgi-bin/gman/gman.pl
-@dirrm www/cgi-bin/gman
+www/cgi-bin/gman.pl
+@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
\ No newline at end of file