summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2019-12-15 18:13:55 +0000
committertaca <taca@pkgsrc.org>2019-12-15 18:13:55 +0000
commit5567ccbf1b278e2c4cec9413c87ec7dad6003cc2 (patch)
treed1bdd1f944bf87d6678d4b638979755c898dc936 /graphics
parent5358f65dddd5d48b219fb510663699d62a3bd06b (diff)
downloadpkgsrc-5567ccbf1b278e2c4cec9413c87ec7dad6003cc2.tar.gz
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 (limited to 'graphics')
-rw-r--r--graphics/php-gd/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 6ad7a859e25..439a737ff52 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -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 library
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}-native-ttf
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"