CVS commit: pkgsrc/graphics/graphviz

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Mar 24 17:15:39 UTC 2018

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

Log Message:
Make "quartz" an option on Darwin. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/graphviz/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/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.178 pkgsrc/graphics/graphviz/Makefile:1.179
--- pkgsrc/graphics/graphviz/Makefile:1.178     Mon Mar 12 11:15:35 2018
+++ pkgsrc/graphics/graphviz/Makefile   Sat Mar 24 17:15:39 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.178 2018/03/12 11:15:35 wiz Exp $
+# $NetBSD: Makefile,v 1.179 2018/03/24 17:15:39 schmonz Exp $
 
 DISTNAME=      graphviz-2.40.1
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
@@ -54,15 +54,6 @@ REPLACE_PERL+=               config/config_perl.pl \
                        tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
                        contrib/dirgraph/dirgraph.pl
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=           quartz
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=       --with-quartz
-PLIST.quartz=          yes
-.endif
-
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-2*)
 BUILDLINK_TRANSFORM+=  rm:-Wno-unused-parameter

Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.24 pkgsrc/graphics/graphviz/options.mk:1.25
--- pkgsrc/graphics/graphviz/options.mk:1.24    Mon May 22 11:19:20 2017
+++ pkgsrc/graphics/graphviz/options.mk Sat Mar 24 17:15:39 2018
@@ -1,7 +1,10 @@
-# $NetBSD: options.mk,v 1.24 2017/05/22 11:19:20 adam Exp $
+# $NetBSD: options.mk,v 1.25 2018/03/24 17:15:39 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.graphviz
 PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml poppler qt svg tcl x11 perl # guile does not build with guile20
+.if exists(/System/Library/Frameworks/Quartz.framework)
+PKG_SUPPORTED_OPTIONS+=        quartz
+.endif
 PKG_SUGGESTED_OPTIONS= gd gtk lua perl tcl x11
 # Explanation of consequence of options, to help those trying to slim down:
 #   guile ocaml lua tcl perl: extension language support
@@ -16,7 +19,7 @@ PKG_SUGGESTED_OPTIONS=        gd gtk lua perl t
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           gd ghostscript gtk guile lua ocaml perl poppler qt svg tcl x11
+PLIST_VARS+=           gd ghostscript gtk guile lua ocaml perl poppler qt quartz svg tcl x11
 
 .if !empty(PKG_OPTIONS:Mgd)
 .  include "../../graphics/gd/buildlink3.mk"
@@ -57,6 +60,13 @@ PLIST.qt=            yes
 CONFIGURE_ARGS+=       --without-qt
 .endif
 
+.if !empty(PKG_OPTIONS:Mquartz)
+PLIST.quartz=          yes
+CONFIGURE_ARGS+=       --with-quartz
+.else
+CONFIGURE_ARGS+=       --without-quartz
+.endif
+
 .if !empty(PKG_OPTIONS:Msvg)
 .  include "../../graphics/librsvg/buildlink3.mk"
 PLIST.svg=             yes