Attachment 181795 Details for Bug 217222 – 180132: Patch php70-gd to build against graphics/gd

[patch] 180132: Patch php70-gd to build against graphics/gd

php-gd.patch (text/plain), 3.41 KB, created by Mikhail Teterin on 2017-04-14 17:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2017-04-14 17:27:44 UTC

Size: 3.41 KB

patch

obsolete

>Index: lang/php70/Makefile
>===================================================================
>--- lang/php70/Makefile	(revision 438528)
>+++ lang/php70/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	php70
>-PORTVERSION=	7.0.17
>+PORTVERSION=	7.0.18
> PORTREVISION?=	0
> CATEGORIES?=	lang devel www
> MASTER_SITES=	PHP/distributions
>Index: lang/php70/Makefile.ext
>===================================================================
>--- lang/php70/Makefile.ext	(revision 438528)
>+++ lang/php70/Makefile.ext	(working copy)
>@@ -94,15 +94,18 @@
> 		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
> 
>-OPTIONS_DEFINE=	T1LIB TRUETYPE JIS X11 VPX
>-OPTIONS_DEFAULT=T1LIB TRUETYPE X11
>+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
>@@ -109,7 +112,6 @@
> X11_DESC=	Enable XPM support
> VPX_DESC=	Enable VP8 codec support
> 
>-PHP_HEADER_DIRS=libgd
> .endif
> 
> .if ${PHP_MODNAME} == "gettext"
>Index: lang/php70/distinfo
>===================================================================
>--- lang/php70/distinfo	(revision 438528)
>+++ lang/php70/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489565928
>-SHA256 (php-7.0.17.tar.xz) = 471c16fcdd6a5e1a37199e97bcaeea6117626229785185be7532aaa7c6ee04be
>-SIZE (php-7.0.17.tar.xz) = 12588452
>+TIMESTAMP = 1492189495
>+SHA256 (php-7.0.18.tar.xz) = 679cffcdf2495dee5ab89bda595e678a1096136678b3a1d08f1f57ba347c234d
>+SIZE (php-7.0.18.tar.xz) = 12593408
>Index: graphics/php70-gd/Makefile
>===================================================================
>--- graphics/php70-gd/Makefile	(revision 438522)
>+++ 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"
>Index: graphics/php70-gd/files/patch-inc-dirs
>===================================================================
>--- graphics/php70-gd/files/patch-inc-dirs	(nonexistent)
>+++ graphics/php70-gd/files/patch-inc-dirs	(working copy)
>@@ -0,0 +1,16 @@
>+--- 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)
>
>Property changes on: graphics/php70-gd/files/patch-inc-dirs
>___________________________________________________________________
>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

Actions: View | Diff

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