can't build curl -- curl-config differs due to PSL support?

[michael-j-oconnor]

I just upgraded from Yosemite to Sierra yesterday. I think I successfully followed the steps at ​https://trac.macports.org/wiki/Migration Things *seem* sane enough:

$ sudo port rev-upgrade
--->  Scanning binaries for linking errors
--->  No broken files found.

Today, I try doing port selfupdate/port upgrade outdated and hit a snag with curl.

I do "sudo port clean curl" and "sudo port install curl" and get the following:

--->  Configuring curl
Warning: reinplace s|-arch [a-z0-9_]+||g didn't change anything in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/curl-7.56.1-x86_64/libcurl.pc
Warning: reinplace s/ '(host_alias|--host)=[^']+'//g didn't change anything in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/curl-7.56.1-x86_64/curl-config
Warning: reinplace s|-arch [a-z0-9_]+||g didn't change anything in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/curl-7.56.1-i386/libcurl.pc
Warning: reinplace s/ '(host_alias|--host)=[^']+'//g didn't change anything in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/curl-7.56.1-i386/curl-config
--->  Building curl
--->  Staging curl into destroot
Error: Failed to destroot curl: curl-config differs in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-i386//opt/local/bin and /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-x86_64//opt/local/bin and cannot be merged
Error: See /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/main.log for details.
Error: Follow https://guide.macports.org/#project.tickets to report a bug.

Looking at what's different, I see:

$ diff /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-i386//opt/local/bin /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-x86_64//opt/local/bin
Binary files /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-i386//opt/local/bin/curl and /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-x86_64//opt/local/bin/curl differ
diff /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-i386//opt/local/bin/curl-config /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_net_curl/curl/work/destroot-x86_64//opt/local/bin/curl-config
86c86
<         for feature in SSL IPv6 UnixSockets libz AsynchDNS IDN NTLM NTLM_WB TLS-SRP HTTPS-proxy ""; do
---
>         for feature in SSL IPv6 UnixSockets libz AsynchDNS IDN PSL NTLM NTLM_WB TLS-SRP HTTPS-proxy ""; do
151c151
<           echo ${CURLLIBDIR}-lcurl -lidn2 -lssl -lcrypto -lssl -lcrypto -lz
---
>           echo ${CURLLIBDIR}-lcurl -lidn2 -lpsl -lssl -lcrypto -lssl -lcrypto -lz
159c159
<           echo ${exec_prefix}/lib/libcurl.a -L/opt/local/lib -Wl,-headerpad_max_install_names  -L/opt/local/lib -L/opt/local/lib -L/opt/local/lib -lidn2 -lssl -lcrypto -lssl -lcrypto -lz
---
>           echo ${exec_prefix}/lib/libcurl.a -L/opt/local/lib -Wl,-headerpad_max_install_names  -L/opt/local/lib -L/opt/local/lib -L/opt/local/lib -lidn2 -lpsl -lssl -lcrypto -lssl -lcrypto -lz

I'm not sure what's going on here. I do appear to have libpsl:

$ sudo port info libpsl
libpsl @0.19.1_1 (net)
Variants:             universal

Description:          A C library and utility to handle the Public Suffix List
Homepage:             https://github.com/rockdaboot/libpsl

Any ideas of what went wrong, or perhaps better yet, how to fix in a way that isn't "start from scratch"?