Make some dependencies optional. This package now supports the following

options: glade, gnomecanvas, svg.

mldonkey-gui needs svg, so make that option on by default, but disable the
others. Bump PKGREVISION.

7 files changed, 109 insertions, 57 deletions

diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 857549baee2..2f0d3a5e680 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/06/05 05:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/06/09 13:17:18 wiz Exp $
 #
 
 DISTNAME=	lablgtk-2.6.0
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
@@ -21,12 +21,9 @@ BUILDLINK_DEPMETHOD.ocaml=	full
 # previous name of this package; does not conflict with lablgtk-1.*
 CONFLICTS=	lablgtk-2.*
 
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "options.mk"
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lablgtk2/PLIST b/x11/lablgtk2/PLIST
index 8b4a45ba93c..ff21b7836d2 100644
--- a/x11/lablgtk2/PLIST
+++ b/x11/lablgtk2/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2006/02/22 20:58:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/06/09 13:17:18 wiz Exp $
 bin/gdk-pixbuf-mlsource
-bin/lablgladecc2
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
 lib/ocaml/lablgtk2/gAction.cmx
@@ -113,30 +112,14 @@ lib/ocaml/lablgtk2/gdk_tags.h
 lib/ocaml/lablgtk2/gdkpixbuf_tags.h
 lib/ocaml/lablgtk2/gdkprivate-win32.h
 lib/ocaml/lablgtk2/glGtk.mli
-lib/ocaml/lablgtk2/glade.cmi
-lib/ocaml/lablgtk2/glade.cmx
-lib/ocaml/lablgtk2/glade.ml
 lib/ocaml/lablgtk2/glade.mli
 lib/ocaml/lablgtk2/glib.cmi
 lib/ocaml/lablgtk2/glib.cmx
 lib/ocaml/lablgtk2/glib.ml
 lib/ocaml/lablgtk2/glib.mli
 lib/ocaml/lablgtk2/glib_tags.h
-lib/ocaml/lablgtk2/gnoCanvas.cmi
-lib/ocaml/lablgtk2/gnoCanvas.cmx
-lib/ocaml/lablgtk2/gnoCanvas.ml
 lib/ocaml/lablgtk2/gnoCanvas.mli
-lib/ocaml/lablgtk2/gnoDruid.cmi
-lib/ocaml/lablgtk2/gnoDruid.cmx
-lib/ocaml/lablgtk2/gnoDruid.ml
 lib/ocaml/lablgtk2/gnoDruid.mli
-lib/ocaml/lablgtk2/gnomeCanvas.cmi
-lib/ocaml/lablgtk2/gnomeCanvas.cmx
-lib/ocaml/lablgtk2/gnomeCanvas.ml
-lib/ocaml/lablgtk2/gnomeDruid.cmi
-lib/ocaml/lablgtk2/gnomeDruid.cmx
-lib/ocaml/lablgtk2/gnomeDruid.ml
-lib/ocaml/lablgtk2/gnomeui_tags.h
 lib/ocaml/lablgtk2/gobject.cmi
 lib/ocaml/lablgtk2/gobject.cmx
 lib/ocaml/lablgtk2/gobject.ml
@@ -228,15 +211,6 @@ lib/ocaml/lablgtk2/gtkWindow.cmi
 lib/ocaml/lablgtk2/gtkWindow.cmx
 lib/ocaml/lablgtk2/gtkWindow.ml
 lib/ocaml/lablgtk2/gtk_tags.h
-lib/ocaml/lablgtk2/lablglade.a
-lib/ocaml/lablgtk2/lablglade.cma
-lib/ocaml/lablgtk2/lablglade.cmxa
-lib/ocaml/lablgtk2/lablgnomecanvas.a
-lib/ocaml/lablgtk2/lablgnomecanvas.cma
-lib/ocaml/lablgtk2/lablgnomecanvas.cmxa
-lib/ocaml/lablgtk2/lablgnomeui.a
-lib/ocaml/lablgtk2/lablgnomeui.cma
-lib/ocaml/lablgtk2/lablgnomeui.cmxa
 lib/ocaml/lablgtk2/lablgtk.a
 lib/ocaml/lablgtk2/lablgtk.cma
 lib/ocaml/lablgtk2/lablgtk.cmxa
@@ -244,19 +218,8 @@ lib/ocaml/lablgtk2/lablgtkspell.a
 lib/ocaml/lablgtk2/lablgtkspell.cma
 lib/ocaml/lablgtk2/lablgtkspell.cmxa
 lib/ocaml/lablgtk2/lablgtktop
