[csw-devel] SF.net SVN: gar:[14261] csw/mgar/pkg/php5/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 14261
          http://gar.svn.sourceforge.net/gar/?rev=14261&view=rev
Author:   bdwalton
Date:     2011-04-17 15:00:41 +0000 (Sun, 17 Apr 2011)

Log Message:
-----------
php5/trunk: cut mbstring extension to new dynamic subpackage generation

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 14:59:45 UTC (rev 14260)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 15:00:41 UTC (rev 14261)
@@ -73,8 +73,9 @@
 $(eval $(call php5_subpackage,imap,CSWimaprt CSWkrb5lib CSWosslrt))
 $(eval $(call php5_subpackage,json))
 $(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl))
+$(eval $(call php5_subpackage,mbstring))
+PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.*
 
-PACKAGES += CSWphp5-mbstring
 PACKAGES += CSWphp5-mcrypt
 PACKAGES += CSWphp5-mssql
 PACKAGES += CSWphp5-mysql
@@ -143,11 +144,6 @@
 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib
 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
 
-CATALOGNAME_CSWphp5-mbstring = php5_mbstring
-SPKG_DESC_CSWphp5-mbstring = The mbstring extension for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-mbstring = CSWphp5
-OBSOLETED_BY_CSWphp5-mbstring = CSWphp5mbstring
-
 CATALOGNAME_CSWphp5-mcrypt = php5_mcrypt
 SPKG_DESC_CSWphp5-mcrypt = The mcrypt extension for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7
@@ -337,9 +333,6 @@
 
 PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.*
 
-PKGFILES_CSWphp5-mbstring = .*/lib/php/extensions/.*/mbstring.*
-PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.*
-
 PKGFILES_CSWphp5-mcrypt = .*/lib/php/extensions/.*/mcrypt.*
 
 PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.*
@@ -557,7 +550,6 @@
 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.