[csw-devel] SF.net SVN: gar:[3661] csw/mgar/pkg/php5/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Sun Mar 8 21:58:01 CET 2009
Revision: 3661
http://gar.svn.sourceforge.net/gar/?rev=3661&view=rev
Author: valholla
Date: 2009-03-08 20:58:01 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
working commit
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/checksums
csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile
csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile
Removed Paths:
-------------
csw/mgar/pkg/php5/trunk/extensions/php5_pdo/
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -31,7 +31,7 @@
STRIP_DIRS += $(PHP5ROOT)/bin
# Auxilliary files
-DISTFILES += php.ini.CSW phpext
+DISTFILES += php.ini.CSW phpext pear.conf.CSW
DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh
PACKAGES = CSWphp5 CSWphp5devel
@@ -48,16 +48,7 @@
PKGFILES_CSWphp5devel = $(prefix)/php5/bin/php-config
PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize
PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/date/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pcre/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pdo/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/spl/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/main/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/php/include/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/regex/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/.*/standard/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/TSRM/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/Zend/.*
+PKGFILES_CSWphp5devel += $(prefix)/php5/include.*
PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.*
PKGFILES_CSWphp5devel += $(prefix)/php5/man/.*
@@ -85,7 +76,7 @@
CONFIGURE_ARGS += --enable-magic-quotes
CONFIGURE_ARGS += --enable-spl=shared
CONFIGURE_ARGS += --with-pcre-regex
-CONFIGURE_ARGS += --with-pear
+CONFIGURE_ARGS += --with-pear=shared
# Disable Tests (report submitted to PHP QA)
SKIPTEST = 1
@@ -103,6 +94,9 @@
ginstall -m 0644 \
$(WORKDIR)/php.ini.CSW \
$(DESTDIR)$(prefix)/php5/lib
+ ginstall -m 0644 \
+ $(WORKDIR)/pear.conf.CSW \
+ $(DESTDIR)$(prefix)/php5/etc
@$(MAKECOOKIE)
post-configure-modulated:
Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/checksums 2009-03-08 20:58:01 UTC (rev 3661)
@@ -1,6 +1,7 @@
7380ffecebd95c6edb317ef861229ebd download/php-5.2.6.tar.bz2
e79baa34abe18575a3d0220c21bd5e37 download/php.ini.CSW
90ae3cef3692d7e566c47d89fe39c43d download/phpext
+2386fa2c49eb730b6344f49bb5ee0fb1 download/pear.conf.CSW
de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh
89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh
8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -10,4 +10,3 @@
CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.*
-PKGFILES_CSWphp5dom += .*/include/php/ext/dom/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -10,4 +10,3 @@
CONFIGURE_ARGS += --with-pcre-dir=$(prefix)
PKGFILES_CSWphp5filter = .*/lib/php/extensions/.*/filter.*
-PKGFILES_CSWphp5filter += .*/include/php/ext/filter/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -20,4 +20,3 @@
CONFIGURE_ARGS += --enable-gd-jis-conv
PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.*
-PKGFILES_CSWphp5gd += .*/include/php/ext/gd/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -9,4 +9,3 @@
CONFIGURE_ARGS += --enable-hash=shared
PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.*
-PKGFILES_CSWphp5hash += .*/include/php/ext/hash/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -16,4 +16,3 @@
#PATCHFILES += iconv.diff
PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.*
-PKGFILES_CSWphp5iconv += .*/include/php/ext/iconv/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -11,4 +11,3 @@
CONFIGURE_ARGS += --enable-mbregex=shared
PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.*
-PKGFILES_CSWphp5mbstring += .*/include/php/ext/mbstring/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -9,4 +9,3 @@
CONFIGURE_ARGS += --enable-session=shared
PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.*
-PKGFILES_CSWphp5session += .*/include/php/ext/session/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -1,12 +1,8 @@
PHP5EXT_NAME = simplexml
-PACKAGES += CSWphp5simplexml
+## build this static, php can not run without it.
+## it is more efficient to have this built into the php binary
-CATALOGNAME_CSWphp5simplexml = php5_simplexml
-SPKG_DESC_CSWphp5simplexml = simplexml Extention for PHP5
-REQUIRED_PKGS_CSWphp5simplexml = CSWphp5 CSWiconv CSWlibxml2 CSWzlib
-
-CONFIGURE_ARGS += --enable-simplexml=shared
+CONFIGURE_ARGS += --enable-simplexml
CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
-PKGFILES_CSWphp5simplexml = .*/lib/php/extensions/.*/simplexml.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -10,4 +10,3 @@
CONFIGURE_ARGS += --enable-sqlite-utf8
PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.*
-PKGFILES_CSWphp5sqlite += .*/include/php/ext/sqlite/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -1,16 +1,5 @@
PHP5EXT_NAME = xml
-PACKAGES += CSWphp5xml
-
-CATALOGNAME_CSWphp5xml = php5_xml
-SPKG_DESC_CSWphp5xml = xml Extention for PHP5
-REQUIRED_PKGS_CSWphp5xml = CSWphp5 CSWexpat
-
-CONFIGURE_ARGS += --enable-xml=shared
+CONFIGURE_ARGS += --enable-xml
CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
CONFIGURE_ARGS += --with-libexpat-dir=$(prefix)
-
-PKGFILES_CSWphp5xml = .*/lib/php/extensions/.*/xml.so
-PKGFILES_CSWphp5xml += .*/lib/php/extensions/.*/xml.a
-PKGFILES_CSWphp5xml += .*/include/php/ext/xml/.*
-PKGFILES_CSWphp5xml += .*/include/php/ext/libxml/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -10,4 +10,3 @@
CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
PKGFILES_CSWphp5zip = .*/lib/php/extensions/.*/zip.*
-PKGFILES_CSWphp5zip += .*/include/php/ext/zip/.*
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-03-08 20:23:51 UTC (rev 3660)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-03-08 20:58:01 UTC (rev 3661)
@@ -1,11 +1,5 @@
PHP5EXT_NAME = zlib
-PACKAGES += CSWphp5zlib
-CATALOGNAME_CSWphp5zlib = php5_zlib
-SPKG_DESC_CSWphp5zlib = zlib Extention for PHP5
-REQUIRED_PKGS_CSWphp5zlib = CSWphp5 CSWzlib
+CONFIGURE_ARGS += --with-zlib=$(prefix)
-CONFIGURE_ARGS += --with-zlib=shared,$(prefix)
-
-PKGFILES_CSWphp5zlib = .*/lib/php/extensions/.*/zlib.*
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