1 files changed, 16 insertions, 7 deletions
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index dfaa3d8e1ad..1b9e811b783 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
+$NetBSD: patch-configure,v 1.2.2.1 2013/12/16 17:05:48 tron Exp $
 
---- configure.orig	2013-08-15 20:48:19.000000000 +0000
+--- configure.orig	2013-10-15 14:29:41.000000000 +0000
 +++ configure
-@@ -23571,7 +23571,7 @@ fi
+@@ -23604,7 +23604,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25721,7 +25721,7 @@ $as_echo "yes" >&6; }
+@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +20,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36778,7 +36778,7 @@ fi
+@@ -36811,7 +36811,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -48536,7 +48536,7 @@ fi
+@@ -48569,7 +48569,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,16 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -104360,12 +104360,7 @@ old_CC=$CC
+@@ -65546,7 +65546,7 @@ rm -f core *.core core.conftest.* gmon.o
+ fi
+ 
+ 
+-if test "$flock_type" == "unknown"; then
++if test "$flock_type" = "unknown"; then
+ 	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
+ fi
+ 
+@@ -104883,12 +104883,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"