Attachment #195051 for bug #217222

Lines 2-10 Link Here

(-)graphics/php70-gd/Makefile (+5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	CATEGORIES= graphics	4	CATEGORIES= graphics
		5	PORTREVISION= 1
5		6
6	MASTERDIR= ${.CURDIR}/../../lang/php70	7	MASTERDIR= ${.CURDIR}/../../lang/php70
7		8
8	PKGNAMESUFFIX= -gd	9	PKGNAMESUFFIX= -gd
9		10
		11	TEST_TARGET= test
		12
10	.include "${MASTERDIR}/Makefile"	13	.include "${MASTERDIR}/Makefile"
		14
		15	LIB_DEPENDS+= libgd.so:graphics/gd




--- config.m4.orig	2018-07-11 13:18:02 UTC
+++ config.m4
@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then
 
   if test "$GD_MODULE_TYPE" = "builtin"; then 
     PHP_ADD_BUILD_DIR($ext_builddir/libgd)
-    GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
 
     PHP_TEST_BUILD(foobar, [], [
@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then
     ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
     GD_HEADER_DIRS="ext/gd/"
-    GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     PHP_ADD_INCLUDE($GD_INCLUDE)
     PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
       AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])




--- config.m4.orig	2018-07-11 13:18:02 UTC
+++ config.m4
@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then
 
   if test "$GD_MODULE_TYPE" = "builtin"; then 
     PHP_ADD_BUILD_DIR($ext_builddir/libgd)
-    GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
 
     PHP_TEST_BUILD(foobar, [], [
@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then
     ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
     GD_HEADER_DIRS="ext/gd/"
-    GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
     PHP_ADD_INCLUDE($GD_INCLUDE)
     PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
       AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])




		libpng.so:graphics/png
USES+=		jpeg

CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
		--with-freetype-dir=${LOCALBASE} \
		--with-jpeg-dir=${LOCALBASE} \
		--with-png-dir=${LOCALBASE} \
		--with-zlib-dir=/usr

EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \
		php-${PORTVERSION}/ext/gd

OPTIONS_DEFINE=TRUETYPE JIS WEBP X11
OPTIONS_DEFAULT=TRUETYPE X11


WEBP_DESC=  Enable WebP image format support
X11_DESC=	Enable XPM support

PHP_HEADER_DIRS=libgd
.endif

.if ${PHP_MODNAME} == "gettext"

Return to bug 217222

Lines 96-107 Link Here

(-)lang/php70/Makefile.ext (-2 / +4 lines)
96	libpng.so:graphics/png	96	libpng.so:graphics/png
97	USES+= jpeg	97	USES+= jpeg
98		98
99	CONFIGURE_ARGS+=--with-gd \	99	CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
100	--with-freetype-dir=${LOCALBASE} \	100	--with-freetype-dir=${LOCALBASE} \
101	--with-jpeg-dir=${LOCALBASE} \	101	--with-jpeg-dir=${LOCALBASE} \
102	--with-png-dir=${LOCALBASE} \	102	--with-png-dir=${LOCALBASE} \
103	--with-zlib-dir=/usr	103	--with-zlib-dir=/usr
104		104
		105	EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \
		106	php-${PORTVERSION}/ext/gd
		107
105	OPTIONS_DEFINE=TRUETYPE JIS WEBP X11	108	OPTIONS_DEFINE=TRUETYPE JIS WEBP X11
106	OPTIONS_DEFAULT=TRUETYPE X11	109	OPTIONS_DEFAULT=TRUETYPE X11
107		110
Lines 110-116 Link Here
110	WEBP_DESC= Enable WebP image format support	113	WEBP_DESC= Enable WebP image format support
111	X11_DESC= Enable XPM support	114	X11_DESC= Enable XPM support
112		115
113	PHP_HEADER_DIRS=libgd
114	.endif	116	.endif
115		117
116	.if ${PHP_MODNAME} == "gettext"	118	.if ${PHP_MODNAME} == "gettext"

Line 0 Link Here

(-)graphics/php70-gd/files/patch-config.m4 (+20 lines)
	1	--- config.m4.orig 2018-07-11 13:18:02 UTC
	2	+++ config.m4
	3	@@ -358,7 +358,7 @@ if test "$PHP_GD" != "no"; then
	4
	5	if test "$GD_MODULE_TYPE" = "builtin"; then
	6	PHP_ADD_BUILD_DIR($ext_builddir/libgd)
	7	- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
	8	+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
	9	GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
	10
	11	PHP_TEST_BUILD(foobar, [], [
	12	@@ -366,7 +366,7 @@ if test "$PHP_GD" != "no"; then
	13	], [ $GD_SHARED_LIBADD ], [char foobar () {}])
	14	else
	15	GD_HEADER_DIRS="ext/gd/"
	16	- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
	17	+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
	18	PHP_ADD_INCLUDE($GD_INCLUDE)
	19	PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
	20	AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])