Index: lang/php70/Makefile.ext
===================================================================
--- lang/php70/Makefile.ext	(revision 434378)
+++ lang/php70/Makefile.ext	(working copy)
@@ -94,12 +94,16 @@
 		libpng.so:graphics/png
 USES+=		jpeg
 
-CONFIGURE_ARGS+=--with-gd \
+CPPFLAGS+=	-UHAVE_GD_BUNDLED
+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=	T1LIB TRUETYPE JIS X11 VPX
 OPTIONS_DEFAULT=T1LIB TRUETYPE X11
 
@@ -109,7 +113,6 @@
 X11_DESC=	Enable XPM support
 VPX_DESC=	Enable VP8 codec support
 
-PHP_HEADER_DIRS=libgd
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
Index: graphics/php70-gd/Makefile
===================================================================
--- graphics/php70-gd/Makefile	(revision 434378)
+++ graphics/php70-gd/Makefile	(working copy)
@@ -2,9 +2,14 @@
 # $FreeBSD$
 
 CATEGORIES=	graphics
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
 
+LIB_DEPENDS+=	gd:graphics/gd
+
 PKGNAMESUFFIX=	-gd
 
+TEST_TARGET=	test
+
 .include "${MASTERDIR}/Makefile"