CVS commit: pkgsrc/www/curl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Aug 17 13:55:40 UTC 2017

Modified Files:
        pkgsrc/www/curl: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/curl/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/www/curl/options.mk
diff -u pkgsrc/www/curl/options.mk:1.15 pkgsrc/www/curl/options.mk:1.16
--- pkgsrc/www/curl/options.mk:1.15     Sat Dec 31 08:31:18 2016
+++ pkgsrc/www/curl/options.mk  Thu Aug 17 13:55:39 2017
@@ -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+=    --with-librtmp
 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)