Attachment 195051 Details for Bug 217222 – Rebased patch

[patch] Rebased patch

php70-gd.diff (text/plain), 4.02 KB, created by Torsten Zuehlsdorff on 2018-07-11 13:43:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torsten Zuehlsdorff

Created: 2018-07-11 13:43:28 UTC

Size: 4.02 KB

patch

obsolete

>Index: graphics/php70-gd/Makefile
>===================================================================
>--- graphics/php70-gd/Makefile	(revision 474248)
>+++ graphics/php70-gd/Makefile	(working copy)
>@@ -2,9 +2,14 @@
> # $FreeBSD$
> 
> CATEGORIES=	graphics
>+PORTREVISION=	1
> 
> MASTERDIR=	${.CURDIR}/../../lang/php70
> 
> PKGNAMESUFFIX=	-gd
> 
>+TEST_TARGET=	test
>+
> .include "${MASTERDIR}/Makefile"
>+
>+LIB_DEPENDS+=	libgd.so:graphics/gd
>Index: graphics/php70-gd/files/patch-config.m4
>===================================================================
>--- graphics/php70-gd/files/patch-config.m4	(nonexistent)
>+++ graphics/php70-gd/files/patch-config.m4	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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.])
>
>Property changes on: graphics/php70-gd/files/patch-config.m4
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/php70-gd/files/patch-config.m4
>===================================================================
>--- graphics/php70-gd/files/patch-config.m4	(nonexistent)
>+++ graphics/php70-gd/files/patch-config.m4	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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.])
>
>Property changes on: graphics/php70-gd/files/patch-config.m4
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/php70/Makefile.ext
>===================================================================
>--- lang/php70/Makefile.ext	(revision 474248)
>+++ lang/php70/Makefile.ext	(working copy)
>@@ -96,12 +96,15 @@
> 		libpng.so:graphics/png
> USES+=		jpeg
> 
>-CONFIGURE_ARGS+=--with-gd \
>+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
> 
>@@ -110,7 +113,6 @@
> WEBP_DESC=  Enable WebP image format support
> X11_DESC=	Enable XPM support
> 
>-PHP_HEADER_DIRS=libgd
> .endif
> 
> .if ${PHP_MODNAME} == "gettext"

Actions: View | Diff

Attachments on bug 217222: 180132 | 181795 | 195051 | 195058