Attachment 159709 Details for Bug 202207 – USE_GITHUB pass 2. Forgot url_handler.sh

[patch] USE_GITHUB pass 2. Forgot url_handler.sh

patch-urlview.patch (text/plain), 8.20 KB, created by Derek Schrock on 2015-08-09 20:39:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2015-08-09 20:39:42 UTC

Size: 8.20 KB

patch

obsolete

>From 2584c4777626559c77abebdbfc9f8e4083396132 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 13:49:09 -0400
>Subject: [PATCH 1/7] Use github - port rev will be the date of the commit.
>
>---
> Makefile | 12 +++++-------
> distinfo |  4 ++--
> 2 files changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index 4df2c5d..28e03fc 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -3,14 +3,12 @@
> 
> PORTNAME=	urlview
> PORTVERSION=	0.9
>-PORTREVISION=	7
>+PORTREVISION= 	102013
> CATEGORIES=	textproc www
>-MASTER_SITES=	ftp://ftp.mutt.org/mutt/contrib/ \
>-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/contrib/ \
>-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \
>-		ftp://ftp.gbnet.net/pub/mutt-international/contrib/ \
>-		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/contrib/ \
>-		http://seis.bris.ac.uk/~mexas/
>+
>+USE_GITHUB= yes
>+GH_ACCOUNT= sigpipe
>+GH_TAGNAME= 45443109
> 
> MAINTAINER=	udvzsolt@gmail.com
> COMMENT=	URL extractor/launcher
>diff --git a/distinfo b/distinfo
>index cda6c78..b7cea2b 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (urlview-0.9.tar.gz) = 74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3
>-SIZE (urlview-0.9.tar.gz) = 46685
>+SHA256 (sigpipe-urlview-0.9-45443109_GH0.tar.gz) = 2aa14d67a8bd44fd0533fa6000507a1aa67e9d72447b0c2eb66183a2f830cd31
>+SIZE (sigpipe-urlview-0.9-45443109_GH0.tar.gz) = 91331
>-- 
>2.4.6
>
>
>From 4e809140c5d5fc4c8b7fdcbd5b4087284844ff52 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 14:06:45 -0400
>Subject: [PATCH 2/7] remove patch-urlview.c - fix upstream
>
>---
> files/patch-urlview.c | 20 --------------------
> 1 file changed, 20 deletions(-)
> delete mode 100644 files/patch-urlview.c
>
>diff --git a/files/patch-urlview.c b/files/patch-urlview.c
>deleted file mode 100644
>index 63d8f3f..0000000
>--- a/files/patch-urlview.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- urlview.c.orig	2013-07-19 22:44:59.000000000 +0100
>-+++ urlview.c	2013-07-19 22:45:22.000000000 +0100
>-@@ -46,6 +46,8 @@
>- #include <rx/rxposix.h>
>- #endif
>- 
>-+#include "quote.h"
>-+
>- #define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]"
>- #define DEFAULT_COMMAND "firefox %s"
>- #define SYSTEM_INITFILE "/usr/local/etc/urlview.conf"
>-@@ -61,7 +63,7 @@
>-   MOTION
>- };
>- 
>--extern int mutt_enter_string (unsigned char *buf, size_t buflen, int y, int x,
>-+extern int mutt_enter_string (char *buf, size_t buflen, int y, int x,
>- 		int flags);
>- 
>- void search_forward (char *search, int urlcount, char **url, int *redraw, int *current, int *top)
>-- 
>2.4.6
>
>
>From 62c94184b74a296e018d2adf142c47de358f33f5 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 14:10:17 -0400
>Subject: [PATCH 3/7] update sample patch
>
>---
> files/patch-sample.urlview | 22 +++++++++-------------
> 1 file changed, 9 insertions(+), 13 deletions(-)
>
>diff --git a/files/patch-sample.urlview b/files/patch-sample.urlview
>index faf6a6a..195592d 100644
>--- a/files/patch-sample.urlview
>+++ b/files/patch-sample.urlview
>@@ -1,25 +1,21 @@
>---- sample.urlview~
>-+++ sample.urlview
>-@@ -3,7 +3,6 @@
>- # man urlview  <Man page>
>- #
>- # 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 @@
>+--- ../work/urlview-45443109/sample.urlview	2013-10-21 16:46:25.000000000 -0400
>++++ sample.urlview	2015-08-09 13:57:54.000000000 -0400
>+@@ -19,13 +19,11 @@
>  #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.
>+-# shell script.  Alternatively, you can leave COMMAND unset and set the BROWSER
>+-# environment variable instead.
> -
> -#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
>+ 
>+ 
>+ # Quit urlview after launch
>-- 
>2.4.6
>
>
>From e5d253e26ad3505012a91c76dd513ff57854604c Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 14:19:52 -0400
>Subject: [PATCH 4/7] Include WWW location for pkgng
>
>---
> pkg-descr | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/pkg-descr b/pkg-descr
>index a1c3032..67c68dd 100644
>--- a/pkg-descr
>+++ b/pkg-descr
>@@ -4,3 +4,5 @@ command to view a specific item.
> 
> urlview uses a regular expression to extract URLs from the
> specified text files.
>+
>+WWW: https://github.com/sigpipe/urlview
>-- 
>2.4.6
>
>
>From ed0afc31431188e57ad9126802dde5824b967f24 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 15:28:34 -0400
>Subject: [PATCH 5/7] portlint fixes
>
>---
> Makefile | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index 28e03fc..fa9e580 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -6,15 +6,15 @@ PORTVERSION=	0.9
> PORTREVISION= 	102013
> CATEGORIES=	textproc www
> 
>-USE_GITHUB= yes
>-GH_ACCOUNT= sigpipe
>-GH_TAGNAME= 45443109
>-
> MAINTAINER=	udvzsolt@gmail.com
> COMMENT=	URL extractor/launcher
> 
> LICENSE=	GPLv2
> 
>+USE_GITHUB= yes
>+GH_ACCOUNT= sigpipe
>+GH_TAGNAME= 45443109
>+
> GNU_CONFIGURE=	yes
> PLIST_FILES=	bin/urlview \
> 		etc/urlview.conf.sample \
>-- 
>2.4.6
>
>
>From 0a411c02473f330542a5c3f700f1a75a863f4ce5 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 15:43:26 -0400
>Subject: [PATCH 6/7] portlint: use makepatch
>
>---
> files/patch-sample.urlview | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/files/patch-sample.urlview b/files/patch-sample.urlview
>index 195592d..47a9146 100644
>--- a/files/patch-sample.urlview
>+++ b/files/patch-sample.urlview
>@@ -1,6 +1,6 @@
>---- ../work/urlview-45443109/sample.urlview	2013-10-21 16:46:25.000000000 -0400
>-+++ sample.urlview	2015-08-09 13:57:54.000000000 -0400
>-@@ -19,13 +19,11 @@
>+--- sample.urlview.orig	2015-08-09 19:37:22 UTC
>++++ sample.urlview
>+@@ -19,14 +19,11 @@
>  #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
>  REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
>  
>@@ -12,10 +12,10 @@
> -#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
>  
>- 
>  # Quit urlview after launch
>+ #QUITONLAUNCH
>-- 
>2.4.6
>
>
>From 0fcd42b7155b522dc1f9ad3fcb1d71782882d8cb Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 9 Aug 2015 16:35:04 -0400
>Subject: [PATCH 7/7] Let out this line for some reason
>
>---
> files/patch-sample.urlview | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/files/patch-sample.urlview b/files/patch-sample.urlview
>index 47a9146..aa6d231 100644
>--- a/files/patch-sample.urlview
>+++ b/files/patch-sample.urlview
>@@ -1,6 +1,14 @@
>---- sample.urlview.orig	2015-08-09 19:37:22 UTC
>+--- sample.urlview.orig	2013-10-21 20:46:25 UTC
> +++ sample.urlview
>-@@ -19,14 +19,11 @@
>+@@ -3,7 +3,6 @@
>+ # man urlview  <Man page>
>+ #
>+ # 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,13 +18,11 @@
>  #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
>  REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
>  
>@@ -12,10 +20,10 @@
> -#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
>  
>+ 
>  # Quit urlview after launch
>- #QUITONLAUNCH
>-- 
>2.4.6
>

Actions: View | Diff

Attachments on bug 202207: 159708 | 159709 | 159716 | 159768 | 159794 | 159805 | 159840 | 159843 | 159844 | 159851 | 159852