Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Apr 2017 08:56:23 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437857 - in head/ftp/wget: . files
Message-ID:  <201704060856.v368uNao060980@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Thu Apr  6 08:56:22 2017
New Revision: 437857
URL: https://svnweb.freebsd.org/changeset/ports/437857

Log:
  Upgrade ftp/wget from 1.19 to 1.19.1
  
  Changelog: http://git.savannah.gnu.org/cgit/wget.git/plain/NEWS
  
  - add test target and TEST_DEPENDS
  - remove gmake from USES: current version of wget can be build without
    gmake
  - unbreak IDN option: since 1.19 wget uses libidn2 instead of libidn
  - libidn2 uses libunistring from ports, so when the IDN option is enabled
    use libunistring from the ports instead of the bundled one
  - disabling pcre support using ./configure --disable-pcre currently works,
    use it
  - remove Makefile and configure patches which are no longer needed
  - patch /usr/local to $PREFIX in wget.info too
  - delete files/patch-src__main.c - this bug has been fixed
    on Mar 2, 2015 [1]
  
  [1] http://git.savannah.gnu.org/cgit/wget.git/commit/?id=9dde436dd689bd51eef71d64152dde9c8c0b5f65
  
  PR:		218408
  Submitted by:	Anton Yuzhaninov <citrin+pr@citrin.ru>

Deleted:
  head/ftp/wget/files/
Modified:
  head/ftp/wget/Makefile
  head/ftp/wget/distinfo

Modified: head/ftp/wget/Makefile
==============================================================================
--- head/ftp/wget/Makefile	Thu Apr  6 07:08:10 2017	(r437856)
+++ head/ftp/wget/Makefile	Thu Apr  6 08:56:22 2017	(r437857)
@@ -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>
 

Modified: head/ftp/wget/distinfo
==============================================================================
--- head/ftp/wget/distinfo	Thu Apr  6 07:08:10 2017	(r437856)
+++ head/ftp/wget/distinfo	Thu Apr  6 08:56:22 2017	(r437857)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704060856.v368uNao060980>