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

52 files changed, 211 insertions, 172 deletions

diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index f18761650e7..549af564c9a 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $
 #
 
 DISTNAME=       HTML-Embperl-1.2.0
-PKGNAME=        ap-Embperl-1.2.0
-PKGREVISION=	3
+PKGNAME=        ap13-Embperl-1.2.0
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/} \
 		ftp://ftp.dev.ecos.de/pub/perl/embperl/
@@ -12,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://perl.apache.org/embperl/
 COMMENT=	Perl5 library for embedding perl in HTML documents
 
+CONFLICTS=	ap-Embperl-[0-9]*
+
 DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 
 PERL5_PACKLIST=	auto/HTML/Embperl/.packlist
diff --git a/www/ap-access-referer/Makefile b/www/ap-access-referer/Makefile
index af7d0424305..8a01db56318 100644
--- a/www/ap-access-referer/Makefile
+++ b/www/ap-access-referer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $
 #
 
 DISTNAME=	mod_access_referer-1.0.2
-PKGNAME=	ap-access-referer-1.0.2
-PKGREVISION=	2
+PKGNAME=	ap13-access-referer-1.0.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=accessreferer/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://accessreferer.sourceforge.net/
 COMMENT=	Apache module for referer-based access control
 
+CONFLICTS=	ap-access-referer-[0-9]*
 
 APACHE_MODULE_NAME=	mod_access_referer.so
 
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index f79971769e4..c665aa0cde0 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/06/02 18:27:58 joerg Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
 # one.
 
 DISTNAME=	mod_auth_cookie.c
-PKGNAME=	ap-auth-cookie-1.9
-PKGREVISION=	2
+PKGNAME=	ap13-auth-cookie-1.9
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.kciLink.com/pub/
 EXTRACT_SUFX=	.gz
@@ -15,6 +14,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 COMMENT=	Cookie-based authentication for Apache
 
+CONFLICTS=	ap-auth-cookie-[0-9]*
+
 WRKSRC=		${WRKDIR}
 
 EXTRACT_CMD=	${DO_NADA}
diff --git a/www/ap-auth-kerb/Makefile b/www/ap-auth-kerb/Makefile
index f1bec09ea06..850fa388ef3 100644
--- a/www/ap-auth-kerb/Makefile
+++ b/www/ap-auth-kerb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/15 12:05:43 markd Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:58 joerg Exp $
 
 DISTNAME=	mod_auth_kerb-5.0rc7
-PKGNAME=	ap-auth-kerb-5.0rc7
+PKGNAME=	${APACHE_PKG_PREFIX}-auth-kerb-5.0rc7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modauthkerb/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://modauthkerb.sourceforge.net/
 COMMENT=	Module to allow Apache authentication using Kerberos
 
+CONFLICTS=	ap-auth-kerb-[0-9]*
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-krb4
 USE_TOOLS+=		gmake
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 120302a592d..0196d237e92 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/05/31 18:22:26 ghen Exp $
+# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:58 joerg Exp $
 
 DISTNAME=	auth_ldap-1.6.1
-PKGNAME=	ap-auth-ldap-1.6.1
-PKGREVISION=	3
+PKGNAME=	ap13-auth-ldap-1.6.1
 SVR4_PKGNAME=	apldap
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.rudedog.org/auth_ldap/
@@ -11,6 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rudedog.org/auth_ldap/
 COMMENT=	Module to allow apache authentication against an LDAP directory
 
+CONFLICTS=	ap-auth-ldap-[0-9]*
 
 APACHE_MODULE_NAME=	auth_ldap.so
 CPPFLAGS+=		-DWITH_OPENLDAP
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index bca7340be64..9ec1a2f7c2d 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/05/16 02:35:37 ben Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $
 #
 
 DISTNAME=		libapache-mod-auth-mysql_4.3.1
-PKGNAME=		${DISTNAME:S/libapache-mod/ap/:S/_/-/}
-PKGREVISION=		5
+PKGNAME=		${APACHE_PKG_PREFIX}-auth-mysql-4.3.1
 WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
 CATEGORIES=		www databases security
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/liba/libapache-mod-auth-mysql/}
@@ -12,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://packages.debian.org/unstable/web/libapache-mod-auth-mysql.html
 COMMENT=		Module to allow apache authentication against a MySQL database
 
