Module Name:	pkgsrc
Committed By:	joerg
Date:		Sun Jun  4 16:26:56 UTC 2006

Modified Files:
	pkgsrc/archivers/php-bz2: Makefile
	pkgsrc/archivers/php-zip: Makefile
	pkgsrc/archivers/php-zlib: Makefile
	pkgsrc/comms/pilot-link-libs: Makefile
	pkgsrc/converters/php-iconv: Makefile
	pkgsrc/converters/uulib: Makefile
	pkgsrc/databases/pear-DB: Makefile
	pkgsrc/databases/php-dba: Makefile
	pkgsrc/databases/php-dbase: Makefile
	pkgsrc/databases/php-dbx: Makefile
	pkgsrc/databases/php-filepro: Makefile
	pkgsrc/databases/php-ldap: Makefile
	pkgsrc/databases/php-mssql: Makefile
	pkgsrc/databases/php-mysql: Makefile
	pkgsrc/databases/php-odbc: Makefile
	pkgsrc/databases/php-pgsql: Makefile
	pkgsrc/databases/php5-mysqli: Makefile
	pkgsrc/devel/php-gettext: Makefile
	pkgsrc/devel/php-gmp: Makefile
	pkgsrc/devel/php-memcache: Makefile
	pkgsrc/devel/php-pcntl: Makefile
	pkgsrc/devel/php-posix: Makefile
	pkgsrc/devel/php-shmop: Makefile
	pkgsrc/devel/php-sysvsem: Makefile
	pkgsrc/devel/php-sysvshm: Makefile
	pkgsrc/graphics/pear-Image_Canvas: Makefile
	pkgsrc/graphics/pear-Image_Color: Makefile
	pkgsrc/graphics/pear-Image_Graph: Makefile
	pkgsrc/graphics/php-gd: Makefile
	pkgsrc/graphics/php-jpgraph: Makefile
	pkgsrc/lang/python: pyversion.mk
	pkgsrc/mail/pear-Mail: Makefile
	pkgsrc/mail/pear-Mail_Mime: Makefile
	pkgsrc/mail/php-imap: Makefile
	pkgsrc/math/pear-Numbers_Roman: Makefile
	pkgsrc/math/pear-Numbers_Words: Makefile
	pkgsrc/math/php-bcmath: Makefile
	pkgsrc/misc/bbdb: Makefile
	pkgsrc/misc/php-calendar: Makefile
	pkgsrc/misc/php-mbstring: Makefile
	pkgsrc/multimedia/php-ming: Makefile
	pkgsrc/net/pear-Net_DIME: Makefile
	pkgsrc/net/pear-Net_SMTP: Makefile
	pkgsrc/net/pear-Net_Sieve: Makefile
	pkgsrc/net/pear-Net_Socket: Makefile
	pkgsrc/net/pear-Net_URL: Makefile
	pkgsrc/net/pear-SOAP: Makefile
	pkgsrc/net/php-ftp: Makefile
	pkgsrc/net/php-snmp: Makefile
	pkgsrc/net/php-sockets: Makefile
	pkgsrc/net/php-xmlrpc: Makefile
	pkgsrc/net/php-yp: Makefile
	pkgsrc/net/php5-soap: Makefile
	pkgsrc/print/foomatic-filters: Makefile
	pkgsrc/print/php-pdflib: Makefile
	pkgsrc/security/php-mcrypt: Makefile
	pkgsrc/security/php-mhash: Makefile
	pkgsrc/textproc/php-pspell: Makefile
	pkgsrc/textproc/php-wddx: Makefile
	pkgsrc/textproc/php4-domxml: Makefile
	pkgsrc/textproc/php4-xslt: Makefile
	pkgsrc/textproc/php5-dom: Makefile
	pkgsrc/textproc/php5-xsl: Makefile
	pkgsrc/textproc/texi2html: Makefile
	pkgsrc/time/pear-Date: Makefile
	pkgsrc/www/pear-HTML_Common: Makefile
	pkgsrc/www/pear-HTML_Select: Makefile
	pkgsrc/www/pear-HTTP_Request: Makefile
	pkgsrc/www/php-FastTemplate: Makefile
	pkgsrc/www/php-apc: Makefile
	pkgsrc/www/php-curl: Makefile
	pkgsrc/www/php-eaccelerator: Makefile
	pkgsrc/www/php4-apc: Makefile
	pkgsrc/x11/qwspritefield: Makefile

Log Message:
Fix CONFLICTS of php/pear packages, the asterix was missing (thanks tv).
While going through the tree, fix some more packages which had similiar
issues with too strict conflicts, bump the revisions of those.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 pkgsrc/archivers/php-bz2/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/archivers/php-zip/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/archivers/php-zlib/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/comms/pilot-link-libs/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/converters/php-iconv/Makefile
cvs rdiff -r1.37 -r1.38 pkgsrc/converters/uulib/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/pear-DB/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-dba/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-dbase/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-dbx/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-filepro/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/databases/php-ldap/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-mssql/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/databases/php-mysql/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-odbc/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/databases/php-pgsql/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php5-mysqli/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-gettext/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-gmp/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/devel/php-memcache/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/devel/php-pcntl/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-posix/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-shmop/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-sysvsem/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/php-sysvshm/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/graphics/pear-Image_Canvas/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/graphics/pear-Image_Color/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/graphics/pear-Image_Graph/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/graphics/php-gd/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/graphics/php-jpgraph/Makefile
cvs rdiff -r1.39 -r1.40 pkgsrc/lang/python/pyversion.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/pear-Mail/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/mail/pear-Mail_Mime/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/mail/php-imap/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/math/pear-Numbers_Roman/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/math/pear-Numbers_Words/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/math/php-bcmath/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/misc/bbdb/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/misc/php-calendar/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/misc/php-mbstring/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/multimedia/php-ming/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/net/pear-Net_DIME/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/pear-Net_SMTP/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/net/pear-Net_Sieve/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/pear-Net_Socket/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/pear-Net_URL/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/pear-SOAP/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/net/php-ftp/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/net/php-snmp/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/net/php-sockets/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/php-xmlrpc/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/net/php-yp/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/net/php5-soap/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/print/php-pdflib/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/security/php-mcrypt/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/security/php-mhash/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/textproc/php-pspell/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/textproc/php-wddx/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/textproc/php4-domxml/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/textproc/php4-xslt/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/textproc/php5-dom/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/textproc/php5-xsl/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/textproc/texi2html/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/time/pear-Date/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/www/pear-HTML_Common/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/www/pear-HTML_Select/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/www/pear-HTTP_Request/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/www/php-FastTemplate/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/www/php-apc/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/www/php-curl/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/www/php-eaccelerator/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/www/php4-apc/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/x11/qwspritefield/Makefile

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