Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29389/dists/unstable/main/finkinfo/languages
Modified Files:
Tag: pangocairo-branch
php5-10.5.info php5.info php5.patch
Removed Files:
Tag: pangocairo-branch
php5-10.5.patch
Log Message:
Compiles for me on 10.4; propagate with 10.5-related diffs (untested)
--- php5-10.5.patch DELETED ---
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.info,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -d -r1.14.2.5 -r1.14.2.6
--- php5.info 15 Feb 2008 14:41:36 -0000 1.14.2.5
+++ php5.info 17 Mar 2008 15:34:58 -0000 1.14.2.6
@@ -1,9 +1,47 @@
Package: php5
Version: 5.1.4
-Revision: 17
+Revision: 21
Distribution: 10.4
###
-BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev,
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>=
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt,
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3,
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>=
2.2.11-1010), gdbm3, net-snmp-unified, net-snmp-unified15-dev, db44-aes,
libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, uw-imap-c-client (>= 2004e-10),
libjpeg, cyrus-sasl2-dev, system-openssl-dev
+BuildDepends: <<
+ apache2-dev (>= 2.0.58-10),
+ aprutil-dev,
+ apr-dev (>= 0.9.12-10),
+ cyrus-sasl2-dev,
+ db44-aes,
+ expat1,
+ fink (>= 0.24.12-1),
+ fontconfig2-dev,
+ freetype219,
+ gd2,
+ gdbm3,
+ gmp (>= 4.1.4-1),
+ libc-client1-dev,
+ libcurl4,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libmcrypt,
+ libmhash (>= 0.8.18-2),
+ libmpfr1,
+ libpng3,
+ libssh2.1,
+ libtiff,
+ libtool14,
+ libxml2 (>= 2.6.1-1),
+ libxslt (>= 1.1.0-1),
+ ming,
+ mysql-ssl15-dev | mysql15-dev,
+ net-snmp-unified,
+ net-snmp-unified15-dev,
+ openldap23-dev (>= 2.3.24-10),
+ postgresql80-unified-dev (>= 8.0.6-1026),
+ sqlite-dev,
+ system-openssl-dev,
+ t1lib5-nox,
+ unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 2.2.11-1010),
+ x11-dev
+<<
Replaces: php5-apache2-ssl
###
CustomMirror: <<
@@ -67,36 +105,29 @@
###
Source: mirror:custom:distributions/php-%v.tar.bz2
Source-MD5: 66a806161d4a2d3b5153ebe4cd0f2e1c
-Source2: ftp://ftp.cac.washington.edu/imap/old/imap-2004e.tar.Z
-Source2-MD5: deee044b2dcaf6fe12dc545673906ac5
Source3: http://pear.php.net/install-pear-nozlib.phar
Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
###
+PatchFile: %n.patch
+PatchFile-MD5: f62b98f72a244ebf3e37a79663f6e6fd
PatchScript: <<
### Fix for gd/freetype and add a2enmod/a2dismod scripts
### Apple's GCC 4 prohibits nested functions
- sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
-
- ### Fix c-client
- cd ../imap-2004e; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue
this build anyway\? Type y or n please\:,[EMAIL PROTECTED] Do you want to
continue this build anyway\? Type y or n please\:\nnone:\n,g' Makefile
- cd ../imap-2004e; perl -pi -e 's,SPOOLDIR=/var/spool
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g'
src/osdep/unix/Makefile
+ ### fix for newer curl and c-client interfaces
+ sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
### Fix for fink's bison
perl -pi -e 's,bison -,/usr/bin/bison -,g' configure
perl -pi -e 's,bison -,/usr/bin/bison -,g' genfiles
perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests.php
- perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests2.php
perl -pi -e 's,bison -,/usr/bin/bison -,g' makedist
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.dsp
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.m4
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/ZendTS.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' ext/w32api/w32api.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php5dll.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php5dllts.dsp
perl -pi -e 's,YACC=\"yacc\",YACC=\"/usr/bin/yacc\",g' configure
### Fix to allow finks xft2 or xfree4.3
- perl -pi -e 's,for i in \$PHP_FREETYPE_DIR /usr/local /usr; do,for i in
\$PHP_FREETYPE_DIR %p /usr/X11R6 /usr/local /usr; do,g' configure
+ perl -pi -e 's,for i in \$PHP_FREETYPE_DIR /usr/local /usr; do,for i in
\$PHP_FREETYPE_DIR %p /usr/X11R6 /usr; do,g' configure
### Fix libtool relink
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
@@ -129,10 +160,9 @@
perl -pi -e 's,enable_maintainer_zts=no,enable_maintainer_zts=yes,g'
configure
<<
### Fix for 10.3 dns stuff & apr & snmp
-SetCFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0 -L%p/lib/system-openssl/lib
-NoSetLIBS: true
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
+### 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
###
DocFiles: <<
CODING_STANDARDS CREDITS EXTENSIONS NEWS README* LICENSE TODO
@@ -148,7 +178,7 @@
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/share/c-client --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
+ 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
### 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
@@ -164,13 +194,6 @@
### 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
- ### Build c-client objects
- cd ../imap-2004e; make osx SSLTYPE=unix SSLDIR=/usr SSLCERTS=%p/etc/ssl
EXTRACFLAGS=-fno-common
-
- ### copy objects to ext/imap dir for linking
- for i in dummy fdstring flstring imap4r1 mail mbx mh misc mmdf mtx mx netmsg
news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp tenex
unix utf8; do cp %b/../imap-2004e/c-client/$i.o %b/apache-build/ext/imap/$i.o;
done
-
-perl -pi -e 's,-lc-client,ext/imap/osdep.o ext/imap/mail.o ext/imap/misc.o
ext/imap/newsrc.o ext/imap/smanager.o ext/imap/utf8.o ext/imap/siglocal.o
ext/imap/dummy.o ext/imap/pseudo.o ext/imap/netmsg.o ext/imap/flstring.o
ext/imap/fdstring.o ext/imap/rfc822.o ext/imap/nntp.o ext/imap/smtp.o
ext/imap/imap4r1.o ext/imap/pop3.o ext/imap/unix.o ext/imap/mbx.o
ext/imap/mmdf.o ext/imap/tenex.o ext/imap/mtx.o ext/imap/news.o
ext/imap/phile.o ext/imap/mh.o ext/imap/mx.o,g' apache-build/Makefile
### Make for apache2
cd apache-build; make
@@ -254,7 +277,21 @@
###
SplitOff: <<
Package: libapache2-mod-php5
- Depends: apache2 (>= 2.0.58-10), bzip2-shlibs, db44-aes-shlibs,
expat-shlibs, gdbm3-shlibs, libapr0-shlibs, libaprutil0-shlibs,
libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1), ming-shlibs,
openldap23-shlibs (>= 2.3.24-10), %N (= %v-%r)
+ Depends: <<
+ %N (= %v-%r),
+ apache2 (>= 2.0.58-10),
+ bzip2-shlibs,
+ db44-aes-shlibs,
+ expat1-shlibs,
+ gdbm3-shlibs,
+ libapr0-shlibs,
+ libaprutil0-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ ming-shlibs,
+ openldap23-shlibs (>= 2.3.24-10)
+ <<
Replaces: libapache2-ssl-mod-php5
Conflicts: libapache2-mod-php4, libapache2-ssl-mod-php4
ConfFiles: <<
@@ -317,7 +354,14 @@
<<
SplitOff2: <<
Package: %N-cgi
- Depends: bzip2-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>=
2.6.1-1), %N (= %v-%r), apache2-common
+ Depends: <<
+ %N (= %v-%r),
+ apache2-common,
+ bzip2-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ <<
Replaces: php5-apache-ssl-cgi
Files: <<
lib/cgi-bin
@@ -341,7 +385,15 @@
<<
SplitOff23: <<
Package: %N-cli
- Depends: bzip2-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>=
2.6.1-1), %N (= %v-%r)
+ Depends: <<
+ %N (= %v-%r),
+ bzip2-shlibs,
+ db44-aes-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ ming-shlibs
+ <<
Replaces: php5-apache-ssl-cgi
Files: <<
bin/php5
@@ -391,7 +443,10 @@
<<
SplitOff4: <<
Package: %N-pear
- Depends: %N-cli (= %v-%r), gnupg
+ Depends: <<
+ %N-cli (= %v-%r),
+ gnupg
+ <<
Replaces: php5-apache2-ssl-pear, php4-apache2-ssl-pear
ConfFiles: %p/etc/pear5.conf
Files: <<
@@ -415,7 +470,11 @@
<<
SplitOff5: <<
Package: %N-curl
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libcurl3-unified-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libcurl4-shlibs,
+ libssh2.1-shlibs
+ <<
Replaces: php5-apache2-ssl-curl
Files: lib/php5/20050922-zts/curl.so
DocFiles: LICENSE
@@ -462,7 +521,18 @@
<<
SplitOff6: <<
Package: %N-gd
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), gd2-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, t1lib5-shlibs,
libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ gd2-shlibs,
+ fontconfig2-shlibs,
+ freetype219-shlibs,
+ libexpat1-shlibs,
+ libiconv,
+ libjpeg-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ t1lib5-nox-shlibs,
+ x11-shlibs
+ <<
Replaces: php5-apache2-ssl-gd
Files: lib/php5/20050922-zts/gd.so
DocFiles: LICENSE
@@ -510,7 +580,10 @@
<<
SplitOff7: <<
Package: %N-imap
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= %v-%r)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libc-client1-shlibs
+ <<
Replaces: php5-apache2-ssl-imap
Files: lib/php5/20050922-zts/imap.so
DocFiles: LICENSE
@@ -557,7 +630,12 @@
<<
SplitOff8: <<
Package: %N-ldap
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), cyrus-sasl2-shlibs, db44-aes-shlibs, openldap23-shlibs (>= 2.3.24-10)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ cyrus-sasl2-shlibs,
+ db44-aes-shlibs,
+ openldap23-shlibs (>= 2.3.24-10)
+ <<
Replaces: php5-apache2-ssl-ldap
Files: lib/php5/20050922-zts/ldap.so
DocFiles: LICENSE
@@ -604,7 +682,11 @@
<<
SplitOff9: <<
Package: %N-mcrypt
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libmcrypt-shlibs, libtool14-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libmcrypt-shlibs,
+ libtool14-shlibs
+ <<
Replaces: php5-apache2-ssl-mcrypt
Files: lib/php5/20050922-zts/mcrypt.so
DocFiles: LICENSE
@@ -651,7 +733,10 @@
<<
SplitOff10: <<
Package: %N-mhash
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libmhash-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libmhash-shlibs
+ <<
Replaces: php5-apache2-ssl-mhash
Files: lib/php5/20050922-zts/mhash.so
DocFiles: LICENSE
@@ -698,7 +783,10 @@
<<
SplitOff11: <<
Package: %N-mysql
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), mysql15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ mysql-ssl15-shlibs | mysql15-shlibs
+ <<
Replaces: php5-apache2-ssl-mysql
Files: lib/php5/20050922-zts/mysql.so
DocFiles: LICENSE
@@ -746,7 +834,10 @@
<<
SplitOff12: <<
Package: %N-mysqli
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), mysql15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ mysql-ssl15-shlibs | mysql15-shlibs
+ <<
Replaces: php5-apache2-ssl-mysqli
Files: lib/php5/20050922-zts/mysqli.so
DocFiles: LICENSE
@@ -794,7 +885,11 @@
<<
SplitOff13: <<
Package: %N-odbc
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), unixodbc2-shlibs (>= 2.2.11-1010) | unixodbc2-nox-shlibs (>=
2.2.11-1010), libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libiconv,
+ unixodbc2-shlibs (>= 2.2.11-1010) | unixodbc2-nox-shlibs (>=
2.2.11-1010)
+ <<
Replaces: php5-apache2-ssl-odbc
Files: lib/php5/20050922-zts/odbc.so
DocFiles: LICENSE
@@ -842,7 +937,10 @@
<<
SplitOff14: <<
Package: %N-pgsql
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), postgresql80-unified-shlibs (>= 8.0.6-1026)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ postgresql80-unified-shlibs (>= 8.0.6-1026)
+ <<
Replaces: php5-apache2-ssl-pgsql
Files: lib/php5/20050922-zts/pgsql.so
DocFiles: LICENSE
@@ -890,7 +988,10 @@
<<
SplitOff15: <<
Package: %N-snmp
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), net-snmp-unified15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ net-snmp-unified15-shlibs
+ <<
Replaces: php5-apache2-ssl-snmp
Files: lib/php5/20050922-zts/snmp.so
DocFiles: LICENSE
@@ -937,7 +1038,10 @@
<<
SplitOff17: <<
Package: %N-gmp
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), gmp-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ gmp-shlibs
+ <<
Replaces: php5-apache2-ssl-gmp
Files: lib/php5/20050922-zts/gmp.so
DocFiles: LICENSE
@@ -984,7 +1088,10 @@
<<
SplitOff19: <<
Package: %N-sqlite
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), sqlite-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ sqlite-shlibs
+ <<
Replaces: php5-apache2-ssl-sqlite
Files: lib/php5/20050922-zts/sqlite.so
DocFiles: LICENSE
@@ -1031,7 +1138,12 @@
<<
SplitOff21: <<
Package: %N-xsl
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libxslt-shlibs (>= 1.1.0-1), libxml2-shlibs (>= 2.6.1-1), libiconv
+ Depends: <<
+ 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),
+ <<
Replaces: php5-apache2-ssl-xsl
Files: lib/php5/20050922-zts/xsl.so
DocFiles: LICENSE
@@ -1078,7 +1190,11 @@
<<
SplitOff22: <<
Package: %N-xmlrpc
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libxml2-shlibs (>= 2.6.1-1), libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1)
+ <<
Replaces: php5-apache2-ssl-xmlrpc
Files: lib/php5/20050922-zts/xmlrpc.so
DocFiles: LICENSE
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.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- php5-10.5.info 15 Feb 2008 14:41:36 -0000 1.1.2.4
+++ php5-10.5.info 17 Mar 2008 15:34:57 -0000 1.1.2.5
@@ -1,9 +1,47 @@
Package: php5
Version: 5.1.4
-Revision: 17
-Distribution: 10.5
+Revision: 21
+Distribution: 10.4
###
-BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev,
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>=
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt,
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3,
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>=
2.2.11-1010), gdbm3, net-snmp-unified, net-snmp-unified15-dev, db44-aes,
libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, uw-imap-c-client (>= 2004e-10),
libjpeg, cyrus-sasl2-dev, system-openssl-dev
+BuildDepends: <<
+ apache2-dev (>= 2.0.58-10),
+ aprutil-dev,
+ apr-dev (>= 0.9.12-10),
+ cyrus-sasl2-dev,
+ db44-aes,
+ expat1,
+ fink (>= 0.24.12-1),
+ fontconfig2-dev,
+ freetype219,
+ gd2,
+ gdbm3,
+ gmp (>= 4.1.4-1),
+ libc-client1-dev,
+ libcurl4,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libmcrypt,
+ libmhash (>= 0.8.18-2),
+ libmpfr1,
+ libpng3,
+ libssh2.1,
+ libtiff,
+ libtool14,
+ libxml2 (>= 2.6.1-1),
+ libxslt (>= 1.1.0-1),
+ ming,
+ mysql-ssl15-dev | mysql15-dev,
+ net-snmp-unified,
+ net-snmp-unified15-dev,
+ openldap23-dev (>= 2.3.24-10),
+ postgresql80-unified-dev (>= 8.0.6-1026),
+ sqlite-dev,
+ system-openssl-dev,
+ t1lib5-nox,
+ unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 2.2.11-1010),
+ x11-dev
+<<
Replaces: php5-apache2-ssl
###
CustomMirror: <<
@@ -67,40 +105,29 @@
###
Source: mirror:custom:distributions/php-%v.tar.bz2
Source-MD5: 66a806161d4a2d3b5153ebe4cd0f2e1c
-Source2: ftp://ftp.cac.washington.edu/imap/old/imap-2004e.tar.Z
-Source2-MD5: deee044b2dcaf6fe12dc545673906ac5
Source3: http://pear.php.net/install-pear-nozlib.phar
Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
###
+PatchFile: %n.patch
+PatchFile-MD5: f62b98f72a244ebf3e37a79663f6e6fd
PatchScript: <<
### Fix for gd/freetype and add a2enmod/a2dismod scripts
### Apple's GCC 4 prohibits nested functions
- sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
-
- ### Fix c-client
- cd ../imap-2004e; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue
this build anyway\? Type y or n please\:,[EMAIL PROTECTED] Do you want to
continue this build anyway\? Type y or n please\:\nnone:\n,g' Makefile
- cd ../imap-2004e; perl -pi -e 's,SPOOLDIR=/var/spool
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g'
src/osdep/unix/Makefile
-
- ### setpgrp chagned to setpgui on 10.5 for UNIX03 cert
- cd ../imap-2004e; perl -pi -e 's,setpgrp,setpgid,g' src/osdep/unix/env_unix.c
- cd ../imap-2004e; perl -pi -e 's,setpgrp,setpgid,g' src/osdep/unix/tcp_unix.c
+ ### fix for newer curl and c-client interfaces
+ sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
### Fix for fink's bison
perl -pi -e 's,bison -,/usr/bin/bison -,g' configure
perl -pi -e 's,bison -,/usr/bin/bison -,g' genfiles
perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests.php
- perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests2.php
perl -pi -e 's,bison -,/usr/bin/bison -,g' makedist
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.dsp
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.m4
perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/ZendTS.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' ext/w32api/w32api.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php5dll.dsp
- perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php5dllts.dsp
perl -pi -e 's,YACC=\"yacc\",YACC=\"/usr/bin/yacc\",g' configure
### Fix to allow finks xft2 or xfree4.3
- perl -pi -e 's,for i in \$PHP_FREETYPE_DIR /usr/local /usr; do,for i in
\$PHP_FREETYPE_DIR %p /usr/X11R6 /usr/local /usr; do,g' configure
+ perl -pi -e 's,for i in \$PHP_FREETYPE_DIR /usr/local /usr; do,for i in
\$PHP_FREETYPE_DIR %p /usr/X11 /usr; do,g' configure
### Fix libtool relink
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
@@ -133,10 +160,9 @@
perl -pi -e 's,enable_maintainer_zts=no,enable_maintainer_zts=yes,g'
configure
<<
### Fix for 10.3 dns stuff & apr & snmp
-SetCFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0 -L%p/lib/system-openssl/lib
-NoSetLIBS: true
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
+### 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
###
DocFiles: <<
CODING_STANDARDS CREDITS EXTENSIONS NEWS README* LICENSE TODO
@@ -152,7 +178,7 @@
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/share/c-client --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
+ 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
### 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
@@ -168,18 +194,6 @@
### 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
- ### Build c-client objects
- cd ../imap-2004e; make osx SSLTYPE=unix SSLDIR=/usr SSLCERTS=%p/etc/ssl
EXTRACFLAGS=-fno-common
-
- ### copy objects to ext/imap dir for linking
- for i in dummy fdstring flstring imap4r1 mail mbx mh misc mmdf mtx mx netmsg
news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp tenex
unix utf8; do cp %b/../imap-2004e/c-client/$i.o %b/apache-build/ext/imap/$i.o;
done
-
-perl -pi -e 's,-lc-client,ext/imap/osdep.o ext/imap/mail.o ext/imap/misc.o
ext/imap/newsrc.o ext/imap/smanager.o ext/imap/utf8.o ext/imap/siglocal.o
ext/imap/dummy.o ext/imap/pseudo.o ext/imap/netmsg.o ext/imap/flstring.o
ext/imap/fdstring.o ext/imap/rfc822.o ext/imap/nntp.o ext/imap/smtp.o
ext/imap/imap4r1.o ext/imap/pop3.o ext/imap/unix.o ext/imap/mbx.o
ext/imap/mmdf.o ext/imap/tenex.o ext/imap/mtx.o ext/imap/news.o
ext/imap/phile.o ext/imap/mh.o ext/imap/mx.o,g' apache-build/Makefile
-
- ### No idea why this is needed on 10.5
- cp -R Zend/* apache-build/Zend/
- cp -R Zend/* cgi-build/Zend/
-
### Make for apache2
cd apache-build; make
@@ -263,7 +277,21 @@
###
SplitOff: <<
Package: libapache2-mod-php5
- Depends: apache2 (>= 2.0.58-10), bzip2-shlibs, db44-aes-shlibs,
expat-shlibs, gdbm3-shlibs, libapr0-shlibs, libaprutil0-shlibs,
libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1), ming-shlibs,
openldap23-shlibs (>= 2.3.24-10), %N (= %v-%r)
+ Depends: <<
+ %N (= %v-%r),
+ apache2 (>= 2.0.58-10),
+ bzip2-shlibs,
+ db44-aes-shlibs,
+ expat1-shlibs,
+ gdbm3-shlibs,
+ libapr0-shlibs,
+ libaprutil0-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ ming-shlibs,
+ openldap23-shlibs (>= 2.3.24-10)
+ <<
Replaces: libapache2-ssl-mod-php5
Conflicts: libapache2-mod-php4, libapache2-ssl-mod-php4
ConfFiles: <<
@@ -326,7 +354,14 @@
<<
SplitOff2: <<
Package: %N-cgi
- Depends: bzip2-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>=
2.6.1-1), %N (= %v-%r), apache2-common
+ Depends: <<
+ %N (= %v-%r),
+ apache2-common,
+ bzip2-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ <<
Replaces: php5-apache-ssl-cgi
Files: <<
lib/cgi-bin
@@ -350,7 +385,15 @@
<<
SplitOff23: <<
Package: %N-cli
- Depends: bzip2-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>=
2.6.1-1), %N (= %v-%r)
+ Depends: <<
+ %N (= %v-%r),
+ bzip2-shlibs,
+ db44-aes-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ ming-shlibs
+ <<
Replaces: php5-apache-ssl-cgi
Files: <<
bin/php5
@@ -400,7 +443,10 @@
<<
SplitOff4: <<
Package: %N-pear
- Depends: %N-cli (= %v-%r), gnupg
+ Depends: <<
+ %N-cli (= %v-%r),
+ gnupg
+ <<
Replaces: php5-apache2-ssl-pear, php4-apache2-ssl-pear
ConfFiles: %p/etc/pear5.conf
Files: <<
@@ -424,7 +470,11 @@
<<
SplitOff5: <<
Package: %N-curl
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libcurl3-unified-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libcurl4-shlibs,
+ libssh2.1-shlibs
+ <<
Replaces: php5-apache2-ssl-curl
Files: lib/php5/20050922-zts/curl.so
DocFiles: LICENSE
@@ -471,7 +521,18 @@
<<
SplitOff6: <<
Package: %N-gd
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), gd2-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, t1lib5-shlibs,
libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ gd2-shlibs,
+ fontconfig2-shlibs,
+ freetype219-shlibs,
+ libexpat1-shlibs,
+ libiconv,
+ libjpeg-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ t1lib5-nox-shlibs,
+ x11-shlibs
+ <<
Replaces: php5-apache2-ssl-gd
Files: lib/php5/20050922-zts/gd.so
DocFiles: LICENSE
@@ -519,7 +580,10 @@
<<
SplitOff7: <<
Package: %N-imap
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= %v-%r)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libc-client1-shlibs
+ <<
Replaces: php5-apache2-ssl-imap
Files: lib/php5/20050922-zts/imap.so
DocFiles: LICENSE
@@ -566,7 +630,12 @@
<<
SplitOff8: <<
Package: %N-ldap
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), cyrus-sasl2-shlibs, db44-aes-shlibs, openldap23-shlibs (>= 2.3.24-10)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ cyrus-sasl2-shlibs,
+ db44-aes-shlibs,
+ openldap23-shlibs (>= 2.3.24-10)
+ <<
Replaces: php5-apache2-ssl-ldap
Files: lib/php5/20050922-zts/ldap.so
DocFiles: LICENSE
@@ -613,7 +682,11 @@
<<
SplitOff9: <<
Package: %N-mcrypt
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libmcrypt-shlibs, libtool14-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libmcrypt-shlibs,
+ libtool14-shlibs
+ <<
Replaces: php5-apache2-ssl-mcrypt
Files: lib/php5/20050922-zts/mcrypt.so
DocFiles: LICENSE
@@ -660,7 +733,10 @@
<<
SplitOff10: <<
Package: %N-mhash
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libmhash-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libmhash-shlibs
+ <<
Replaces: php5-apache2-ssl-mhash
Files: lib/php5/20050922-zts/mhash.so
DocFiles: LICENSE
@@ -707,7 +783,10 @@
<<
SplitOff11: <<
Package: %N-mysql
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), mysql15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ mysql-ssl15-shlibs | mysql15-shlibs
+ <<
Replaces: php5-apache2-ssl-mysql
Files: lib/php5/20050922-zts/mysql.so
DocFiles: LICENSE
@@ -755,7 +834,10 @@
<<
SplitOff12: <<
Package: %N-mysqli
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), mysql15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ mysql-ssl15-shlibs | mysql15-shlibs
+ <<
Replaces: php5-apache2-ssl-mysqli
Files: lib/php5/20050922-zts/mysqli.so
DocFiles: LICENSE
@@ -803,7 +885,11 @@
<<
SplitOff13: <<
Package: %N-odbc
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), unixodbc2-shlibs (>= 2.2.11-1010) | unixodbc2-nox-shlibs (>=
2.2.11-1010), libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libiconv,
+ unixodbc2-shlibs (>= 2.2.11-1010) | unixodbc2-nox-shlibs (>=
2.2.11-1010)
+ <<
Replaces: php5-apache2-ssl-odbc
Files: lib/php5/20050922-zts/odbc.so
DocFiles: LICENSE
@@ -851,7 +937,10 @@
<<
SplitOff14: <<
Package: %N-pgsql
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), postgresql80-unified-shlibs (>= 8.0.6-1026)
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ postgresql80-unified-shlibs (>= 8.0.6-1026)
+ <<
Replaces: php5-apache2-ssl-pgsql
Files: lib/php5/20050922-zts/pgsql.so
DocFiles: LICENSE
@@ -899,7 +988,10 @@
<<
SplitOff15: <<
Package: %N-snmp
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), net-snmp-unified15-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ net-snmp-unified15-shlibs
+ <<
Replaces: php5-apache2-ssl-snmp
Files: lib/php5/20050922-zts/snmp.so
DocFiles: LICENSE
@@ -946,7 +1038,10 @@
<<
SplitOff17: <<
Package: %N-gmp
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), gmp-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ gmp-shlibs
+ <<
Replaces: php5-apache2-ssl-gmp
Files: lib/php5/20050922-zts/gmp.so
DocFiles: LICENSE
@@ -993,7 +1088,10 @@
<<
SplitOff19: <<
Package: %N-sqlite
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), sqlite-shlibs
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ sqlite-shlibs
+ <<
Replaces: php5-apache2-ssl-sqlite
Files: lib/php5/20050922-zts/sqlite.so
DocFiles: LICENSE
@@ -1040,7 +1138,12 @@
<<
SplitOff21: <<
Package: %N-xsl
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libxslt-shlibs (>= 1.1.0-1), libxml2-shlibs (>= 2.6.1-1), libiconv
+ Depends: <<
+ 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),
+ <<
Replaces: php5-apache2-ssl-xsl
Files: lib/php5/20050922-zts/xsl.so
DocFiles: LICENSE
@@ -1087,7 +1190,11 @@
<<
SplitOff22: <<
Package: %N-xmlrpc
- Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r), libxml2-shlibs (>= 2.6.1-1), libiconv
+ Depends: <<
+ libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (=
%v-%r),
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1)
+ <<
Replaces: php5-apache2-ssl-xmlrpc
Files: lib/php5/20050922-zts/xmlrpc.so
DocFiles: LICENSE
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- php5.patch 23 Jun 2006 17:25:27 -0000 1.1
+++ php5.patch 17 Mar 2008 15:34:58 -0000 1.1.2.1
@@ -1,3 +1,26 @@
+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
+@@ -266,7 +266,9 @@
+ REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -306,7 +308,9 @@
+ REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
diff -ruN php-5.1.4.orig/ext/gd/gdcache.c php-5.1.4/ext/gd/gdcache.c
--- php-5.1.4.orig/ext/gd/gdcache.c 2005-01-09 14:05:05.000000000 -0700
+++ php-5.1.4/ext/gd/gdcache.c 2006-06-15 12:27:43.000000000 -0600
@@ -33,6 +56,34 @@
/*********************************************************/
+diff -ruN php-5.1.4.orig/ext/imap/php_imap.c php-5.1.4/ext/imap/php_imap.c
+--- php-5.1.4.orig/ext/imap/php_imap.c 2006-01-28 03:07:20.000000000 -0500
++++ php-5.1.4/ext/imap/php_imap.c 2008-03-17 01:06:16.000000000 -0400
+@@ -71,6 +71,7 @@
+ /* the gets we use */
+ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size,
GETS_DATA *md);
+
++#if 0
+ /* These function declarations are missing from the IMAP header files... */
+ void rfc822_date(char *date);
+ char *cpystr(const char *str);
+@@ -79,6 +80,7 @@
+ unsigned long find_rightmost_bit(unsigned long *valptr);
+ void fs_give(void **block);
+ void *fs_get(size_t size);
++#endif
+
+
+ /* {{{ imap_functions[]
+@@ -2160,7 +2162,7 @@
+ dest.size = 0;
+
+ cpytxt(&src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+- utf8_mime2text(&src, &dest);
++ utf8_mime2text(&src, &dest, U8T_CANONICAL);
+ RETURN_STRINGL(dest.data, strlen(dest.data), 1);
+ }
+ /* }}} */
diff -ruN php-5.1.4.orig/fink/php5.conf php-5.1.4/fink/php5.conf
--- php-5.1.4.orig/fink/php5.conf 1969-12-31 17:00:00.000000000 -0700
+++ php-5.1.4/fink/php5.conf 2006-06-15 12:28:34.000000000 -0600
-------------------------------------------------------------------------
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
