fix unportable == in ext/curl/config.m4

3 files changed, 34 insertions, 14 deletions

diff --git a/lang/php72/distinfo b/lang/php72/distinfo
index a773e22b16e..313a9360302 100644
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2017/11/15 11:01:31 jdolecek Exp $
 
 SHA1 (php-7.2.0RC6.tar.bz2) = dfc81aa8965ec73f3d24725d207ad9f6b362a238
 RMD160 (php-7.2.0RC6.tar.bz2) = 8b4dac9c5247b3d63b8d7a785bb5015555f37fee
 SHA512 (php-7.2.0RC6.tar.bz2) = 35cf7e4aaf461c360885aaa4bb7997ae60eb7d8a8134c8ab4c42412576a9c36b56f1acc24358be3e7722142a10f330719907f254d6bf174fb22a6d61d3fe3fde
 Size (php-7.2.0RC6.tar.bz2) = 14953026 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
-SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
+SHA1 (patch-configure) = a9d48535baf94415ca49ccda43e196010969ea9e
+SHA1 (patch-ext_curl_config.m4) = f583f90a499d4f0bdb3d21fa8f129a30d2fa6d6c
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
@@ -16,8 +16,6 @@ SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
-SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
-SHA1 (patch-ext_standard_uniqid.c) = 154ed6e6d4796a52c6664b52994d6cad4ed22f30
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
diff --git a/lang/php72/patches/patch-configure b/lang/php72/patches/patch-configure
index 655fa7d1dad..2f36b6eda2d 100644
--- a/lang/php72/patches/patch-configure
+++ b/lang/php72/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+$NetBSD: patch-configure,v 1.2 2017/11/15 11:01:31 jdolecek Exp $
 
---- configure.orig	2016-04-28 18:12:26.000000000 +0000
+--- configure.orig	2017-11-07 11:57:02.000000000 +0000
 +++ configure
-@@ -6930,27 +6930,6 @@ EOF
+@@ -7007,27 +7007,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18408,7 +18387,7 @@ fi
+@@ -18592,7 +18571,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
+@@ -21090,7 +21069,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -48,7 +48,16 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -31742,7 +31721,7 @@ fi
+@@ -23626,7 +23605,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl.pc" >&5
+ $as_echo_n "checking for libcurl.pc... " >&6; }
+-    if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then
++    if test "$PHP_CURL" = "yes" -o "$PHP_CURL" = "/usr"; then
+       PKNAME=libcurl
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default path" >&5
+ $as_echo "using default path" >&6; }
+@@ -32006,7 +31985,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -57,7 +66,7 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -42631,7 +42610,7 @@ fi
+@@ -42805,7 +42784,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -66,7 +75,7 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -92806,7 +92785,7 @@ fi
+@@ -92412,7 +92391,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -75,7 +84,7 @@ $NetBSD: patch-configure,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -96439,12 +96418,7 @@ old_CC=$CC
+@@ -95975,12 +95954,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"
diff --git a/lang/php72/patches/patch-ext_curl_config.m4 b/lang/php72/patches/patch-ext_curl_config.m4
new file mode 100644
index 00000000000..0f96368350b
--- /dev/null
+++ b/lang/php72/patches/patch-ext_curl_config.m4
@@ -0,0 +1,13 @@
+$NetBSD: patch-ext_curl_config.m4,v 1.1 2017/11/15 11:01:31 jdolecek Exp $
+
+--- ext/curl/config.m4.orig	2017-11-15 10:50:33.000000000 +0000
++++ ext/curl/config.m4
+@@ -14,7 +14,7 @@ if test "$PHP_CURL" != "no"; then
+     dnl using pkg-config output
+ 
+     AC_MSG_CHECKING(for libcurl.pc)
+-    if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then
++    if test "$PHP_CURL" = "yes" -o "$PHP_CURL" = "/usr"; then
+       PKNAME=libcurl
+       AC_MSG_RESULT(using default path)
+     elif test -r $PHP_CURL/$PHP_LIBDIR/pkgconfig/libcurl.pc; then