Log Message: ----------- fix conflicts Modified Files: -------------- mports/x11-toolkits/linux-pango: Makefile (r1.5 -> r1.6) (http://cvsweb.midnightbsd.org/mports/x11-toolkits/linux-pango/Makefile?r1=1.5&r2=1.6)