Tue Mar 16 16:02:21 2010 UTC ()
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.


(taca)
diff -r1.3 -r1.4 pkgsrc/audio/ampache/Makefile
diff -r1.81 -r1.82 pkgsrc/databases/phpmyadmin/Makefile
diff -r1.24 -r1.25 pkgsrc/mail/roundcube/Makefile
diff -r1.4 -r1.5 pkgsrc/mail/roundcube/options.mk
diff -r1.4 -r1.5 pkgsrc/www/drupal/options.mk
diff -r1.4 -r1.5 pkgsrc/www/drupal6/options.mk
diff -r1.3 -r1.4 pkgsrc/www/fengoffice/Makefile
diff -r1.67 -r1.68 pkgsrc/www/horde/Makefile
diff -r1.15 -r1.16 pkgsrc/www/typolight27/Makefile
diff -r1.4 -r1.5 pkgsrc/www/typolight28/Makefile

cvs diff -r1.3 -r1.4 pkgsrc/audio/ampache/Makefile (expand / switch to context diff)
--- pkgsrc/audio/ampache/Makefile 2010/01/04 20:46:06 1.3
+++ pkgsrc/audio/ampache/Makefile 2010/03/16 16:02:20 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/01/04 20:46:06 abs Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/16 16:02:20 taca Exp $
 #
 
 DISTNAME=	ampache-3.5.3
@@ -12,7 +12,7 @@
 DEPENDS+=       ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php
 DEPENDS+=       ${PHP_PKG_PREFIX}-gettext>=0:../../devel/php-gettext
 DEPENDS+=       ${PHP_PKG_PREFIX}-iconv>=0:../../converters/php-iconv
-DEPENDS+=       ${PHP_PKG_PREFIX}-mbstring>=0:../../misc/php-mbstring
+DEPENDS+=       ${PHP_PKG_PREFIX}-mbstring>=0:../../converters/php-mbstring
 DEPENDS+=       ${PHP_PKG_PREFIX}-mysql>=0:../../databases/php-mysql
 
 NO_BUILD=		yes

cvs diff -r1.81 -r1.82 pkgsrc/databases/phpmyadmin/Makefile (expand / switch to context diff)
--- pkgsrc/databases/phpmyadmin/Makefile 2010/01/26 12:04:37 1.81
+++ pkgsrc/databases/phpmyadmin/Makefile 2010/03/16 16:02:21 1.82
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2010/01/26 12:04:37 tron Exp $
+# $NetBSD: Makefile,v 1.82 2010/03/16 16:02:21 taca Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -11,7 +11,7 @@
 COMMENT=	Set of PHP-scripts to adminstrate MySQL over the WWW
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
 
 PKG_DESTDIR_SUPPORT=	user-destdir

cvs diff -r1.24 -r1.25 pkgsrc/mail/roundcube/Makefile (expand / switch to context diff)
--- pkgsrc/mail/roundcube/Makefile 2010/03/15 16:48:53 1.24
+++ pkgsrc/mail/roundcube/Makefile 2010/03/16 16:02:21 1.25
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/03/15 16:48:53 taca Exp $
+# $NetBSD: Makefile,v 1.25 2010/03/16 16:02:21 taca Exp $
 #
 
 DISTNAME=	roundcubemail-${RCVERSION}-dep
@@ -29,7 +29,7 @@
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
 
 PKG_SYSCONFSUBDIR?=	roundcube
 

cvs diff -r1.4 -r1.5 pkgsrc/mail/roundcube/options.mk (expand / switch to context diff)
--- pkgsrc/mail/roundcube/options.mk 2009/01/19 20:15:49 1.4
+++ pkgsrc/mail/roundcube/options.mk 2010/03/16 16:02:21 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2009/01/19 20:15:49 abs Exp $
+# $NetBSD: options.mk,v 1.5 2010/03/16 16:02:21 taca Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.roundcube
 
@@ -57,7 +57,7 @@
 ### Use mbstring
 ###
 .if !empty(PKG_OPTIONS:Mmultibyte)
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../misc/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../converters/php-mbstring
 .endif
 
 ###

cvs diff -r1.4 -r1.5 pkgsrc/www/drupal/Attic/options.mk (expand / switch to context diff)
--- pkgsrc/www/drupal/Attic/options.mk 2010/03/15 16:48:53 1.4
+++ pkgsrc/www/drupal/Attic/options.mk 2010/03/16 16:02:21 1.5
@@ -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 @@
 ### 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

cvs diff -r1.4 -r1.5 pkgsrc/www/drupal6/Attic/options.mk (expand / switch to context diff)
--- pkgsrc/www/drupal6/Attic/options.mk 2010/03/15 16:48:53 1.4
+++ pkgsrc/www/drupal6/Attic/options.mk 2010/03/16 16:02:21 1.5
@@ -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 @@
 ### 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
 
 ###

cvs diff -r1.3 -r1.4 pkgsrc/www/fengoffice/Makefile (expand / switch to context diff)
--- pkgsrc/www/fengoffice/Makefile 2010/02/19 19:46:18 1.3
+++ pkgsrc/www/fengoffice/Makefile 2010/03/16 16:02:21 1.4
@@ -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 @@
 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

cvs diff -r1.67 -r1.68 pkgsrc/www/horde/Makefile (expand / switch to context diff)
--- pkgsrc/www/horde/Makefile 2010/03/15 16:48:53 1.67
+++ pkgsrc/www/horde/Makefile 2010/03/16 16:02:21 1.68
@@ -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-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

cvs diff -r1.15 -r1.16 pkgsrc/www/typolight27/Attic/Makefile (expand / switch to context diff)
--- pkgsrc/www/typolight27/Attic/Makefile 2010/03/15 16:45:59 1.15
+++ pkgsrc/www/typolight27/Attic/Makefile 2010/03/16 16:02:21 1.16
@@ -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 @@
 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
 

cvs diff -r1.4 -r1.5 pkgsrc/www/typolight28/Attic/Makefile (expand / switch to context diff)
--- pkgsrc/www/typolight28/Attic/Makefile 2010/03/15 16:45:59 1.4
+++ pkgsrc/www/typolight28/Attic/Makefile 2010/03/16 16:02:21 1.5
@@ -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 @@
 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