-lib/ocaml/lablgtk2/lablpanel.a
-lib/ocaml/lablgtk2/lablpanel.cma
-lib/ocaml/lablgtk2/lablpanel.cmxa
-lib/ocaml/lablgtk2/lablrsvg.a
-lib/ocaml/lablgtk2/lablrsvg.cma
-lib/ocaml/lablgtk2/lablrsvg.cmxa
-lib/ocaml/lablgtk2/liblablglade2.a
-lib/ocaml/lablgtk2/liblablgnomecanvas.a
-lib/ocaml/lablgtk2/liblablgnomeui.a
 lib/ocaml/lablgtk2/liblablgtk2.a
 lib/ocaml/lablgtk2/liblablgtkspell.a
-lib/ocaml/lablgtk2/liblablpanel.a
-lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/ml_gdk.h
 lib/ocaml/lablgtk2/ml_gdkpixbuf.h
 lib/ocaml/lablgtk2/ml_glib.h
@@ -266,11 +229,7 @@ lib/ocaml/lablgtk2/ml_gtk.h
 lib/ocaml/lablgtk2/ml_gtktree.h
 lib/ocaml/lablgtk2/ml_gvaluecaml.h
 lib/ocaml/lablgtk2/ml_pango.h
-lib/ocaml/lablgtk2/panel.cmi
-lib/ocaml/lablgtk2/panel.cmx
-lib/ocaml/lablgtk2/panel.ml
 lib/ocaml/lablgtk2/panel.mli
-lib/ocaml/lablgtk2/panel_tags.h
 lib/ocaml/lablgtk2/pango.cmi
 lib/ocaml/lablgtk2/pango.cmx
 lib/ocaml/lablgtk2/pango.ml
@@ -279,21 +238,13 @@ lib/ocaml/lablgtk2/pangoEnums.cmx
 lib/ocaml/lablgtk2/pangoEnums.ml
 lib/ocaml/lablgtk2/pango_tags.h
 lib/ocaml/lablgtk2/propcc
-lib/ocaml/lablgtk2/rsvg.cmi
-lib/ocaml/lablgtk2/rsvg.cmx
-lib/ocaml/lablgtk2/rsvg.ml
 lib/ocaml/lablgtk2/rsvg.mli
 lib/ocaml/lablgtk2/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
-lib/ocaml/stublibs/dlllablglade2.so
-lib/ocaml/stublibs/dlllablgnomecanvas.so
-lib/ocaml/stublibs/dlllablgnomeui.so
 lib/ocaml/stublibs/dlllablgtk2.so
 lib/ocaml/stublibs/dlllablgtkspell.so
-lib/ocaml/stublibs/dlllablpanel.so
-lib/ocaml/stublibs/dlllablrsvg.so
 @unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE}
 @dirrm lib/ocaml/lablgtk2
 @unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/x11/lablgtk2/PLIST.glade b/x11/lablgtk2/PLIST.glade
