Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*,

all PEAR packages to php?-pear-* and all Apache packages to ap13-* or
ap2-* respectively. Add new variables to simplify the Makefile
handling. Add CONFLICTS on the old names. Reset revisions of bumped
packages. ap-php will now depend on the default Apache and PHP version.
All programs using it have an implicit option of the Apache version
as well.

OK from jlam@ and adrianp@.

6 files changed, 18 insertions, 16 deletions

diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile
index 28e1b0b69f8..0eaae1f0743 100644
--- a/textproc/php-pspell/Makefile
+++ b/textproc/php-pspell/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		pspell
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for pspell support
 
+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 3a11d4f57d6..30b9070db81 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/05/23 22:55:56 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		wddx
-PKGREVISION=		4
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for WDDX support
 
+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 12aa36853c8..c7fadc387e9 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		domxml
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP4 extension for DOM support
 
+PHP_VERSIONS_ACCEPTED=	4
+
+CONFLICTS=	php-domxml-[0-9]
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-dom=shared,${BUILDLINK_PREFIX.libxml2}
@@ -12,7 +14,6 @@ CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-dom-xslt=${BUILDLINK_PREFIX.libxslt}
 CONFIGURE_ARGS+=	--with-dom-exslt=${BUILDLINK_PREFIX.libxslt}
 
-PHP_VERSION_REQD=	4
 .include "../../lang/php/ext.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index 393532c2bad..a32d2235ea1 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		xslt
-PKGREVISION=		2
 CATEGORIES+=		textproc
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
+PHP_VERSIONS_ACCEPTED=	4
+
+CONFLICTS=	php-xslt-[0-9]
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 CONFIGURE_ARGS+=	--with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron}
@@ -34,7 +36,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README.XSLT-BACKENDS ${DOCDIR}
 
-PHP_VERSION_REQD=	4
 .include "../../lang/php/ext.mk"
 .include "../../textproc/sablotron/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php5-dom/Makefile b/textproc/php5-dom/Makefile
index 2e6185e21a0..e19d650f1ce 100644
--- a/textproc/php5-dom/Makefile
+++ b/textproc/php5-dom/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		dom
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP5 extension for DOM support
 
+CONFLICTS=	php-dom-[0-9]
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 CONFIGURE_ARGS+=	--with-libxml-dir=${BUILDLINK_PREFIX.libxml2}
 
-PHP_VERSION_REQD=	5
+PHP_VERSIONS_ACCEPTED=	5
 .include "../../lang/php/ext.mk"
 #.include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/php5-xsl/Makefile b/textproc/php5-xsl/Makefile
index 718780bfebf..10fc742c122 100644
--- a/textproc/php5-xsl/Makefile
+++ b/textproc/php5-xsl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		xsl
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP5 extension for XSLT functions
 
+CONFLICTS=	php-xsl-[0-9]
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt}
 
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt}
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/${MODNAME} ${DISTNAME}/ext/dom
 WRKSRC=			${WRKDIR}/${DISTNAME}/ext/${MODNAME}
 
-PHP_VERSION_REQD=	5
+PHP_VERSIONS_ACCEPTED=	5
 .include "../../lang/php/ext.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"