svn commit: r334855 - in head/textproc/urlview: . files

[Danilo Egea Gondolfo]

Author: danilo
Date: Mon Nov 25 15:06:59 2013
New Revision: 334855
URL: http://svnweb.freebsd.org/changeset/ports/334855

Log:
  - Fix warnings in urlview.c [1]
  - Add LICENSE
  - Add stage support
  
  PR:		ports/180681
  Submitted by:	Anton Shterenlikht <mexas at bris.ac.uk> (maintainer) [1]

Modified:
  head/textproc/urlview/Makefile
  head/textproc/urlview/files/patch-urlview.c

Modified: head/textproc/urlview/Makefile
==============================================================================
--- head/textproc/urlview/Makefile	Mon Nov 25 14:45:37 2013	(r334854)
+++ head/textproc/urlview/Makefile	Mon Nov 25 15:06:59 2013	(r334855)
@@ -15,19 +15,23 @@ MASTER_SITES=	ftp://ftp.mutt.org/mutt/co
 MAINTAINER=	mexas at bris.ac.uk
 COMMENT=	URL extractor/launcher
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
-MAN1=		urlview.1
 PLIST_FILES=	bin/urlview \
-		etc/urlview.conf.sample
+		etc/urlview.conf.sample \
+		man/man1/urlview.1.gz
+MAKE_ENV=	DESTDIR=${STAGEDIR}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		-e 's/url_handler.sh/firefox/' \
 		${WRKSRC}/*
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/urlview ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${MAN1PREFIX}/man/man1/urlview.1
 	${INSTALL_DATA} ${WRKSRC}/sample.urlview \
-		${PREFIX}/etc/urlview.conf.sample
+		${STAGEDIR}${PREFIX}/etc/urlview.conf.sample
 
 .include <bsd.port.mk>

Modified: head/textproc/urlview/files/patch-urlview.c
==============================================================================
--- head/textproc/urlview/files/patch-urlview.c	Mon Nov 25 14:45:37 2013	(r334854)
+++ head/textproc/urlview/files/patch-urlview.c	Mon Nov 25 15:06:59 2013	(r334855)
@@ -1,5 +1,5 @@
---- urlview.c.orig	Wed Nov  9 15:34:39 2005
-+++ urlview.c	Wed Nov  9 15:35:06 2005
+--- 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
@@ -7,5 +7,14 @@
 +#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 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)