From 29a4a9b873025f72c731c1522c3c786af4889c5a Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 2 Jun 2006 18:27:54 +0000
Subject: 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@.
---
 misc/php-calendar/Makefile | 4 ++--
 misc/php-mbstring/Makefile | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index bc631a8069f..1a54a5858c1 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
 
 MODNAME=		calendar
-PKGREVISION=		1
 CATEGORIES+=		misc
 COMMENT=		PHP extension for calendar conversion support
 
+CONFLICTS=	php-calendar-[0-9]
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 
diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile
index 8f6e81d7713..c526dbd027e 100644
--- a/misc/php-mbstring/Makefile
+++ b/misc/php-mbstring/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $
 
 MODNAME=		mbstring
 CATEGORIES+=		misc
-PKGREVISION=		2
 COMMENT=		PHP extension for multibyte characters support (currently, Japanese only)
 
+CONFLICTS=	php-mbstring-[0-9]
+
 USE_PHP_EXT_PATCHES=	yes
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
-- 
cgit v1.2.3