CVS commit: pkgsrc/net/wget

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Nov 14 09:51:13 UTC 2017

Modified Files:
        pkgsrc/net/wget: Makefile options.mk

Log Message:
wget: Use devel/libidn2 and adjust `idn' option logic in options.mk

Since wget-1.19, libidn2 is needed for the IDN/IRIs support. Adjust
the `idn' package option logic to reflect that and explicitly ask
for it via CONFIGURE_ARGS. This should also fix the build without
the `idn' option selected pointed out by john heasley via PR pkg/52726.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/net/wget/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/wget/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wget/Makefile
diff -u pkgsrc/net/wget/Makefile:1.136 pkgsrc/net/wget/Makefile:1.137
--- pkgsrc/net/wget/Makefile:1.136      Thu Oct 26 15:01:38 2017
+++ pkgsrc/net/wget/Makefile    Tue Nov 14 09:51:13 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2017/10/26 15:01:38 tez Exp $
+# $NetBSD: Makefile,v 1.137 2017/11/14 09:51:13 leot Exp $
 
 DISTNAME=      wget-1.19.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GNU:=wget/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/wget/options.mk
diff -u pkgsrc/net/wget/options.mk:1.9 pkgsrc/net/wget/options.mk:1.10
--- pkgsrc/net/wget/options.mk:1.9      Sat Apr 26 11:17:18 2014
+++ pkgsrc/net/wget/options.mk  Tue Nov 14 09:51:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2014/04/26 11:17:18 tron Exp $
+# $NetBSD: options.mk,v 1.10 2017/11/14 09:51:13 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wget
 PKG_SUPPORTED_OPTIONS= idn inet6
@@ -12,8 +12,11 @@ PKG_SUGGESTED_OPTIONS=       idn inet6 openssl
 ### Support IDN
 ###
 .if !empty(PKG_OPTIONS:Midn)
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-iri
+.else
+CONFIGURE_ARGS+=       --disable-iri
 .endif
 
 ###