[pkgsrc/trunk]: pkgsrc/graphics/php-gd graphics/php-gd: fix for php74

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a71afa5121b
branches:  trunk
changeset: 419277:4a71afa5121b
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Dec 15 18:13:55 2019 +0000

description:
graphics/php-gd: fix for php74

php-gd on php74, try to use external gd (graphics/gd) since most of
configure arguments are changed (no effect).

diffstat:

 graphics/php-gd/Makefile |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r d78c6960b977 -r 4a71afa5121b graphics/php-gd/Makefile
--- a/graphics/php-gd/Makefile  Sun Dec 15 18:07:16 2019 +0000
+++ b/graphics/php-gd/Makefile  Sun Dec 15 18:13:55 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/11/15 02:32:22 taca Exp $
+# $NetBSD: Makefile,v 1.47 2019/12/15 18:13:55 taca Exp $
 
 MODNAME=               gd
 CATEGORIES+=           graphics
@@ -6,9 +6,9 @@
 
 CONFLICTS=     php-gd-[0-9]*
 
-# XXX we use bundled GD so that extension is usable also by non-threaded
-# PHP, such as CLI/CGI version or ap-php on Apache 1.x.
+.include "../../lang/php/phpversion.mk"
 
+.if ${PKG_PHP_VERSION} < 74
 CONFIGURE_ARGS+=       --with-${MODNAME}=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=       --with-jpeg-dir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=       --with-png-dir=${BUILDLINK_DIR}
@@ -18,9 +18,12 @@
 CONFIGURE_ARGS+=       --enable-${MODNAME}-jis-conv
 CONFIGURE_ARGS+=       --without-t1lib
 
-USE_PHP_EXT_PATCHES=   yes
+USE_TOOLS+=            pkg-config
+.else
+CONFIGURE_ARGS+=       --with-external-gd
+.endif
 
-USE_TOOLS+=            pkg-config
+USE_PHP_EXT_PATCHES=   yes
 
 .include "options.mk"