+CONFLICTS=	ap-auth-mysql-[0-9]*
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
index d0abf2e2288..89712c21c79 100644
--- a/www/ap-auth-pam/Makefile
+++ b/www/ap-auth-pam/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:58 joerg Exp $
 
 DISTNAME=	mod_auth_pam-1.0a
-PKGNAME=	ap-auth-pam-1.0a
-PKGREVISION=	2
+PKGNAME=	ap13-auth-pam-1.0a
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
 
@@ -10,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pam.sourceforge.net/mod_auth_pam/
 COMMENT=	Module to allow Apache authentication using PAM
 
+CONFLICTS=	ap-auth-pam-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_pam.so
 LDFLAGS+=		-lpam
diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile
index e5cea03c5da..daaaf1071be 100644
--- a/www/ap-auth-pgsql/Makefile
+++ b/www/ap-auth-pgsql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:16 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $
 
 DISTNAME=	mod_auth_pgsql-0.9.12
-PKGNAME=	ap-auth-pgsql-0.9.12
-PKGREVISION=	3
+PKGNAME=	ap13-auth-pgsql-0.9.12
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 
@@ -10,7 +9,9 @@ MAINTAINER=	waddell@caravan.com
 HOMEPAGE=	http://www.giuseppetanzilli.it/mod_auth_pgsql/
 COMMENT=	Apache module for user authentication/logging against a PostgreSQL DB
 
-CONFLICTS=	ap-auth-postgresql-[0-9]*
+CONFLICTS=	ap-auth-pgsql-[0-9]*
+CONFLICTS+=	ap-auth-postgresql-[0-9]*
+CONFLICTS+=	ap13-auth-postgresql-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_pgsql.so
 
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index d6c9abcf992..b5e93a6b435 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2006/03/20 19:59:21 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/02 18:27:58 joerg Exp $
 
 DISTNAME=	AuthPG-1.4
-PKGNAME=	ap-auth-postgresql-1.4
-PKGREVISION=	3
+PKGNAME=	ap13-auth-postgresql-1.4
 CATEGORIES=	www databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=authpg/}
 
@@ -10,8 +9,9 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://authpg.sourceforge.net/
 COMMENT=	Module to allow apache authentication against a Postgresql database
 
-CONFLICTS=	ap-auth-pgsql-[0-9]*
-
+CONFLICTS=	ap-auth-postgresql-[0-9]*
+CONFLICTS+=	ap-auth-pgsql-[0-9]*
+CONFLICTS+=	ap13-auth-pgsql-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_pg.so
 
diff --git a/www/ap-auth-radius/Makefile b/www/ap-auth-radius/Makefile
index 491905c0dac..e4c8d74d547 100644
--- a/www/ap-auth-radius/Makefile
+++ b/www/ap-auth-radius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
 #
 
 DISTNAME=	mod_auth_radius-1.5.7
-PKGREVISION=	2
+PKGNAME=	ap13-auth-radius-1.5.7
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
 EXTRACT_SUFX=	.tar
@@ -11,6 +11,7 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/mod_auth_radius/
 COMMENT=	Radius authentication module for Apache
 
+CONFLICTS=	ap-auth-radius-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_radius.so
 
diff --git a/www/ap-auth-script/Makefile b/www/ap-auth-script/Makefile
index e73e213f507..223b3b1ffd1 100644
--- a/www/ap-auth-script/Makefile
+++ b/www/ap-auth-script/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_auth_script-alpha1.3
-PKGNAME=	ap-auth-script-1.3
-PKGREVISION=	2
+PKGNAME=	ap13-auth-script-1.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mod-auth-script/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mod-auth-script.sourceforge.net/
 COMMENT=	Apache module for script-based authentication
 
+CONFLICTS=	ap-auth-script-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_script.so
 
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index 84f2257d9b3..d7f4445e266 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_bandwidth.c
-PKGNAME=	ap-bandwidth-2.0.6
-PKGREVISION=	2
+PKGNAME=	ap13-bandwidth-2.0.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cohprog.com/pub/apache/module/
 EXTRACT_SUFX=	# empty
@@ -12,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cohprog.com/mod_bandwidth.html
 COMMENT=	Apache module for bandwidth management
 
