CVS commit: pkgsrc/graphics/GraphicsMagick

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Apr  1 09:21:23 UTC 2019

Modified Files:
        pkgsrc/graphics/GraphicsMagick: Makefile options.mk

Log Message:
Fix build of GraphicsMagick with ghostscript disabled

(No change to default build)


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/graphics/GraphicsMagick/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/GraphicsMagick/options.mk

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

Modified files:

Index: pkgsrc/graphics/GraphicsMagick/Makefile
diff -u pkgsrc/graphics/GraphicsMagick/Makefile:1.95 pkgsrc/graphics/GraphicsMagick/Makefile:1.96
--- pkgsrc/graphics/GraphicsMagick/Makefile:1.95        Mon Mar 18 16:17:47 2019
+++ pkgsrc/graphics/GraphicsMagick/Makefile     Mon Apr  1 09:21:23 2019
@@ -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 @@ DEPENDS+=     urw-fonts-[0-9]*:../../fonts/u
 
 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

Index: pkgsrc/graphics/GraphicsMagick/options.mk
diff -u pkgsrc/graphics/GraphicsMagick/options.mk:1.7 pkgsrc/graphics/GraphicsMagick/options.mk:1.8
--- pkgsrc/graphics/GraphicsMagick/options.mk:1.7       Tue Nov 20 10:19:29 2018
+++ pkgsrc/graphics/GraphicsMagick/options.mk   Mon Apr  1 09:21:23 2019
@@ -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 @@ CONFIGURE_ARGS+=      --without-jp2
 .endif
 
 .if !empty(PKG_OPTIONS:Mghostscript)
+USE_TOOLS+=            gs:run
 .include "../../print/ghostscript/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-gslib
 .else