CVS commit: pkgsrc/net

[Thomas Klausner <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 31 08:37:32 UTC 2009

Modified Files:
        pkgsrc/net/cftp: Makefile
        pkgsrc/net/py-twisted: Makefile

Log Message:
Make py-twisted and cftp conflict with each other, both install a
bin/cftp file.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/cftp/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/py-twisted/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.