+CONFLICTS=	ap-bandwidth-[0-9]*
+
 WRKSRC=		${WRKDIR}
 
 APACHE_MODULE_NAME=	mod_bandwidth.so
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index 38d48377ea2..e65a6bcb663 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:52 reed Exp $
+# $NetBSD: Makefile,v 1.20 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=		mod_dav-1.0.3-1.3.6
-PKGNAME=		ap-dav-1.0.3
-PKGREVISION=		4
+PKGNAME=		ap13-dav-1.0.3
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/mod_dav/
 
@@ -10,8 +9,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.webdav.org/mod_dav/
 COMMENT=		Apache WebDAV module
 
-# Ugly mess that says apache>=1.3.9 and apache<2.0.
-BUILDLINK_API_DEPENDS.apache+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
+CONFLICTS=	ap-dav-[0-9]*
 
 APACHE_MODULE=		YES
 GNU_CONFIGURE=		YES
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 93e69fcfc56..300747163d9 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=	mod_dtcl-0.11.6
-PKGNAME=	ap-dtcl-0.11.2
-PKGREVISION=	3
+PKGNAME=	ap13-dtcl-0.11.2
 CATEGORIES=	www
 MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
 
@@ -10,6 +9,8 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://tcl.apache.org/
 COMMENT=	Simple, fast Tcl server side scripting for apache
 
+CONFLICTS=	ap-dtcl-[0-9]*
+
 WRKSRC=		${WRKDIR}/mod_dtcl
 
 TCLSH=		${BUILDLINK_PREFIX.tcl}/bin/tclsh
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 32c5ebbc7f4..55fbbdd28ae 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:59 joerg Exp $
 #
 
 .include "Makefile.common"
 
-PKGNAME=	${DISTNAME:S/mod_/ap-/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/mod_/ap13-/}
+
+CONFLICTS=	ap-fastcgi-[0-9]*
 
 APACHE_MODULE=	yes
 APACHE_MODULE_NAME=	mod_fastcgi.so
diff --git a/www/ap-gzip/Makefile b/www/ap-gzip/Makefile
index 6bfc8d8b6af..4eb96b69606 100644
--- a/www/ap-gzip/Makefile
+++ b/www/ap-gzip/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_gzip-1.3.26.1a
-PKGNAME=	${DISTNAME:C|mod_|ap-|}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:C|mod_|ap13-|}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mod-gzip/}
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/projects/mod-gzip/
 COMMENT=	On-the-fly GZIP compression for Apache 1.3.x
 
+CONFLICTS=	ap-gzip-[0-9]*
 
 APACHE_MODULE_NAME=	mod_gzip.so
 
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index be383428a7f..b75dd12b3b5 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/02 18:27:59 joerg Exp $
 
 .include "../../www/iasp/Makefile.common"
 
-PKGNAME=	ap-iasp-${IASP_VERSION}
-PKGREVISION=	2
+PKGNAME=	ap13-iasp-${IASP_VERSION}
 COMMENT=	Apache connector for accessing a iASP proxy server
 
+CONFLICTS=	ap-iasp-[0-9]*
+
 DEPENDS+=	{iasp-${IASP_VERSION},iasp-${IASP_VERSION}nb*}:../../www/iasp
 
 IASP_SRCDIR=	${IASP_DIR}/bin/apache/source/1.3
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 6fbf491ceaf..0ecdba6305d 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
-PKGNAME=	ap-jk-${JK_VERSION}
+PKGNAME=	ap13-jk-${JK_VERSION}
 JK_VERSION=	1.2.15
-PKGREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/
 
@@ -11,6 +10,8 @@ MAINTAINER=	erh@NetBSD.org
 HOMEPAGE=	http://jakarta.apache.org/tomcat/connectors-doc/
 COMMENT=	Apache connector for accessing Jakarta Tomcat
 
+CONFLICTS=	ap-jk-[0-9]*
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/jk/native
 APACHE_MODULE=	YES
 BUILD_DEFS+=	JK_ENABLE_JNI
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 9a72e463049..97708d914ba 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_layout-3.2
-PKGNAME=	${DISTNAME:C|mod_|ap-|}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:C|mod_|ap13-|}
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
@@ -12,6 +11,7 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://software.tangent.org/
 COMMENT=	Apache module to wrap static or dynamic content
 
