py??-curl build failure

[Havard Eidnes <he%NetBSD.org@localhost>]

Hi,

my bulk builds of the various py??-curl packages consistently
fail because the final link stage doesn't include -lidn2.

I'm using

PBULK_CACHE_DIRECTORY=/var/tmp/

in /etc/mk.conf, and /var/tmp/build-options.curl contains

PKG_BUILD_OPTIONS.curl= gssapi inet6 libidn

Looking at curl's options.mk file shows

PKG_OPTIONS_VAR=        PKG_OPTIONS.curl
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

and curl's buildlink3.mk contains

.if !empty(PKG_BUILD_OPTIONS.curl:Midn)
.  include "../../devel/libidn2/buildlink3.mk"
.endif

However, since the cached build options include the legacy name
and not the new name, the condition in the buildlink3.mk file is
not triggered, and we get a link error.

Any hints as to what the actual problem is here?  The options.mk
file correctly contains the "new" option name, so why does the
legacy option name creep into the build-options.curl file?

Simply execusing "make show-var..." shows the correct result:

: {39} pwd
/usr/pkgsrc/www/curl
: {40} make show-var VARNAME=PKG_SUGGESTED_OPTIONS
inet6 idn gssapi
: {41} 

Is this simply a case of a PBULK_CACHE_DIRECTORY which needs to
be manually cleaned out between each pkgsrc branch?

Regards,

- Håvard