Log Message: ----------- add conflicts Modified Files: -------------- mports/textproc/linux-expat: Makefile (r1.4 -> r1.5) (http://cvsweb.midnightbsd.org/mports/textproc/linux-expat/Makefile?r1=1.4&r2=1.5)