+CONFLICTS=	ap-layout-[0-9]*
 
 APACHE_MODULE_NAME=	mod_layout.so
 
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index 17aabc0b220..0b26878595c 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
-PKGNAME=	${DISTNAME:C|mod_|ap-|}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:C|mod_|ap13-|}
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
@@ -12,6 +11,7 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://software.tangent.org/media/
 COMMENT=	Apache module for streaming mp3 files
 
+CONFLICTS=	ap-mp3-[0-9]*
 
 APACHE_MODULE_NAME=	${DISTNAME:C|-.*||}.so
 APACHE_MODULE_SRCDIR=	${WRKSRC}/src
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 1171d677728..a67fec04354 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:53 reed Exp $
+# $NetBSD: Makefile,v 1.43 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=		mod_perl-1.29
-PKGNAME=		ap-perl-1.29
-PKGREVISION=		5
+PKGNAME=		ap13-perl-1.29
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
 			http://perl.apache.org/dist/
@@ -12,7 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://perl.apache.org/
 COMMENT=		Module that embeds a Perl interpreter into Apache
 
-CONFLICTS=		ap2-perl-[0-9]*
+CONFLICTS=		ap-perl-[0-9]*
+CONFLICTS+=		ap2-perl-[0-9]*
 
 DEPENDS+=		${BUILDLINK_API_DEPENDS.apache}:../../www/apache
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index 58554677528..3742ab297b8 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/06/02 18:27:59 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ap-perl
+BUILDLINK_DEPENDS+=	ap13-perl
 .endif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap-perl}
-BUILDLINK_PACKAGES+=	ap-perl
+BUILDLINK_PACKAGES+=	ap13-perl
 
 .if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
-BUILDLINK_ABI_DEPENDS.ap-perl?=	ap-perl>=1.29nb5
+BUILDLINK_API_DEPENDS.ap-perl+=	ap13-perl>=1.29nb3
+BUILDLINK_ABI_DEPENDS.ap-perl?=	ap13-perl>=1.29nb5
 BUILDLINK_PKGSRCDIR.ap-perl?=	../../www/ap-perl
 
 BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 35e2e03291c..92cfe3ce2a5 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2006/04/14 13:47:30 cube Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:59 joerg Exp $
 #
 
-PKGNAME=		ap-php-${PHP_BASE_VERS}
-PKGREVISION=		6
+PKGNAME=		${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
 COMMENT=		Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
+CONFLICTS=		ap-php-[0-9]*
+
 APACHE_MODULE=		YES
 SHLIBTOOL_OVERRIDE=	libtool
 
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index 875ff60b212..d74224fe488 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=		mod_python-2.7.10
-PKGNAME=		ap-python-2.7.10
-PKGREVISION=		2
+PKGNAME=		ap13-python-2.7.10
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/modpython/}
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.modpython.org/
 COMMENT=		Python interpreter embedded into Apache
 
+CONFLICTS=	ap-python-[0-9]*
+
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
 GNU_CONFIGURE=		yes
diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile
index 2c0d4ee6933..eee28afb38f 100644
--- a/www/ap-rivet/Makefile
+++ b/www/ap-rivet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=	rivet_0.4.0-1
-PKGNAME=	ap-rivet-0.4.0.1
-PKGREVISION=	3
+PKGNAME=	ap13-rivet-0.4.0.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=tcl/rivet/}
 
@@ -10,6 +9,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://tcl.apache.org/rivet/
 COMMENT=	System for creating dynamic web content via Tcl
 
+CONFLICTS=	ap-rivet-[0-9]*
+
 WRKSRC=		${WRKDIR}/tcl-rivet
 HAS_CONFIGURE=	yes
 CONFIGURE_DIRS=	src
diff --git a/www/ap-rpaf/Makefile b/www/ap-rpaf/Makefile
index 5f1fbd8cacf..27a021f7616 100644
--- a/www/ap-rpaf/Makefile
+++ b/www/ap-rpaf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/03/22 22:50:33 tv Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=		mod_rpaf-0.5
-PKGNAME=		${DISTNAME:S/mod_/ap-/}
+PKGNAME=		${APACHE_PKG_PREFIX}-rpaf-0.5
 CATEGORIES=		www
 MASTER_SITES=		http://stderr.net/apache/rpaf/download/
 
