Attachment #181795 for bug #217222

Lines 2-8 Link Here

(-)lang/php70/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= php70	4	PORTNAME= php70
5	PORTVERSION= 7.0.17	5	PORTVERSION= 7.0.18
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES?= lang devel www	7	CATEGORIES?= lang devel www
8	MASTER_SITES= PHP/distributions	8	MASTER_SITES= PHP/distributions




		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 X11
OPTIONS_DEFAULT=TRUETYPE X11

T1LIB_DESC=	Include T1lib support
TRUETYPE_DESC=	Enable TrueType string function
JIS_DESC=	Enable JIS-mapped Japanese font support

X11_DESC=	Enable XPM support
VPX_DESC=	Enable VP8 codec support

PHP_HEADER_DIRS=libgd
.endif

.if ${PHP_MODNAME} == "gettext"

Lines 1-3 Link Here

(-)lang/php70/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1489565928	1	TIMESTAMP = 1492189495
2	SHA256 (php-7.0.17.tar.xz) = 471c16fcdd6a5e1a37199e97bcaeea6117626229785185be7532aaa7c6ee04be	2	SHA256 (php-7.0.18.tar.xz) = 679cffcdf2495dee5ab89bda595e678a1096136678b3a1d08f1f57ba347c234d
3	SIZE (php-7.0.17.tar.xz) = 12588452	3	SIZE (php-7.0.18.tar.xz) = 12593408

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
		9	LIB_DEPENDS+= gd:graphics/gd
		10
8	PKGNAMESUFFIX= -gd	11	PKGNAMESUFFIX= -gd
9		12
		13	TEST_TARGET= test
		14
10	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"




--- config.m4	2017-03-14 07:26:09.000000000 -0400
+++ config.m4	2017-04-14 12:48:12.529657000 -0400
@@ -360,5 +360,5 @@
     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,5 +366,5 @@
     ], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
     GD_HEADER_DIRS="ext/gd/"
-    GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
+    GDLIB_CFLAGS="-I../.. -I$GD_INCLUDE $GDLIB_CFLAGS"
     PHP_ADD_INCLUDE($GD_INCLUDE)

Return to bug 217222

Lines 94-108 Link Here

(-)lang/php70/Makefile.ext (-4 / +6 lines)
94	libpng.so:graphics/png	94	libpng.so:graphics/png
95	USES+= jpeg	95	USES+= jpeg
96		96
97	CONFIGURE_ARGS+=--with-gd \	97	CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \
98	--with-freetype-dir=${LOCALBASE} \	98	--with-freetype-dir=${LOCALBASE} \
99	--with-jpeg-dir=${LOCALBASE} \	99	--with-jpeg-dir=${LOCALBASE} \
100	--with-png-dir=${LOCALBASE} \	100	--with-png-dir=${LOCALBASE} \
101	--with-zlib-dir=/usr	101	--with-zlib-dir=/usr
102		102
103	OPTIONS_DEFINE= T1LIB TRUETYPE JIS X11 VPX	103	EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \
104	OPTIONS_DEFAULT=T1LIB TRUETYPE X11	104	php-${PORTVERSION}/ext/gd
105		105
		106	OPTIONS_DEFINE= TRUETYPE JIS X11
		107	OPTIONS_DEFAULT=TRUETYPE X11
		108
106	T1LIB_DESC= Include T1lib support	109	T1LIB_DESC= Include T1lib support
107	TRUETYPE_DESC= Enable TrueType string function	110	TRUETYPE_DESC= Enable TrueType string function
108	JIS_DESC= Enable JIS-mapped Japanese font support	111	JIS_DESC= Enable JIS-mapped Japanese font support
Lines 109-115 Link Here
109	X11_DESC= Enable XPM support	112	X11_DESC= Enable XPM support
110	VPX_DESC= Enable VP8 codec support	113	VPX_DESC= Enable VP8 codec support
111		114
112	PHP_HEADER_DIRS=libgd
113	.endif	115	.endif
114		116
115	.if ${PHP_MODNAME} == "gettext"	117	.if ${PHP_MODNAME} == "gettext"

Line 0 Link Here

(-)graphics/php70-gd/files/patch-inc-dirs (+16 lines)
	1	--- config.m4 2017-03-14 07:26:09.000000000 -0400
	2	+++ config.m4 2017-04-14 12:48:12.529657000 -0400
	3	@@ -360,5 +360,5 @@
	4	PHP_ADD_BUILD_DIR($ext_builddir/libgd)
	5	- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
	6	+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS"
	7	GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
	8
	9	PHP_TEST_BUILD(foobar, [], [
	10	@@ -366,5 +366,5 @@
	11	], [ $GD_SHARED_LIBADD ], [char foobar () {}])
	12	else
	13	GD_HEADER_DIRS="ext/gd/"
	14	- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
	15	+ GDLIB_CFLAGS="-I../.. -I$GD_INCLUDE $GDLIB_CFLAGS"
	16	PHP_ADD_INCLUDE($GD_INCLUDE)