[Midnightbsd-cvs] mports [19600] trunk/ftp/wget: wget 1.16.3

[laffer1 at midnightbsd.org]

Revision: 19600
          http://svnweb.midnightbsd.org/mports/?rev=19600
Author:   laffer1
Date:     2015-07-15 20:34:16 -0400 (Wed, 15 Jul 2015)
Log Message:
-----------
wget 1.16.3

Modified Paths:
--------------
    trunk/ftp/wget/Makefile
    trunk/ftp/wget/distinfo

Added Paths:
-----------
    trunk/ftp/wget/files/patch-src__main.c

Removed Paths:
-------------
    trunk/ftp/wget/files/patch-NEWS

Modified: trunk/ftp/wget/Makefile
===================================================================
--- trunk/ftp/wget/Makefile	2015-07-16 00:00:55 UTC (rev 19599)
+++ trunk/ftp/wget/Makefile	2015-07-16 00:34:16 UTC (rev 19600)
@@ -1,18 +1,19 @@
 # $MidnightBSD$
 
 PORTNAME=	wget
-DISTVERSION=	1.16
+DISTVERSION=	1.16.3
 CATEGORIES=	ftp www ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	wget
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
 LICENSE=	gpl3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		charsetfix gmake makeinfo perl5 tar:xz
+USES=		charsetfix cpe gmake makeinfo perl5 tar:xz
 USE_PERL5=	build
+CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 
@@ -44,10 +45,11 @@
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-ssl=openssl
+CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE}
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
+USES+=		pkgconfig
 LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -66,5 +68,7 @@
 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
 			 -e 's, at file{}, at file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
+	${REINPLACE_CMD} -e '/ac_fn_c_check_header_mongrel.*uuid\/uuid.h/ d' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: trunk/ftp/wget/distinfo
===================================================================
--- trunk/ftp/wget/distinfo	2015-07-16 00:00:55 UTC (rev 19599)
+++ trunk/ftp/wget/distinfo	2015-07-16 00:34:16 UTC (rev 19600)
@@ -1,2 +1,2 @@
-SHA256 (wget-1.16.tar.xz) = 9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7
-SIZE (wget-1.16.tar.xz) = 1697308
+SHA256 (wget-1.16.3.tar.xz) = 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37
+SIZE (wget-1.16.3.tar.xz) = 1794148

Deleted: trunk/ftp/wget/files/patch-NEWS
===================================================================
--- trunk/ftp/wget/files/patch-NEWS	2015-07-16 00:00:55 UTC (rev 19599)
+++ trunk/ftp/wget/files/patch-NEWS	2015-07-16 00:34:16 UTC (rev 19600)
@@ -1,12 +0,0 @@
---- NEWS.orig	2009-09-22 05:53:35.000000000 +0300
-+++ NEWS	2010-09-06 20:09:17.000000000 +0300
-@@ -6,6 +6,9 @@
- 
- Please send GNU Wget bug reports to <bug-wget at gnu.org>.
- 

-+** By default, on server redirects, use the original URL to get the
-+   local file name. Close CVE-2010-2252.
-+
- * Changes in Wget 1.12
- 
- ** Mailing list MOVED to bug-wget at gnu.org

Added: trunk/ftp/wget/files/patch-src__main.c
===================================================================
--- trunk/ftp/wget/files/patch-src__main.c	                        (rev 0)
+++ trunk/ftp/wget/files/patch-src__main.c	2015-07-16 00:34:16 UTC (rev 19600)
@@ -0,0 +1,12 @@
+--- src/main.c.orig	2015-02-10 23:31:49.000000000 +0200
++++ src/main.c	2015-03-06 21:55:03.975252490 +0200
+@@ -1272,6 +1272,9 @@
+   if (opt.verbose == -1)
+     opt.verbose = !opt.quiet;
+ 
++  if (opt.quiet && opt.show_progress == -1)
++    opt.show_progress = false;
++
+   /* Sanity checks.  */
+   if (opt.verbose && opt.quiet)
+     {


Property changes on: trunk/ftp/wget/files/patch-src__main.c
___________________________________________________________________
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