graphviz: Options fixed

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jul 15 16:42:38 2022 +0200
Changeset:	49082f6ac37947e62e64c5a902d4871261d34880

Modified Files:
	graphviz/COMMIT_MSG
	graphviz/DESCR
	graphviz/PLIST
	graphviz/options.mk

Log Message:
graphviz: Options fixed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49082f6ac37947e62e64c5a902d4871261d34880

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

diffstat:
 graphviz/COMMIT_MSG | 3 ++-
 graphviz/DESCR      | 5 ++---
 graphviz/PLIST      | 4 ++--
 graphviz/options.mk | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diffs:
diff --git a/graphviz/COMMIT_MSG b/graphviz/COMMIT_MSG
index 2c804bf686..3eaf6c84a3 100644
--- a/graphviz/COMMIT_MSG
+++ b/graphviz/COMMIT_MSG
@@ -9,7 +9,8 @@ graphics/graphviz: Update to 5.0.0
 - swig is now a tool dependency (as documented by upstream).
 - Guile option removed (already broken with older package versions).
 - OCaml option removed (already broken with older package versions).
-- Lua, Perl and Tcl language extension options are now disabled by default.
+- Lua, Perl and Tcl language extension options are now disabled by default
+  (to reduce expensive dependencies).
 
 
 5.0.0 - 2022-07-07
diff --git a/graphviz/DESCR b/graphviz/DESCR
index 2338de39f8..0f0918af1c 100644
--- a/graphviz/DESCR
+++ b/graphviz/DESCR
@@ -4,8 +4,7 @@ Laboratories.
 It includes:
 - dot: makes hierarchical layouts of directed graphs
 - neato: makes "spring" model layouts of undirected graphs
-- lefty: a programmable graphics editor
-- dotty: a customizable interface written in LEFTY
 - tcldot: a customizable graphical interface written in TCL
-- libgraph: the base library for graph tools
+  (part of "tcl" option)
+- libcgraph: the base library for graph tools
 - various associated utilities
diff --git a/graphviz/PLIST b/graphviz/PLIST
index 60895a4400..90eaca8477 100644
--- a/graphviz/PLIST
+++ b/graphviz/PLIST
@@ -81,7 +81,7 @@ ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
 ${PLIST.perl}lib/graphviz/perl/gv.pm
 ${PLIST.perl}lib/graphviz/perl/gv.so
 ${PLIST.perl}lib/graphviz/perl/libgv_perl.la
-${PLIST.tcl}${PLIST.gd}lib/graphviz/tcl/libgdtclft.la
+${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la
 ${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
@@ -104,7 +104,7 @@ lib/pkgconfig/libgvpr.pc
 lib/pkgconfig/liblab_gamut.pc
 lib/pkgconfig/libpathplan.pc
 lib/pkgconfig/libxdot.pc
-${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
+${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
diff --git a/graphviz/options.mk b/graphviz/options.mk
index f9511c5be4..89901a453b 100644
--- a/graphviz/options.mk
+++ b/graphviz/options.mk
@@ -100,6 +100,9 @@ CONFIGURE_ARGS+=	--disable-lua
 .endif
 
 .if !empty(PKG_OPTIONS:Mtcl)
+.  if empty(PKG_OPTIONS:Mx11)
+PKG_FAIL_REASON=	"tcl option requires x11 option"
+.  endif
 USING_SWIG=	yes
 .  include "../../lang/tcl/Makefile.version"
 .  include "../../x11/tk/buildlink3.mk"