@@ -10,6 +10,8 @@ MAINTAINER=		tv@NetBSD.org
 HOMEPAGE=		http://stderr.net/apache/rpaf/
 COMMENT=		Remaps reverse-proxied connections to "real" requesting IPs
 
+CONFLICTS=	ap-rpaf-[0-9]*
+
 APACHE_MODULE=		# defined
 INSTALLATION_DIRS=	share/doc
 
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index f80d4d68218..2d944bcb2c2 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/06/02 18:27:59 joerg Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
-PKGNAME=	ap-${RUBY_PKGPREFIX}-${VERSION}
-PKGREVISION=	5
+PKGNAME=	ap13-${RUBY_PKGPREFIX}-${VERSION}
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -11,7 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.modruby.net/
 COMMENT=	Apache module that embeds Ruby interpreter within
 
-CONFLICTS+=		ap2-ruby*
+CONFLICTS=	ap-ruby* ap2-ruby*
 
 RUBY_HAS_ARCHLIB=	yes
 APACHE_MODULE=		yes
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index fe5d27c7939..649ea787dcb 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2006/04/06 06:22:53 reed Exp $
+# $NetBSD: Makefile,v 1.101 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=		mod_ssl-2.8.25-1.3.34
-PKGNAME=		ap-ssl-2.8.25
-PKGREVISION=		2
+PKGNAME=		ap13-ssl-2.8.25
 CATEGORIES=		www security
 MASTER_SITES=		http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
@@ -13,6 +12,7 @@ HOMEPAGE=		http://www.modssl.org/
 COMMENT=		SSL/TLS protocols module for Apache
 
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
+CONFLICTS+=		ap-ssl-[0-9]*
 
 BUILDLINK_API_DEPENDS.apache+=	apache>=1.3.33
 
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index a19ee067f77..e465da291dd 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=	mod_throttle312
-PKGNAME=	ap-throttle-3.1.2
-PKGREVISION=	3
+PKGNAME=	ap13-throttle-3.1.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.snert.com/Software/mod_throttle/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,8 @@ MAINTAINER=	eric@cirr.com
 HOMEPAGE=	${MASTER_SITES}
 COMMENT=	Apache module for limiting bandwidth usage
 
+CONFLICTS=	ap-throttle-[0-9]*
+
 WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV:S/ap-/mod_/}
 
 APACHE_MODULE_NAME=	mod_throttle.so
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 38bd8a66cbf..ed9caf071b2 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/06/02 18:27:59 joerg Exp $
 
 DISTNAME=	modxslt-1.1
-PKGNAME=	ap-xslt-1.1
-PKGREVISION=	11
+PKGNAME=	ap13-xslt-1.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modxslt/}
 
@@ -10,6 +9,8 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://modxslt.sourceforge.net/
 COMMENT=	Simple, fast XSLT transformations for apache
 
+CONFLICTS=	ap-xslt-[0-9]*
+
 WRKSRC=		${WRKDIR}/modxslt
 
 APACHE_MODULE_NAME=	mod_xslt.so
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index 990f2a4e26f..24fdc0ef24f 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	apc_gui-1.0.3
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://apc.neuropeans.com/download/
 
@@ -10,10 +10,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://apc.neuropeans.com/
 COMMENT=	Web interface for managing APC (php-apc)
 
-PHP_VERSION_REQD=	4
+PHP_VERSIONS_ACCEPTED=	4
 
-DEPENDS+=	php-apc>=1.1.0.1:../../www/php4-apc
-DEPENDS+=	php-gd-4.[0-9]*:../../graphics/php-gd
+.include "../../lang/php/phpversion.mk"
+
+DEPENDS+=	${PHP_PKG_PREFIX}-apc>=1.1.0.1:../../www/php4-apc
+DEPENDS+=	${PHP_PKG_PREFIX}-gd-4.[0-9]*:../../graphics/php-gd
 
 NO_BUILD=	YES
 
diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile
index 350c58a7a7c..d079479b6cf 100644
--- a/www/blur6ex/Makefile
+++ b/www/blur6ex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $
 #
 
 DISTNAME=	blur6ex-0.1.198
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.blursoft.com/releases/
 
