Date: Wed, 27 Jul 2011 13:55:48 +0400 From: Test Rat <ttsestt@gmail.com> To: Anton Shterenlikht <mexas@bristol.ac.uk> Cc: freebsd-ports@freebsd.org Subject: Re: is %%GECKO%% defined anywhere? Message-ID: <86zkk0dp3v.fsf@gmail.com> In-Reply-To: <20110727082212.GA68537@mech-cluster241.men.bris.ac.uk> (Anton Shterenlikht's message of "Wed, 27 Jul 2011 09:22:12 %2B0100") References: <20110727082212.GA68537@mech-cluster241.men.bris.ac.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
Anton Shterenlikht <mexas@bristol.ac.uk> writes:
> # cat /usr/ports/textproc/urlview/files/gecko.sh.in
> #! /bin/sh
> # $FreeBSD: ports/textproc/urlview/files/gecko.sh.in,v 1.1 2009/11/29 08:24:50 obrien Exp $
> # Launch %%GECKO%% for urlview
> URL=$@
> %%GECKO%% -remote "openurl($URL, new-tab)" || %%GECKO%% $URL
> #
>
> which on installation turns into
>
> # cat /usr/local/bin/gecko.sh
> #! /bin/sh
> # $FreeBSD: ports/textproc/urlview/files/gecko.sh.in,v 1.1 2009/11/29 08:24:50 obrien Exp $
> # Launch for urlview
> URL=$@
> -remote "openurl($URL, new-tab)" || $URL
> #
>
> I cannot find any reference to %%GECKO%% in Mk/*
It's pre-processed by sed(1) before being installed, see SUB_LIST.
$ make -V SUB_LIST:MGECKO\*
GECKO=
$ make -V SUB_LIST:MGECKO\* WITH_FIREFOX=
GECKO=firefox3
$ make -V SUB_LIST:MGECKO\* WITH_SEAMONKEY=
GECKO=seamonkey
Here is a bandaid that uses firefox by default. A proper fix would
probably involve relying on an environment variable and doing
away with gecko.sh to also address ports/152453.
%%
Index: textproc/urlview/Makefile
===================================================================
RCS file: /a/.cvsup/ports/textproc/urlview/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- textproc/urlview/Makefile 2 May 2011 22:05:18 -0000 1.33
+++ textproc/urlview/Makefile 27 Jul 2011 09:32:54 -0000
@@ -25,12 +25,12 @@ MAN1= urlview.1
SUB_FILES= gecko.sh
SUB_LIST= GECKO=${GECKO}
-.if defined(WITH_FIREFOX)
-USE_FIREFOX= 36
-GECKO= firefox3
-.elif defined(WITH_SEAMONKEY)
+.if defined(WITH_SEAMONKEY)
USE_SEAMONKEY= 20
GECKO= seamonkey
+.else
+USE_FIREFOX= yes
+GECKO= firefox
.endif
.include <bsd.port.pre.mk>
%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zkk0dp3v.fsf>