From owner-svn-ports-head@freebsd.org Tue Jul 31 08:42:20 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7122C10527EB; Tue, 31 Jul 2018 08:42:20 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1981480158; Tue, 31 Jul 2018 08:42:20 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EECC91150A; Tue, 31 Jul 2018 08:42:19 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6V8gJCk051319; Tue, 31 Jul 2018 08:42:19 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6V8gJ4X050774; Tue, 31 Jul 2018 08:42:19 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201807310842.w6V8gJ4X050774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 31 Jul 2018 08:42:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475982 - in head: graphics/php70-gd graphics/php70-gd/files lang/php70 X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head: graphics/php70-gd graphics/php70-gd/files lang/php70 X-SVN-Commit-Revision: 475982 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 08:42:20 -0000 Author: tz Date: Tue Jul 31 08:42:19 2018 New Revision: 475982 URL: https://svnweb.freebsd.org/changeset/ports/475982 Log: graphics/php70-gd: Switch from bundled libgd to graphics/gd Currently the gd-module uses a bundled libgd, while most systems already provide the same library via graphics/gd. Therefore instead of adding the bundled library we use the port instead. PR: 217222 Submitted by: Mikhail Teterin Added: head/graphics/php70-gd/files/ head/graphics/php70-gd/files/patch-config.m4 (contents, props changed) Modified: head/graphics/php70-gd/Makefile head/lang/php70/Makefile.ext Modified: head/graphics/php70-gd/Makefile ============================================================================== --- head/graphics/php70-gd/Makefile Tue Jul 31 08:41:22 2018 (r475981) +++ head/graphics/php70-gd/Makefile Tue Jul 31 08:42:19 2018 (r475982) @@ -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 Added: head/graphics/php70-gd/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php70-gd/files/patch-config.m4 Tue Jul 31 08:42:19 2018 (r475982) @@ -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.]) Modified: head/lang/php70/Makefile.ext ============================================================================== --- head/lang/php70/Makefile.ext Tue Jul 31 08:41:22 2018 (r475981) +++ head/lang/php70/Makefile.ext Tue Jul 31 08:42:19 2018 (r475982) @@ -96,12 +96,15 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ 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 @@ JIS_DESC= Enable JIS-mapped Japanese font support WEBP_DESC= Enable WebP image format support X11_DESC= Enable XPM support -PHP_HEADER_DIRS=libgd .endif .if ${PHP_MODNAME} == "gettext"