graphics/graphviz: Add tcl/tk 8.5 support
The PLIST was hardcoded for tcl8.4. Leverage the tcl Makefile.version to generate PLIST_SUBST variable so it won't break with tcl8.6.
This commit is contained in:
parent
b2fbf638f6
commit
10b4e3cc0f
3 changed files with 7 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.100 2012/06/14 07:44:36 sbd Exp $
|
||||
# $NetBSD: Makefile,v 1.101 2012/08/21 21:44:00 marino Exp $
|
||||
|
||||
DISTNAME= graphviz-2.26.3
|
||||
PKGREVISION= 11
|
||||
PKGREVISION= 12
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.39 2012/03/23 01:12:14 obache Exp $
|
||||
@comment $NetBSD: PLIST,v 1.40 2012/08/21 21:44:00 marino Exp $
|
||||
bin/acyclic
|
||||
bin/bcomps
|
||||
bin/ccomps
|
||||
|
@ -106,7 +106,7 @@ lib/pkgconfig/libgvc.pc
|
|||
lib/pkgconfig/libgvpr.pc
|
||||
lib/pkgconfig/libpathplan.pc
|
||||
lib/pkgconfig/libxdot.pc
|
||||
${PLIST.tcl}lib/tcl8.4/graphviz
|
||||
${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz
|
||||
man/man1/acyclic.1
|
||||
man/man1/bcomps.1
|
||||
man/man1/ccomps.1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.13 2012/03/21 16:25:47 obache Exp $
|
||||
# $NetBSD: options.mk,v 1.14 2012/08/21 21:44:00 marino Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
|
||||
PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl
|
||||
|
@ -129,12 +129,14 @@ CONFIGURE_ARGS+= --disable-ocaml
|
|||
|
||||
.if !empty(PKG_OPTIONS:Mtcl)
|
||||
USING_SWIG= yes
|
||||
.include "../../lang/tcl/Makefile.version"
|
||||
.include "../../x11/tk/buildlink3.mk"
|
||||
CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
|
||||
CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
|
||||
CONFIGURE_ARGS+= --with-wish=${WISH}
|
||||
CONFIGURE_ARGS+= --with-tclsh=${TCLSH}
|
||||
PLIST.tcl= yes
|
||||
PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-tcl
|
||||
.endif
|
||||
|
|
Loading…
Reference in a new issue