Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28173/10.3/unstable/crypto/finkinfo
Modified Files: php5-apache2-ssl.info php5-apache2-ssl.patch Log Message: Backport correct gcc4 fix Index: php5-apache2-ssl.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/php5-apache2-ssl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- php5-apache2-ssl.patch 3 Jan 2005 01:26:07 -0000 1.1 +++ php5-apache2-ssl.patch 9 Mar 2006 01:21:36 -0000 1.2 @@ -1,7 +1,35 @@ diff -ruN php-4.3.3.orig/configure php-4.3.3/configure --- php-4.3.3.orig/configure Sun Aug 24 17:15:34 2003 +++ php-4.3.3/configure Thu Aug 28 21:30:26 2003 -@@ -91109,10 +91109,10 @@ +@@ -49319,7 +49319,6 @@ + #line 49320 "configure" + #include "confdefs.h" + #include <stdarg.h> +-int main() { + + int foo(int x, ...) { + va_list va; +@@ -49331,7 +49330,6 @@ + } + int main() { return foo(10, "", 3.14); } + +-; return 0; } + EOF + if { (eval echo configure:49337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* +@@ -83367,11 +83365,9 @@ + # include <wchar.h> + #endif + +-int main() { + + int __tmp__() { mbstate_t a; } + +-; return 0; } + EOF + if { (eval echo configure:83377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* +@@ -95263,10 +95259,10 @@ # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! Index: php5-apache2-ssl.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/php5-apache2-ssl.info,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- php5-apache2-ssl.info 7 Mar 2006 02:02:18 -0000 1.11 +++ php5-apache2-ssl.info 9 Mar 2006 01:21:36 -0000 1.12 @@ -1,6 +1,6 @@ Package: php5-apache2-ssl Version: 5.0.4 -Revision: 14 +Revision: 15 ### Depends: libapache2-ssl-mod-php5 | %N-cgi BuildDepends: apr-ssl (>= 0.9.5-12), libtool14, libgettext3-dev, libiconv-dev, gd2, mysql14-dev, sqlite-dev, postgresql80-unified-dev, libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcve (>= 3.2.2-1), libmcrypt, libxml2, libxslt, openldap-ssl-dev (>= 2.1.22-24), ming, t1lib5, libpng3, apache2-ssl-dev (>= 2.0.54-1), unixodbc2 | unixodbc2-nox, gdbm3, net-snmp-ssl (>= 5.0.7-2), net-snmp-ssl-dev (>= 5.0.7-2), db43-ssl, libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, mnogosearch1-dev, clibpdf (>= 2.0.2r1-2), uw-imap-c-client-ssl (>= 2002e-1), libjpeg, cyrus-sasl2-dev @@ -74,6 +74,7 @@ ### PatchScript: << ### Fix for gd/freetype + ### Apple's GCC 4 prohibits nested functions sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1 ### Fix c-client @@ -132,9 +133,6 @@ perl -pi -e 's,pear\.conf,pear5\.conf,g' pear/PEAR/Config.php perl -pi -e 's,// PEAR executables,\$config-\>set\(\"php_bin\"\, \"%p/bin/php5\"\, \"default\"\);\n// PEAR executables,g' pear/install-pear.php - - ### gcc4 prohibits nested functions - perl -pi -e 's,int main(\(\) \{ return foo),int foofoo\1,' configure << ### Fix for 10.3 dns stuff & apr & snmp SetCFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0 ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits