Attachment 181518 Details for Bug 218408 – Update to 1.19.1

[patch] Update to 1.19.1

ftp-wget.patch (text/plain), 3.84 KB, created by Anton Yuzhaninov on 2017-04-05 22:22:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Yuzhaninov

Created: 2017-04-05 22:22:56 UTC

Size: 3.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 437805)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	wget
>-DISTVERSION=	1.19
>+DISTVERSION=	1.19.1
> CATEGORIES=	ftp www ipv6
> MASTER_SITES=	GNU
> 
>@@ -12,7 +12,10 @@ COMMENT=	Retrieve files from the Net via
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		charsetfix cpe gmake iconv makeinfo perl5 tar:xz
>+TEST_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
>+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
>+
>+USES=		charsetfix cpe iconv makeinfo perl5 tar:xz
> USE_PERL5=	build
> CPE_VENDOR=	gnu
> GNU_CONFIGURE=	yes
>@@ -32,10 +35,13 @@ NLS_CONFIGURE_ENABLE=	nls
> NLS_CPPFLAGS=		-I${LOCALBASE}/include
> NLS_LDFLAGS=		-L${LOCALBASE}/lib
> 
>-IDN_USES=		iconv
>-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
>+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
>+			libunistring.so:devel/libunistring
>+IDN_CPPFLAGS=		-I${LOCALBASE}/include
>+IDN_LDFLAGS=		-L${LOCALBASE}/lib
> IDN_CONFIGURE_ENABLE=	iri
>-IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
>+IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE} --with-libunistring-prefix=${LOCALBASE}
>+IDN_CONFIGURE_OFF=	--with-included-libunistring
> 
> METALINK_CONFIGURE_WITH=metalink
> METALINK_LIB_DEPENDS=	libmetalink.so:misc/libmetalink
>@@ -43,15 +49,13 @@ METALINK_LIB_DEPENDS=	libmetalink.so:mis
> PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> PCRE_CPPFLAGS=		-I${LOCALBASE}/include
> PCRE_LDFLAGS=		-L${LOCALBASE}/lib
>-PCRE_CONFIGURE_ENV_OFF=	ac_cv_header_pcre_h=no
>+PCRE_CONFIGURE_ENABLE=	pcre
> 
> PSL_CONFIGURE_WITH=	libpsl
> PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
> 
> .include <bsd.port.options.mk>
> 
>-CONFIGURE_ARGS+=--with-included-libunistring
>-
> .if ${PORT_OPTIONS:MOPENSSL}
> USES+=		ssl
> CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE}
>@@ -69,17 +73,13 @@ CONFIGURE_ARGS+=--without-ssl
> 
> INFO=		wget
> 
>-# eliminate gmakism
>+TEST_TARGET=	check
>+
> post-patch:
>-	${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \
>-			 -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \
>+	${REINPLACE_CMD} -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \
> 		${WRKSRC}/doc/Makefile.in
> 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
>-			 -e 's,@file{},@file{${PREFIX}},' \
>-		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
>-	${REINPLACE_CMD} -e '/ac_fn_c_check_header_mongrel.*uuid\/uuid.h/ d' \
>-			 -e 's|-R$$found_dir|-Wl,-rpath=$$found_dir|g' \
>-		${WRKSRC}/configure
>+		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/wget.info
> 
> .include <bsd.port.pre.mk>
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 437805)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1486213522
>-SHA256 (wget-1.19.tar.xz) = 0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384
>-SIZE (wget-1.19.tar.xz) = 2075916
>+TIMESTAMP = 1491337367
>+SHA256 (wget-1.19.1.tar.xz) = 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2
>+SIZE (wget-1.19.1.tar.xz) = 2111756
>Index: files/patch-src__main.c
>===================================================================
>--- files/patch-src__main.c	(revision 437805)
>+++ files/patch-src__main.c	(nonexistent)
>@@ -1,12 +0,0 @@
>---- 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: files/patch-src__main.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 218408: 181518