diff options
Diffstat (limited to 'dev-lang/php/files/4-any')
20 files changed, 400 insertions, 0 deletions
diff --git a/dev-lang/php/files/4-any/CVS/Entries b/dev-lang/php/files/4-any/CVS/Entries new file mode 100644 index 0000000..77835d6 --- /dev/null +++ b/dev-lang/php/files/4-any/CVS/Entries @@ -0,0 +1,8 @@ +D/apache-1.3//// +D/apache-2.0//// +/php4-fastbuild.patch/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +/php4-imap-symlink.diff/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +/php4-iodbc-config.diff/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +/php4-libtool-1.5.patch/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +/php4-uClibc-have_dn_skipname.patch/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +/php4-with-iodbc.diff/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 diff --git a/dev-lang/php/files/4-any/CVS/Repository b/dev-lang/php/files/4-any/CVS/Repository new file mode 100644 index 0000000..1bc8a44 --- /dev/null +++ b/dev-lang/php/files/4-any/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/dev-lang/php/files/4-any diff --git a/dev-lang/php/files/4-any/CVS/Root b/dev-lang/php/files/4-any/CVS/Root new file mode 100644 index 0000000..854a2c8 --- /dev/null +++ b/dev-lang/php/files/4-any/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot diff --git a/dev-lang/php/files/4-any/CVS/Tag b/dev-lang/php/files/4-any/CVS/Tag new file mode 100644 index 0000000..5062263 --- /dev/null +++ b/dev-lang/php/files/4-any/CVS/Tag @@ -0,0 +1 @@ +N1.1 diff --git a/dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf b/dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf new file mode 100644 index 0000000..34a41d8 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf @@ -0,0 +1,19 @@ +# vim: ft=apache sw=4 ts=4 +<IfDefine PHP4> + + # Load the module first + <IfModule !sapi_apache.c> + LoadModule php4_module modules/libphp4.so + </IfModule> + + # Set it to handle the files + <IfModule mod_mime.c> + AddType application/x-httpd-php .php + AddType application/x-httpd-php .phtml + AddType application/x-httpd-php .php3 + AddType application/x-httpd-php .php4 + AddType application/x-httpd-php-source .phps + </IfModule> + + AddDirectoryIndex index.php index.phtml +</IfDefine> diff --git a/dev-lang/php/files/4-any/apache-1.3/CVS/Entries b/dev-lang/php/files/4-any/apache-1.3/CVS/Entries new file mode 100644 index 0000000..0a4f813 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-1.3/CVS/Entries @@ -0,0 +1,2 @@ +/70_mod_php.conf/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +D diff --git a/dev-lang/php/files/4-any/apache-1.3/CVS/Repository b/dev-lang/php/files/4-any/apache-1.3/CVS/Repository new file mode 100644 index 0000000..073ee00 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-1.3/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/dev-lang/php/files/4-any/apache-1.3 diff --git a/dev-lang/php/files/4-any/apache-1.3/CVS/Root b/dev-lang/php/files/4-any/apache-1.3/CVS/Root new file mode 100644 index 0000000..854a2c8 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-1.3/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot diff --git a/dev-lang/php/files/4-any/apache-1.3/CVS/Tag b/dev-lang/php/files/4-any/apache-1.3/CVS/Tag new file mode 100644 index 0000000..5062263 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-1.3/CVS/Tag @@ -0,0 +1 @@ +N1.1 diff --git a/dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf b/dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf new file mode 100644 index 0000000..ce68032 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf @@ -0,0 +1,19 @@ +# vim: ft=apache sw=4 ts=4 +<IfDefine PHP4> + + # Load the module first + <IfModule !sapi_apache2.c> + LoadModule php4_module modules/libphp4.so + </IfModule> + + # Set it to handle the files + <IfModule mod_mime.c> + AddType application/x-httpd-php .php + AddType application/x-httpd-php .phtml + AddType application/x-httpd-php .php3 + AddType application/x-httpd-php .php4 + AddType application/x-httpd-php-source .phps + </IfModule> + + AddDirectoryIndex index.php index.phtml +</IfDefine> diff --git a/dev-lang/php/files/4-any/apache-2.0/CVS/Entries b/dev-lang/php/files/4-any/apache-2.0/CVS/Entries new file mode 100644 index 0000000..0a4f813 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-2.0/CVS/Entries @@ -0,0 +1,2 @@ +/70_mod_php.conf/1.1/Mon Oct 31 14:10:39 2005/-ko/T1.1 +D diff --git a/dev-lang/php/files/4-any/apache-2.0/CVS/Repository b/dev-lang/php/files/4-any/apache-2.0/CVS/Repository new file mode 100644 index 0000000..de0b025 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-2.0/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/dev-lang/php/files/4-any/apache-2.0 diff --git a/dev-lang/php/files/4-any/apache-2.0/CVS/Root b/dev-lang/php/files/4-any/apache-2.0/CVS/Root new file mode 100644 index 0000000..854a2c8 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-2.0/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot diff --git a/dev-lang/php/files/4-any/apache-2.0/CVS/Tag b/dev-lang/php/files/4-any/apache-2.0/CVS/Tag new file mode 100644 index 0000000..5062263 --- /dev/null +++ b/dev-lang/php/files/4-any/apache-2.0/CVS/Tag @@ -0,0 +1 @@ +N1.1 diff --git a/dev-lang/php/files/4-any/php4-fastbuild.patch b/dev-lang/php/files/4-any/php4-fastbuild.patch new file mode 100644 index 0000000..47f0dc7 --- /dev/null +++ b/dev-lang/php/files/4-any/php4-fastbuild.patch @@ -0,0 +1,250 @@ +diff -u --recursive php-4.4.0/acinclude.m4 php-4.4.0-cgi/acinclude.m4 +--- php-4.4.0/acinclude.m4 2005-09-14 22:39:22.000000000 +0200 ++++ php-4.4.0-cgi/acinclude.m4 2005-09-14 22:39:54.000000000 +0200 +@@ -84,7 +84,7 @@ + dnl + dnl which array to append to? + AC_DEFUN([PHP_ADD_SOURCES],[ +- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) ++ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) + ]) + dnl + dnl _PHP_ASSIGN_BUILD_VARS(type) +diff -u --recursive php-4.4.0/configure.in php-4.4.0-cgi/configure.in +--- php-4.4.0/configure.in 2005-07-11 08:45:09.000000000 +0100 ++++ php-4.4.0-cgi/configure.in 2005-09-01 08:00:54.000000000 +0100 +@@ -1216,20 +1216,20 @@ + INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" + CXXFLAGS="$CXXFLAGS $standard_libtool_flag" + +-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' ++all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET) $(PHP_CGI_TARGET)' + install_targets="$install_modules $install_pear install-build install-headers install-programs" + +-case $PHP_SAPI in +- cgi) +- install_targets="install-sapi $install_targets" +- ;; +- cli) +- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" +- ;; +- *) +- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" +- ;; +-esac ++if test "$PHP_SAPI_CGI" != "no" ; then ++ install_targets="install-sapi $install_targets" ++fi ++ ++if test "$PHP_SAPI_CLI" != "no" ; then ++ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" ++fi ++ ++if test "$PHP_SAPI" != "default" ; then ++ install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" ++fi + + PHP_SUBST(all_targets) + PHP_SUBST(install_targets) +diff -u --recursive php-4.4.0/sapi/cgi/Makefile.frag php-4.4.0-cgi/sapi/cgi/Makefile.frag +--- php-4.4.0/sapi/cgi/Makefile.frag 2003-07-02 02:06:29.000000000 +0100 ++++ php-4.4.0-cgi/sapi/cgi/Makefile.frag 2005-09-01 08:03:20.000000000 +0100 +@@ -1,2 +1,6 @@ +-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) ++$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) + $(BUILD_CGI) ++ ++install-cgi: $(SAPI_CGI_PATH) ++ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" ++ @$(INSTALL_CGI) +diff -u --recursive php-4.4.0/sapi/cgi/config9.m4 php-4.4.0-cgi/sapi/cgi/config9.m4 +--- php-4.4.0/sapi/cgi/config9.m4 2004-12-30 07:02:18.000000000 +0000 ++++ php-4.4.0-cgi/sapi/cgi/config9.m4 2005-09-01 08:05:08.000000000 +0100 +@@ -81,93 +81,107 @@ + ]) + + +-if test "$PHP_SAPI" = "default"; then +- AC_MSG_CHECKING(for CGI build) +- if test "$PHP_SAPI_CGI" != "no"; then +- AC_MSG_RESULT(yes) +- +- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) +- case $host_alias in +- *cygwin* ) +- SAPI_CGI_PATH=sapi/cgi/php.exe +- ;; +- * ) +- SAPI_CGI_PATH=sapi/cgi/php +- ;; +- esac +- PHP_SUBST(SAPI_CGI_PATH) +- +- PHP_TEST_WRITE_STDOUT +- +- AC_MSG_CHECKING(whether to force Apache CGI redirect) +- if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then +- REDIRECT=1 +- else +- REDIRECT=0 +- fi +- AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) +- AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) ++AC_MSG_CHECKING(for CGI build) ++if test "$PHP_SAPI_CGI" != "no"; then ++ AC_MSG_RESULT(yes) ++ ++ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) ++ case $host_alias in ++ *cygwin* ) ++ SAPI_CGI_PATH=sapi/cgi/php.exe ++ ;; ++ * ) ++ SAPI_CGI_PATH=sapi/cgi/php ++ ;; ++ esac ++ PHP_SUBST(SAPI_CGI_PATH) + ++ PHP_TEST_WRITE_STDOUT + +- AC_MSG_CHECKING(whether to discard path_info + path_translated) +- if test "$PHP_DISCARD_PATH" = "yes"; then +- DISCARD_PATH=1 +- else +- DISCARD_PATH=0 +- fi +- AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) +- AC_MSG_RESULT($PHP_DISCARD_PATH) ++ AC_MSG_CHECKING(whether to force Apache CGI redirect) ++ if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then ++ REDIRECT=1 ++ else ++ REDIRECT=0 ++ fi ++ AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) ++ AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) + +- AC_MSG_CHECKING(whether to enable path info checking) +- if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then +- ENABLE_PATHINFO_CHECK=1 +- else +- ENABLE_PATHINFO_CHECK=0 +- fi +- AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) +- AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) + +- AC_MSG_CHECKING(whether to enable fastcgi support) +- PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" +- if test -z $PHP_LIBFCGI_DIR; then +- echo "$PHP_LIBFCGI_DIR does not exist" +- exit 1 +- fi +- if test "$PHP_ENABLE_FASTCGI" = "yes"; then +- PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) +- PHP_FASTCGI=1 +- PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" +- PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" +- PHP_FCGI_STATIC=1 +- else +- PHP_FASTCGI=0 +- PHP_FCGI_FILES="" +- PHP_FCGI_INCLUDE="" +- PHP_FCGI_STATIC=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) +- AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) +- AC_MSG_RESULT($PHP_ENABLE_FASTCGI) +- +- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" +- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') +- +- case $host_alias in +- *darwin*) +- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ++ AC_MSG_CHECKING(whether to discard path_info + path_translated) ++ if test "$PHP_DISCARD_PATH" = "yes"; then ++ DISCARD_PATH=1 ++ else ++ DISCARD_PATH=0 ++ fi ++ AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) ++ AC_MSG_RESULT($PHP_DISCARD_PATH) ++ ++ AC_MSG_CHECKING(whether to enable path info checking) ++ if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then ++ ENABLE_PATHINFO_CHECK=1 ++ else ++ ENABLE_PATHINFO_CHECK=0 ++ fi ++ AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) ++ AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) ++ ++ AC_MSG_CHECKING(whether to enable fastcgi support) ++ PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" ++ if test -z $PHP_LIBFCGI_DIR; then ++ echo "$PHP_LIBFCGI_DIR does not exist" ++ exit 1 ++ fi ++ if test "$PHP_ENABLE_FASTCGI" = "yes"; then ++ PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) ++ PHP_FASTCGI=1 ++ PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" ++ PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" ++ PHP_FCGI_STATIC=1 ++ else ++ PHP_FASTCGI=0 ++ PHP_FCGI_FILES="" ++ PHP_FCGI_INCLUDE="" ++ PHP_FCGI_STATIC=0 ++ fi ++ AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) ++ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) ++ AC_MSG_RESULT($PHP_ENABLE_FASTCGI) ++ ++ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" ++ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, cgi) ++ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) ++ ++ case $host_alias in ++ *darwin*) ++ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; +- *) +- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ++ *) ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; +- esac ++ esac + +- PHP_SUBST(BUILD_CGI) ++ PHP_CGI_TARGET="$SAPI_CGI_PATH" ++ PHP_INSTALL_CGI_TARGET="install-cgi" + +- elif test "$PHP_SAPI_CLI" != "no"; then +- AC_MSG_RESULT(no) +- OVERALL_TARGET= +- PHP_SAPI=cli +- else +- AC_MSG_ERROR([No SAPIs selected.]) ++ PHP_SUBST(BUILD_CGI) ++ PHP_SUBST(INSTALL_CGI) ++ PHP_SUBST(PHP_CGI_OBJS) ++ PHP_SUBST(PHP_CGI_TARGET) ++ PHP_SUBST(PHP_INSTALL_CGI_TARGET) ++ ++ if test "$PHP_SAPI" = "default" ; then ++ PHP_BUILD_PROGRAM($SAPI_CGI_PATH) ++ fi ++ ++else ++ AC_MSG_RESULT(no) ++ if test "$PHP_SAPI" = "default" ; then ++ if test "$PHP_SAPI_CLI" != "no"; then ++ OVERALL_TARGET= ++ PHP_SAPI=cli ++ else ++ AC_MSG_ERROR([No SAPIs selected.]) ++ fi + fi + fi diff --git a/dev-lang/php/files/4-any/php4-imap-symlink.diff b/dev-lang/php/files/4-any/php4-imap-symlink.diff new file mode 100644 index 0000000..cf74905 --- /dev/null +++ b/dev-lang/php/files/4-any/php4-imap-symlink.diff @@ -0,0 +1,15 @@ +--- ext/imap/config.m4 2005-09-04 02:48:47.000000000 +0200 ++++ ext/imap/config.m4 2005-09-04 02:49:05.000000000 +0200 +@@ -158,12 +158,6 @@ + AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) + fi + +- if test -r "$IMAP_DIR/c-client/c-client.a"; then +- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/lib/c-client.a"; then +- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 +- fi +- + for lib in c-client4 c-client imap; do + IMAP_LIB=$lib + IMAP_LIB_CHK(lib) diff --git a/dev-lang/php/files/4-any/php4-iodbc-config.diff b/dev-lang/php/files/4-any/php4-iodbc-config.diff new file mode 100644 index 0000000..a706916 --- /dev/null +++ b/dev-lang/php/files/4-any/php4-iodbc-config.diff @@ -0,0 +1,14 @@ +--- ext/odbc/config.m4 2005-08-10 02:05:26.000000000 +0200 ++++ ext/odbc/config.m4 2005-08-10 02:06:10.000000000 +0200 +@@ -401,9 +401,9 @@ + fi + if test "$withval" != "no"; then + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) +- PHP_ADD_INCLUDE($withval/include, 1) ++ PHP_ADD_INCLUDE($withval/include/iodbc, 1) + ODBC_TYPE=iodbc +- ODBC_INCLUDE=-I$withval/include ++ ODBC_INCLUDE=-I$withval/include/iodbc + ODBC_LFLAGS=-L$withval/lib + ODBC_LIBS=-liodbc + AC_DEFINE(HAVE_IODBC,1,[ ]) diff --git a/dev-lang/php/files/4-any/php4-libtool-1.5.patch b/dev-lang/php/files/4-any/php4-libtool-1.5.patch new file mode 100644 index 0000000..0761203 --- /dev/null +++ b/dev-lang/php/files/4-any/php4-libtool-1.5.patch @@ -0,0 +1,19 @@ +--- acinclude.m4 2005-09-08 13:16:38.000000000 +0200 ++++ acinclude.m4 2005-09-08 13:21:09.000000000 +0200 +@@ -783,12 +783,12 @@ + dnl + AC_DEFUN([PHP_BUILD_PROGRAM],[ + OVERALL_TARGET=[]ifelse($1,,php,$1) +- php_c_pre='$(CC)' ++ php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post=' && echo > $[@]' +- php_cxx_pre='$(CXX)' ++ php_c_post= ++ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post=' && echo > $[@]' ++ php_cxx_post= + php_lo=o + + case $with_pic in diff --git a/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch b/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch new file mode 100644 index 0000000..3a86dfb --- /dev/null +++ b/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch @@ -0,0 +1,30 @@ +--- ext/standard/dns.c ++++ ext/standard/dns.c +@@ -275,6 +275,7 @@ PHP_FUNCTION(checkdnsrr) + #define MAXHOSTNAMELEN 256 + #endif /* MAXHOSTNAMELEN */ + ++#if HAVE_DN_SKIPNAME + /* {{{ proto int getmxrr(string hostname, array mxhosts [, array weight]) + Get MX records corresponding to a given Internet host name */ + PHP_FUNCTION(getmxrr) +@@ -355,6 +356,7 @@ PHP_FUNCTION(getmxrr) + RETURN_TRUE; + } + /* }}} */ ++#endif /* HAVE_DN_SKIPNAME */ + + #endif + /* +--- ext/standard/basic_functions.c ++++ ext/standard/basic_functions.c +@@ -449,7 +449,9 @@ function_entry basic_functions[] = { + + #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE)) + PHP_FE(checkdnsrr, NULL) ++# if HAVE_DN_SKIPNAME + PHP_FE(getmxrr,second_and_third_args_force_ref) ++# endif + #endif + + PHP_FE(getmyuid, NULL) diff --git a/dev-lang/php/files/4-any/php4-with-iodbc.diff b/dev-lang/php/files/4-any/php4-with-iodbc.diff new file mode 100644 index 0000000..81afcc0 --- /dev/null +++ b/dev-lang/php/files/4-any/php4-with-iodbc.diff @@ -0,0 +1,13 @@ +--- ext/odbc/php_odbc_includes.h 2005-02-22 17:55:18.000000000 +0000 ++++ ext/odbc/php_odbc_includes.h 2005-02-22 17:55:26.000000000 +0000 +@@ -91,8 +91,8 @@ + #elif defined(HAVE_IODBC) /* iODBC library */ + + #define ODBC_TYPE "iODBC" +-#include <isql.h> +-#include <isqlext.h> ++#include <iodbc/isql.h> ++#include <iodbc/isqlext.h> + #define HAVE_SQL_EXTENDED_FETCH 1 + #define SQL_FD_FETCH_ABSOLUTE 0x00000010L + #define SQL_CURSOR_DYNAMIC 2UL |