CVS commit: pkgsrc/graphics/php-gd

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec 15 18:13:55 UTC 2019

Modified Files:
        pkgsrc/graphics/php-gd: Makefile

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/php-gd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/php-gd/Makefile
diff -u pkgsrc/graphics/php-gd/Makefile:1.46 pkgsrc/graphics/php-gd/Makefile:1.47
--- pkgsrc/graphics/php-gd/Makefile:1.46        Thu Nov 15 02:32:22 2018
+++ pkgsrc/graphics/php-gd/Makefile     Sun Dec 15 18:13:55 2019
@@ -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 @@ COMMENT=                PHP extension for GD graphics 
 
 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}-nat
 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_PHP_EXT_PATCHES=   yes
 
 .include "options.mk"