freetype: freetype-config differs and cannot be merged

[soehn@…]

When trying to update freetype I get the following error message:

--->  Staging freetype into destroot
Error: Target org.macports.destroot returned: /opt/local/bin/freetype-config differs in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_print_freetype/work/destroot-i386 and /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_print_freetype/work/destroot-x86_64 and cannot be merged
Log for freetype is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_ports_print_freetype/main.log
Error: Unable to upgrade port: 1

[ryandesign (Ryan Carsten Schmidt)]

Can you please attach the freetype-config file from both of those directories so I can see what differs about them?

[opus@…]

destroot-i386 freetype-config

[opus@…]

destroot-x86_64 freetype-config

[opus@…]

Here is my diff:

[root@kilgore work]# pwd
/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_print_freetype/work
[root@kilgore work]# diff -diw ./destroot-i386/opt/local/bin/freetype-config ./destroot-x86_64/opt/local/bin/freetype-config
147c147
<   libs="-lfreetype -lz  "
---
>   libs="-lfreetype -lz -lbz2 "

[ryandesign (Ryan Carsten Schmidt)]

Thanks! Looks like as of freetype 2.4.5 it needs bzip2 and I did not add a dependency on that. I've fixed it in r79971. Please wait 30 minutes, then "sudo port selfupdate" and try again.