add patch to fix build of php-gd, adapted from php71

2 files changed, 63 insertions, 1 deletions

diff --git a/lang/php72/distinfo b/lang/php72/distinfo
index 9364d051563..0fbf09afeea 100644
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/12/03 12:54:33 jdolecek Exp $
+$NetBSD: distinfo,v 1.9 2017/12/06 21:36:34 jdolecek Exp $
 
 SHA1 (php-7.2.0.tar.bz2) = b15bd8fef8d5b99b993784e9c2254ab82f616c64
 RMD160 (php-7.2.0.tar.bz2) = a39b7057bcb93b656fda39008ee4743c4f7f2a0f
@@ -6,11 +6,13 @@ SHA512 (php-7.2.0.tar.bz2) = f4b4d97a0b662cab9ed47a549453ad522da45fa5aa34e3ece49
 Size (php-7.2.0.tar.bz2) = 14594486 bytes
 SHA1 (patch-configure) = 71d2e8334bea48db1e65c82219f2a93cf8d46159
 SHA1 (patch-ext_curl_config.m4) = 86a293d57aafcd42d1feab4a6d0d4f88dbcfb5c8
+SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_pdo__mysql_config.m4) = dd9a72c6c95da5a6942bc581c62d485cf792e2b4
 SHA1 (patch-ext_pdo_config.m4) = 95f3c1ccf696f6686da320e309b48cfcaadb5e43
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
+SHA1 (patch-ext_phar_build_command.php) = 523f74571e22274b05b002960722507c4cdcc3ed
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
diff --git a/lang/php72/patches/patch-ext_gd_config.m4 b/lang/php72/patches/patch-ext_gd_config.m4
new file mode 100644
index 00000000000..4d6d8d087dd
--- /dev/null
+++ b/lang/php72/patches/patch-ext_gd_config.m4
@@ -0,0 +1,60 @@
+$NetBSD: patch-ext_gd_config.m4,v 1.1 2017/12/06 21:36:34 jdolecek Exp $
+
+--- ext/gd/config.m4.orig	2017-11-28 09:22:54.000000000 +0000
++++ ext/gd/config.m4
+@@ -43,18 +43,7 @@ dnl Checks for the configure options
+ dnl
+ 
+ AC_DEFUN([PHP_GD_ZLIB],[
+-	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+-		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+-		elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+-		else
+-			AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
+-		fi
+-	else
+-		for i in /usr/local /usr; do
++		for i in "$PHP_ZLIB_DIR" /usr/local /usr; do
+ 			if test -f "$i/include/zlib/zlib.h"; then
+ 				PHP_ZLIB_DIR="$i"
+ 				PHP_ZLIB_INCDIR="$i/include/zlib"
+@@ -63,7 +52,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
+ 				PHP_ZLIB_INCDIR="$i/include"
+ 			fi
+ 		done
+-	fi
+ ])
+ 
+ AC_DEFUN([PHP_GD_WEBP],[
+@@ -140,13 +128,13 @@ AC_DEFUN([PHP_GD_PNG],[
+       AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
+     fi
+ 
+-    PHP_CHECK_LIBRARY(png,png_write_image,
++    PHP_CHECK_LIBRARY(png16,png_write_image,
+     [
+       PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+-      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+     ],[
+-      AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
++      AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.])
+     ],[
+       -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
+     ])
+@@ -220,7 +208,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromBmp,   [AC_DEFINE(HAVE_GD_BMP,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdVersionString,        [AC_DEFINE(HAVE_GD_LIBVERSION,       1, [ ])], [], [ $GD_SHARED_LIBADD ])