new file mode 100644
index 00000000000..ea82a252a7e
--- /dev/null
+++ b/x11/lablgtk2/PLIST.glade
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.glade,v 1.1 2007/06/09 13:17:18 wiz Exp $
+bin/lablgladecc2
+lib/ocaml/lablgtk2/glade.cmi
+lib/ocaml/lablgtk2/glade.cmx
+lib/ocaml/lablgtk2/glade.ml
+lib/ocaml/lablgtk2/lablglade.a
+lib/ocaml/lablgtk2/lablglade.cma
+lib/ocaml/lablgtk2/lablglade.cmxa
+lib/ocaml/lablgtk2/liblablglade2.a
+lib/ocaml/stublibs/dlllablglade2.so
diff --git a/x11/lablgtk2/PLIST.gnome b/x11/lablgtk2/PLIST.gnome
new file mode 100644
index 00000000000..99c77c4674e
--- /dev/null
+++ b/x11/lablgtk2/PLIST.gnome
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.gnome,v 1.1 2007/06/09 13:17:18 wiz Exp $
+lib/ocaml/lablgtk2/gnoDruid.cmi
+lib/ocaml/lablgtk2/gnoDruid.cmx
+lib/ocaml/lablgtk2/gnoDruid.ml
+lib/ocaml/lablgtk2/gnomeDruid.cmi
+lib/ocaml/lablgtk2/gnomeDruid.cmx
+lib/ocaml/lablgtk2/gnomeDruid.ml
+lib/ocaml/lablgtk2/gnomeui_tags.h
+lib/ocaml/lablgtk2/lablgnomeui.a
+lib/ocaml/lablgtk2/lablgnomeui.cma
+lib/ocaml/lablgtk2/lablgnomeui.cmxa
+lib/ocaml/lablgtk2/liblablgnomeui.a
+lib/ocaml/stublibs/dlllablgnomeui.so
diff --git a/x11/lablgtk2/PLIST.gnomecanvas b/x11/lablgtk2/PLIST.gnomecanvas
new file mode 100644
index 00000000000..26b186ef356
--- /dev/null
+++ b/x11/lablgtk2/PLIST.gnomecanvas
@@ -0,0 +1,21 @@
+@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/06/09 13:17:18 wiz Exp $
+lib/ocaml/lablgtk2/gnoCanvas.cmi
+lib/ocaml/lablgtk2/gnoCanvas.cmx
+lib/ocaml/lablgtk2/gnoCanvas.ml
+lib/ocaml/lablgtk2/gnomeCanvas.cmi
+lib/ocaml/lablgtk2/gnomeCanvas.cmx
+lib/ocaml/lablgtk2/gnomeCanvas.ml
+lib/ocaml/lablgtk2/lablgnomecanvas.a
+lib/ocaml/lablgtk2/lablgnomecanvas.cma
+lib/ocaml/lablgtk2/lablgnomecanvas.cmxa
+lib/ocaml/lablgtk2/lablpanel.a
+lib/ocaml/lablgtk2/lablpanel.cma
+lib/ocaml/lablgtk2/lablpanel.cmxa
+lib/ocaml/lablgtk2/liblablgnomecanvas.a
+lib/ocaml/lablgtk2/liblablpanel.a
+lib/ocaml/lablgtk2/panel.cmi
+lib/ocaml/lablgtk2/panel.cmx
+lib/ocaml/lablgtk2/panel.ml
+lib/ocaml/lablgtk2/panel_tags.h
+lib/ocaml/stublibs/dlllablgnomecanvas.so
+lib/ocaml/stublibs/dlllablpanel.so
diff --git a/x11/lablgtk2/PLIST.svg b/x11/lablgtk2/PLIST.svg
new file mode 100644
index 00000000000..325b27157ce
--- /dev/null
+++ b/x11/lablgtk2/PLIST.svg
@@ -0,0 +1,21 @@
+@comment $NetBSD: PLIST.svg,v 1.1 2007/06/09 13:17:18 wiz Exp $
+lib/ocaml/lablgtk2/gnoDruid.cmi
+lib/ocaml/lablgtk2/gnoDruid.cmx
+lib/ocaml/lablgtk2/gnoDruid.ml
+lib/ocaml/lablgtk2/gnomeDruid.cmi
+lib/ocaml/lablgtk2/gnomeDruid.cmx
+lib/ocaml/lablgtk2/gnomeDruid.ml
+lib/ocaml/lablgtk2/gnomeui_tags.h
+lib/ocaml/lablgtk2/lablgnomeui.a
+lib/ocaml/lablgtk2/lablgnomeui.cma
+lib/ocaml/lablgtk2/lablgnomeui.cmxa
+lib/ocaml/lablgtk2/lablrsvg.a
+lib/ocaml/lablgtk2/lablrsvg.cma
+lib/ocaml/lablgtk2/lablrsvg.cmxa
+lib/ocaml/lablgtk2/liblablgnomeui.a
+lib/ocaml/lablgtk2/liblablrsvg.a
+lib/ocaml/lablgtk2/rsvg.cmi
+lib/ocaml/lablgtk2/rsvg.cmx
+lib/ocaml/lablgtk2/rsvg.ml
+lib/ocaml/stublibs/dlllablgnomeui.so
+lib/ocaml/stublibs/dlllablrsvg.so
diff --git a/x11/lablgtk2/options.mk b/x11/lablgtk2/options.mk
new file mode 100644
index 00000000000..5a4ae029c5d
--- /dev/null
+++ b/x11/lablgtk2/options.mk
@@ -0,0 +1,39 @@
+# $NetBSD: options.mk,v 1.1 2007/06/09 13:17:19 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lablgtk2
+PKG_SUPPORTED_OPTIONS=	glade gnomecanvas svg
+PKG_SUGGESTED_OPTIONS=	svg
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mglade)
+.include "../../devel/libglade2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-glade
+PLIST_SRC+=		PLIST.glade
+.else
+CONFIGURE_ARGS+=	--without-glade
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../x11/gnome-panel/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gnomecanvas
+PLIST_SRC+=		PLIST.gnomecanvas
+.else
+CONFIGURE_ARGS+=	--without-gnomecanvas
+.endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-rsvg
+PLIST_SRC+=		PLIST.svg
+.else
+CONFIGURE_ARGS+=	--without-rsvg
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome) || !empty(PKG_OPTIONS:Msvg)
+PLIST_SRC+=		PLIST.gnome
+.endif
+
+PLIST_SRC+=	PLIST