Attachment #159805 for bug #202207




# $FreeBSD$

PORTNAME=	urlview
PORTVERSION=	0.9.2013.10.20
PORTREVISION=	7
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/

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 \

Lines 1-2 Link Here

(-)b/distinfo (-2 / +2 lines)
1	SHA256 (urlview-0.9.tar.gz) = 74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3	1	SHA256 (sigpipe-urlview-0.9.2013.10.20-45443109_GH0.tar.gz) = 2aa14d67a8bd44fd0533fa6000507a1aa67e9d72447b0c2eb66183a2f830cd31
2	SIZE (urlview-0.9.tar.gz) = 46685	2	SIZE (sigpipe-urlview-0.9.2013.10.20-45443109_GH0.tar.gz) = 91331




--- sample.urlview.orig	2013-10-21 20:46:25 UTC
+++ sample.urlview
@@ -3,7 +3,6 @@
 # man urlview  <Man page>

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




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

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

(-)b/pkg-descr (+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
		8	WWW: https://github.com/sigpipe/urlview

Return to bug 202207

Lines 2-22 Link Here

(-)b/Makefile (-8 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= urlview	4	PORTNAME= urlview
5	PORTVERSION= 0.9	5	PORTVERSION= 0.9.2013.10.20
6	PORTREVISION= 7
7	CATEGORIES= textproc www	6	CATEGORIES= textproc www
8	MASTER_SITES= ftp://ftp.mutt.org/mutt/contrib/ \
9	ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/contrib/ \
10	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \
11	ftp://ftp.gbnet.net/pub/mutt-international/contrib/ \
12	ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/contrib/ \
13	http://seis.bris.ac.uk/~mexas/
14		7
15	MAINTAINER= udvzsolt@gmail.com	8	MAINTAINER= udvzsolt@gmail.com
16	COMMENT= URL extractor/launcher	9	COMMENT= URL extractor/launcher
17		10
18	LICENSE= GPLv2	11	LICENSE= GPLv2
19		12
		13	USE_GITHUB= yes
		14	GH_ACCOUNT= sigpipe
		15	GH_TAGNAME= 45443109
		16
20	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
21	PLIST_FILES= bin/urlview \	18	PLIST_FILES= bin/urlview \
22	etc/urlview.conf.sample \	19	etc/urlview.conf.sample \

Lines 1-4 Link Here

(-)b/files/patch-sample.urlview (-4 / +8 lines)
1	--- sample.urlview~	1	--- sample.urlview.orig 2013-10-21 20:46:25 UTC
2	+++ sample.urlview	2	+++ sample.urlview
3	@@ -3,7 +3,6 @@	3	@@ -3,7 +3,6 @@
4	# man urlview <Man page>	4	# man urlview <Man page>
Lines 8-25 Link Here
8	#	8	#
9	# You can call 'urlview' while in 'mutt' by pressing the Ctrl b keys.	9	# You can call 'urlview' while in 'mutt' by pressing the Ctrl b keys.
10	# Put these macros in your $HOME/.muttrc file.	10	# Put these macros in your $HOME/.muttrc file.
11	@@ -19,10 +18,8 @@	11	@@ -19,13 +18,11 @@
12	#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>">\):]
13	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>">\):]
14		14
15	-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh	15	-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh
16	-# shell script.	16	-# shell script. Alternatively, you can leave COMMAND unset and set the BROWSER
		17	-# environment variable instead.
17	-	18	-
18	-#COMMAND lynx %s	19	-#COMMAND lynx %s
19	-#COMMAND netscape -remote 'openURL(%s)'	20	-#COMMAND netscape -remote 'openURL(%s)'
20	-COMMAND url_handler.sh	21	-COMMAND url_handler.sh
21	+# Command to invoke for selected URL.	22	+# Command to invoke for selected URL.
22		23	+
23	+#COMMAND lynx %s # :VT	24	+#COMMAND lynx %s # :VT
24	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT	25	+#COMMAND u=%s; xterm -e lynx $u \|\| lynx $u # :XT
25	+#COMMAND firefox %s 2>/dev/null & # :XW	26	+#COMMAND firefox %s 2>/dev/null & # :XW
		27
		28
		29	# Quit urlview after launch

Removed Link Here

(-)a/files/patch-urlview.c (-20 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)