ftp/wget: Upgrade from 1.14_2 to 1.15

PR:		ports/186718 (parts of it)
Submitted by:	Eero Hänninen <fax@nohik.ee>

4 files changed, 5 insertions, 56 deletions

diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 58844852e7b2..092b129895d0 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 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 @@ MASTER_SITE_SUBDIR=	wget
 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
@@ -73,7 +74,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
 .endif
 
-MAN1=		wget.1
 INFO=		wget
 
 # eliminate gmakism
diff --git a/ftp/wget/distinfo b/ftp/wget/distinfo
index 898cfe7c0fa4..d136efc6795d 100644
--- a/ftp/wget/distinfo
+++ b/ftp/wget/distinfo
@@ -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 --git a/ftp/wget/files/patch-doc__texi2pod.pl b/ftp/wget/files/patch-doc__texi2pod.pl
deleted file mode 100644
index 45a8873a9e72..000000000000
--- a/ftp/wget/files/patch-doc__texi2pod.pl
+++ /dev/null
@@ -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 --git a/ftp/wget/files/patch-doc__wget.texi b/ftp/wget/files/patch-doc__wget.texi
deleted file mode 100644
index 5bcac741748a..000000000000
--- a/ftp/wget/files/patch-doc__wget.texi
+++ /dev/null
@@ -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