[csw-devel] SF.net SVN: gar:[19747] csw/mgar/pkg/php5/trunk/Makefile
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun Nov 25 21:09:06 CET 2012
Revision: 19747
http://gar.svn.sourceforge.net/gar/?rev=19747&view=rev
Author: bdwalton
Date: 2012-11-25 20:09:05 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
php5/trunk: fix up more dependency issues discovered by the direct binding flags
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2012-11-25 18:32:44 UTC (rev 19746)
+++ csw/mgar/pkg/php5/trunk/Makefile 2012-11-25 20:09:05 UTC (rev 19747)
@@ -81,10 +81,8 @@
PACKAGES = CSWphp5
CATALOGNAME_CSWphp5 = php5
SPKG_DESC_CSWphp5 = A High-Level Scripting Language
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibiconv2 CSWlibexpat1 CSWlibz1
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio49
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1
RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n49
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicudata49
RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc49
INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
@@ -99,7 +97,7 @@
CATALOGNAME_CSWphp5-dev = php5_dev
SPKG_DESC_CSWphp5-dev = Development files for php5
RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5
-RUNTIME_DEP_PKGS_CSWphp5-dev = CSWgsed
+RUNTIME_DEP_PKGS_CSWphp5-dev += CSWgsed
OBSOLETED_BY_CSWphp5-dev = CSWphp5devel
PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config
PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config
@@ -131,11 +129,9 @@
PACKAGES += CSWap2-modphp5
CATALOGNAME_CSWap2-modphp5 = ap2_modphp5
SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
-RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio49
RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n49
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicudata49
RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc49
OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
@@ -146,13 +142,13 @@
$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
$(eval $(call php5_subpackage,calendar,))
$(eval $(call php5_subpackage,ctype,))
-$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWlibssl1-0-0))
+$(eval $(call php5_subpackage,curl,CSWlibcurl4))
$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42))
-$(eval $(call php5_subpackage,dom,CSWlibiconv2 CSWlibxml2-2))
+$(eval $(call php5_subpackage,dom,CSWlibxml2-2))
PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
-$(eval $(call php5_subpackage,exif,CSWlibz1))
+$(eval $(call php5_subpackage,exif,))
$(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0))
-$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWlibt1-5 CSWlibxpm4))
+$(eval $(call php5_subpackage,gd,CSWlibgd2 CSWlibt1-5))
PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
$(eval $(call php5_subpackage,gettext,CSWlibintl8))
$(eval $(call php5_subpackage,gmp,CSWlibgmp10))
@@ -160,23 +156,23 @@
PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
$(eval $(call php5_subpackage,iconv,CSWlibiconv2))
PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWlibc-client2007f CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl1-0-0))
+$(eval $(call php5_subpackage,imap,CSWlibc-client2007f))
$(eval $(call php5_subpackage,json,))
-$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2 CSWlibsasl2-2))
+$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2))
$(eval $(call php5_subpackage,mbstring,))
PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.*
-$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7))
+$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4))
$(eval $(call php5_subpackage,mssql,CSWlibsybdb5))
$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0))
# likely a checkpkg glitch (uses sparcv8plus+vis path for the library)
CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0
-$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibssl1-0-0))
+$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18))
$(eval $(call php5_subpackage,odbc,CSWlibodbc2))
-$(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0 CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3))
+$(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0))
$(eval $(call php5_subpackage,pcntl,))
$(eval $(call php5_subpackage,pdo,))
PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*
-$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo CSWlibssl1-0-0))
+$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo))
PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so
PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql
CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
@@ -191,20 +187,20 @@
PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql
CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5
-$(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo))
+$(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo))
PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so
PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite
CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5
$(eval $(call php5_subpackage,pgsql,CSWlibpq5))
$(eval $(call php5_subpackage,posix,))
-$(eval $(call php5_subpackage,pspell,CSWaspell))
-$(eval $(call php5_subpackage,readline,CSWlibreadline6 CSWlibncurses5))
+$(eval $(call php5_subpackage,pspell,CSWlibaspell15))
+$(eval $(call php5_subpackage,readline,CSWlibreadline6))
$(eval $(call php5_subpackage,session,CSWlibmm))
PKGFILES_CSWphp5-session += .*/include/php/ext/session.*
$(eval $(call php5_subpackage,shmop,))
$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp25))
-$(eval $(call php5_subpackage,soap,CSWlibiconv2 CSWlibxml2-2))
+$(eval $(call php5_subpackage,soap,CSWlibxml2-2))
$(eval $(call php5_subpackage,sockets,))
$(eval $(call php5_subpackage,sysvmsg,))
$(eval $(call php5_subpackage,sysvsem,))
@@ -212,10 +208,10 @@
$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99))
$(eval $(call php5_subpackage,tokenizer,))
$(eval $(call php5_subpackage,wddx,))
-$(eval $(call php5_subpackage,xmlreader,CSWlibiconv2 CSWlibxml2-2))
+$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2))
$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1))
-$(eval $(call php5_subpackage,xmlwriter,CSWlibiconv2 CSWlibxml2-2))
-$(eval $(call php5_subpackage,xsl,CSWlibiconv2 CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0))
+$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2))
+$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0))
$(eval $(call php5_subpackage,zip,CSWlibz1))
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list