diff -urN textproc/urlview.orig/Makefile textproc/urlview/Makefile
--- textproc/urlview.orig/Makefile	Sat May 13 06:24:50 2006
+++ textproc/urlview/Makefile	Wed Sep  6 22:57:06 2006
@@ -8,12 +8,11 @@
 
 PORTNAME=	urlview
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc www
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/contrib/ \
 		ftp://ftp.sunsite.auc.dk/pub/mail/mutt/contrib/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/contrib/
-
 #PATCH_SITES=	http://feeding.frenzy.com/~rainking/
 #PATCHFILES=	urlview.diff
 
@@ -23,12 +22,25 @@
 GNU_CONFIGURE=	yes
 MAN1=		urlview.1
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" ${WRKSRC}/url_handler.sh
+SUB_FILES=	gecko.sh
+SUB_LIST=	GECKO=${GECKO}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GECKO)
+USE_GECKO=	firefox firefox-devel seamonkey mozilla
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.else
+GECKO=	firefox
+.endif
+
+pre-configure:
+	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g;s,/usr/X11R6,${X11BASE}," \
+		${WRKSRC}/url_handler.sh
 	@${REINPLACE_CMD} -e \
 		"s,/etc/urlview.conf,${PREFIX}/etc/urlview.conf,g" ${WRKSRC}/*
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/url_handler.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/url_handler.sh ${WRKDIR}/gecko.sh ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN textproc/urlview.orig/files/gecko.sh.in textproc/urlview/files/gecko.sh.in
--- textproc/urlview.orig/files/gecko.sh.in	Thu Jan  1 01:00:00 1970
+++ textproc/urlview/files/gecko.sh.in	Wed Sep  6 22:52:31 2006
@@ -0,0 +1,4 @@
+#! /bin/sh
+# Launch %%GECKO%% for urlview
+URL=$@
+%%GECKO%% -remote "openurl($URL, new-tab)" || %%GECKO%% $URL
diff -urN textproc/urlview.orig/files/patch-url_handler.sh textproc/urlview/files/patch-url_handler.sh
--- textproc/urlview.orig/files/patch-url_handler.sh	Wed Aug 22 19:46:52 2001
+++ textproc/urlview/files/patch-url_handler.sh	Wed Sep  6 22:48:30 2006
@@ -1,5 +1,5 @@
---- url_handler.sh.orig	Tue Jul  4 03:14:30 2000
-+++ url_handler.sh	Wed Aug 22 10:42:49 2001
+--- url_handler.sh.orig	Tue Jul  4 12:14:30 2000
++++ url_handler.sh	Wed Sep  6 22:47:02 2006
 @@ -1,4 +1,4 @@
 -#! /bin/bash
 +#! /bin/sh
@@ -15,8 +15,8 @@
 -mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT"
 -gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT"
 -ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT"
-+https_prgs="!!PREFIX!!/bin/netscape:XW !!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/w3m:XT"
-+http_prgs="!!PREFIX!!/bin/netscape:XW !!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/w3m:XT !!PREFIX!!/bin/links:XT"
++https_prgs="!!PREFIX!!/bin/gecko.sh:XW !!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/w3m:XT"
++http_prgs="!!PREFIX!!/bin/gecko.sh:XW !!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/w3m:XT !!PREFIX!!/bin/links:XT"
 +mailto_prgs="!!PREFIX!!/bin/mutt:VT !!PREFIX!!/bin/elm:VT !!PREFIX!!/bin/pine:VT /usr/bin/mail:VT"
 +gopher_prgs="!!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/gopher:XT"
 +ftp_prgs="!!PREFIX!!/bin/lynx:XT !!PREFIX!!/bin/ncftp2:XT !!PREFIX!!/bin/ncftp3:XT !!PREFIX!!/bin/ncftp:XT"
diff -urN textproc/urlview.orig/pkg-plist textproc/urlview/pkg-plist
--- textproc/urlview.orig/pkg-plist	Tue Dec 18 06:20:50 2001
+++ textproc/urlview/pkg-plist	Wed Sep  6 22:57:33 2006
@@ -1,3 +1,4 @@
 @comment $FreeBSD: ports/textproc/urlview/pkg-plist,v 1.4 2001/12/18 05:20:50 petef Exp $
+bin/gecko.sh
 bin/url_handler.sh
 bin/urlview