Revision: 24766
http://sourceforge.net/p/gar/code/24766
Author: janholzh
Date: 2015-03-24 13:38:15 +0000 (Tue, 24 Mar 2015)
Log Message:
-----------
php5/trunk: Fix Deps and Overrides
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2015-03-24 10:14:42 UTC (rev 24765)
+++ csw/mgar/pkg/php5/trunk/Makefile 2015-03-24 13:38:15 UTC (rev 24766)
@@ -215,9 +215,6 @@
$(eval $(call php5_subpackage,zip,CSWlibz1))
#$(eval $(call php5_subpackage,ibm_db2,))
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc54
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n54
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n54
RUNTIME_DEP_PKGS_CSWphp5-bz2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWphp5-bcmath += CSWlibz1
RUNTIME_DEP_PKGS_CSWphp5-openssl += CSWlibz1
@@ -289,82 +286,26 @@
RUNTIME_DEP_PKGS_CSWphp5-pdomysql += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWphp5-pdomysql += CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWlibncurses5
-#CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWlibssl1-0-0
-#CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWlibtidy0-99
-#CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWlibsasl2-2
CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWlibz1
CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibssl1-0-0
-#CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibidn11
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibpng15-15
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibjpeg7
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibz1
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibgd2
CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibxpm4
-#CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibicudata52
-#CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibicuuc51
-#CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibicui18n51
-#CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5 += surplus-dependency|CSWlibicuuc51
-#CHECKPKG_OVERRIDES_CSWphp5 += surplus-dependency|CSWlibicui18n51
-#CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWlibssl1-0-0
-#CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-iconv += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWlibltdl7
-#CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWlibssl1-0-0
-#CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWlibssl1-0-0
-#CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWlibz1
-#CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWlibiconv2
-#CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWlibssl1-0-0
+CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWlibssl1-0-0
+CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibssl1-0-0
+CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibidn11
+CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWlibssl1-0-0
+CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWlibssl1-0-0
+CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWlibltdl7
+CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWlibncurses5
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
EXTRA_LIB = /opt/csw/postgresql/lib
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
