[pkgsrc/trunk]: pkgsrc/devel/frama-c Add a gnomecanvas option to fix build wh...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa42df07ab99
branches:  trunk
changeset: 568214:aa42df07ab99
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 07 16:39:12 2009 +0000

description:
Add a gnomecanvas option to fix build when lablgtk was compiled without
gnomecanvas support.

Actually, it depends completely on lablgtk's gnomecanvas option --
but I didn't manage to check for that. The way I know only works
for inclusion in buildlink3.mk files.

diffstat:

 devel/frama-c/Makefile          |   5 +++--
 devel/frama-c/PLIST             |  11 +----------
 devel/frama-c/PLIST.gnomecanvas |  10 ++++++++++
 devel/frama-c/options.mk        |  13 +++++++++++++
 4 files changed, 27 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r 23c25037f631 -r aa42df07ab99 devel/frama-c/Makefile
--- a/devel/frama-c/Makefile    Mon Dec 07 14:30:15 2009 +0000
+++ b/devel/frama-c/Makefile    Mon Dec 07 16:39:12 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/11 15:09:35 tonio Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/07 16:39:12 wiz Exp $
 #
 
 DISTNAME=      frama-c-Beryllium-20090901
@@ -16,8 +16,9 @@
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= yes
 
+.include "options.mk"
+
 .include "../../x11/gtksourceview/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 23c25037f631 -r aa42df07ab99 devel/frama-c/PLIST
--- a/devel/frama-c/PLIST       Mon Dec 07 14:30:15 2009 +0000
+++ b/devel/frama-c/PLIST       Mon Dec 07 16:39:12 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/11 15:09:35 tonio Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/12/07 16:39:12 wiz Exp $
 bin/caduceus
 bin/frama-c
 bin/frama-c-gui
@@ -56,14 +56,10 @@
 lib/frama-c/clist.cmi
 lib/frama-c/cmdline.cmi
 lib/frama-c/computation.cmi
-lib/frama-c/concreteModel.cmi
 lib/frama-c/config.cmi
 lib/frama-c/cparser.cmi
 lib/frama-c/cprint.cmi
 lib/frama-c/cvalue_type.cmi
-lib/frama-c/dGraphModel.cmi
-lib/frama-c/dGraphView.cmi
-lib/frama-c/dGraphViewItem.cmi
 lib/frama-c/dataflow.cmi
 lib/frama-c/datatype.cmi
 lib/frama-c/db.cmi
@@ -185,16 +181,11 @@
 lib/frama-c/unroll_loops.cmi
 lib/frama-c/usedef.cmi
 lib/frama-c/utf8_logic.cmi
-lib/frama-c/viewGraph.cmi
-lib/frama-c/viewGraph_select.cmi
-lib/frama-c/viewGraph_utils.cmi
 lib/frama-c/visitor.cmi
 lib/frama-c/warning_manager.cmi
 lib/frama-c/whitetrack.cmi
 lib/frama-c/widen.cmi
 lib/frama-c/widen_type.cmi
-lib/frama-c/xDot.cmi
-lib/frama-c/xDotDraw.cmi
 lib/frama-c/zrapp.cmi
 man/man1/frama-c-gui.1
 man/man1/frama-c.1
diff -r 23c25037f631 -r aa42df07ab99 devel/frama-c/PLIST.gnomecanvas
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/frama-c/PLIST.gnomecanvas   Mon Dec 07 16:39:12 2009 +0000
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2009/12/07 16:39:12 wiz Exp $
+lib/frama-c/concreteModel.cmi
+lib/frama-c/dGraphModel.cmi
+lib/frama-c/dGraphView.cmi
+lib/frama-c/dGraphViewItem.cmi
+lib/frama-c/viewGraph.cmi
+lib/frama-c/viewGraph_select.cmi
+lib/frama-c/viewGraph_utils.cmi
+lib/frama-c/xDot.cmi
+lib/frama-c/xDotDraw.cmi
diff -r 23c25037f631 -r aa42df07ab99 devel/frama-c/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/frama-c/options.mk  Mon Dec 07 16:39:12 2009 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2009/12/07 16:39:12 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.frama-c
+PKG_SUPPORTED_OPTIONS= gnomecanvas
+# actually, depends completely on lablgtk's gnomecanvas option
+# but I didn't manage to check for that.
+PKG_SUGGESTED_OPTIONS= gnomecanvas
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnomecanvas)
+PLIST_SRC+=    PLIST.gnomecanvas
+.endif