From a8e40ef4f9e34f0798b53fe2e6d4315e9deb9eee Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 4 Jun 2006 16:26:54 +0000 Subject: 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. --- mail/pear-Mail/Makefile | 4 ++-- mail/pear-Mail_Mime/Makefile | 4 ++-- mail/php-imap/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mail') 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 -- cgit v1.2.3