Attachment #159709 for bug #202207





PORTNAME=	urlview
PORTVERSION=	0.9
PORTREVISION= 	102013
CATEGORIES=	textproc www

USE_GITHUB= yes
GH_ACCOUNT= sigpipe
GH_TAGNAME= 45443109
		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/contrib/ \
		http://seis.bris.ac.uk/~mexas/

MAINTAINER=	udvzsolt@gmail.com
COMMENT=	URL extractor/launcher

Lines 1-2 Link Here

(-)b/distinfo (-4 / +2 lines)
1	SHA256 (urlview-0.9.tar.gz) = 74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3	1	SHA256 (sigpipe-urlview-0.9-45443109_GH0.tar.gz) = 2aa14d67a8bd44fd0533fa6000507a1aa67e9d72447b0c2eb66183a2f830cd31
2	SIZE (urlview-0.9.tar.gz) = 46685	2	SIZE (sigpipe-urlview-0.9-45443109_GH0.tar.gz) = 91331
3	-
4	--
5	files/patch-urlview.c \| 20 --------------------	3	files/patch-urlview.c \| 20 --------------------
6	1 file changed, 20 deletions(-)	4	1 file changed, 20 deletions(-)
7	delete mode 100644 files/patch-urlview.c	5	delete mode 100644 files/patch-urlview.c




--- 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)
- 
--
files/patch-sample.urlview | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)




--- ../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 @@
 # 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 @@
 #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.  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
pkg-descr | 2 ++
1 file changed, 2 insertions(+)

Lines 4-6 command to view a specific item. Link Here

(-)b/pkg-descr (-2 / +2 lines)
4		4
5	urlview uses a regular expression to extract URLs from the	5	urlview uses a regular expression to extract URLs from the
6	specified text files.	6	specified text files.
7	-	7
8	--	8	WWW: https://github.com/sigpipe/urlview
9	Makefile \| 8 ++++----	9	Makefile \| 8 ++++----
10	1 file changed, 4 insertions(+), 4 deletions(-)	10	1 file changed, 4 insertions(+), 4 deletions(-)




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 \
- 
--
files/patch-sample.urlview | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)




--- 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>">\):]
 

-#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
--
files/patch-sample.urlview | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)




--- sample.urlview.orig	2013-10-21 20:46:25 UTC
+++ 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,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>">\):]
 

-#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
- 

Return to bug 202207

Lines 3-16 Link Here

(-)b/Makefile (-7 / +5 lines)
3		3
4	PORTNAME= urlview	4	PORTNAME= urlview
5	PORTVERSION= 0.9	5	PORTVERSION= 0.9
6	PORTREVISION= 7	6	PORTREVISION= 102013
7	CATEGORIES= textproc www	7	CATEGORIES= textproc www
8	MASTER_SITES= ftp://ftp.mutt.org/mutt/contrib/ \	8
9	ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/contrib/ \	9	USE_GITHUB= yes
10	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \	10	GH_ACCOUNT= sigpipe
11	ftp://ftp.gbnet.net/pub/mutt-international/contrib/ \	11	GH_TAGNAME= 45443109
12	ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/contrib/ \
13	http://seis.bris.ac.uk/~mexas/
14		12
15	MAINTAINER= udvzsolt@gmail.com	13	MAINTAINER= udvzsolt@gmail.com
16	COMMENT= URL extractor/launcher	14	COMMENT= URL extractor/launcher

Removed Link Here