@@ -10,8 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.blursoft.com/
 COMMENT=	Weblog and content framework
 
-DEPENDS+=	ap{,2}-php>=4.0.0:../../www/ap-php
-DEPENDS+=	php-mysql-[0-9]*:../../databases/php-mysql
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
 DEPENDS+=	mysql-server>=4.1:../../databases/mysql5-server
 
 NO_CONFIGURE=	yes
@@ -51,4 +51,6 @@ do-install:
 		'-s|./engine/core/db.php$$||' .			\
 		${PREFIX}/${HTTPD_ROOT}/blog
 
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 2209072a595..e7a948fb2b7 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/05/28 14:46:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	drupal-4.7.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -8,10 +9,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://drupal.org/
 COMMENT=	Open source content management system
 
-.include "../../lang/php/phpversion.mk"
-
-DEPENDS+=	ap-php>=4.3.3:../../www/ap-php
-DEPENDS+=	php-gd>=4.3.3:../../graphics/php-gd
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
 
 NO_BUILD=	YES
 DRUPAL=		${PREFIX}/share/drupal
@@ -30,6 +29,9 @@ SUBST_FILES.conf=	drupal.conf
 SUBST_SED.conf=		-e "s|@DRUPAL@|${DRUPAL}|g"
 SUBST_MESSAGE.conf=     Fixing configuration files.
 
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
+
 .include "options.mk"
 
 post-extract:
diff --git a/www/drupal/options.mk b/www/drupal/options.mk
index c057fdea091..5e229b8e533 100644
--- a/www/drupal/options.mk
+++ b/www/drupal/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/05/28 14:46:47 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2006/06/02 18:28:00 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -15,13 +15,13 @@ PKG_SUGGESTED_OPTIONS=	mysql drupal-xmlservices
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
 .	include "../../mk/pgsql.buildlink3.mk"
