Tue Aug 21 21:44:00 2012 UTC ()
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.
(marino)
diff -r1.100 -r1.101 pkgsrc/graphics/graphviz/Makefile
diff -r1.39 -r1.40 pkgsrc/graphics/graphviz/PLIST
diff -r1.13 -r1.14 pkgsrc/graphics/graphviz/options.mk
--- pkgsrc/graphics/graphviz/Makefile 2012/06/14 07:44:36 1.100
+++ pkgsrc/graphics/graphviz/Makefile 2012/08/21 21:44:00 1.101
@@ -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/
--- pkgsrc/graphics/graphviz/PLIST 2012/03/23 01:12:14 1.39
+++ pkgsrc/graphics/graphviz/PLIST 2012/08/21 21:44:00 1.40
@@ -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/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
--- pkgsrc/graphics/graphviz/options.mk 2012/03/21 16:25:47 1.13
+++ pkgsrc/graphics/graphviz/options.mk 2012/08/21 21:44:00 1.14
@@ -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 @@
.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