From nobody@FreeBSD.org  Thu Feb 13 10:28:23 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D65667D5
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 13 Feb 2014 10:28:23 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id B23331318
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 13 Feb 2014 10:28:23 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1DASML4033119
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 13 Feb 2014 10:28:22 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1DASM5L033112;
	Thu, 13 Feb 2014 10:28:22 GMT
	(envelope-from nobody)
Message-Id: <201402131028.s1DASM5L033112@cgiserv.freebsd.org>
Date: Thu, 13 Feb 2014 10:28:22 GMT
From: Eero Hnninen <fax@nohik.ee>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] ftp/wget update to version 1.15
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186718
>Category:       ports
>Synopsis:       [patch] ftp/wget update to version 1.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 13 10:30:00 UTC 2014
>Closed-Date:    Fri Feb 14 08:07:20 UTC 2014
>Last-Modified:  Fri Feb 14 08:07:20 UTC 2014
>Originator:     Eero Hnninen
>Release:        10.0-RELEASE
>Organization:
>Environment:
FreeBSD sneezy 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- Update to version 1.15, this also fixes PR/182104
- Added LICENSE
- Fixed LIB_DEPENDS
- removed deprecated MAN1 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN wget.orig/Makefile wget/Makefile
--- wget.orig/Makefile	2014-02-12 15:22:28.000000000 +0200
+++ wget/Makefile	2014-02-13 11:33:59.000000000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/ftp/wget/Makefile 343918 2014-02-12 13:22:28Z tijl $
 
 PORTNAME=	wget
-DISTVERSION=	1.14
-PORTREVISION=	3
+DISTVERSION=	1.15
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
@@ -11,6 +10,8 @@
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
+LICENSE=	GPLv3
+
 USES=		charsetfix gmake perl5
 USE_XZ=		yes
 USE_PERL5=	build
@@ -31,7 +32,7 @@
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -57,7 +58,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=--enable-iri --with-libidn=${LOCALBASE}
 USES+=		iconv
 .else
@@ -66,14 +67,13 @@
 
 .if ${PORT_OPTIONS:MPCRE}
 # Wget will pick pcre automatically and link with it if it is present.
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
 CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
 .endif
 
-MAN1=		wget.1
 INFO=		wget
 
 # eliminate gmakism
diff -ruN wget.orig/distinfo wget/distinfo
--- wget.orig/distinfo	2014-01-22 17:30:13.000000000 +0200
+++ wget/distinfo	2014-02-13 11:28:26.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (wget-1.14.tar.xz) = 1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b
-SIZE (wget-1.14.tar.xz) = 1584060
+SHA256 (wget-1.15.tar.xz) = d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb
+SIZE (wget-1.15.tar.xz) = 1679908
diff -ruN wget.orig/files/patch-doc__texi2pod.pl wget/files/patch-doc__texi2pod.pl
--- wget.orig/files/patch-doc__texi2pod.pl	2014-01-22 19:40:44.000000000 +0200
+++ wget/files/patch-doc__texi2pod.pl	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- doc/texi2pod.pl.orig	2013-10-24 16:59:55.000000000 +0300
-+++ doc/texi2pod.pl	2013-10-24 17:01:23.000000000 +0300
-@@ -291,7 +291,7 @@
- 	if (defined $1) {
-             my $thing = $1;
-             if ($ic =~ /\@asis/) {
--                $_ = "\n=item $thing\n";
-+                $_ = "\n=item C<$thing>\n";
-             } else {
-                 # Entity escapes prevent munging by the <> processing below.
-                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
diff -ruN wget.orig/files/patch-doc__wget.texi wget/files/patch-doc__wget.texi
--- wget.orig/files/patch-doc__wget.texi	2014-01-22 19:40:44.000000000 +0200
+++ wget/files/patch-doc__wget.texi	1970-01-01 03:00:00.000000000 +0300
@@ -1,40 +0,0 @@
---- doc/wget.texi
-+++ doc/wget.texi
-@@ -875,7 +875,7 @@ recommendation to block many unrelated users from a web site due to the
- actions of one.
- 
- @cindex proxy
--@itemx --no-proxy
-+@item --no-proxy
- Don't use proxies, even if the appropriate @code{*_proxy} environment
- variable is defined.
- 
-@@ -976,7 +976,7 @@ are outside the range of @sc{ascii} characters (that is, greater than
- whose encoding does not match the one used locally.
- 
- @cindex IPv6
--@itemx -4
-+@item -4
- @itemx --inet4-only
- @itemx -6
- @itemx --inet6-only
-@@ -3093,7 +3093,7 @@ display properly---the same as @samp{-p}.
- Change setting of passive @sc{ftp}, equivalent to the
- @samp{--passive-ftp} option.
- 
--@itemx password = @var{string}
-+@item password = @var{string}
- Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
- This command can be overridden using the @samp{ftp_password} and 
- @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
-@@ -3604,7 +3604,7 @@ In addition to the environment variables, proxy location and settings
- may be specified from within Wget itself.
- 
- @table @samp
--@itemx --no-proxy
-+@item --no-proxy
- @itemx proxy = on/off
- This option and the corresponding command may be used to suppress the
- use of proxy, even if the appropriate environment variables are set.
---
-cgit v0.9.0.2
diff -ruN wget.orig/pkg-plist wget/pkg-plist
--- wget.orig/pkg-plist	2014-01-28 15:33:39.000000000 +0200
+++ wget/pkg-plist	2014-02-13 11:46:18.000000000 +0200
@@ -1,5 +1,7 @@
 bin/wget
-etc/wgetrc.sample
+@unexec if cmp -s %D/etc/wgetrc.sample %D/etc/wgetrc; then rm -f %D/etc/wgetrc; fi
+%%ETCDIR%%rc.sample
+@exec if [ ! -f %D/etc/wgetrc ] ; then cp -p %D/%F %B/wgetrc; fi
 man/man1/wget.1.gz
 %%NLS%%share/locale/be/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wget.mo


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vd 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Feb 13 10:30:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186718 
State-Changed-From-To: open->closed 
State-Changed-By: vd 
State-Changed-When: Fri Feb 14 08:01:24 UTC 2014 
State-Changed-Why:  
Committed partially. 

Why did you change LIB_DEPENDS? 

I left the wgetrc.sample handling in the old way because it is simpler and 
because the new way does not have any benefits (but is more complex). 
wgetrc.sample is completely commented so even if we copy it into wgetrc, 
it will not change anything in wget behavior by default. Thus it is simpler 
to just install and uninstall wgetrc.sample and leave the user to deal with 
copying it into wgetrc if he needs to. 

Thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186718 
>Unformatted:
