graphics/php7*-gd: fix broken build when XPM option is disabled

The switch from bundled gd to graphics/gd broke the port
if a user disabled the XPM option.

PR:		230234 217222
Submitted by:	Guido Falsi <madpilot@FreeBSD.org>
Reported by:	Guido Falsi <madpilot@FreeBSD.org>,  Dani <i.dani@outlook.com>

2 files changed, 94 insertions, 3 deletions

diff --git a/graphics/php71-gd/files/patch-config.m4 b/graphics/php71-gd/files/patch-config.m4
index 7e36e3dd138d..5e7e2d14203d 100644
--- a/graphics/php71-gd/files/patch-config.m4
+++ b/graphics/php71-gd/files/patch-config.m4
@@ -1,6 +1,14 @@
---- config.m4.orig	2018-07-11 13:18:02 UTC
+--- config.m4.orig	2018-07-19 06:17:29 UTC
 +++ config.m4
-@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then
+@@ -295,6 +295,7 @@ dnl enable the support in bundled GD library
+ 
+   if test -n "$GD_XPM_DIR"; then
+     AC_DEFINE(HAVE_GD_XPM, 1, [ ])
++    AC_DEFINE(HAVE_XPM, 1, [ ])
+     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
+   fi
+ 
+@@ -358,7 +359,7 @@ if test "$PHP_GD" != "no"; then
  
    if test "$GD_MODULE_TYPE" = "builtin"; then 
      PHP_ADD_BUILD_DIR($ext_builddir/libgd)
@@ -9,7 +17,7 @@
      GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
  
      PHP_TEST_BUILD(foobar, [], [
-@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then
+@@ -366,7 +367,7 @@ if test "$PHP_GD" != "no"; then
      ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
    else
      GD_HEADER_DIRS="ext/gd/"
diff --git a/graphics/php71-gd/files/patch-gd.c b/graphics/php71-gd/files/patch-gd.c
new file mode 100644
index 000000000000..8787085ee304
--- /dev/null
+++ b/graphics/php71-gd/files/patch-gd.c
@@ -0,0 +1,83 @@
+--- gd.c.orig	2018-07-19 06:17:30 UTC
++++ gd.c
+@@ -53,7 +53,7 @@
+ # include <Wingdi.h>
+ #endif
+ 
+-#ifdef HAVE_GD_XPM
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ # include <X11/xpm.h>
+ #endif
+ 
+@@ -79,7 +79,7 @@ static int le_gd, le_gd_font;
+ # endif
+ #endif
+ 
+-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+ # include "X11/xpm.h"
+ #endif
+ 
+@@ -327,7 +327,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0)
+ 	ZEND_ARG_INFO(0, filename)
+ ZEND_END_ARG_INFO()
+ 
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
+ 	ZEND_ARG_INFO(0, filename)
+ ZEND_END_ARG_INFO()
+@@ -901,7 +901,7 @@ const zend_function_entry gd_functions[] = {
+ #endif
+ 	PHP_FE(imagecreatefromwbmp,						arginfo_imagecreatefromwbmp)
+ 	PHP_FE(imagecreatefromxbm,						arginfo_imagecreatefromxbm)
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ 	PHP_FE(imagecreatefromxpm,						arginfo_imagecreatefromxpm)
+ #endif
+ 	PHP_FE(imagecreatefromgd,						arginfo_imagecreatefromgd)
+@@ -1252,7 +1252,7 @@ PHP_MINFO_FUNCTION(gd)
+ 	php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
+ #endif
+ 	php_info_print_table_row(2, "WBMP Support", "enabled");
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ 	php_info_print_table_row(2, "XPM Support", "enabled");
+ 	{
+ 		char tmp[12];
+@@ -1307,7 +1307,7 @@ PHP_FUNCTION(gd_info)
+ 	add_assoc_bool(return_value, "PNG Support", 0);
+ #endif
+ 	add_assoc_bool(return_value, "WBMP Support", 1);
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ 	add_assoc_bool(return_value, "XPM Support", 1);
+ #else
+ 	add_assoc_bool(return_value, "XPM Support", 0);
+@@ -2147,7 +2147,7 @@ PHP_FUNCTION(imagetypes)
+ 	ret |= 4;
+ #endif
+ 	ret |= 8;
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ 	ret |= 16;
+ #endif
+ #ifdef HAVE_GD_WEBP
+@@ -2397,7 +2397,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P
+ 			case PHP_GDIMG_TYPE_GD2PART:
+ 				im = (*func_p)(fp, srcx, srcy, width, height);
+ 				break;
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ 			case PHP_GDIMG_TYPE_XPM:
+ 				im = gdImageCreateFromXpm(file);
+ 				break;
+@@ -2479,7 +2479,7 @@ PHP_FUNCTION(imagecreatefromxbm)
+ }
+ /* }}} */
+ 
+-#if defined(HAVE_GD_XPM)
++#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
+ /* {{{ proto resource imagecreatefromxpm(string filename)
+    Create a new image from XPM file or URL */
+ PHP_FUNCTION(imagecreatefromxpm)