From 28dc0b6c3fd1ffbcf0b28ff12bff8bcb148a8612 Mon Sep 17 00:00:00 2001
From: joneum <joneum@FreeBSD.org>
Date: Sat, 10 Nov 2018 17:33:27 +0000
Subject: Update to 7.2.12

Changelog:
 - http://www.php.net/ChangeLog-7.php#7.2.12

Approved by:	tz (implicit)
Sponsored by:	Netzkommune GmbH
---
 databases/php72-odbc/files/patch-config.m4 | 33 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'databases')

diff --git a/databases/php72-odbc/files/patch-config.m4 b/databases/php72-odbc/files/patch-config.m4
index cf68ac678e4c..6479cf0f531d 100644
--- a/databases/php72-odbc/files/patch-config.m4
+++ b/databases/php72-odbc/files/patch-config.m4
@@ -1,12 +1,11 @@
---- config.m4.orig	2016-10-25 15:23:21 UTC
-+++ config.m4
-@@ -100,13 +100,17 @@ dnl
+--- config.m4.orig	2018-11-10 15:32:27.031531000 +0100
++++ config.m4	2018-11-10 15:37:40.815007000 +0100
+@@ -100,13 +100,16 @@ dnl
  dnl configure options
  dnl
  
 +PHP_ARG_ENABLE(odbc,,
 +[  --enable-odbc             Enable ODBC support with selected driver])
-+
 +
  PHP_ARG_WITH(odbcver,,
  [  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0350.
@@ -19,7 +18,7 @@
  
    AC_MSG_CHECKING([for Adabas support])
    if test "$PHP_ADABAS" != "no"; then
-@@ -135,7 +139,7 @@ fi
+@@ -135,7 +138,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(sapdb,,
@@ -28,7 +27,7 @@
  
    AC_MSG_CHECKING([for SAP DB support])
    if test "$PHP_SAPDB" != "no"; then
-@@ -155,7 +159,7 @@ fi
+@@ -155,7 +158,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(solid,,
@@ -37,7 +36,7 @@
  
    AC_MSG_CHECKING(for Solid support)
    if test "$PHP_SOLID" != "no"; then
-@@ -182,7 +186,7 @@ fi
+@@ -182,7 +185,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ibm-db2,,
@@ -46,7 +45,7 @@
  
    AC_MSG_CHECKING(for IBM DB2 support)
    if test "$PHP_IBM_DB2" != "no"; then
-@@ -221,7 +225,7 @@ fi
+@@ -221,7 +224,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ODBCRouter,,
@@ -55,7 +54,7 @@
  
    AC_MSG_CHECKING(for ODBCRouter.com support)
    if test "$PHP_ODBCROUTER" != "no"; then
-@@ -244,7 +248,7 @@ fi
+@@ -244,7 +247,7 @@ fi
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(empress,,
  [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
@@ -64,7 +63,7 @@
  
    AC_MSG_CHECKING(for Empress support)
    if test "$PHP_EMPRESS" != "no"; then
-@@ -270,7 +274,7 @@ if test -z "$ODBC_TYPE"; then
+@@ -270,7 +273,7 @@ if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(empress-bcs,,
  [  --with-empress-bcs[=DIR]
                            Include Empress Local Access support [\$EMPRESSPATH]
@@ -73,16 +72,16 @@
  
    AC_MSG_CHECKING(for Empress local access support)
    if test "$PHP_EMPRESS_BCS" != "no"; then
-@@ -310,7 +314,7 @@ fi
+@@ -310,7 +313,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(birdstep,,
 -[  --with-birdstep[=DIR]     Include Birdstep support [/usr/local/birdstep]])
 +[  --with-birdstep[=DIR]     Include Birdstep support [/usr/local/birdstep]], no, no)
-   
+ 
    AC_MSG_CHECKING(for Birdstep support)
    if test "$PHP_BIRDSTEP" != "no"; then
-@@ -366,7 +370,7 @@ PHP_ARG_WITH(custom-odbc,,
+@@ -366,7 +369,7 @@ PHP_ARG_WITH(custom-odbc,,
                            running this configure script:
                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
                              LDFLAGS=-lunix
@@ -91,7 +90,7 @@
  
    AC_MSG_CHECKING(for a custom ODBC support)
    if test "$PHP_CUSTOM_ODBC" != "no"; then
-@@ -388,7 +392,7 @@ fi
+@@ -388,7 +391,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(iodbc,,
@@ -100,7 +99,7 @@
  
    AC_MSG_CHECKING(for iODBC support)
    if test "$PHP_IODBC" != "no"; then
-@@ -426,7 +430,7 @@ fi
+@@ -426,7 +429,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(esoob,,
@@ -109,7 +108,7 @@
  
    AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
    if test "$PHP_ESOOB" != "no"; then
-@@ -448,7 +452,7 @@ fi
+@@ -448,7 +451,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(unixODBC,,
@@ -118,7 +117,7 @@
  
    AC_MSG_CHECKING(for unixODBC support)
    if test "$PHP_UNIXODBC" != "no"; then
-@@ -471,7 +475,7 @@ fi
+@@ -471,7 +474,7 @@ fi
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(dbmaker,,
-- 
cgit