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

12 files changed, 44 insertions, 33 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 510e1451109..2abfc35403e 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	imp-3.2.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -12,8 +12,8 @@ COMMENT=	Internet Messaging Program
 CONFLICTS+=	imp-4.*
 
 DEPENDS+=	horde>=2.2.4:../../www/horde
-DEPENDS+=	php-imap>4.0.0:../../mail/php-imap
-DEPENDS+=	pear-Mail-[0-9]*:../../mail/pear-Mail
+DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.0.0:../../mail/php-imap
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
 
 DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
@@ -71,4 +71,5 @@ do-install:
 	${FIND} ${IMPDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${IMPDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 9eb7925f9f4..4662e23e141 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2006/04/29 09:23:19 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/imp/ \
-		ftp://ftp.horde.org/pub/imp/ 
+		ftp://ftp.horde.org/pub/imp/
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/imp/
@@ -13,8 +14,8 @@ COMMENT=	Internet Messaging Program
 CONFLICTS+=	imp-3.*
 
 DEPENDS+=	horde>=3.0.2:../../www/horde3
-DEPENDS+=	php-imap>4.3.3:../../mail/php-imap
-DEPENDS+=	pear-Mail-[0-9]*:../../mail/pear-Mail
+DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -97,4 +98,5 @@ do-install:
 	@${CHOWN} ${APACHE_USER}:${ROOT_GROUP} ${IMPDIR}/config
 	@${CHMOD} 0750 ${IMPDIR}/config
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index 5d0a00a6fe0..def6bb1ed9f 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/05/12 20:52:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	ingo-h3-${INGOVER}
 PKGNAME=	ingo-${INGOVER}
@@ -81,4 +81,5 @@ do-install:
 	@${CHOWN} ${APACHE_USER}:${SHAREGRP} ${INGODIR}/config
 	@${CHMOD} 0750 ${INGODIR}/config
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ingo/options.mk b/mail/ingo/options.mk
index f96981bc76b..4e2d4c893d7 100644
--- a/mail/ingo/options.mk
+++ b/mail/ingo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/03/31 22:06:34 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2006/06/02 18:27:56 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ingo
 PKG_SUPPORTED_OPTIONS=	sieve imap
@@ -9,12 +9,12 @@ PKG_SUPPORTED_OPTIONS=	sieve imap
 ### Bring in support for the sieve filtering language
 ###
 .if !empty(PKG_OPTIONS:Msieve)
-DEPENDS+=	pear-Net_Sieve>=1.0.0:../../net/pear-Net_Sieve
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_Sieve>=1.0.0:../../net/pear-Net_Sieve
 .endif
 
 ###
 ### Bring in support for an IMAP server
 ###
 .if !empty(PKG_OPTIONS:Mimap)
-DEPENDS+=	php-imap>4.3.3:../../mail/php-imap
+DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
 .endif
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index c85453d5b72..1edd25d23a7 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/05/05 05:32:36 martti Exp $
+# $NetBSD: Makefile,v 1.29 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	squirrelmail-1.4.6
 PKGNAME=	ja-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,8 +19,8 @@ CONFLICTS=	sq-attachment-handlers-[0-9]*
 CONFLICTS+=	sq-squirrelspell-[0-9]*
 CONFLICTS+=	squirrelmail-[0-9]*
 
-DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
-DEPENDS+=	php-mbstring>=4.3.3:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
 
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
@@ -82,4 +82,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
 	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 4953adac303..4a687480223 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	Mail-1.1.4
-PKGREVISION=	1
 CATEGORIES=	mail
 
-DEPENDS+=       pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
+CONFLICTS=	php-pear-Mail-[0-9]
+
+DEPENDS+=       ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Mail
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 592f950685d..48a7c887dbf 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	Mail_Mime-1.2.1
-PKGREVISION=	1
 CATEGORIES+=	mail
 
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	PHP classes to create and decode mime messages
 
+CONFLICTS=	php-pear-Mail_Mime-[0-9]
+
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index e343a83258e..1bc49364a03 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:56 joerg Exp $
 
 MODNAME=		imap
-PKGREVISION=		1
 CATEGORIES+=		mail
 COMMENT=		PHP extension for IMAP (Internet Mailbox Access Protocol)
 
+CONFLICTS=	php-imap-[0-9]
+
 USE_PHP_EXT_PATCHES=	yes
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index 65c46a9940b..dfde29f5e6f 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/03/02 07:41:44 martti Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	squirrelmail-decode-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,11 +12,12 @@ COMMENT=	Extra decoding library for SquirrelMail
 
 NO_BUILD=	yes
 
-DEPENDS+=	php-iconv>=4.3.3:../../converters/php-iconv
+DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC:Q}/eastasia/*.php ${WRKSRC:Q}/x-mac/*.php \
 		${PREFIX:Q}/share/squirrelmail/functions/decode
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mail/squirrelmail/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index c16849df16f..49836355e42 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2006/04/11 05:24:20 martti Exp $
+# $NetBSD: Makefile,v 1.72 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	squirrelmail-1.4.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +15,7 @@ CONFLICTS+=	sq-squirrelspell-[0-9]*
 CONFLICTS+=	ja-squirrelspell-[0-9]*
 CONFLICTS+=	ja-squirrelmail-[0-9]*
 
-DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
 
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
@@ -77,4 +77,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
 	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 98728d95cfc..030ed8a01d1 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/05/12 21:12:28 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:56 joerg Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -86,4 +86,5 @@ do-install:
 	@${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
 	@${CHMOD} 0750 ${TURBADIR}/config
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/turba/options.mk b/mail/turba/options.mk
index d618651cc1d..27f39d1266c 100644
--- a/mail/turba/options.mk
+++ b/mail/turba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2006/06/02 18:27:56 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.turba
 PKG_SUPPORTED_OPTIONS=	ldap mysql
@@ -10,12 +10,12 @@ PKG_SUGGESTED_OPTIONS=	ldap
 ### Use OpenLDAP for storing data
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-DEPENDS+=	php-ldap>=4.3.3:../../databases/php-ldap
+DEPENDS+=	${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap
 .endif
 
 ###
 ### Use MySQL for storing data
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+=	php-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 .endif