lang/php53/patches/patch-ab

   1 $NetBSD: patch-ab,v 1.5 2013/03/16 01:58:18 taca Exp $
   2
   3 --- configure.orig      2013-04-10 07:50:37.000000000 +0000
   4 +++ configure
   5 @@ -14121,7 +14121,7 @@ EOF
   6    PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
   7
   8
   9 -        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
  10 +        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
  11
  12    if test "$PHP_SAPI" != "default"; then
  13  { echo "configure: error:
  14 @@ -23462,7 +23462,7 @@ fi
  15      if test "$found_openssl" = "no"; then
  16
  17      if test "$PHP_OPENSSL_DIR" = "yes"; then
  18 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  19 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
  20      fi
  21
  22      for i in $PHP_OPENSSL_DIR; do
  23 @@ -25453,7 +25453,7 @@ echo "configure:25433: checking bundled
  24      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  25
  26
  27 -    for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
  28 +    for header_file; do
  29
  30
  31    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
  32 @@ -36315,7 +36315,7 @@ fi
  33      if test "$found_openssl" = "no"; then
  34
  35      if test "$PHP_OPENSSL_DIR" = "yes"; then
  36 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  37 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
  38      fi
  39
  40      for i in $PHP_OPENSSL_DIR; do
  41 @@ -50360,7 +50360,7 @@ fi
  42      if test "$found_openssl" = "no"; then
  43
  44      if test "$PHP_OPENSSL_DIR" = "yes"; then
  45 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  46 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
  47      fi
  48
  49      for i in $PHP_OPENSSL_DIR; do
  50 @@ -84478,7 +84478,7 @@ fi
  51      if test "$found_openssl" = "no"; then
  52
  53      if test "$PHP_OPENSSL_DIR" = "yes"; then
  54 -      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  55 +      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
  56      fi
  57
  58      for i in $PHP_OPENSSL_DIR; do
  59 @@ -107641,12 +107641,7 @@ old_CC=$CC
  60  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
  61    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
  62    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
  63 -  cat >meta_ccld<<EOF
  64 -#! /bin/sh
  65 -exec $CC $ac_cv_pthreads_cflags \$@
  66 -EOF
  67 -  CC="$abs_builddir/meta_ccld"
  68 -  chmod +x meta_ccld
  69 +  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
  70  fi
  71
  72  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then