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

[bdwalton at users.sourceforge.net]

Revision: 13632
          http://gar.svn.sourceforge.net/gar/?rev=13632&view=rev
Author:   bdwalton
Date:     2011-03-07 01:36:41 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
php5/trunk: more overrides for mod -> php5 deps; drop deps from main package; add library based deps to other modules

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-03-07 01:26:36 UTC (rev 13631)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-03-07 01:36:41 UTC (rev 13632)
@@ -29,6 +29,7 @@
 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
 
 PACKAGES = CSWphp5 CSWphp5devel
+PACKAGES += CSWap2-modphp5
 PACKAGES += CSWphp5-bcmath
 PACKAGES += CSWphp5-bz2
 PACKAGES += CSWphp5-calendar
@@ -94,8 +95,13 @@
 SPKG_DESC_CSWphp5devel     = Development files for php5
 RUNTIME_DEP_PKGS_CSWphp5      = CSWiconv 
 RUNTIME_DEP_PKGS_CSWphp5     += CSWlibxml2 CSWzlib
-RUNTIME_DEP_PKGS_CSWphp5     += CSWlibmm CSWapache2
 
+CATALOGNAME_CSWap2-modphp5 = ap2_modphp5
+SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
+RUNTIME_DEP_PKGS_CSWap2-modphp5  = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib
+OBSOLETES_CSWap2-modphp5 = CSWap2modphp5
+
 CATALOGNAME_CSWphp5-bcmath = php5_bcmath
 SPKG_DESC_CSWphp5-bcmath = The bcmath extension for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-bcmath = CSWphp5
@@ -119,7 +125,7 @@
 CATALOGNAME_CSWphp5-curl = php5_curl
 SPKG_DESC_CSWphp5-curl = The curl extension for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-curl  = CSWphp5 CSWcurlrt CSWlibidn 
-RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib CSWlibcares
 OBSOLETES_CSWphp5-curl = CSWphp5curl
 
 CATALOGNAME_CSWphp5-dba = php5_dba
@@ -170,7 +176,7 @@
 
 CATALOGNAME_CSWphp5-iconv = php5_iconv
 SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv
+RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5
 OBSOLETES_CSWphp5-iconv = CSWphp5iconv
 
 CATALOGNAME_CSWphp5-imap = php5_imap
@@ -259,7 +265,7 @@
 
 CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite
 SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version)
-RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo
+RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo CSWsqlite3rt
 OBSOLETES_CSWphp5-pdosqlite = CSWphp5pdosqlite
 
 CATALOGNAME_CSWphp5-pgsql = php5_pgsql
@@ -349,7 +355,7 @@
 
 CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc
 SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat
+RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWexpat
 OBSOLETES_CSWphp5-xmlrpc = CSWphp5xmlrpc
 
 CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter
@@ -387,6 +393,8 @@
 PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1
 PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1
 
+PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
+
 PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.*
 
 PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.*
@@ -697,6 +705,13 @@
 CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
+CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
+CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
+CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
 
 include files/scripts.mk
 include gar/category.mk


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