Update dependency to newer package path.

	converters/php-mbstring
	databases/php-mysqli
	net/php-soap
	textproc/php-dom
	textproc/php-xsl
	time/php-calendar

No functional change should be done.

6 files changed, 16 insertions, 16 deletions

diff --git a/www/drupal/options.mk b/www/drupal/options.mk
index 0d25957bfdf..6a33851e50e 100644
--- a/www/drupal/options.mk
+++ b/www/drupal/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $
+# $NetBSD: options.mk,v 1.5 2010/03/16 16:02:21 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -29,5 +29,5 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 ### syndication.
 ###
 .if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 .endif
diff --git a/www/drupal6/options.mk b/www/drupal6/options.mk
index fc043612d45..db0caa66cff 100644
--- a/www/drupal6/options.mk
+++ b/www/drupal6/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $
+# $NetBSD: options.mk,v 1.5 2010/03/16 16:02:21 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -29,14 +29,14 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
 ### syndication.
 ###
 .if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 .endif
 
 ###
 ### Support for unicode
 ###
 .if !empty(PKG_OPTIONS:Municode)
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../converters/php-mbstring
 .endif
 
 ###
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 8da7733b519..69c0cf3663f 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/19 19:46:18 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/16 16:02:21 taca Exp $
 #
 
 DISTNAME=	fengoffice_1.6.2
@@ -17,10 +17,10 @@ LICENSE=	gnu-gpl-v3
 CONFLICTS+=	opengoo-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.1.0:../../databases/php-mysql
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.1.0:../../archivers/php-zip
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.1.0:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.1.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-imap>=5.1.0:../../mail/php-imap
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 142d3f6e62c..b139b4c94ab 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2010/03/15 16:48:53 taca Exp $
+# $NetBSD: Makefile,v 1.68 2010/03/16 16:02:21 taca Exp $
 
 DISTNAME=	horde-3.3.6
 PKGREVISION=	1
@@ -24,7 +24,7 @@ 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
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find
diff --git a/www/typolight27/Makefile b/www/typolight27/Makefile
index ef4f974258f..2557728a870 100644
--- a/www/typolight27/Makefile
+++ b/www/typolight27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/03/15 16:45:59 taca Exp $
+# $NetBSD: Makefile,v 1.16 2010/03/16 16:02:21 taca Exp $
 #
 
 DISTNAME=	typolight-${TL_VERSION}
@@ -12,10 +12,10 @@ COMMENT=	Powerful web content management system (CMS)
 LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
-DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php5-soap
+DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/typolight28/Makefile b/www/typolight28/Makefile
index 567369017a6..e927d17baff 100644
--- a/www/typolight28/Makefile
+++ b/www/typolight28/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/03/15 16:45:59 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/16 16:02:21 taca Exp $
 #
 
 DISTNAME=	typolight-${TL_VERSION}
@@ -12,10 +12,10 @@ COMMENT=	Powerful web content management system (CMS)
 LICENSE=	gnu-lgpl-v3
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
-DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php5-soap
+DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
 
 PKG_DESTDIR_SUPPORT=	user-destdir