aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2009-11-29 16:24:50 +0800
committerobrien <obrien@FreeBSD.org>2009-11-29 16:24:50 +0800
commit17213429b40e3947db5c480de5adbc335c467a94 (patch)
tree2f1a61a9d79ae63e80bc78070ef6c70978d1d4dc
parentbcb1701b4cb9aee2b21ef1c2267808f46873d400 (diff)
downloadfreebsd-ports-gnome-17213429b40e3947db5c480de5adbc335c467a94.tar.gz
freebsd-ports-gnome-17213429b40e3947db5c480de5adbc335c467a94.tar.zst
freebsd-ports-gnome-17213429b40e3947db5c480de5adbc335c467a94.zip
+ Use bsd.gecko.mk to set GECKO, if WITH_GECKO is set, or default to firefox.
+ Respect X11BASE. PR: 102954 Submitted by: Thierry Thomas <thierry@@pompo.net>
-rw-r--r--textproc/urlview/Makefile18
-rw-r--r--textproc/urlview/files/gecko.sh.in5
-rw-r--r--textproc/urlview/files/patch-url_handler.sh5
-rw-r--r--textproc/urlview/pkg-plist1
4 files changed, 24 insertions, 5 deletions
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index b3b41b7d9b70..43430b593690 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -8,7 +8,7 @@
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/ \
@@ -22,13 +22,25 @@ COMMENT= URL extractor/launcher
GNU_CONFIGURE= yes
MAN1= urlview.1
+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
post-patch:
- @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" ${WRKSRC}/url_handler.sh
+ @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
+ -e "s,/usr/X11R6,${X11BASE},g" ${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
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/urlview/files/gecko.sh.in b/textproc/urlview/files/gecko.sh.in
new file mode 100644
index 000000000000..5c0d5ba4f1ad
--- /dev/null
+++ b/textproc/urlview/files/gecko.sh.in
@@ -0,0 +1,5 @@
+#! /bin/sh
+# $FreeBSD$
+# Launch %%GECKO%% for urlview
+URL=$@
+%%GECKO%% -remote "openurl($URL, new-tab)" || %%GECKO%% $URL
diff --git a/textproc/urlview/files/patch-url_handler.sh b/textproc/urlview/files/patch-url_handler.sh
index 99a26639c5cb..1f8c42ffab3a 100644
--- a/textproc/urlview/files/patch-url_handler.sh
+++ b/textproc/urlview/files/patch-url_handler.sh
@@ -1,3 +1,4 @@
+$FreeBSD$
--- url_handler.sh.orig Tue Jul 4 03:14:30 2000
+++ url_handler.sh Wed Aug 22 10:42:49 2001
@@ -1,4 +1,4 @@
@@ -15,8 +16,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 --git a/textproc/urlview/pkg-plist b/textproc/urlview/pkg-plist
index 1342dafbb214..586625222171 100644
--- a/textproc/urlview/pkg-plist
+++ b/textproc/urlview/pkg-plist
@@ -1,3 +1,4 @@
@comment $FreeBSD$
+bin/gecko.sh
bin/url_handler.sh
bin/urlview