[pkgsrc/trunk]: pkgsrc/www/curl Somewhere around 7.53.0, curl's IDN support s...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95b540f69d6a
branches:  trunk
changeset: 366790:95b540f69d6a
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Aug 17 13:55:39 2017 +0000

description:
Somewhere around 7.53.0, curl's IDN support switched to libidn2. Update
CONFIGURE_ARGS and the included buildlink3.mk, and rename the "libidn"
option to "idn" using PKG_OPTIONS_LEGACY_OPTS.

diffstat:

 www/curl/options.mk |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (32 lines):

diff -r 519720bad3e1 -r 95b540f69d6a www/curl/options.mk
--- a/www/curl/options.mk       Thu Aug 17 13:53:30 2017 +0000
+++ b/www/curl/options.mk       Thu Aug 17 13:55:39 2017 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.15 2016/12/31 08:31:18 jperkin Exp $
+# $NetBSD: options.mk,v 1.16 2017/08/17 13:55:39 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn http2
-PKG_SUGGESTED_OPTIONS= inet6 libidn
+PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp idn http2
+PKG_SUGGESTED_OPTIONS= inet6 idn
+PKG_OPTIONS_LEGACY_OPTS=libidn:idn
 
 # Kerberos is built in - no additional dependency
 PKG_SUGGESTED_OPTIONS.NetBSD+= gssapi
@@ -45,11 +46,11 @@
 CONFIGURE_ARGS+=       --without-librtmp
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibidn)
-.include "../../devel/libidn/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-libidn
+.if !empty(PKG_OPTIONS:Midn)
+.include "../../devel/libidn2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-libidn2
 .else
-CONFIGURE_ARGS+=       --without-libidn
+CONFIGURE_ARGS+=       --without-libidn2
 .endif
 
 .if !empty(PKG_OPTIONS:Mhttp2)