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

[bdwalton at users.sourceforge.net]

Revision: 14274
          http://gar.svn.sourceforge.net/gar/?rev=14274&view=rev
Author:   bdwalton
Date:     2011-04-17 18:47:56 +0000 (Sun, 17 Apr 2011)

Log Message:
-----------
php5/trunk: cut pgsql extension to new dynamic subpackage generation (fix a split in pdoodbc too)

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 18:45:26 UTC (rev 14273)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 18:47:56 UTC (rev 14274)
@@ -88,7 +88,7 @@
 PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_mysql.so
 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo))
-PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo))
 PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so
@@ -96,8 +96,8 @@
 $(eval $(call php5_subpackage,pdosqlite,CSWsqlite3rt CSWphp5-pdo))
 PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so
 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
+$(eval $(call php5_subpackage,pgsql,CSWlibpq))
 
-PACKAGES += CSWphp5-pgsql
 PACKAGES += CSWphp5-posix
 PACKAGES += CSWphp5-pspell
 PACKAGES += CSWphp5-readline
@@ -153,11 +153,6 @@
 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib
 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
 
-CATALOGNAME_CSWphp5-pgsql = php5_pgsql
-SPKG_DESC_CSWphp5-pgsql = The pgsql extension for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-pgsql = CSWphp5 CSWlibpq
-OBSOLETED_BY_CSWphp5-pgsql = CSWphp5pgsql
-
 CATALOGNAME_CSWphp5-posix = php5_posix
 SPKG_DESC_CSWphp5-posix = The posix extension for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-posix = CSWphp5
@@ -286,8 +281,6 @@
 
 PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.*
 
-PKGFILES_CSWphp5-pgsql = .*/lib/php/extensions/.*/pgsql.*
-
 PKGFILES_CSWphp5-posix = .*/lib/php/extensions/.*/posix.*
 
 PKGFILES_CSWphp5-pspell = .*/lib/php/extensions/.*/pspell.*
@@ -485,7 +478,6 @@
 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5


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