Add libpng 1.2.5 as libpng12
Add gtk+ as gtk_plus (was gtk-plus)