[pkgsrc/trunk]: pkgsrc/graphics/GraphicsMagick Fix build of GraphicsMagick wi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8340f96d81dd
branches:  trunk
changeset: 393999:8340f96d81dd
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Apr 01 09:21:23 2019 +0000

description:
Fix build of GraphicsMagick with ghostscript disabled

(No change to default build)

diffstat:

 graphics/GraphicsMagick/Makefile   |  4 ++--
 graphics/GraphicsMagick/options.mk |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r e39a637ad95a -r 8340f96d81dd graphics/GraphicsMagick/Makefile
--- a/graphics/GraphicsMagick/Makefile  Mon Apr 01 09:14:51 2019 +0000
+++ b/graphics/GraphicsMagick/Makefile  Mon Apr 01 09:21:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2019/03/18 16:17:47 gdt Exp $
+# $NetBSD: Makefile,v 1.96 2019/04/01 09:21:23 abs Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -12,7 +12,7 @@
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config:run gs:run
+USE_TOOLS+=            gmake pkg-config:run
 USE_FEATURES=          vsnprintf       # optional but recommended for security
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
diff -r e39a637ad95a -r 8340f96d81dd graphics/GraphicsMagick/options.mk
--- a/graphics/GraphicsMagick/options.mk        Mon Apr 01 09:14:51 2019 +0000
+++ b/graphics/GraphicsMagick/options.mk        Mon Apr 01 09:21:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2018/11/20 10:19:29 adam Exp $
+# $NetBSD: options.mk,v 1.8 2019/04/01 09:21:23 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.GraphicsMagick
 PKG_SUPPORTED_OPTIONS= x11 jasper ghostscript wmf
@@ -27,6 +27,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mghostscript)
+USE_TOOLS+=            gs:run
 .include "../../print/ghostscript/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-gslib
 .else