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@.

5 files changed, 22 insertions, 17 deletions

diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 47aa5af8e6b..b509454cab6 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	Image_Canvas-0.2.4
-PKGREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Color/
 COMMENT=	Common interface to image drawing, making image source code
 
-DEPENDS+=	pear-Image_Color>=1.0.0:../../graphics/pear-Image_Color
+CONFLICTS=	php-pear-Image_Canvas-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Color>=1.0.0:../../graphics/pear-Image_Color
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index fcc00d83b4c..3fdb56beb1b 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	Image_Color-1.0.2
-PKGREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Color/
 COMMENT=	Manage and handles color data and conversions
 
-DEPENDS+=	php-gd-[0-9]*:../../graphics/php-gd
+CONFLICTS=	php-pear-Image_Color-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index b78bca29a24..6fd89ef8816 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	Image_Graph-0.3.0dev4
-PKGREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Graph/
 COMMENT=	Package for displaying (numerical) data as a graph/chart/plot
 
-DEPENDS+=	pear-Image_Canvas>=0.2.1:../../graphics/pear-Image_Canvas
-DEPENDS+=	pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman
-DEPENDS+=	pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words
+CONFLICTS=	php-pear-Image_Graph-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Canvas>=0.2.1:../../graphics/pear-Image_Canvas
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 0966938a356..1558c111bbe 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:56 joerg Exp $
 
 MODNAME=		gd
-PKGREVISION=		2
 CATEGORIES+=		graphics
 COMMENT=		PHP extension for GD graphics library
 
+CONFLICTS=	php-gd-[0-9]
 
 # XXX we use bundled GD so that extension is usable also by non-threaded
 # PHP, such as CLI/CGI version or ap-php on Apache 1.x.
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index 7c5ef9852e6..220ff1e9b72 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/04/13 01:30:43 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	jpgraph-1.18
-PKGNAME=	php-${DISTNAME}
-PKGREVISION=	2
+PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	graphics www
 MASTER_SITES=	http://members.chello.se/jpgraph/jpgdownloads/
 
@@ -10,7 +9,9 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://www.aditus.nu/jpgraph/index.php
 COMMENT=	Object Oriented class library for PHP
 
-DEPENDS+=	php-gd>=4.3.1:../../graphics/php-gd
+CONFLICTS=	php-jgraph-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd
 
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
@@ -52,4 +53,5 @@ do-install:
 	${FIND} ${PREFIX}/share/doc/php-jpgraph/html -type d | ${XARGS} \
 		${CHMOD} ${PKGDIRMODE}
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"