CVS commit: pkgsrc

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Wed Oct  3 23:40:39 UTC 2012

Modified Files:
        pkgsrc/audio/py-dynampd: Makefile
        pkgsrc/audio/py-musicbrainz: Makefile
        pkgsrc/biology/py-mol: Makefile
        pkgsrc/devel/py-InlineEgg: Makefile
        pkgsrc/devel/py-ipython: Makefile
        pkgsrc/devel/py-ipython012: Makefile
        pkgsrc/devel/py-subversion: Makefile
        pkgsrc/devel/py-subvertpy: Makefile
        pkgsrc/devel/py-unit: Makefile
        pkgsrc/filesystems/py-filesystem: Makefile
        pkgsrc/fonts/py-fonttools: Makefile
        pkgsrc/graphics/py-aafigure: Makefile
        pkgsrc/graphics/py-cairo: Makefile
        pkgsrc/graphics/py-uniconvertor: Makefile
        pkgsrc/lang/py-pyrex: Makefile
        pkgsrc/mail/py-sendmail-admin: Makefile
        pkgsrc/math/py-networkx: Makefile
        pkgsrc/net/py-ORBit: Makefile
        pkgsrc/net/py-omniORBpy: Makefile
        pkgsrc/net/py-s3cmd: Makefile
        pkgsrc/security/py-denyhosts: Makefile
        pkgsrc/security/py-tlslite: Makefile
        pkgsrc/textproc/py-4Suite: Makefile
        pkgsrc/textproc/py-Excelerator: Makefile
        pkgsrc/textproc/py-X: Makefile
        pkgsrc/textproc/py-creole: Makefile
        pkgsrc/textproc/py-empy: Makefile
        pkgsrc/textproc/py-html2text: Makefile
        pkgsrc/textproc/py-markdown: Makefile
        pkgsrc/textproc/py-markdown2: Makefile
        pkgsrc/textproc/py-pdf-parser: Makefile
        pkgsrc/textproc/py-xlrd: Makefile
        pkgsrc/wm/py-tyle: Makefile
        pkgsrc/www/py-moin: Makefile
        pkgsrc/x11/py-wxWidgets: Makefile

Log Message:
CONFLICTS between python modules


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/py-dynampd/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/py-musicbrainz/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/biology/py-mol/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-InlineEgg/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/py-ipython/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-ipython012/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-subversion/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-subvertpy/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-unit/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/py-filesystem/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/fonts/py-fonttools/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/py-aafigure/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/py-cairo/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/py-uniconvertor/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/py-pyrex/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/py-sendmail-admin/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/py-networkx/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/py-ORBit/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-omniORBpy/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-s3cmd/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py-denyhosts/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-tlslite/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-4Suite/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/py-Excelerator/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/py-X/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-creole/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-empy/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/py-html2text/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-markdown/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-markdown2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-pdf-parser/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-xlrd/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/py-tyle/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/py-moin/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/py-wxWidgets/Makefile

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