From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 30 13:30:15 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A29BB1065672 for ; Sat, 30 Jul 2011 13:30:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 900BB8FC17 for ; Sat, 30 Jul 2011 13:30:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6UDUFLx011098 for ; Sat, 30 Jul 2011 13:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6UDUFOQ011094; Sat, 30 Jul 2011 13:30:15 GMT (envelope-from gnats) Date: Sat, 30 Jul 2011 13:30:15 GMT Message-Id: <201107301330.p6UDUFOQ011094@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Anton Shterenlikht Cc: Subject: RE: ports/152453: textproc/urlview port should install gecko.sh optionally X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Anton Shterenlikht List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2011 13:30:15 -0000 The following reply was made to PR ports/152453; it has been noted by GNATS. From: Anton Shterenlikht To: bug-followup@FreeBSD.org, thurners@nicsys.de Cc: Subject: RE: ports/152453: textproc/urlview port should install gecko.sh optionally Date: Sat, 30 Jul 2011 14:28:52 +0100 --lrZ03NoBR/3+SXJZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Please try attached patch, thanks to Test Rat . -- 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 --lrZ03NoBR/3+SXJZ Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="urlview.patch" %% Makefile | 32 +++++++++----------------------- files/gecko.sh.in | 5 ----- (removed) files/patch-sample.urlview | 25 +++++++++++++++++++++++++ files/patch-url_handler.sh | 35 ----------------------------------- (removed) pkg-plist | 4 ---- (removed) 5 files changed, 34 insertions(+), 67 deletions(-) Index: textproc/urlview/Makefile =================================================================== RCS file: /home/ncvs/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 30 Jul 2011 13:03:15 -0000 @@ -8,41 +8,27 @@ 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/ \ ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/contrib/ -#PATCH_SITES= http://feeding.frenzy.com/~rainking/ -#PATCHFILES= urlview.diff - MAINTAINER= mexas@bristol.ac.uk 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 30 Jul 2011 13:03:15 -0000 @@ -0,0 +1,25 @@ +--- 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,8 @@ + #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 lynx %s +-#COMMAND netscape -remote 'openURL(%s)' +-COMMAND url_handler.sh ++# Command to invoke for selected URL. + ++#COMMAND lynx %s # :VT ++#COMMAND u=%s; xterm -e lynx $u || lynx $u # :XT ++#COMMAND firefox %s 2>/dev/null & # :XW 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 - %% --lrZ03NoBR/3+SXJZ--