From owner-freebsd-ports@FreeBSD.ORG Wed Jul 27 12:03:54 2011 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B66A106564A for ; Wed, 27 Jul 2011 12:03:54 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id C6EDB8FC0C for ; Wed, 27 Jul 2011 12:03:53 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirg.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1Qm2pk-0001M6-Mi; Wed, 27 Jul 2011 13:03:43 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Qm2pK-0002Wc-7e; Wed, 27 Jul 2011 13:03:02 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id p6RC31hW073473; Wed, 27 Jul 2011 13:03:01 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id p6RC31k6073472; Wed, 27 Jul 2011 13:03:01 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Wed, 27 Jul 2011 13:03:01 +0100 From: Anton Shterenlikht To: Test Rat Message-ID: <20110727120301.GA73424@mech-cluster241.men.bris.ac.uk> References: <20110727082212.GA68537@mech-cluster241.men.bris.ac.uk> <86zkk0dp3v.fsf@gmail.com> <20110727103737.GA71837@mech-cluster241.men.bris.ac.uk> <864o28c6vi.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <864o28c6vi.fsf@gmail.com> User-Agent: Mutt/1.4.2.3i Cc: Anton Shterenlikht , freebsd-ports@freebsd.org Subject: Re: is %%GECKO%% defined anywhere? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jul 2011 12:03:54 -0000 On Wed, Jul 27, 2011 at 03:14:57PM +0400, Test Rat wrote: > Anton Shterenlikht writes: > > [...] > > HOw about doing away with gecko.sh > > completely, and letting the user > > specify what they want directly in > > $HOME/.urlview: > > > > % cat $HOME/.urlview > > COMMAND lynx %s > > #COMMAND firefox3 %s > > #COMMAND midori %s > > Then we don't need url_handler.sh as well. But I don't use > the port... it's redundant when one has browse-url-at-point. ;) Thanks for the patch. I like it. But this seems like a major change. What's the usual consultation procedure and period for changes like this? > > %% > Makefile | 29 +++++++++-------------------- > files/gecko.sh.in | 5 ----- (removed) > files/patch-sample.urlview | 23 +++++++++++++++++++++++ > files/patch-url_handler.sh | 35 ----------------------------------- (removed) > pkg-plist | 4 ---- (removed) > 5 files changed, 32 insertions(+), 64 deletions(-) > 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 11:09:45 -0000 > @@ -8,7 +8,7 @@ > > PORTNAME= urlview > PORTVERSION= 0.9 > -PORTREVISION= 6 > +PORTREVISION= 7 > CATEGORIES= textproc www > MASTER_SITES= ftp://ftp.mutt.org/mutt/contrib/ \ > ftp://ftp.sunsite.auc.dk/pub/mail/mutt/contrib/ \ > @@ -22,27 +22,16 @@ COMMENT= URL extractor/launcher > > GNU_CONFIGURE= yes > MAN1= urlview.1 > -SUB_FILES= gecko.sh > -SUB_LIST= GECKO=${GECKO} > - > -.if defined(WITH_FIREFOX) > -USE_FIREFOX= 36 > -GECKO= firefox3 > -.elif defined(WITH_SEAMONKEY) > -USE_SEAMONKEY= 20 > -GECKO= seamonkey > -.endif > - > -.include > +PLIST_FILES= bin/urlview \ > + etc/urlview.conf.sample > > post-patch: > - @${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}/* > + @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ > + -e 's/url_handler.sh/firefox/' \ > + ${WRKSRC}/* > > post-install: > - ${INSTALL_SCRIPT} ${WRKSRC}/url_handler.sh ${WRKDIR}/gecko.sh \ > - ${PREFIX}/bin > + ${INSTALL_DATA} ${WRKSRC}/sample.urlview \ > + ${PREFIX}/etc/urlview.conf.sample > > -.include > +.include > Index: textproc/urlview/pkg-plist > =================================================================== > RCS file: textproc/urlview/pkg-plist > diff -N textproc/urlview/pkg-plist > --- textproc/urlview/pkg-plist 29 Nov 2009 08:24:49 -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,4 +0,0 @@ > -@comment $FreeBSD: ports/textproc/urlview/pkg-plist,v 1.5 2009/11/29 08:24:49 obrien Exp $ > -bin/gecko.sh > -bin/url_handler.sh > -bin/urlview > Index: textproc/urlview/files/gecko.sh.in > =================================================================== > RCS file: textproc/urlview/files/gecko.sh.in > diff -N textproc/urlview/files/gecko.sh.in > --- textproc/urlview/files/gecko.sh.in 29 Nov 2009 08:24:50 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,5 +0,0 @@ > -#! /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 > Index: textproc/urlview/files/patch-sample.urlview > =================================================================== > RCS file: textproc/urlview/files/patch-sample.urlview > diff -N textproc/urlview/files/patch-sample.urlview > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ textproc/urlview/files/patch-sample.urlview 27 Jul 2011 11:11:08 -0000 > @@ -0,0 +1,23 @@ > +--- sample.urlview~ > ++++ sample.urlview > +@@ -3,7 +3,6 @@ > + # man urlview > + # > + # Put this file in: $HOME/.urlview > +-# Put url_handler.sh in: /usr/bin > + # > + # You can call 'urlview' while in 'mutt' by pressing the Ctrl b keys. > + # Put these macros in your $HOME/.muttrc file. > +@@ -19,10 +18,7 @@ > + #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] > + REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] > + > +-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh > +-# shell script. > ++# Command to invoke for selected URL. > + > + #COMMAND lynx %s > +-#COMMAND netscape -remote 'openURL(%s)' > +-COMMAND url_handler.sh > +- > ++COMMAND url_handler.sh %s > Index: textproc/urlview/files/patch-url_handler.sh > =================================================================== > RCS file: textproc/urlview/files/patch-url_handler.sh > diff -N textproc/urlview/files/patch-url_handler.sh > --- textproc/urlview/files/patch-url_handler.sh 29 Nov 2009 08:24:50 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,35 +0,0 @@ > -$FreeBSD: ports/textproc/urlview/files/patch-url_handler.sh,v 1.2 2009/11/29 08:24:50 obrien Exp $ > ---- 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 @@ > --#! /bin/bash > -+#! /bin/sh > - > - # Copyright (c) 1998 Martin Schulze > - # Slightly modified by Luis Francisco Gonzalez > -@@ -28,11 +28,11 @@ > - # VT: Launch in the same terminal > - > - # The lists of programs to be executed are > --https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT" > --http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW" > --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/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" > - > - # Program used as an xterm (if it doesn't support -T you'll need to change > - # the command line in getprg) > -@@ -42,7 +42,7 @@ > - ########################################################################### > - # Change bellow this at your own risk > - ########################################################################### > --function getprg() > -+getprg() > - { > - local ele tag prog > - > %% -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423