Sat Sep 29 23:34:11 2012 UTC ()
Revert version 1.15, which was committed presumably by accident during the
cairo revbump earlier this month and was probably meant to be part of a
yet-uncommitted update. It doesn't appear to be correct with the current
version.


(dholland)
diff -r1.15 -r1.16 pkgsrc/graphics/graphviz/options.mk
cvs diff -r1.15 -r1.16 pkgsrc/graphics/graphviz/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/options.mk 2012/09/07 19:16:47 1.15
+++ pkgsrc/graphics/graphviz/options.mk 2012/09/29 23:34:11 1.16
@@ -1,83 +1,116 @@ @@ -1,83 +1,116 @@
1# $NetBSD: options.mk,v 1.15 2012/09/07 19:16:47 adam Exp $ 1# $NetBSD: options.mk,v 1.16 2012/09/29 23:34:11 dholland 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.
15# gd: basic graphic format support, especially gif 15# gd: basic graphic format support, especially gif
16# ghostscript: provides better ps/pdf-support, plus eps 16# ghostscript: provides better ps/pdf-support, plus eps
17 17
18.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
19 19
20PLIST_VARS+= gd ghostscript gtk guile lua ocaml pangocairo perl rsvg tcl x11 20PLIST_VARS+= gd ghostscript gtk guile lua ocaml pangocairo perl rsvg tcl x11
21 21
22.if !empty(PKG_OPTIONS:Mx11) 22.if !empty(PKG_OPTIONS:Mx11)
23.include "../../mk/xaw.buildlink3.mk" 23.include "../../mk/xaw.buildlink3.mk"
24CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} 24CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
25PLIST.x11= yes 25PLIST.x11= yes
26.else 
27CONFIGURE_ARGS+= --without-x 
28.endif 
29 26
30.if !empty(PKG_OPTIONS:Mpangocairo) 27. if !empty(PKG_OPTIONS:Mpangocairo)
31.include "../../devel/pango/buildlink3.mk" 28. include "../../devel/pango/buildlink3.mk"
32.include "../../graphics/cairo/buildlink3.mk" 29. include "../../graphics/cairo/buildlink3.mk"
33PLIST.pangocairo= yes 30PLIST.pangocairo= yes
34.else 
35CONFIGURE_ARGS+= --without-pangocairo 
36.endif 
37 31
38.if !empty(PKG_OPTIONS:Mghostscript) 32. if !empty(PKG_OPTIONS:Mghostscript)
39.include "../../print/ghostscript/buildlink3.mk" 33. include "../../print/ghostscript/buildlink3.mk"
40PLIST.ghostscript= yes 34PLIST.ghostscript= yes
41.else 35. else
42CONFIGURE_ARGS+= --without-ghostscript 36CONFIGURE_ARGS+= --without-ghostscript
43.endif 37. endif
44 38
45.if !empty(PKG_OPTIONS:Mgtk) 39. if !empty(PKG_OPTIONS:Mgtk)
46.include "../../x11/gtk2/buildlink3.mk" 40. include "../../x11/gtk2/buildlink3.mk"
47PLIST.gtk= yes 41PLIST.gtk= yes
48.else 42. else
49CONFIGURE_ARGS+= --without-gdk-pixbuf 43CONFIGURE_ARGS+= --without-gdk-pixbuf
50CONFIGURE_ARGS+= --without-gtk 44CONFIGURE_ARGS+= --without-gtk
51CONFIGURE_ARGS+= --without-gnomeui 45CONFIGURE_ARGS+= --without-gnomeui
52.endif 46. endif
53 47
54.if !empty(PKG_OPTIONS:Mrsvg) 48. if !empty(PKG_OPTIONS:Mrsvg)
55.include "../../graphics/librsvg/buildlink3.mk" 49. include "../../graphics/librsvg/buildlink3.mk"
56PLIST.rsvg= yes 50PLIST.rsvg= yes
 51. else
 52CONFIGURE_ARGS+= --without-rsvg
 53. endif
 54
 55. else
 56# + x11, -pangocairo
 57CONFIGURE_ARGS+= --without-pangocairo
 58
 59. if !empty(PKG_OPTIONS:Mghostscript)
 60PKG_FAIL_REASON+= "option ghostscript needs option pangocairo"
 61. endif
 62CONFIGURE_ARGS+= --without-ghostscript
 63
 64. if !empty(PKG_OPTIONS:Mgtk)
 65PKG_FAIL_REASON+= "option gtk needs option pangocairo"
 66. endif
 67CONFIGURE_ARGS+= --without-gdk-pixbuf
 68CONFIGURE_ARGS+= --without-gtk
 69CONFIGURE_ARGS+= --without-gnomeui
 70
 71. if !empty(PKG_OPTIONS:Mrsvg)
 72PKG_FAIL_REASON+= "option rsvg needs option pangocairo"
 73. endif
 74CONFIGURE_ARGS+= --without-rsvg
 75. endif
 76
57.else 77.else
 78# - x11
 79CONFIGURE_ARGS+= --without-x
 80
 81. if !empty(PKG_OPTIONS:Mpangocairo)
 82PKG_FAIL_REASON+= "option pangocairo needs option x11"
 83. endif
 84CONFIGURE_ARGS+= --without-pangocairo
 85
 86. if !empty(PKG_OPTIONS:Mghostscript)
 87PKG_FAIL_REASON+= "option ghostscript needs option pangocairo and x11"
 88. endif
 89CONFIGURE_ARGS+= --without-ghostscript
 90
 91. if !empty(PKG_OPTIONS:Mgtk)
 92PKG_FAIL_REASON+= "option gtk needs option pangocairo and x11"
 93. endif
 94CONFIGURE_ARGS+= --without-gdk-pixbuf
 95CONFIGURE_ARGS+= --without-gtk
 96CONFIGURE_ARGS+= --without-gnomeui
 97
 98. if !empty(PKG_OPTIONS:Mrsvg)
 99PKG_FAIL_REASON+= "option rsvg needs option pangocairo and x11"
 100. endif
58CONFIGURE_ARGS+= --without-rsvg 101CONFIGURE_ARGS+= --without-rsvg
59.endif 102.endif
60 103
61#. if !empty(PKG_OPTIONS:Mghostscript) 
62#PKG_FAIL_REASON+= "option ghostscript needs option pangocairo and x11" 
63#. endif 
64#. if !empty(PKG_OPTIONS:Mgtk) 
65#PKG_FAIL_REASON+= "option gtk needs option pangocairo and x11" 
66#. endif 
67#. if !empty(PKG_OPTIONS:Mrsvg) 
68#PKG_FAIL_REASON+= "option rsvg needs option pangocairo and x11" 
69#. endif 
70 
71.if !empty(PKG_OPTIONS:Mgd) 104.if !empty(PKG_OPTIONS:Mgd)
72.include "../../graphics/gd/buildlink3.mk" 105.include "../../graphics/gd/buildlink3.mk"
73PLIST.gd= yes 106PLIST.gd= yes
74.else 107.else
75CONFIGURE_ARGS+= --without-libgd 108CONFIGURE_ARGS+= --without-libgd
76CONFIGURE_ARGS+= --without-mylibgd 109CONFIGURE_ARGS+= --without-mylibgd
77.endif 110.endif
78 111
79USING_SWIG= no 112USING_SWIG= no
80 113
81.if !empty(PKG_OPTIONS:Mlua) 114.if !empty(PKG_OPTIONS:Mlua)
82USING_SWIG= yes 115USING_SWIG= yes
83.include "../../lang/lua/buildlink3.mk" 116.include "../../lang/lua/buildlink3.mk"