[csw-devel] SF.net SVN: gar:[5801] csw/mgar/pkg/php5/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Sat Aug 1 20:18:42 CEST 2009
Revision: 5801
http://gar.svn.sourceforge.net/gar/?rev=5801&view=rev
Author: valholla
Date: 2009-08-01 18:18:42 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
fix for db47
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/Makefile.cswdir
csw/mgar/pkg/php5/trunk/Makefile.php5dir
csw/mgar/pkg/php5/trunk/checksums
csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile
csw/mgar/pkg/php5/trunk/files/configure.diff
Added Paths:
-----------
csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/Makefile 2009-08-01 18:18:42 UTC (rev 5801)
@@ -1,5 +1,5 @@
GARNAME = php5
-GARVERSION = 5.2.9
+GARVERSION = 5.2.10
CATEGORIES = lang
SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g')
DISTNAME = $(SF_PROJ)-$(GARVERSION)
@@ -19,11 +19,12 @@
endef
MASTER_SITES = http://us.php.net/distributions/
-SPKG_SOURCEURL = http://www.php.net/downloads.php
+SPKG_SOURCEURL = http://www.php.net/
INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
+STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext CSWphp5.postinstall
+DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
PACKAGES = CSWphp5 CSWphp5devel
@@ -61,8 +62,6 @@
EXTDIRLIST = $(shell ls -d extensions/*)
include $(foreach X,$(EXTDIRLIST),$(X)/Makefile)
-EXTRA_LIB += $(prefix)/bdb44/lib
-EXTRA_INC += $(prefix)/bdb44/include
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
NOISALIST = 1
Modified: csw/mgar/pkg/php5/trunk/Makefile.cswdir
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-08-01 18:18:42 UTC (rev 5801)
@@ -19,7 +19,7 @@
endef
MASTER_SITES = http://us.php.net/distributions/
-SPKG_SOURCEURL = http://www.php.net/downloads.php
+SPKG_SOURCEURL = http://www.php.net/
INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
@@ -62,8 +62,6 @@
EXTDIRLIST = $(shell ls -d extensions/*)
include $(foreach X,$(EXTDIRLIST),$(X)/Makefile)
-EXTRA_LIB += $(prefix)/bdb44/lib
-EXTRA_INC += $(prefix)/bdb44/include
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
NOISALIST = 1
Modified: csw/mgar/pkg/php5/trunk/Makefile.php5dir
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.php5dir 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/Makefile.php5dir 2009-08-01 18:18:42 UTC (rev 5801)
@@ -19,7 +19,7 @@
endef
MASTER_SITES = http://us.php.net/distributions/
-SPKG_SOURCEURL = http://www.php.net/downloads.php
+SPKG_SOURCEURL = http://www.php.net/
INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
@@ -62,8 +62,6 @@
EXTDIRLIST = $(shell ls -d extensions/*)
include $(foreach X,$(EXTDIRLIST),$(X)/Makefile)
-EXTRA_LIB += $(prefix)/bdb44/lib
-EXTRA_INC += $(prefix)/bdb44/include
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
NOISALIST = 1
Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/checksums 2009-08-01 18:18:42 UTC (rev 5801)
@@ -5,12 +5,13 @@
2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove
0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space
98c6458b20eca91982b67c80a0554586 download/CSWphp5.postinstall
-ab08e2ba62667bf13fa236099e433e84 download/configure.diff
+91060cc7c31aa917d88cd537d3d5bb42 download/configure.diff
a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW
2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff
230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff
+d4c93751890b989c5a7b04acb5845fd9 download/pear.conf.CSW
13db46097c9686302bebf160e2d26ed2 download/pgsql.diff
-280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2
+15c7b5a87f57332d6fc683528e28247b download/php-5.2.10.tar.bz2
a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff
670b8fbf4cf9105d72f22dbf4b1e29cd download/php.ini.CSW
6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext
Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-08-01 18:18:42 UTC (rev 5801)
@@ -4,12 +4,12 @@
CATALOGNAME_CSWphp5dba = php5_dba
SPKG_DESC_CSWphp5dba = dba Extention for PHP5
-REQUIRED_PKGS_CSWphp5dba = CSWphp5 CSWbdb44 CSWgdbm
+REQUIRED_PKGS_CSWphp5dba = CSWphp5 CSWbdb CSWgdbm
CONFIGURE_ARGS += --enable-dba=shared
CONFIGURE_ARGS += --with-ndbm
CONFIGURE_ARGS += --with-gdbm=$(prefix)
-CONFIGURE_ARGS += --with-db4=$(prefix)/bdb44
+CONFIGURE_ARGS += --with-db4=$(prefix)
PKGFILES_CSWphp5dba = .*/lib/php/extensions/.*/dba\.so
Modified: csw/mgar/pkg/php5/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/php5/trunk/files/configure.diff 2009-08-01 15:43:44 UTC (rev 5800)
+++ csw/mgar/pkg/php5/trunk/files/configure.diff 2009-08-01 18:18:42 UTC (rev 5801)
@@ -1,6 +1,6 @@
---- php-5.2.9/configure~ 2009-02-25 09:39:40.000000000 -0600
-+++ php-5.2.9/configure 2009-03-13 20:43:49.996093631 -0500
-@@ -4744,7 +4744,7 @@
+--- php-5.2.10/configure.o 2009-06-23 13:56:57.118204433 -0500
++++ php-5.2.10/configure 2009-06-23 14:01:59.104988013 -0500
+@@ -4776,7 +4776,7 @@
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
if test "$?" != "0"; then
@@ -9,7 +9,7 @@
else
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-@@ -4757,7 +4757,7 @@
+@@ -4789,7 +4789,7 @@
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -18,7 +18,7 @@
fi
fi
-@@ -5905,7 +5905,7 @@
+@@ -5937,7 +5937,7 @@
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -27,7 +27,7 @@
fi
case $host_alias in
-@@ -6753,7 +6753,7 @@
+@@ -6785,7 +6785,7 @@
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -36,7 +36,7 @@
fi
case $host_alias in
-@@ -7770,7 +7770,7 @@
+@@ -7802,7 +7802,7 @@
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
if test "$?" != "0"; then
@@ -45,7 +45,7 @@
else
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-@@ -7783,7 +7783,7 @@
+@@ -7815,7 +7815,7 @@
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
@@ -54,26 +54,8 @@
fi
fi
-@@ -19951,7 +19951,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
-- for i in $PHP_LIBXML_DIR /usr/local /usr; do
-+ for i in $PHP_LIBXML_DIR /opt/csw /usr/local /usr; do
- if test -x "$i/bin/xml2-config"; then
- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
- break
-@@ -46061,7 +46061,7 @@
+@@ -46657,7 +46657,7 @@
- if test "$found_iconv" = "no"; then
-
-- for i in $PHP_ICONV /usr/local /usr; do
-+ for i in $PHP_ICONV /opt/csw /usr/local /usr; do
- if test -r $i/include/giconv.h; then
- cat >> confdefs.h <<\EOF
- #define HAVE_GICONV_H 1
-@@ -46542,7 +46542,7 @@
-
if test "$iconv_avail" != "no"; then
if test -z "$ICONV_DIR"; then
- for i in /usr/local /usr; do
@@ -81,18 +63,18 @@
if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
PHP_ICONV_PREFIX="$i"
break
-@@ -68556,7 +68556,7 @@
+@@ -68725,7 +68725,7 @@
echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
- echo "configure:68558: checking for unixODBC support" >&5
+ echo "configure:68727: checking for unixODBC support" >&5
if test "$PHP_UNIXODBC" = "yes"; then
- PHP_UNIXODBC=/usr/local
+ PHP_UNIXODBC=/opt/csw
fi
ODBC_INCDIR=$PHP_UNIXODBC/include
ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
-@@ -77195,8 +77195,8 @@
+@@ -77388,8 +77388,8 @@
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:77197: checking for pg_config" >&5
+ echo "configure:77390: checking for pg_config" >&5
for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
- if test -x $i/pg_config; then
- PG_CONFIG="$i/pg_config"
@@ -101,9 +83,9 @@
break;
fi
done
-@@ -80000,8 +80000,8 @@
+@@ -80202,8 +80202,8 @@
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:80002: checking for pg_config" >&5
+ echo "configure:80204: checking for pg_config" >&5
for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
- if test -x $i/pg_config; then
- PG_CONFIG="$i/pg_config"
@@ -112,19 +94,19 @@
break;
fi
done
-@@ -83215,7 +83215,7 @@
+@@ -83426,7 +83426,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lreadline $LIBS"
-+LIBS="-lreadline -lcurses $LIBS"
++LIBS="-lreadline -lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 83221 "configure"
+ #line 83432 "configure"
#include "confdefs.h"
-@@ -103440,7 +103440,7 @@
+@@ -103475,7 +103475,7 @@
else
echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
- echo "configure:103443: checking for XMLRPC-EPI in default path" >&5
+ echo "configure:103478: checking for XMLRPC-EPI in default path" >&5
- for i in /usr/local /usr; do
+ for i in /opt/csw /usr/local /usr; do
if test -r $i/include/xmlrpc.h; then
Added: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-08-01 18:18:42 UTC (rev 5801)
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/php5/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php5/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php5/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php5/bin";s:8:"data_dir";s:26:"/opt/csw/php5/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php5/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/php5/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/php5/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/php5/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt
/csw/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:26:"/opt/csw/php5/etc/pearkeys";}
\ No newline at end of file
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