From 8572e2517c9d359fa0575baf432af6b50a175a18 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
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.

---
 textproc/php-pspell/Makefile  | 4 ++--
 textproc/php-wddx/Makefile    | 4 ++--
 textproc/php4-domxml/Makefile | 4 ++--
 textproc/php4-xslt/Makefile   | 4 ++--
 textproc/php5-dom/Makefile    | 4 ++--
 textproc/php5-xsl/Makefile    | 4 ++--
 textproc/texi2html/Makefile   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'textproc')

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
 
-- 
cgit v1.2.3