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
cvs diff -r1.100 -r1.101 pkgsrc/graphics/graphviz/Makefile (expand / switch to unified diff)

--- 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,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.100 2012/06/14 07:44:36 sbd Exp $ 1# $NetBSD: Makefile,v 1.101 2012/08/21 21:44:00 marino Exp $
2 2
3DISTNAME= graphviz-2.26.3 3DISTNAME= graphviz-2.26.3
4PKGREVISION= 11 4PKGREVISION= 12
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ 6MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
7 7
8MAINTAINER= sno@NetBSD.org 8MAINTAINER= sno@NetBSD.org
9HOMEPAGE= http://www.graphviz.org/ 9HOMEPAGE= http://www.graphviz.org/
10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
11LICENSE= cpl-1.0 11LICENSE= cpl-1.0
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 16CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
17 17
cvs diff -r1.39 -r1.40 pkgsrc/graphics/graphviz/PLIST (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.39 2012/03/23 01:12:14 obache Exp $ 1@comment $NetBSD: PLIST,v 1.40 2012/08/21 21:44:00 marino Exp $
2bin/acyclic 2bin/acyclic
3bin/bcomps 3bin/bcomps
4bin/ccomps 4bin/ccomps
5bin/circo 5bin/circo
6${PLIST.gd}bin/diffimg 6${PLIST.gd}bin/diffimg
7bin/dijkstra 7bin/dijkstra
8bin/dot 8bin/dot
9bin/dot2gxl 9bin/dot2gxl
10bin/dotty 10bin/dotty
11bin/fdp 11bin/fdp
12bin/gc 12bin/gc
13bin/gml2gv 13bin/gml2gv
14bin/gv2gxl 14bin/gv2gxl
@@ -96,27 +96,27 @@ lib/libgraph.la @@ -96,27 +96,27 @@ lib/libgraph.la
96lib/libgvc.la 96lib/libgvc.la
97lib/libgvpr.la 97lib/libgvpr.la
98lib/libpathplan.la 98lib/libpathplan.la
99lib/libxdot.la 99lib/libxdot.la
100${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm 100${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
101${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so 101${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
102lib/pkgconfig/libcdt.pc 102lib/pkgconfig/libcdt.pc
103lib/pkgconfig/libcgraph.pc 103lib/pkgconfig/libcgraph.pc
104lib/pkgconfig/libgraph.pc 104lib/pkgconfig/libgraph.pc
105lib/pkgconfig/libgvc.pc 105lib/pkgconfig/libgvc.pc
106lib/pkgconfig/libgvpr.pc 106lib/pkgconfig/libgvpr.pc
107lib/pkgconfig/libpathplan.pc 107lib/pkgconfig/libpathplan.pc
108lib/pkgconfig/libxdot.pc 108lib/pkgconfig/libxdot.pc
109${PLIST.tcl}lib/tcl8.4/graphviz 109${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz
110man/man1/acyclic.1 110man/man1/acyclic.1
111man/man1/bcomps.1 111man/man1/bcomps.1
112man/man1/ccomps.1 112man/man1/ccomps.1
113man/man1/circo.1 113man/man1/circo.1
114man/man1/dijkstra.1 114man/man1/dijkstra.1
115man/man1/dot.1 115man/man1/dot.1
116man/man1/dotty.1 116man/man1/dotty.1
117man/man1/fdp.1 117man/man1/fdp.1
118man/man1/gc.1 118man/man1/gc.1
119man/man1/gml2gv.1 119man/man1/gml2gv.1
120man/man1/gv2gxl.1 120man/man1/gv2gxl.1
121man/man1/gvcolor.1 121man/man1/gvcolor.1
122man/man1/gvgen.1 122man/man1/gvgen.1
cvs diff -r1.13 -r1.14 pkgsrc/graphics/graphviz/options.mk (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.13 2012/03/21 16:25:47 obache Exp $ 1# $NetBSD: options.mk,v 1.14 2012/08/21 21:44:00 marino Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz 3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
4PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl 4PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl
5PKG_SUGGESTED_OPTIONS= gd gtk lua pangocairo perl tcl x11 5PKG_SUGGESTED_OPTIONS= gd gtk lua pangocairo perl tcl x11
6# Explanation of consequence of options, to help those trying to slim down: 6# Explanation of consequence of options, to help those trying to slim down:
7# guile ocaml lua tcl perl: extension language support 7# guile ocaml lua tcl perl: extension language support
8# x11: Omits all linking with x11, which means x11 graphics supports as 8# x11: Omits all linking with x11, which means x11 graphics supports as
9# well as x11 frontend support. 9# well as x11 frontend support.
10# pangocairo: basic ps/pdf support. 10# pangocairo: basic ps/pdf support.
11# gtk: basic graphic format support (in addition to gd, which isn't 11# gtk: basic graphic format support (in addition to gd, which isn't
12# maintained anymore) 12# maintained anymore)
13# rsvg: Omitting loses svg support. librsvg has large dependencies 13# rsvg: Omitting loses svg support. librsvg has large dependencies
14# including some GNOME libs. 14# including some GNOME libs.
@@ -119,32 +119,34 @@ PLIST.lua= yes @@ -119,32 +119,34 @@ PLIST.lua= yes
119CONFIGURE_ARGS+= --disable-lua 119CONFIGURE_ARGS+= --disable-lua
120.endif 120.endif
121 121
122.if !empty(PKG_OPTIONS:Mocaml) 122.if !empty(PKG_OPTIONS:Mocaml)
123USING_SWIG= yes 123USING_SWIG= yes
124.include "../../lang/ocaml/buildlink3.mk" 124.include "../../lang/ocaml/buildlink3.mk"
125PLIST.ocaml= yes 125PLIST.ocaml= yes
126.else 126.else
127CONFIGURE_ARGS+= --disable-ocaml 127CONFIGURE_ARGS+= --disable-ocaml
128.endif 128.endif
129 129
130.if !empty(PKG_OPTIONS:Mtcl) 130.if !empty(PKG_OPTIONS:Mtcl)
131USING_SWIG= yes 131USING_SWIG= yes
 132.include "../../lang/tcl/Makefile.version"
132.include "../../x11/tk/buildlink3.mk" 133.include "../../x11/tk/buildlink3.mk"
133CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} 134CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
134CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} 135CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
135CONFIGURE_ARGS+= --with-wish=${WISH} 136CONFIGURE_ARGS+= --with-wish=${WISH}
136CONFIGURE_ARGS+= --with-tclsh=${TCLSH} 137CONFIGURE_ARGS+= --with-tclsh=${TCLSH}
137PLIST.tcl= yes 138PLIST.tcl= yes
 139PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER}
138.else 140.else
139CONFIGURE_ARGS+= --disable-tcl 141CONFIGURE_ARGS+= --disable-tcl
140.endif 142.endif
141 143
142.if !empty(PKG_OPTIONS:Mguile) 144.if !empty(PKG_OPTIONS:Mguile)
143USING_SWIG= yes 145USING_SWIG= yes
144.include "../../lang/guile/buildlink3.mk" 146.include "../../lang/guile/buildlink3.mk"
145CONFIGURE_ARGS+= --enable-guile 147CONFIGURE_ARGS+= --enable-guile
146PLIST.guile= yes 148PLIST.guile= yes
147.else 149.else
148CONFIGURE_ARGS+= --disable-guile 150CONFIGURE_ARGS+= --disable-guile
149.endif 151.endif
150 152