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

3 files changed, 17 insertions, 14 deletions

diff --git a/security/base/Makefile b/security/base/Makefile
index dea69ecd41f..5c07bff6508 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/05/12 22:31:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:57 joerg Exp $
 #
 
 DISTNAME=	base-1.2.4
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=secureideas/}
 
@@ -10,15 +11,15 @@ HOMEPAGE=	http://secureideas.sourceforge.net/
 COMMENT=	Analysis engine to process a database of security events
 
 DEPENDS+=	adodb>=1.2:../../databases/adodb
-DEPENDS+=	ap-php>=4.0.4:../../www/ap-php
-DEPENDS+=	php-gd>=4.0.4:../../graphics/php-gd
-DEPENDS+=	php-sockets>=4.0.4:../../net/php-sockets
-DEPENDS+=	php-mysql>=4.0.4:../../databases/php-mysql
-DEPENDS+=	pear-Log-[0-9]*:../../sysutils/pear-Log
-DEPENDS+=	pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words
-DEPENDS+=	pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman
-DEPENDS+=	pear-Image_Color-[0-9]*:../../graphics/pear-Image_Color
-DEPENDS+=	pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.4:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.0.4:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-sockets>=4.0.4:../../net/php-sockets
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.0.4:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Color-[0-9]*:../../graphics/pear-Image_Color
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph
 
 NO_BUILD=	YES
 
@@ -72,4 +73,6 @@ do-install:
 
 	@${CHOWN} ${WWW_USER} ${BASE_DIR}
 
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile
index 00ea366e61c..6b100bd6df6 100644
--- a/security/php-mcrypt/Makefile
+++ b/security/php-mcrypt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		mcrypt
-PKGREVISION=		1
 CATEGORIES+=		security
 COMMENT=		PHP extension for the mcrypt crypto algorithms library
 
+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 70822b6ce9e..4e8781ae8ba 100644
--- a/security/php-mhash/Makefile
+++ b/security/php-mhash/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
 
 MODNAME=		mhash
-PKGREVISION=		1
 CATEGORIES+=		security
 COMMENT=		PHP extension for the mhash hash algorithms library
 
+CONFLICTS=	php-mhash-[0-9]
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.mhash}