-DEPENDS+=	php-pgsql-[0-9]*:../../databases/php-pgsql
+DEPENDS+=	${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql
 .elif !empty(PKG_OPTIONS:Mmysql)
 ###
 ### Use MySQL for storing Drupal data
 ###
 .	include "../../mk/mysql.buildlink3.mk"
-DEPENDS+=	php-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 .endif
 
 ###
@@ -30,8 +30,8 @@ DEPENDS+=	php-mysql>=4.3.3:../../databases/php-mysql
 ###
 .if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
 .	if ${PKG_PHP_VERSION} == "4"
-DEPENDS+=	php-domxml>=4.3.3:../../textproc/php4-domxml
+DEPENDS+=	${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml
 .	elif ${PKG_PHP_VERSION} == "5"
-DEPENDS+=	php-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
 .	endif
 .endif
diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile
index 6ef68f22899..ec6ff0bce67 100644
--- a/www/ganglia-webfrontend/Makefile
+++ b/www/ganglia-webfrontend/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:23 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $
 #
 
 DISTNAME=	ganglia-3.0.1
 PKGNAME=	ganglia-webfrontend-3.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ganglia/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://ganglia.sourceforge.net/
 COMMENT=	PHP based frontend for the Ganglia Cluster Monitor
 
-DEPENDS+=	ap-php>=4.1:../../www/ap-php
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php
 DEPENDS+=	ganglia-monitor-core>=3.0.1:../../parallel/ganglia-monitor-core
 
 NO_BUILD=	YES
@@ -31,4 +31,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCROOT}
 	cd ${WRKSRC} && ${PAX} -rw . ${DOCROOT}/
 
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index f1ce64fe516..9e6ba1f8bde 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2006/05/28 15:48:32 adrianp Exp $
+# $NetBSD: Makefile,v 1.44 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	horde-2.2.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
@@ -9,9 +9,11 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/
 COMMENT=	PHP application framework
 
-DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
-DEPENDS+=	pear-Log-[0-9]*:../../sysutils/pear-Log
-DEPENDS+=	pear-DB-[0-9]*:../../databases/pear-DB
+.include "../../lang/php/phpversion.mk"
+
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
 
 CONFLICTS+=	horde-3.*
 
diff --git a/www/horde3/Makefile b/www/horde3/Makefile
index 8e2cf4726b7..ffb9f3162c5 100644
--- a/www/horde3/Makefile
+++ b/www/horde3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/04/29 09:23:19 adrianp Exp $
+# $NetBSD: Makefile,v 1.25 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	horde-3.1.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
@@ -13,20 +14,20 @@ CONFLICTS+=	horde-2.*
 
 .include "../../lang/php/phpversion.mk"
 
-DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
-DEPENDS+=	php-mcrypt>=4.3.3:../../security/php-mcrypt
-DEPENDS+=	php-iconv>=4.3.3:../../converters/php-iconv
-DEPENDS+=	php-gd>=4.3.3:../../graphics/php-gd
-DEPENDS+=	pear-Log-[0-9]*:../../sysutils/pear-Log
-DEPENDS+=	pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
-DEPENDS+=	pear-DB-[0-9]*:../../databases/pear-DB
-DEPENDS+=	ap-php>=4.3.3:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
 .if ${PKG_PHP_VERSION} == "4"
-DEPENDS+=	php-domxml>=4.3.3:../../textproc/php4-domxml
+DEPENDS+=	${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml
 .elif ${PKG_PHP_VERSION} == "5"
-DEPENDS+=	php-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
 .endif
-DEPENDS+=	php-zlib>=4.3.3:../../archivers/php-zlib
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -127,4 +128,5 @@ do-install:
 	@${CHOWN} ${APACHE_USER}:${SHAREGRP} ${HORDEDIR}/config
 	@${CHMOD} 0750 ${HORDEDIR}/config
 
+.include "../../mk/apachever.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 49fac12b53c..d668c9eeb49 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/02 18:28:00 joerg Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 SVR4_PKGNAME=	p5aas
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index d76d8214fec..1903296ddb1 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/02 18:28:00 joerg Exp $
 #
 
 DISTNAME=	Apache-AuthCookie-3.06
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Apache-AuthCookie/
 COMMENT=	Perl5 module for Authentication and Authorization via cookies
 
-DEPENDS+=	ap-perl>=1.29:../../www/ap-perl
+DEPENDS+=	ap13-perl>=1.29:../../www/ap-perl
 DEPENDS+=	p5-Apache-Test-[0-9]*:../../www/p5-Apache-Test
 
 PERL5_PACKLIST=		auto/Apache/AuthCookie/.packlist
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 0f3ff7ed3f9..c713412c37f 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	Apache-Filter-1.022
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 SVR4_PKGNAME=	p5afi
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index fc0649a395a..4cc74dda5b6 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 SVR4_PKGNAME=	p5ass
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index c5fae6c7404..fed51ba1c4f 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:31:01 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=		HTML-Mason-1.3101
 PKGNAME=		p5-HTML-Mason-1.31.1
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		p5hma
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index ec1895dafcd..baf4f322d27 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	libapreq-1.33
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	p5lap
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/pear-HTML_Common/Makefile b/www/pear-HTML_Common/Makefile
index dbd2d4d145e..66069cc6f1c 100644
--- a/www/pear-HTML_Common/Makefile
+++ b/www/pear-HTML_Common/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:27 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	HTML_Common-1.2.1
-PKGREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	Base PHP class for other HTML classes
 
+CONFLICTS=	php-pear-HTML_Common-[0-9]
+
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/pear-HTML_Select/Makefile b/www/pear-HTML_Select/Makefile
index 88fd3b8f739..9411e76dedd 100644
--- a/www/pear-HTML_Select/Makefile
+++ b/www/pear-HTML_Select/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:27 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	HTML_Select-1.2.1
-PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	PHP class for generating HTML form select elements
 
-DEPENDS+=	pear-HTML_Common>=1.1:../../www/pear-HTML_Common
+CONFLICTS=	php-pear-HTML_Select-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-HTML_Common>=1.1:../../www/pear-HTML_Common
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index 7b38ca7a712..f7f56560e15 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:27 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	HTTP_Request-1.2.3
-PKGREVISION=	1
 #CATEGORIES+=	www
 
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	PHP classes to provides an easy way to perform HTTP requests
 
-DEPENDS+=	pear-Net_URL>=1.0.12:../../net/pear-Net_URL
-DEPENDS+=	pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
+CONFLICTS=	php-pear-HTTP_Request-[0-9]
+
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_URL>=1.0.12:../../net/pear-Net_URL
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile
index c43754066b1..6e612512e60 100644
--- a/www/php-FastTemplate/Makefile
+++ b/www/php-FastTemplate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $
 
 DISTNAME=	FastTemplate-1_1_0
-PKGNAME=	php-FastTemplate-1.1.0
-PKGREVISION=	1
+PKGNAME=	${PHP_PKG_PREFIX}-FastTemplate-1.1.0
 CATEGORIES=	www php4
 MASTER_SITES=	http://www.thewebmasters.net/php/
 
@@ -13,7 +12,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.thewebmasters.net/php/FastTemplate.phtml
 COMMENT=	PHP extension for managing templates and variable interpolation
 
-DEPENDS+=	php>=3.0.18:../../www/php4
+CONFLICTS=	php-FastTemplate-[0-9]
+
+PHP_VERSIONS_ACCEPTED=	4
 
 WRKSRC=		${WRKDIR}/FastTemplate
 DIST_SUBDIR=	${PKGBASE}
@@ -40,4 +41,5 @@ do-install:
 	done
 	${INSTALL_DATA} ${WRKSRC}/templates/*.tpl ${EGDIR}/templates
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile
index 4304b7ad94a..6ddcc99b979 100644
--- a/www/php-apc/Makefile
+++ b/www/php-apc/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2006/05/03 14:02:30 tv Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/02 18:28:00 joerg Exp $
 
 MODNAME=	apc
 PECL_VERSION=	3.0.10
 CATEGORIES+=	sysutils
 COMMENT=	Alternative PHP Cache
 
+CONFLICTS=	php-apc-[0-9]
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index aed61a1d506..0b3c1a562b9 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $
 
 MODNAME=		curl
-PKGREVISION=		1
 CATEGORIES+=		www
 COMMENT=		PHP extension for curl functions
 
+CONFLICTS=	php-curl-[0-9]
 
 CONFIGURE_ARGS+=	--with-curl=shared,${BUILDLINK_PREFIX.curl}
 
diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile
index 66e4ca98c0c..aa0d935e97f 100644
--- a/www/php-eaccelerator/Makefile
+++ b/www/php-eaccelerator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/01 18:00:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:28:01 joerg Exp $
 
 MODNAME=	eaccelerator
 PECL_VERSION=	0.9.5beta2
@@ -6,6 +6,8 @@ PECL_DISTNAME=	${MODNAME}-0.9.5-beta2
 CATEGORIES+=	sysutils
 COMMENT=	PHP accelerator, optimizer, encoder and dynamic content cache
 
+CONFLICTS=	php-eaccelator-[0-9]
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eaccelerator/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile
index f363874bef0..7336a4272a9 100644
--- a/www/php4-apc/Makefile
+++ b/www/php4-apc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:01 joerg Exp $
 
 MODNAME=	apc
 PECL_VERSION=	2.0.4
-PKGREVISION=	2
 CATEGORIES+=	sysutils
 COMMENT=	Alternative PHP Cache for PHP4
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 
+CONFLICTS=	php-apc-[0-9]
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 WRKSRC=		${WRKDIR}/APC-${PECL_VERSION}
@@ -20,7 +20,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
 
-PHP_VERSION_REQD=	4		# PHP 4.x only
+PHP_VERSIONS_ACCEPTED=	4
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/websvn/Makefile b/www/websvn/Makefile
index 66c5a34de10..50ee4eba1ba 100644
--- a/www/websvn/Makefile
+++ b/www/websvn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/02 18:28:01 joerg Exp $
 #
 
 DISTNAME=	WebSVN_161
 PKGNAME=	websvn-1.61
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://websvn.tigris.org/files/documents/1380/14334/
 
@@ -11,8 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://websvn.tigris.org/
 COMMENT=	Subversion repository web frontend
 
-DEPENDS+=	ap{,2}-php>=4.0.0:../../www/ap-php
-DEPENDS+=	php-zlib-[0-9]*:../../archivers/php-zlib
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
 
 WRKSRC=		${WRKDIR}/WebSVN
 NO_BUILD=	yes
@@ -40,4 +40,6 @@ do-install:
 post-install:
 	${RM} ${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc
 
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"