(-)a/files/patch-urlview.c (-22 lines)
1	--- urlview.c.orig 2013-07-19 22:44:59.000000000 +0100
2	+++ urlview.c 2013-07-19 22:45:22.000000000 +0100
3	@@ -46,6 +46,8 @@
4	#include <rx/rxposix.h>
5	#endif
6
7	+#include "quote.h"
8	+
9	#define DEFAULT_REGEXP "(((https?\|ftp\|gopher)://\|(mailto\|file\|news):)[^' \t<>\"]+\|(www\|web\|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]"
10	#define DEFAULT_COMMAND "firefox %s"
11	#define SYSTEM_INITFILE "/usr/local/etc/urlview.conf"
12	@@ -61,7 +63,7 @@
13	MOTION
14	};
15
16	-extern int mutt_enter_string (unsigned char *buf, size_t buflen, int y, int x,
17	+extern int mutt_enter_string (char *buf, size_t buflen, int y, int x,
18	int flags);
19
20	void search_forward (char search, int urlcount, char url, int redraw, int current, int top)
21	-
22	--
23	files/patch-sample.urlview \| 22 +++++++++-------------	0	files/patch-sample.urlview \| 22 +++++++++-------------
24	1 file changed, 9 insertions(+), 13 deletions(-)	1	1 file changed, 9 insertions(+), 13 deletions(-)

Lines 1-25 Link Here

(-)b/files/patch-sample.urlview (-15 / +9 lines)
1	--- sample.urlview~	1	--- ../work/urlview-45443109/sample.urlview 2013-10-21 16:46:25.000000000 -0400
2	+++ sample.urlview	2	+++ sample.urlview 2015-08-09 13:57:54.000000000 -0400
3	@@ -3,7 +3,6 @@	3	@@ -19,13 +19,11 @@
4	# man urlview <Man page>
5	#
6	# Put this file in: $HOME/.urlview
7	-# Put url_handler.sh in: /usr/bin
8	#
9	# You can call 'urlview' while in 'mutt' by pressing the Ctrl b keys.
10	# Put these macros in your $HOME/.muttrc file.
11	@@ -19,10 +18,8 @@
12	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	4	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
13	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	5	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
14		6
15	-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh	7	-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh
16	-# shell script.	8	-# shell script. Alternatively, you can leave COMMAND unset and set the BROWSER
		9	-# environment variable instead.
17	-	10	-
18	-#COMMAND lynx %s	11	-#COMMAND lynx %s
19	-#COMMAND netscape -remote 'openURL(%s)'	12	-#COMMAND netscape -remote 'openURL(%s)'
20	-COMMAND url_handler.sh	13	-COMMAND url_handler.sh
21	+# Command to invoke for selected URL.	14	+# Command to invoke for selected URL.
22		15	+
23	+#COMMAND lynx %s # :VT	16	+#COMMAND lynx %s # :VT
24	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT	17	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT
25	+#COMMAND firefox %s 2>/dev/null & # :XW	18	+#COMMAND firefox %s 2>/dev/null & # :XW
26	-	19
27	--	20
		21	# Quit urlview after launch
28	pkg-descr \| 2 ++	22	pkg-descr \| 2 ++
29	1 file changed, 2 insertions(+)	23	1 file changed, 2 insertions(+)

Lines 6-20 PORTVERSION= 0.9 Link Here

(-)b/Makefile (-6 / +4 lines)
6	PORTREVISION= 102013	6	PORTREVISION= 102013
7	CATEGORIES= textproc www	7	CATEGORIES= textproc www
8		8
9	USE_GITHUB= yes
10	GH_ACCOUNT= sigpipe
11	GH_TAGNAME= 45443109
12
13	MAINTAINER= udvzsolt@gmail.com	9	MAINTAINER= udvzsolt@gmail.com
14	COMMENT= URL extractor/launcher	10	COMMENT= URL extractor/launcher
15		11
16	LICENSE= GPLv2	12	LICENSE= GPLv2
17		13
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= sigpipe
		16	GH_TAGNAME= 45443109
		17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	PLIST_FILES= bin/urlview \	19	PLIST_FILES= bin/urlview \
20	etc/urlview.conf.sample \	20	etc/urlview.conf.sample \
21	-
22	--
23	files/patch-sample.urlview \| 10 +++++-----	21	files/patch-sample.urlview \| 10 +++++-----
24	1 file changed, 5 insertions(+), 5 deletions(-)	22	1 file changed, 5 insertions(+), 5 deletions(-)

Lines 1-6 Link Here

(-)b/files/patch-sample.urlview (-7 / +5 lines)
1	--- ../work/urlview-45443109/sample.urlview 2013-10-21 16:46:25.000000000 -0400	1	--- sample.urlview.orig 2015-08-09 19:37:22 UTC
2	+++ sample.urlview 2015-08-09 13:57:54.000000000 -0400	2	+++ sample.urlview
3	@@ -19,13 +19,11 @@	3	@@ -19,14 +19,11 @@
4	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	4	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
5	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	5	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
6		6
Lines 12-21 Link Here
12	-#COMMAND netscape -remote 'openURL(%s)'	12	-#COMMAND netscape -remote 'openURL(%s)'
13	-COMMAND url_handler.sh	13	-COMMAND url_handler.sh
14	+# Command to invoke for selected URL.	14	+# Command to invoke for selected URL.
15	+	15
16	+#COMMAND lynx %s # :VT	16	+#COMMAND lynx %s # :VT
17	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT	17	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT
18	+#COMMAND firefox %s 2>/dev/null & # :XW	18	+#COMMAND firefox %s 2>/dev/null & # :XW
19		19
20
21	# Quit urlview after launch	20	# Quit urlview after launch
22	-	21	#QUITONLAUNCH
23	--
24	files/patch-sample.urlview \| 16 ++++++++++++----	22	files/patch-sample.urlview \| 16 ++++++++++++----
25	1 file changed, 12 insertions(+), 4 deletions(-)	23	1 file changed, 12 insertions(+), 4 deletions(-)

Lines 1-6 Link Here

(-)b/files/patch-sample.urlview (-5 / +12 lines)
1	--- sample.urlview.orig 2015-08-09 19:37:22 UTC	1	--- sample.urlview.orig 2013-10-21 20:46:25 UTC
2	+++ sample.urlview	2	+++ sample.urlview
3	@@ -19,14 +19,11 @@	3	@@ -3,7 +3,6 @@
		4	# man urlview <Man page>
		5	#
		6	# Put this file in: $HOME/.urlview
		7	-# Put url_handler.sh in: /usr/bin
		8	#
		9	# You can call 'urlview' while in 'mutt' by pressing the Ctrl b keys.
		10	# Put these macros in your $HOME/.muttrc file.
		11	@@ -19,13 +18,11 @@
4	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	12	#REGEXP (((http\|https\|ftp\|gopher)\|mailto):(//)?[^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
5	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]	13	REGEXP (((http\|https\|ftp\|gopher)\|mailto)[.:][^ >"\t]*\|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
6		14
Lines 12-21 Link Here
12	-#COMMAND netscape -remote 'openURL(%s)'	20	-#COMMAND netscape -remote 'openURL(%s)'
13	-COMMAND url_handler.sh	21	-COMMAND url_handler.sh
14	+# Command to invoke for selected URL.	22	+# Command to invoke for selected URL.
15		23	+
16	+#COMMAND lynx %s # :VT	24	+#COMMAND lynx %s # :VT
17	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT	25	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT
18	+#COMMAND firefox %s 2>/dev/null & # :XW	26	+#COMMAND firefox %s 2>/dev/null & # :XW
19		27
		28
20	# Quit urlview after launch	29	# Quit urlview after launch
21	#QUITONLAUNCH
22	-