From mexas@bristol.ac.uk  Sat Jul 20 17:28:13 2013
Return-Path: <mexas@bristol.ac.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id B9F556A5
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jul 2013 17:28:13 +0000 (UTC)
	(envelope-from mexas@bristol.ac.uk)
Received: from eu1sys200aog106.obsmtp.com (eu1sys200aog106.obsmtp.com [207.126.144.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 17633C7E
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jul 2013 17:28:12 +0000 (UTC)
Received: from mail-we0-f180.google.com ([74.125.82.180]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP
	ID DSNKUerIiyULtt51z3C9F6FtnP2Zzx3caexb@postini.com; Sat, 20 Jul 2013 17:28:13 UTC
Received: by mail-we0-f180.google.com with SMTP id p59so880840wes.25
        for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jul 2013 10:27:39 -0700 (PDT)
Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241])
        by mx.google.com with ESMTPSA id z6sm30024365wiv.11.2013.07.20.10.27.37
        for <FreeBSD-gnats-submit@freebsd.org>
        (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
        Sat, 20 Jul 2013 10:27:38 -0700 (PDT)
Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1])
	by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r6KHRaH4009207
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jul 2013 18:27:36 +0100 (BST)
	(envelope-from mexas@mech-cluster241.men.bris.ac.uk)
Received: (from mexas@localhost)
	by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r6KHRZb3009206;
	Sat, 20 Jul 2013 18:27:35 +0100 (BST)
	(envelope-from mexas)
Message-Id: <201307201727.r6KHRZb3009206@mech-cluster241.men.bris.ac.uk>
Date: Sat, 20 Jul 2013 18:27:35 +0100 (BST)
From: Anton Shterenlikht <mexas@bris.ac.uk>
Sender: Anton Shterenlikht <mexas@bristol.ac.uk>
Reply-To: Anton Shterenlikht <mexas@bris.ac.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] textproc/urlview fix compiler warnings
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         180681
>Category:       ports
>Synopsis:       [patch] textproc/urlview fix compiler warnings
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    danilo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 20 17:30:00 UTC 2013
>Closed-Date:    Mon Nov 25 15:07:12 UTC 2013
>Last-Modified:  Mon Nov 25 15:10:00 UTC 2013
>Originator:     Anton Shterenlikht
>Release:        FreeBSD 10.0-CURRENT ia64
>Organization:
University of Bristol 
>Environment:
System: FreeBSD mech-cluster241.men.bris.ac.uk 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r252055: Fri Jun 21 15:57:18 BST 2013 root@mech-cluster241.men.bris.ac.uk:/usr/obj/usr/src/sys/TZAV ia64


	
>Description:

This patch must be used *instead of* the current files/patch-urlview.c

Tested on redports
 
	
>How-To-Repeat:
	
>Fix:

	

--- patch-urlview.c begins here ---
--- 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)
--- patch-urlview.c ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Jul 20 18:58:36 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180681 
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Sun Sep 22 09:10:24 CDT 2013 
Responsible-Changed-Why:  
Back to the heap due to timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180681 
Responsible-Changed-From-To: freebsd-ports-bugs->danilo 
Responsible-Changed-By: danilo 
Responsible-Changed-When: Mon Nov 25 15:04:43 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180681 
State-Changed-From-To: open->closed 
State-Changed-By: danilo 
State-Changed-When: Mon Nov 25 15:07:11 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180681 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180681: commit references a PR
Date: Mon, 25 Nov 2013 15:07:06 +0000 (UTC)

 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@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@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)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
