Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18121/dists/unstable/main/finkinfo/languages
Modified Files:
Tag: pangocairo-branch
php5-10.5.info php5.info php5.patch
Log Message:
Deterministic handling of bind9; make even more sure to avoid fink's openssl
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.info,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -d -r1.14.2.7 -r1.14.2.8
--- php5.info 17 Mar 2008 15:49:47 -0000 1.14.2.7
+++ php5.info 18 Mar 2008 01:04:44 -0000 1.14.2.8
@@ -1,12 +1,13 @@
Package: php5
Version: 5.1.4
-Revision: 21
+Revision: 22
Distribution: 10.4
###
BuildDepends: <<
apache2-dev (>= 2.0.58-10),
aprutil-dev,
apr-dev (>= 0.9.12-10),
+ bind9-ssl-dev | bind9-dev,
cyrus-sasl2-dev,
db44-aes,
expat1,
@@ -109,7 +110,7 @@
Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
###
PatchFile: %n.patch
-PatchFile-MD5: f62b98f72a244ebf3e37a79663f6e6fd
+PatchFile-MD5: b3b53b470a0e183ca51be59a66957fbc
PatchScript: <<
### Fix for gd/freetype and add a2enmod/a2dismod scripts
### Apple's GCC 4 prohibits nested functions
@@ -161,8 +162,8 @@
<<
### Fix for 10.3 dns stuff & apr & snmp
### make really sure system-openssl flags are before fink's
-SetCFLAGS: -I%p/lib/system-openssl/include -L%p/lib/system-openssl/lib
-SetCPPFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0
+SetCFLAGS: -L%p/lib/system-openssl/lib
+SetCPPFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0 -I%p/include/bind
###
DocFiles: <<
CODING_STANDARDS CREDITS EXTENSIONS NEWS README* LICENSE TODO
@@ -172,13 +173,19 @@
ConfigureParams: --enable-thread-safety --with-ming=%p --with-db4=%p
--enable-dba --with-gdbm=%p --enable-dbx --with-zlib-dir=/usr
--enable-ucd-snmp-hack --without-mcal --without-recode
--enable-force-cgi-redirect --enable-maintainer-zts --without-mm
--program-suffix=5 --disable-debug --enable-safe-mode --enable-memory-limit
--with-layout=GNU --enable-calendar --enable-sysvmsg --enable-sysvsem
--enable-sysvshm --enable-track-vars --enable-trans-sid --enable-bcmath
--with-bz2=%p --enable-ctype --with-iconv=%p --enable-exif --enable-flatfile
--enable-filepro --enable-ftp --with-libxml-dir=%p --with-gettext=%p
--enable-mbstring --enable-shmop --enable-sockets --enable-wddx --enable-soap
--enable-sqlite-utf8 --with-pcre-regex --with-expat-dir=%p --enable-yp
--with-zlib --with-kerberos=/usr --with-openssl=/usr --with-openssl-dir=/usr
--without-sybase-ct --with-regex=php --disable-rpath --disable-static
--with-exec-dir=%p/lib/php5/libexec --mandir=%p/share/man
###
CompileScript: <<
+#!/bin/sh -ev
+
+ export PKG_CONFIG_PATH=%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH
+
### Configure for apache2
if [ -d apache-build ]; then rm -rf apache-build; fi
mkdir -p apache-build
mkdir -p apache-build/ext/dba/libcdb
mkdir -p apache-build/ext/dba/libflatfile
mkdir -p apache-build/ext/sqlite/libsqlite/src
- cd apache-build; YACC="/usr/bin/bison -y" ../configure %c
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6
--with-png-dir=%p --with-freetype-dir=shared,%p --with-imap=shared,%p
--with-ldap=shared,%p --with-ldap-sasl=%p --with-mhash=shared,%p
--with-mcrypt=shared,%p --with-mysql=shared,%p --with-sqlite=shared,%p
--with-mysqli=shared,%p/bin/mysql_config --with-pgsql=shared,%p
--with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p --with-snmp=shared,%p
+ pushd apache-build
+ YACC="/usr/bin/bison -y" ../configure %c --with-apxs2=%p/bin/apxs2
--with-config-file-path=%p/etc/php5/apache2 --with-imap-ssl=/usr
--with-xmlrpc=shared --with-xsl=shared,%p --with-gmp=shared,%p
--with-curl=shared,%p --with-gd=shared,%p --with-tiff-dir=%p --with-jpeg-dir=%p
--with-xpm-dir=shared,/usr/X11R6 --with-png-dir=%p
--with-freetype-dir=shared,%p --with-imap=shared,%p --with-ldap=shared,%p
--with-ldap-sasl=%p --with-mhash=shared,%p --with-mcrypt=shared,%p
--with-mysql=shared,%p --with-sqlite=shared,%p
--with-mysqli=shared,%p/bin/mysql_config --with-pgsql=shared,%p
--with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p --with-snmp=shared,%p
+ popd
### Fix for dlcompat
perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
apache-build/main/php_config.h
@@ -189,24 +196,27 @@
### Configure for cgi
if [ -d cgi-build ]; then rm -rf cgi-build; fi
mkdir -p cgi-build
- cd cgi-build; YACC="/usr/bin/bison -y" ../configure %c
--with-config-file-path=%p/etc/php5/cli --without-mysql --without-pgsql
-
- ### Fix for dlcompat
- perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
cgi-build/main/php_config.h
+ pushd cgi-build
+ YACC="/usr/bin/bison -y" ../configure %c
--with-config-file-path=%p/etc/php5/cli --without-mysql --without-pgsql
+ ### Fix for dlcompat
+ perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef
HAVE_MACH_O_DYLD_H,g' main/php_config.h
+ popd
### Make for apache2
- cd apache-build; make
+ make -C apache-build
- ### Make for cgi/cli
- cd cgi-build; make
- mv cgi-build/sapi/cli/php cgi-build/php5.cgi
+ pushd cgi-build
+ ### Make for cgi/cli
+ make
+ mv sapi/cli/php php5.cgi
- ### Hack to not reconfigure cgi for cli
- cd cgi-build; perl -pi -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/g'
main/php_config.h
- cd cgi-build; perl -pi -e 's/DISCARD_PATH 0/DISCARD_PATH 1/g'
main/php_config.h
- cd cgi-build; make clean
- cd cgi-build; make
- mv cgi-build/sapi/cli/php cgi-build/php5
+ ### Hack to not reconfigure cgi for cli
+ perl -pi -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/g'
main/php_config.h
+ perl -pi -e 's/DISCARD_PATH 0/DISCARD_PATH 1/g' main/php_config.h
+ make clean
+ make
+ mv sapi/cli/php php5
+ popd
### sanitize php.ini file
cat php.ini-dist | tr "\t" " " > php.ini-dist.new
@@ -217,6 +227,8 @@
<<
###
InstallScript: <<
+#!/bin/sh -ev
+
### installing default config files
mkdir -p %i/etc/php5/apache2
mkdir -p %i/etc/php5/cli
@@ -228,11 +240,7 @@
install -m 644 apache-build/libs/libphp5.so %i/lib/apache2/modules
### install modules' files
- cd apache-build && make install-modules INSTALL_ROOT=%d
- cd apache-build && make install-pear INSTALL_ROOT=%d
- cd apache-build && make install-build INSTALL_ROOT=%d
- cd apache-build && make install-headers INSTALL_ROOT=%d
- cd apache-build && make install-programs INSTALL_ROOT=%d
+ make -C apache-build install-modules install-pear install-build
install-headers install-programs INSTALL_ROOT=%d
### Fix pear
perl -pi -e 's,bin/php\",bin/php5\",g' %i/bin/pear
@@ -249,10 +257,12 @@
perl -pi -e "s,'pecl','pecl5',g" %i/share/pear5/peclcmd.php
### FIXME Need to count %p 11 -3 + %p
OLD=`/usr/bin/perl fink/fixpearconf conf %i/etc/pear.conf`;
NEW=`/usr/bin/perl fink/fixpearconf new %p`; perl -pi -e
's,'${OLD}','${NEW}',g' %i/etc/pear.conf
- mv %i/bin/pear %i/bin/pear5
- mv %i/bin/pecl %i/bin/pecl5
- mv %i/bin/peardev %i/bin/pear5dev
- mv %i/etc/pear.conf %i/etc/pear5.conf
+ pushd %i
+ mv bin/pear bin/pear5
+ mv bin/pecl bin/pecl5
+ mv bin/peardev bin/pear5dev
+ mv etc/pear.conf etc/pear5.conf
+ popd
install -m 755 cgi-build/php5 %i/bin/php5
mkdir -p %i/lib/cgi-bin
@@ -262,13 +272,15 @@
ln -s %p/lib/php5/20050922-zts %i/lib/php5/libexec
### Remove un needed files
- rm -rf %i/lib/php5/20050922-zts/*.a
- rm -rf %i/../.channels %i/../.depdb %i/../.depdblock %i/../.filemap
%i/../.lock %i/../.registry
+ pushd %i
+ rm -f lib/php5/20050922-zts/*.a
+ cd ..
+ rm -rf .channels .depdb .depdblock .filemap .lock .registry
+ popd
### Install apache2 load/conf files
mkdir -p %i/etc/apache2/mods-available
- cp fink/php5.load %i/etc/apache2/mods-available
- cp fink/php5.conf %i/etc/apache2/mods-available
+ cp fink/php5.load fink/php5.conf %i/etc/apache2/mods-available
<<
ConfFiles: <<
%p/etc/php5/apache2/php.ini
@@ -280,6 +292,7 @@
Depends: <<
%N (= %v-%r),
apache2 (>= 2.0.58-10),
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
db44-aes-shlibs,
expat1-shlibs,
@@ -357,10 +370,11 @@
Depends: <<
%N (= %v-%r),
apache2-common,
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
libgettext3-shlibs,
libiconv,
- libxml2-shlibs (>= 2.6.1-1),
+ libxml2-shlibs (>= 2.6.1-1)
<<
Replaces: php5-apache-ssl-cgi
Files: <<
@@ -387,6 +401,7 @@
Package: %N-cli
Depends: <<
%N (= %v-%r),
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
db44-aes-shlibs,
libgettext3-shlibs,
@@ -1142,7 +1157,7 @@
libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
libiconv,
libxml2-shlibs (>= 2.6.1-1),
- libxslt-shlibs (>= 1.1.0-1),
+ libxslt-shlibs (>= 1.1.0-1)
<<
Replaces: php5-apache2-ssl-xsl
Files: lib/php5/20050922-zts/xsl.so
Index: php5-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5-10.5.info,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- php5-10.5.info 17 Mar 2008 15:49:47 -0000 1.1.2.7
+++ php5-10.5.info 18 Mar 2008 01:04:43 -0000 1.1.2.8
@@ -1,12 +1,13 @@
Package: php5
Version: 5.1.4
-Revision: 121
+Revision: 122
Distribution: 10.5
###
BuildDepends: <<
apache2-dev (>= 2.0.58-10),
aprutil-dev,
apr-dev (>= 0.9.12-10),
+ bind9-ssl-dev | bind9-dev,
cyrus-sasl2-dev,
db44-aes,
expat1,
@@ -109,7 +110,7 @@
Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
###
PatchFile: %n.patch
-PatchFile-MD5: f62b98f72a244ebf3e37a79663f6e6fd
+PatchFile-MD5: b3b53b470a0e183ca51be59a66957fbc
PatchScript: <<
### Fix for gd/freetype and add a2enmod/a2dismod scripts
### Apple's GCC 4 prohibits nested functions
@@ -161,8 +162,8 @@
<<
### Fix for 10.3 dns stuff & apr & snmp
### make really sure system-openssl flags are before fink's
-SetCFLAGS: -I%p/lib/system-openssl/include -L%p/lib/system-openssl/lib
-SetCPPFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0
+SetCFLAGS: -L%p/lib/system-openssl/lib
+SetCPPFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0 -I%p/include/bind
###
DocFiles: <<
CODING_STANDARDS CREDITS EXTENSIONS NEWS README* LICENSE TODO
@@ -172,13 +173,19 @@
ConfigureParams: --enable-thread-safety --with-ming=%p --with-db4=%p
--enable-dba --with-gdbm=%p --enable-dbx --with-zlib-dir=/usr
--enable-ucd-snmp-hack --without-mcal --without-recode
--enable-force-cgi-redirect --enable-maintainer-zts --without-mm
--program-suffix=5 --disable-debug --enable-safe-mode --enable-memory-limit
--with-layout=GNU --enable-calendar --enable-sysvmsg --enable-sysvsem
--enable-sysvshm --enable-track-vars --enable-trans-sid --enable-bcmath
--with-bz2=%p --enable-ctype --with-iconv=%p --enable-exif --enable-flatfile
--enable-filepro --enable-ftp --with-libxml-dir=%p --with-gettext=%p
--enable-mbstring --enable-shmop --enable-sockets --enable-wddx --enable-soap
--enable-sqlite-utf8 --with-pcre-regex --with-expat-dir=%p --enable-yp
--with-zlib --with-kerberos=/usr --with-openssl=/usr --with-openssl-dir=/usr
--without-sybase-ct --with-regex=php --disable-rpath --disable-static
--with-exec-dir=%p/lib/php5/libexec --mandir=%p/share/man
###
CompileScript: <<
+#!/bin/sh -ev
+
+ export PKG_CONFIG_PATH=%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH
+
### Configure for apache2
if [ -d apache-build ]; then rm -rf apache-build; fi
mkdir -p apache-build
mkdir -p apache-build/ext/dba/libcdb
mkdir -p apache-build/ext/dba/libflatfile
mkdir -p apache-build/ext/sqlite/libsqlite/src
- cd apache-build; YACC="/usr/bin/bison -y" ../configure %c
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11
--with-png-dir=%p --with-freetype-dir=shared,%p --with-imap=shared,%p
--with-ldap=shared,%p --with-ldap-sasl=%p --with-mhash=shared,%p
--with-mcrypt=shared,%p --with-mysql=shared,%p --with-sqlite=shared,%p
--with-mysqli=shared,%p/bin/mysql_config --with-pgsql=shared,%p
--with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p --with-snmp=shared,%p
+ pushd apache-build
+ YACC="/usr/bin/bison -y" ../configure %c --with-apxs2=%p/bin/apxs2
--with-config-file-path=%p/etc/php5/apache2 --with-imap-ssl=/usr
--with-xmlrpc=shared --with-xsl=shared,%p --with-gmp=shared,%p
--with-curl=shared,%p --with-gd=shared,%p --with-tiff-dir=%p --with-jpeg-dir=%p
--with-xpm-dir=shared,/usr/X11 --with-png-dir=%p --with-freetype-dir=shared,%p
--with-imap=shared,%p --with-ldap=shared,%p --with-ldap-sasl=%p
--with-mhash=shared,%p --with-mcrypt=shared,%p --with-mysql=shared,%p
--with-sqlite=shared,%p --with-mysqli=shared,%p/bin/mysql_config
--with-pgsql=shared,%p --with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p
--with-snmp=shared,%p
+ popd
### Fix for dlcompat
perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
apache-build/main/php_config.h
@@ -189,24 +196,27 @@
### Configure for cgi
if [ -d cgi-build ]; then rm -rf cgi-build; fi
mkdir -p cgi-build
- cd cgi-build; YACC="/usr/bin/bison -y" ../configure %c
--with-config-file-path=%p/etc/php5/cli --without-mysql --without-pgsql
-
- ### Fix for dlcompat
- perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
cgi-build/main/php_config.h
+ pushd cgi-build
+ YACC="/usr/bin/bison -y" ../configure %c
--with-config-file-path=%p/etc/php5/cli --without-mysql --without-pgsql
+ ### Fix for dlcompat
+ perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef
HAVE_MACH_O_DYLD_H,g' main/php_config.h
+ popd
### Make for apache2
- cd apache-build; make
+ make -C apache-build
- ### Make for cgi/cli
- cd cgi-build; make
- mv cgi-build/sapi/cli/php cgi-build/php5.cgi
+ pushd cgi-build
+ ### Make for cgi/cli
+ make
+ mv sapi/cli/php php5.cgi
- ### Hack to not reconfigure cgi for cli
- cd cgi-build; perl -pi -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/g'
main/php_config.h
- cd cgi-build; perl -pi -e 's/DISCARD_PATH 0/DISCARD_PATH 1/g'
main/php_config.h
- cd cgi-build; make clean
- cd cgi-build; make
- mv cgi-build/sapi/cli/php cgi-build/php5
+ ### Hack to not reconfigure cgi for cli
+ perl -pi -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/g'
main/php_config.h
+ perl -pi -e 's/DISCARD_PATH 0/DISCARD_PATH 1/g' main/php_config.h
+ make clean
+ make
+ mv sapi/cli/php php5
+ popd
### sanitize php.ini file
cat php.ini-dist | tr "\t" " " > php.ini-dist.new
@@ -217,6 +227,8 @@
<<
###
InstallScript: <<
+#!/bin/sh -ev
+
### installing default config files
mkdir -p %i/etc/php5/apache2
mkdir -p %i/etc/php5/cli
@@ -228,11 +240,7 @@
install -m 644 apache-build/libs/libphp5.so %i/lib/apache2/modules
### install modules' files
- cd apache-build && make install-modules INSTALL_ROOT=%d
- cd apache-build && make install-pear INSTALL_ROOT=%d
- cd apache-build && make install-build INSTALL_ROOT=%d
- cd apache-build && make install-headers INSTALL_ROOT=%d
- cd apache-build && make install-programs INSTALL_ROOT=%d
+ make -C apache-build install-modules install-pear install-build
install-headers install-programs INSTALL_ROOT=%d
### Fix pear
perl -pi -e 's,bin/php\",bin/php5\",g' %i/bin/pear
@@ -249,10 +257,12 @@
perl -pi -e "s,'pecl','pecl5',g" %i/share/pear5/peclcmd.php
### FIXME Need to count %p 11 -3 + %p
OLD=`/usr/bin/perl fink/fixpearconf conf %i/etc/pear.conf`;
NEW=`/usr/bin/perl fink/fixpearconf new %p`; perl -pi -e
's,'${OLD}','${NEW}',g' %i/etc/pear.conf
- mv %i/bin/pear %i/bin/pear5
- mv %i/bin/pecl %i/bin/pecl5
- mv %i/bin/peardev %i/bin/pear5dev
- mv %i/etc/pear.conf %i/etc/pear5.conf
+ pushd %i
+ mv bin/pear bin/pear5
+ mv bin/pecl bin/pecl5
+ mv bin/peardev bin/pear5dev
+ mv etc/pear.conf etc/pear5.conf
+ popd
install -m 755 cgi-build/php5 %i/bin/php5
mkdir -p %i/lib/cgi-bin
@@ -262,13 +272,15 @@
ln -s %p/lib/php5/20050922-zts %i/lib/php5/libexec
### Remove un needed files
- rm -rf %i/lib/php5/20050922-zts/*.a
- rm -rf %i/../.channels %i/../.depdb %i/../.depdblock %i/../.filemap
%i/../.lock %i/../.registry
+ pushd %i
+ rm -f lib/php5/20050922-zts/*.a
+ cd ..
+ rm -rf .channels .depdb .depdblock .filemap .lock .registry
+ popd
### Install apache2 load/conf files
mkdir -p %i/etc/apache2/mods-available
- cp fink/php5.load %i/etc/apache2/mods-available
- cp fink/php5.conf %i/etc/apache2/mods-available
+ cp fink/php5.load fink/php5.conf %i/etc/apache2/mods-available
<<
ConfFiles: <<
%p/etc/php5/apache2/php.ini
@@ -280,6 +292,7 @@
Depends: <<
%N (= %v-%r),
apache2 (>= 2.0.58-10),
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
db44-aes-shlibs,
expat1-shlibs,
@@ -357,10 +370,11 @@
Depends: <<
%N (= %v-%r),
apache2-common,
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
libgettext3-shlibs,
libiconv,
- libxml2-shlibs (>= 2.6.1-1),
+ libxml2-shlibs (>= 2.6.1-1)
<<
Replaces: php5-apache-ssl-cgi
Files: <<
@@ -387,6 +401,7 @@
Package: %N-cli
Depends: <<
%N (= %v-%r),
+ bind9-ssl-shlibs | bind9-shlibs,
bzip2-shlibs,
db44-aes-shlibs,
libgettext3-shlibs,
@@ -1142,7 +1157,7 @@
libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
libiconv,
libxml2-shlibs (>= 2.6.1-1),
- libxslt-shlibs (>= 1.1.0-1),
+ libxslt-shlibs (>= 1.1.0-1)
<<
Replaces: php5-apache2-ssl-xsl
Files: lib/php5/20050922-zts/xsl.so
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- php5.patch 17 Mar 2008 15:34:58 -0000 1.1.2.1
+++ php5.patch 18 Mar 2008 01:04:44 -0000 1.1.2.2
@@ -1,3 +1,15 @@
+diff -ruN php-5.1.4.orig/configure php-5.1.4/configure
+--- php-5.1.4.orig/configure 2006-05-12 10:41:10.000000000 -0400
++++ php-5.1.4/configure 2008-03-17 15:49:03.000000000 -0400
+@@ -19831,7 +19831,7 @@
+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
+ if test "$LIBXML_VERSION" -ge "2006011"; then
+ LIBXML_LIBS=`$XML2_CONFIG --libs`
+- LIBXML_INCS=`$XML2_CONFIG --cflags`
++ LIBXML_INCS=`pkg-config --cflags openssl; $XML2_CONFIG --cflags`
+
+ for ac_i in $LIBXML_LIBS; do
+ case $ac_i in
diff -ruN php-5.1.4.orig/ext/curl/interface.c php-5.1.4/ext/curl/interface.c
--- php-5.1.4.orig/ext/curl/interface.c 2006-04-13 07:26:10.000000000
-0400
+++ php-5.1.4/ext/curl/interface.c 2008-03-17 00:47:39.000000000 -0400
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
