ports/182853: ports/textproc/urlview: regex -> pcreregex
Anton Shterenlikht
mexas at bris.ac.uk
Wed Oct 16 15:40:02 UTC 2013
The following reply was made to PR ports/182853; it has been noted by GNATS.
From: Anton Shterenlikht <mexas at bris.ac.uk>
To: bug-followup at freebsd.org
Cc:
Subject: RE: ports/182853: ports/textproc/urlview: regex -> pcreregex
Date: Wed, 16 Oct 2013 16:35:00 +0100 (BST)
I updated the patch to support stage,
and incorporated the change from
http://www.freebsd.org/cgi/query-pr.cgi?pr=180681
The port builds and installs on ia64 and amd64, both
current, but fails configure on redports:
On my boxes:
checking whether the C compiler (cc -O2 -pipe -I/usr/local/include -Wall -fno-strict-aliasing -L/usr/local/lib -lpcreposix -lpcre) works... yes
On redports, any platform:
checking whether the C compiler (cc -O2 -pipe -I/usr/local/include -Wall -fno-strict-aliasing -L/usr/local/lib -lpcreposix -lpcre) works... no
I don't know what the reason for this is.
I asked in ports@ and got no reply.
Another issue is that staging Q/A gives
this error:
====> Running Q/A tests
Error: /usr/ports/textproc/urlview/work/stage/usr/local/bin/urlview is referring to /usr/ports/textproc/urlview/work/stage
#
Again, I asked in ports and got no reply.
Can the PR submitter please try the new
patch and report back.
Index: Makefile
===================================================================
--- Makefile (revision 330472)
+++ Makefile (working copy)
@@ -16,18 +16,20 @@
COMMENT= URL extractor/launcher
GNU_CONFIGURE= yes
-MAN1= urlview.1
PLIST_FILES= bin/urlview \
- etc/urlview.conf.sample
+ etc/urlview.conf.sample \
+ man/man1/urlview.1.gz
-NO_STAGE= yes
+CFLAGS+= -I${LOCALBASE}/include -Wall
+LDFLAGS+= -L${LOCALBASE}/lib -lpcreposix -lpcre
+
post-patch:
- @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
+ @${REINPLACE_CMD} -e 's,/etc,${STAGEDIR}${PREFIX}&,' \
-e 's/url_handler.sh/firefox/' \
${WRKSRC}/*
post-install:
${INSTALL_DATA} ${WRKSRC}/sample.urlview \
- ${PREFIX}/etc/urlview.conf.sample
+ ${STAGEDIR}${PREFIX}/etc/urlview.conf.sample
.include <bsd.port.mk>
Index: files/patch-Makefile.in
===================================================================
--- files/patch-Makefile.in (revision 0)
+++ files/patch-Makefile.in (working copy)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2013-10-15 17:01:57.000000000 +0100
++++ Makefile.in 2013-10-15 17:02:06.000000000 +0100
+@@ -318,7 +318,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
++ $(INSTALL_DATA) urlview.man $(DESTDIR)$(mandir)/man1/urlview.1
+
+ # how to create a target for uninstall-data-local???
+
Property changes on: files/patch-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-urlview.c
===================================================================
--- files/patch-urlview.c (revision 330472)
+++ files/patch-urlview.c (working copy)
@@ -1,6 +1,12 @@
---- urlview.c.orig Wed Nov 9 15:34:39 2005
-+++ urlview.c Wed Nov 9 15:35:06 2005
-@@ -46,6 +46,8 @@
+--- urlview.c.orig 2000-07-04 11:14:30.000000000 +0100
++++ urlview.c 2013-10-16 16:06:40.000000000 +0100
+@@ -41,13 +41,15 @@
+ #include <sys/stat.h>
+
+ #ifdef HAVE_REGEX_H
+-#include <regex.h>
++#include <pcreposix.h>
+ #else
#include <rx/rxposix.h>
#endif
@@ -7,5 +13,17 @@
+#include "quote.h"
+
#define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]"
- #define DEFAULT_COMMAND "url_handler.sh %s"
- #define SYSTEM_INITFILE "/usr/local/etc/urlview.conf"
+-#define DEFAULT_COMMAND "url_handler.sh %s"
++#define DEFAULT_COMMAND "firefox %s"
+ #define SYSTEM_INITFILE "/etc/urlview.conf"
+
+ #define OFFSET 2
+@@ -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)
More information about the freebsd-ports-bugs
mailing list