summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/pear-Mail/Makefile4
-rw-r--r--mail/pear-Mail_Mime/Makefile4
-rw-r--r--mail/php-imap/Makefile4
-rw-r--r--math/pear-Numbers_Roman/Makefile4
-rw-r--r--math/pear-Numbers_Words/Makefile4
-rw-r--r--math/php-bcmath/Makefile4
-rw-r--r--misc/bbdb/Makefile6
-rw-r--r--misc/php-calendar/Makefile4
-rw-r--r--misc/php-mbstring/Makefile4
-rw-r--r--multimedia/php-ming/Makefile4
-rw-r--r--net/pear-Net_DIME/Makefile4
-rw-r--r--net/pear-Net_SMTP/Makefile4
-rw-r--r--net/pear-Net_Sieve/Makefile4
-rw-r--r--net/pear-Net_Socket/Makefile4
-rw-r--r--net/pear-Net_URL/Makefile4
-rw-r--r--net/pear-SOAP/Makefile4
-rw-r--r--net/php-ftp/Makefile4
-rw-r--r--net/php-snmp/Makefile4
-rw-r--r--net/php-sockets/Makefile4
-rw-r--r--net/php-xmlrpc/Makefile4
-rw-r--r--net/php-yp/Makefile4
-rw-r--r--net/php5-soap/Makefile4
-rw-r--r--print/foomatic-filters/Makefile6
-rw-r--r--print/php-pdflib/Makefile4
-rw-r--r--security/php-mcrypt/Makefile4
-rw-r--r--security/php-mhash/Makefile4
-rw-r--r--textproc/php-pspell/Makefile4
-rw-r--r--textproc/php-wddx/Makefile4
-rw-r--r--textproc/php4-domxml/Makefile4
-rw-r--r--textproc/php4-xslt/Makefile4
-rw-r--r--textproc/php5-dom/Makefile4
-rw-r--r--textproc/php5-xsl/Makefile4
-rw-r--r--textproc/texi2html/Makefile4
-rw-r--r--time/pear-Date/Makefile4
-rw-r--r--www/pear-HTML_Common/Makefile4
-rw-r--r--www/pear-HTML_Select/Makefile4
-rw-r--r--www/pear-HTTP_Request/Makefile4
-rw-r--r--www/php-FastTemplate/Makefile4
-rw-r--r--www/php-apc/Makefile4
-rw-r--r--www/php-curl/Makefile4
-rw-r--r--www/php-eaccelerator/Makefile4
-rw-r--r--www/php4-apc/Makefile4
-rw-r--r--x11/qwspritefield/Makefile6
43 files changed, 89 insertions, 89 deletions
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 4a687480223..bc32d458fa2 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Mail-1.1.4
CATEGORIES= mail
-CONFLICTS= php-pear-Mail-[0-9]
+CONFLICTS= php-pear-Mail-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 48a7c887dbf..3e4de7b0e06 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Mail_Mime-1.2.1
CATEGORIES+= mail
@@ -6,7 +6,7 @@ CATEGORIES+= mail
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes to create and decode mime messages
-CONFLICTS= php-pear-Mail_Mime-[0-9]
+CONFLICTS= php-pear-Mail_Mime-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index 1bc49364a03..5f50e315bd8 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:54 joerg Exp $
MODNAME= imap
CATEGORIES+= mail
COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol)
-CONFLICTS= php-imap-[0-9]
+CONFLICTS= php-imap-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff --git a/math/pear-Numbers_Roman/Makefile b/math/pear-Numbers_Roman/Makefile
index 1c936f53474..f31bc0370f6 100644
--- a/math/pear-Numbers_Roman/Makefile
+++ b/math/pear-Numbers_Roman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Numbers_Roman-0.2.0
CATEGORIES= math
@@ -7,7 +7,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://pear.php.net/package/Numbers_Roman/
COMMENT= Provides methods for converting to and from Roman Numerals
-CONFLICTS= php-pear-Numbers_Roman-[0-9]
+CONFLICTS= php-pear-Numbers_Roman-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/pear-Numbers_Words/Makefile b/math/pear-Numbers_Words/Makefile
index e86db668632..19d08d4f29a 100644
--- a/math/pear-Numbers_Words/Makefile
+++ b/math/pear-Numbers_Words/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Numbers_Words-0.14.0
CATEGORIES= math
@@ -7,7 +7,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://pear.php.net/package/Numbers_Words/
COMMENT= Provides methods for spelling numerals in words
-CONFLICTS= php-pear-Numbers_Words-[0-9]
+CONFLICTS= php-pear-Numbers_Words-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/php-bcmath/Makefile b/math/php-bcmath/Makefile
index 3dfb757bfcf..b0d61c1571f 100644
--- a/math/php-bcmath/Makefile
+++ b/math/php-bcmath/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:54 joerg Exp $
MODNAME= bcmath
CATEGORIES+= math
COMMENT= PHP extension for bc-style arbitrary precision math
-CONFLICTS= php-bcmath-[0-9]
+CONFLICTS= php-bcmath-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 55785cfa13d..7213cb4fec6 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/05/19 09:24:31 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/06/04 16:26:54 joerg Exp $
#
DISTNAME= bbdb-2.34
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail misc news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/}
@@ -13,7 +13,7 @@ COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program
# bbdb is included in xemacs-packages
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-CONFLICTS+= xemacs-packages
+CONFLICTS+= xemacs-packages-[0-9]*
BROKEN_IN= pkgsrc-2006Q1
diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index 1a54a5858c1..547562a38fa 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $
MODNAME= calendar
CATEGORIES+= misc
COMMENT= PHP extension for calendar conversion support
-CONFLICTS= php-calendar-[0-9]
+CONFLICTS= php-calendar-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile
index c526dbd027e..79dbf8a6151 100644
--- a/misc/php-mbstring/Makefile
+++ b/misc/php-mbstring/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $
MODNAME= mbstring
CATEGORIES+= misc
COMMENT= PHP extension for multibyte characters support (currently, Japanese only)
-CONFLICTS= php-mbstring-[0-9]
+CONFLICTS= php-mbstring-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile
index 15efaed3157..e23b06b3574 100644
--- a/multimedia/php-ming/Makefile
+++ b/multimedia/php-ming/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
MODNAME= ming
CATEGORIES+= multimedia
@@ -6,7 +6,7 @@ CATEGORIES+= multimedia
MAINTAINER= obata@lins.jp
COMMENT= PHP extension for Ming library
-CONFLICTS= php-ming-[0-9]
+CONFLICTS= php-ming-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming}
diff --git a/net/pear-Net_DIME/Makefile b/net/pear-Net_DIME/Makefile
index 87d53d99bb3..fb79e3d69b8 100644
--- a/net/pear-Net_DIME/Makefile
+++ b/net/pear-Net_DIME/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_DIME-0.3
CATEGORIES+= net
@@ -6,7 +6,7 @@ CATEGORIES+= net
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes that implements DIME encoding
-CONFLICTS= php-pear-Net_DIME-[0-9]
+CONFLICTS= php-pear-Net_DIME-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index ffdb2686b29..af0e8f8bd8b 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_SMTP-1.2.6
CATEGORIES+= net mail
@@ -6,7 +6,7 @@ CATEGORIES+= net mail
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes to provide SMTP Interface
-CONFLICTS= php-pear-Net_SMTP-[0-9]
+CONFLICTS= php-pear-Net_SMTP-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index 6a12a4312e5..f127c457647 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_Sieve-1.1.1
CATEGORIES+= net
@@ -7,7 +7,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://pear.php.net/package/Net_Sieve/
COMMENT= PHP classes that handles talking to timsieved
-CONFLICTS= php-pear-Net_Sieve-[0-9]
+CONFLICTS= php-pear-Net_Sieve-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.0:../../net/pear-Net_Socket
diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index 847e4d749de..38c0b08956b 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_Socket-1.0.2
CATEGORIES+= net
@@ -6,7 +6,7 @@ CATEGORIES+= net
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes to provide Network Socket Interface
-CONFLICTS= php-pear-Net_Socket-[0-9]
+CONFLICTS= php-pear-Net_Socket-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile
index 30acbe5da49..be0218f1763 100644
--- a/net/pear-Net_URL/Makefile
+++ b/net/pear-Net_URL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
DISTNAME= Net_URL-1.0.14
CATEGORIES+= net
@@ -6,7 +6,7 @@ CATEGORIES+= net
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes to easy parsing of URLs
-CONFLICTS= php-pear-Net_URL-[0-9]
+CONFLICTS= php-pear-Net_URL-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index 5b133481f9a..841e5c6eb8f 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
DISTNAME= SOAP-0.8.1
CATEGORIES+= net
@@ -6,7 +6,7 @@ CATEGORIES+= net
MAINTAINER= jdolecek@NetBSD.org
COMMENT= SOAP Client/Server for PHP
-CONFLICTS= php-pear-SOAP-[0-9]
+CONFLICTS= php-pear-SOAP-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.2:../../mail/pear-Mail_Mime
DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request>=1.2:../../www/pear-HTTP_Request
diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile
index 66320e99cc7..35a8dcfa277 100644
--- a/net/php-ftp/Makefile
+++ b/net/php-ftp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
MODNAME= ftp
CATEGORIES+= net
COMMENT= PHP extension for FTP access
-CONFLICTS= php-ftp-[0-9]
+CONFLICTS= php-ftp-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile
index bef00964038..4f59d3804b7 100644
--- a/net/php-snmp/Makefile
+++ b/net/php-snmp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
MODNAME= snmp
CATEGORIES+= net
COMMENT= PHP extension for SNMP
-CONFLICTS= php-snmp-[0-9]
+CONFLICTS= php-snmp-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=${PREFIX}
diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile
index 216d764d7da..50145f46d96 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
MODNAME= sockets
CATEGORIES+= net
COMMENT= PHP extension for sockets support
-CONFLICTS= php-sockets-[0-9]
+CONFLICTS= php-sockets-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile
index 4c2caf000b4..f03ef1100ea 100644
--- a/net/php-xmlrpc/Makefile
+++ b/net/php-xmlrpc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
MODNAME= xmlrpc
CATEGORIES+= net
COMMENT= PHP extension for XML-RPC support
-CONFLICTS= php-xmlrpc-[0-9]
+CONFLICTS= php-xmlrpc-[0-9]*
HOMEPAGE= http://xmlrpc-epi.sourceforge.net/
diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile
index ad41ef5e198..1c90f5ceb26 100644
--- a/net/php-yp/Makefile
+++ b/net/php-yp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:55 joerg Exp $
MODNAME= yp
CATEGORIES+= net
COMMENT= PHP extension for YP domain support
-CONFLICTS= php-yp-[0-9]
+CONFLICTS= php-yp-[0-9]*
# yp extension has been unbundled in PHP 5.1.1, it's only available
# in CVS and isn't available through have PECL; thus, mark this
diff --git a/net/php5-soap/Makefile b/net/php5-soap/Makefile
index 0d7bf3f1e73..e3dfd1d85a5 100644
--- a/net/php5-soap/Makefile
+++ b/net/php5-soap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:55 joerg Exp $
MODNAME= soap
CATEGORIES+= net
@@ -6,7 +6,7 @@ COMMENT= PHP5 extension for SOAP functions
MAINTAINER= jdolecek@NetBSD.org
-CONFLICTS= php-soap-[0-9]
+CONFLICTS= php-soap-[0-9]*
PHP_VERSIONS_ACCEPTED= 5
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index a98e58b6621..daba1209cfe 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:55 joerg Exp $
.include "Makefile.common"
DISTNAME= foomatic-filters-${FOOMATIC_FILTERS_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
MASTER_SITES= http://www.linuxprinting.org/download/foomatic/
MAINTAINER= jlam@pkgsrc.org
COMMENT= Spooler-independent PostScript printing filter
-CONFLICTS+= foomatic-gswrapper-[0-9]
+CONFLICTS+= foomatic-gswrapper-[0-9]*
USE_TOOLS+= gmake gs:run perl:run
INSTALL_TARGET= install-bin install-man
diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile
index e70c9ba2a23..29b4e23b7ac 100644
--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:55 joerg Exp $
MODNAME= pdflib
PKGMODNAME= pdf
@@ -6,7 +6,7 @@ PECL_VERSION= 2.0.3
CATEGORIES+= print
COMMENT= PHP extension for PDFlib on-the-fly PDF generation
-CONFLICTS= php-pdf-[0-9]
+CONFLICTS= php-pdf-[0-9]*
CONFIGURE_ARGS+= --with-pdflib=shared,${BUILDLINK_PREFIX.pdflib}
diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile
index 6b100bd6df6..27ff07da88a 100644
--- a/security/php-mcrypt/Makefile
+++ b/security/php-mcrypt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
MODNAME= mcrypt
CATEGORIES+= security
COMMENT= PHP extension for the mcrypt crypto algorithms library
-CONFLICTS= php-mcrypt-[0-9]
+CONFLICTS= php-mcrypt-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.libmcrypt}
diff --git a/security/php-mhash/Makefile b/security/php-mhash/Makefile
index 4e8781ae8ba..6e4af6f861b 100644
--- a/security/php-mhash/Makefile
+++ b/security/php-mhash/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
MODNAME= mhash
CATEGORIES+= security
COMMENT= PHP extension for the mhash hash algorithms library
-CONFLICTS= php-mhash-[0-9]
+CONFLICTS= php-mhash-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.mhash}
diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile
index 0eaae1f0743..2fdb28739a5 100644
--- a/textproc/php-pspell/Makefile
+++ b/textproc/php-pspell/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:55 joerg Exp $
MODNAME= pspell
CATEGORIES+= textproc
COMMENT= PHP extension for pspell support
-CONFLICTS= php-pspell-[0-9]
+CONFLICTS= php-pspell-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.aspell}
diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile
index 30b9070db81..f06be82c350 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:55 joerg Exp $
MODNAME= wddx
CATEGORIES+= textproc
COMMENT= PHP extension for WDDX support
-CONFLICTS= php-wddx-[0-9]
+CONFLICTS= php-wddx-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index c7fadc387e9..38d206ac8fb 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/06/04 16:26:55 joerg Exp $
MODNAME= domxml
CATEGORIES+= textproc
@@ -6,7 +6,7 @@ COMMENT= PHP4 extension for DOM support
PHP_VERSIONS_ACCEPTED= 4
-CONFLICTS= php-domxml-[0-9]
+CONFLICTS= php-domxml-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-dom=shared,${BUILDLINK_PREFIX.libxml2}
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index a32d2235ea1..089ca7cca16 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/06/04 16:26:55 joerg Exp $
MODNAME= xslt
CATEGORIES+= textproc
@@ -6,7 +6,7 @@ COMMENT= PHP4 extension for XSLT functions (Sablotron backend)
PHP_VERSIONS_ACCEPTED= 4
-CONFLICTS= php-xslt-[0-9]
+CONFLICTS= php-xslt-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron}
diff --git a/textproc/php5-dom/Makefile b/textproc/php5-dom/Makefile
index e19d650f1ce..31e4f85f68e 100644
--- a/textproc/php5-dom/Makefile
+++ b/textproc/php5-dom/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:55 joerg Exp $
MODNAME= dom
CATEGORIES+= textproc
COMMENT= PHP5 extension for DOM support
-CONFLICTS= php-dom-[0-9]
+CONFLICTS= php-dom-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2}
diff --git a/textproc/php5-xsl/Makefile b/textproc/php5-xsl/Makefile
index 10fc742c122..b6bd98163d9 100644
--- a/textproc/php5-xsl/Makefile
+++ b/textproc/php5-xsl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:55 joerg Exp $
MODNAME= xsl
CATEGORIES+= textproc
COMMENT= PHP5 extension for XSLT functions
-CONFLICTS= php-xsl-[0-9]
+CONFLICTS= php-xsl-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt}
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 28e692984ab..da6cd820701 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/30 03:44:44 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/06/04 16:26:55 joerg Exp $
DISTNAME= texi2html-1.76
CATEGORIES= textproc
@@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nongnu.org/texi2html/
COMMENT= Texinfo-to-HTML direct translator
-CONFLICTS= teTeX-bin-1.0 teTeX-bin-1.0.[1234567]
+CONFLICTS= teTeX-bin-1.*
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/time/pear-Date/Makefile b/time/pear-Date/Makefile
index 27b51020f0a..45517adc895 100644
--- a/time/pear-Date/Makefile
+++ b/time/pear-Date/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $
DISTNAME= Date-1.4.3
CATEGORIES= time
@@ -6,7 +6,7 @@ CATEGORIES= time
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP Date and Time Zone Classes
-CONFLICTS= php-pear-Date-[0-9]
+CONFLICTS= php-pear-Date-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/pear-HTML_Common/Makefile b/www/pear-HTML_Common/Makefile
index 66069cc6f1c..b8946fe7bf7 100644
--- a/www/pear-HTML_Common/Makefile
+++ b/www/pear-HTML_Common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:55 joerg Exp $
DISTNAME= HTML_Common-1.2.1
CATEGORIES= www
@@ -6,7 +6,7 @@ CATEGORIES= www
MAINTAINER= jdolecek@NetBSD.org
COMMENT= Base PHP class for other HTML classes
-CONFLICTS= php-pear-HTML_Common-[0-9]
+CONFLICTS= php-pear-HTML_Common-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/pear-HTML_Select/Makefile b/www/pear-HTML_Select/Makefile
index 9411e76dedd..6bcdadef650 100644
--- a/www/pear-HTML_Select/Makefile
+++ b/www/pear-HTML_Select/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/04 16:26:56 joerg Exp $
DISTNAME= HTML_Select-1.2.1
CATEGORIES= www
@@ -6,7 +6,7 @@ CATEGORIES= www
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP class for generating HTML form select elements
-CONFLICTS= php-pear-HTML_Select-[0-9]
+CONFLICTS= php-pear-HTML_Select-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTML_Common>=1.1:../../www/pear-HTML_Common
diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index f7f56560e15..cad5cef2676 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:56 joerg Exp $
DISTNAME= HTTP_Request-1.2.3
#CATEGORIES+= www
@@ -6,7 +6,7 @@ DISTNAME= HTTP_Request-1.2.3
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP classes to provides an easy way to perform HTTP requests
-CONFLICTS= php-pear-HTTP_Request-[0-9]
+CONFLICTS= php-pear-HTTP_Request-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_URL>=1.0.12:../../net/pear-Net_URL
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile
index 6e612512e60..b474e6d7d76 100644
--- a/www/php-FastTemplate/Makefile
+++ b/www/php-FastTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:56 joerg Exp $
DISTNAME= FastTemplate-1_1_0
PKGNAME= ${PHP_PKG_PREFIX}-FastTemplate-1.1.0
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.thewebmasters.net/php/FastTemplate.phtml
COMMENT= PHP extension for managing templates and variable interpolation
-CONFLICTS= php-FastTemplate-[0-9]
+CONFLICTS= php-FastTemplate-[0-9]*
PHP_VERSIONS_ACCEPTED= 4
diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile
index 6ddcc99b979..8328d86d5d5 100644
--- a/www/php-apc/Makefile
+++ b/www/php-apc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:56 joerg Exp $
MODNAME= apc
PECL_VERSION= 3.0.10
CATEGORIES+= sysutils
COMMENT= Alternative PHP Cache
-CONFLICTS= php-apc-[0-9]
+CONFLICTS= php-apc-[0-9]*
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index 0b3c1a562b9..241d104e2fd 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/04 16:26:56 joerg Exp $
MODNAME= curl
CATEGORIES+= www
COMMENT= PHP extension for curl functions
-CONFLICTS= php-curl-[0-9]
+CONFLICTS= php-curl-[0-9]*
CONFIGURE_ARGS+= --with-curl=shared,${BUILDLINK_PREFIX.curl}
diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile
index aa0d935e97f..d5314ff1b3a 100644
--- a/www/php-eaccelerator/Makefile
+++ b/www/php-eaccelerator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:28:01 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:56 joerg Exp $
MODNAME= eaccelerator
PECL_VERSION= 0.9.5beta2
@@ -6,7 +6,7 @@ PECL_DISTNAME= ${MODNAME}-0.9.5-beta2
CATEGORIES+= sysutils
COMMENT= PHP accelerator, optimizer, encoder and dynamic content cache
-CONFLICTS= php-eaccelator-[0-9]
+CONFLICTS= php-eaccelator-[0-9]*
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eaccelerator/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile
index 7336a4272a9..cfcd8ff7ca0 100644
--- a/www/php4-apc/Makefile
+++ b/www/php4-apc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:01 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/06/04 16:26:56 joerg Exp $
MODNAME= apc
PECL_VERSION= 2.0.4
@@ -7,7 +7,7 @@ COMMENT= Alternative PHP Cache for PHP4
MAINTAINER= pkgsrc-users@NetBSD.org
-CONFLICTS= php-apc-[0-9]
+CONFLICTS= php-apc-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
WRKSRC= ${WRKDIR}/APC-${PECL_VERSION}
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 1c5eda27847..482028cdcc0 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.29 2006/05/11 16:27:03 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/06/04 16:26:56 joerg Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.troll.no/contrib/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Efficiently redrawn sprites in the Qt GUI Toolkit
-CONFLICTS= kdesupport-1.0
+CONFLICTS= kdesupport<1.1
WRKSRC= ${WRKDIR}/QwSpriteField
USE_LANGUAGES= c++