Mon Dec 21 12:45:39 2009 UTC ()
gnomecanvas option needs gnomecanvas. Make sure PLIST_SRC is built
correctly.

XXX This should be a build option of lablgtk or so


(joerg)
diff -r1.2 -r1.3 pkgsrc/devel/frama-c/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/frama-c/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/devel/frama-c/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/frama-c/Makefile 2009/12/07 16:39:12 1.2
+++ pkgsrc/devel/frama-c/Makefile 2009/12/21 12:45:38 1.3
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.2 2009/12/07 16:39:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2009/12/21 12:45:38 joerg Exp $
2# 2#
3 3
4DISTNAME= frama-c-Beryllium-20090901 4DISTNAME= frama-c-Beryllium-20090901
5PKGNAME= ${DISTNAME:S/-Beryllium//} 5PKGNAME= ${DISTNAME:S/-Beryllium//}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://frama-c.cea.fr/download/ 7MASTER_SITES= http://frama-c.cea.fr/download/
8 8
9MAINTAINER= tonio@NetBSD.org 9MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://frama-c.cea.fr/ 10HOMEPAGE= http://frama-c.cea.fr/
11COMMENT= Extensible platform dedicated to source-code analysis of C software 11COMMENT= Extensible platform dedicated to source-code analysis of C software
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
 19PLIST_SRC= ${PLIST_SRC_DFLT}
 20
19.include "options.mk" 21.include "options.mk"
20 22
21.include "../../x11/gtksourceview/buildlink3.mk" 23.include "../../x11/gtksourceview/buildlink3.mk"
22.include "../../x11/lablgtk/buildlink3.mk" 24.include "../../x11/lablgtk/buildlink3.mk"
23.include "../../lang/ocaml/buildlink3.mk" 25.include "../../lang/ocaml/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/frama-c/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/frama-c/options.mk 2009/12/07 16:39:12 1.1
+++ pkgsrc/devel/frama-c/options.mk 2009/12/21 12:45:38 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: options.mk,v 1.1 2009/12/07 16:39:12 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2009/12/21 12:45:38 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.frama-c 3PKG_OPTIONS_VAR= PKG_OPTIONS.frama-c
4PKG_SUPPORTED_OPTIONS= gnomecanvas 4PKG_SUPPORTED_OPTIONS= gnomecanvas
5# actually, depends completely on lablgtk's gnomecanvas option 5# actually, depends completely on lablgtk's gnomecanvas option
6# but I didn't manage to check for that. 6# but I didn't manage to check for that.
7PKG_SUGGESTED_OPTIONS= gnomecanvas 7PKG_SUGGESTED_OPTIONS= gnomecanvas
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mgnomecanvas) 11.if !empty(PKG_OPTIONS:Mgnomecanvas)
12PLIST_SRC+= PLIST.gnomecanvas 12PLIST_SRC+= PLIST.gnomecanvas
 13
 14.include "../../graphics/libgnomecanvas/buildlink3.mk"
13.endif 15.endif