[MacPorts] #26860: curl +universal: destroot fails after recent upgrade to 7.21.2

[MacPorts]

#26860: curl +universal: destroot fails after recent upgrade to 7.21.2
---------------------------------+------------------------------------------
 Reporter:  devans@…             |       Owner:  ryandesign@…           
     Type:  defect               |      Status:  new                    
 Priority:  Normal               |   Milestone:                         
Component:  ports                |     Version:  1.9.1                  
 Keywords:  universal            |        Port:  curl                   
---------------------------------+------------------------------------------
 While attempting to upgrade to 7.21.2 on SL x86_64, curl +universal fails
 in destroot with
 {{{
 --->  Staging curl into destroot
 Error: Target org.macports.destroot returned: /opt/local/bin/curl-config
 differs in /opt/local/var/macports/build/_Volumes_wdc-
 320_opt_macports_trunk_dports_net_curl/work/destroot-i386 and
 /opt/local/var/macports/build/_Volumes_wdc-
 320_opt_macports_trunk_dports_net_curl/work/destroot-x86_64 and cannot be
 merged
 Log for curl is at: /opt/local/var/macports/logs/_Volumes_wdc-
 320_opt_macports_trunk_dports_net_curl/main.log
 Error: Unable to upgrade port: 1
 }}}

 this is similar to #24001 but the diff is different
 {{{
 --- destroot-i386/opt/local/bin/curl-config     2010-10-15
 12:25:56.000000000 -0700
 +++ destroot-x86_64/opt/local/bin/curl-config   2010-10-15
 12:25:54.000000000 -0700
 @@ -142,14 +142,14 @@
            CURLLIBDIR=""
         fi
         if test "Xyes" = "Xyes"; then
 -         echo ${CURLLIBDIR}-lcurl -L/opt/local/lib  -L/opt/local/lib
 -L/opt/local/lib -lidn -lssl -lcrypto -lssl -lcrypto -lz -lz
 +         echo ${CURLLIBDIR}-lcurl -L/opt/local/lib  -L/opt/local/lib
 -L/opt/local/lib -lidn -lssl -lcrypto -lssl -lcrypto -lz -lz -lrtmp
         else
           echo ${CURLLIBDIR}-lcurl -L/opt/local/lib  -L/opt/local/lib
 -L/opt/local/lib
         fi
         ;;

      --static-libs)
 -       echo ${exec_prefix}/lib/libcurl.a -L/opt/local/lib
 -L/opt/local/lib -L/opt/local/lib -lidn -lssl -lcrypto -lssl -lcrypto -lz
 -lz
 +       echo ${exec_prefix}/lib/libcurl.a -L/opt/local/lib
 -L/opt/local/lib -L/opt/local/lib -lidn -lssl -lcrypto -lssl -lcrypto -lz
 -lz -lrtmp
         ;;

      --configure)
 }}}

 Previous version built +universal without problem.  Log file attached.

-- 
Ticket URL: <https://trac.macports.org/ticket/26860>
MacPorts <http://www.macports.org/>
Ports system for Mac OS