diff options
author | dholland <dholland@pkgsrc.org> | 2017-09-05 04:22:09 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2017-09-05 04:22:09 +0000 |
commit | 79d676353ebc5ca76c8938e6e6f185cc70e4cbd7 (patch) | |
tree | 5f19112e1b83ced2a8507dc4f8ae00fcf29cfc12 /x11/ocaml-lablgtk | |
parent | 48924ee3990ef6ef01610194a3d89e313c2ed409 (diff) | |
download | pkgsrc-79d676353ebc5ca76c8938e6e6f185cc70e4cbd7.tar.gz |
Detach the gnomecanvas option from libgnomeui and gnome-panel (which are
both very heavyweight) -- control these with the "gnome" option instead.
Everything's still enabled by default, so no version bump.
Diffstat (limited to 'x11/ocaml-lablgtk')
-rw-r--r-- | x11/ocaml-lablgtk/PLIST.gnomecanvas | 12 | ||||
-rw-r--r-- | x11/ocaml-lablgtk/PLIST.gnomepanel | 11 | ||||
-rw-r--r-- | x11/ocaml-lablgtk/options.mk | 24 |
3 files changed, 27 insertions, 20 deletions
diff --git a/x11/ocaml-lablgtk/PLIST.gnomecanvas b/x11/ocaml-lablgtk/PLIST.gnomecanvas index 74fc6ab6885..862a1c63700 100644 --- a/x11/ocaml-lablgtk/PLIST.gnomecanvas +++ b/x11/ocaml-lablgtk/PLIST.gnomecanvas @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2016/06/25 14:33:11 jaapb Exp $ +@comment $NetBSD: PLIST.gnomecanvas,v 1.3 2017/09/05 04:22:09 dholland Exp $ ${OCAML_SITELIB}/lablgtk2/gnoCanvas.cmi ${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnoCanvas.cmx ${OCAML_SITELIB}/lablgtk2/gnoCanvas.ml @@ -9,15 +9,5 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.a ${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cma ${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cmxs -${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.a -${OCAML_SITELIB}/lablgtk2/lablpanel.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxs ${OCAML_SITELIB}/lablgtk2/liblablgnomecanvas.a -${OCAML_SITELIB}/lablgtk2/liblablpanel.a -${OCAML_SITELIB}/lablgtk2/panel.cmi -${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/panel.cmx -${OCAML_SITELIB}/lablgtk2/panel.ml -${OCAML_SITELIB}/lablgtk2/panel_tags.h ${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgnomecanvas.so -${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablpanel.so diff --git a/x11/ocaml-lablgtk/PLIST.gnomepanel b/x11/ocaml-lablgtk/PLIST.gnomepanel new file mode 100644 index 00000000000..c314e0f31be --- /dev/null +++ b/x11/ocaml-lablgtk/PLIST.gnomepanel @@ -0,0 +1,11 @@ +@comment $NetBSD: PLIST.gnomepanel,v 1.1 2017/09/05 04:22:09 dholland Exp $ +${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.a +${OCAML_SITELIB}/lablgtk2/lablpanel.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxs +${OCAML_SITELIB}/lablgtk2/liblablpanel.a +${OCAML_SITELIB}/lablgtk2/panel.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/panel.cmx +${OCAML_SITELIB}/lablgtk2/panel.ml +${OCAML_SITELIB}/lablgtk2/panel_tags.h +${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablpanel.so diff --git a/x11/ocaml-lablgtk/options.mk b/x11/ocaml-lablgtk/options.mk index 3cb4d3b1c04..1462fae13aa 100644 --- a/x11/ocaml-lablgtk/options.mk +++ b/x11/ocaml-lablgtk/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2014/10/10 08:37:49 jaapb Exp $ +# $NetBSD: options.mk,v 1.2 2017/09/05 04:22:09 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lablgtk -PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg -PKG_SUGGESTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg +PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg gnome +PKG_SUGGESTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg gnome .include "../../mk/bsd.options.mk" @@ -23,15 +23,25 @@ CONFIGURE_ARGS+= --without-gtkspell .endif .if !empty(PKG_OPTIONS:Mgnomecanvas) -.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 +# Note: it looks like it should work to split these, but I don't +# want to build gnome-panel tonight to check. +.if !empty(PKG_OPTIONS:Mgnome) +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../x11/gnome-panel/buildlink3.mk" +CONFIGURE_ARGS+= --with-gnomeui --with-panel +PLIST_SRC+= PLIST.gnome +PLIST_SRC+= PLIST.gnomepanel +.else +CONFIGURE_ARGS+= --without-gnomeui --without-panel +.endif + .if !empty(PKG_OPTIONS:Mgtksourceview) .include "../../x11/gtksourceview/buildlink3.mk" CONFIGURE_ARGS+= --with-gtksourceview @@ -56,8 +66,4 @@ PLIST_SRC+= PLIST.svg CONFIGURE_ARGS+= --without-rsvg .endif -.if !empty(PKG_OPTIONS:Mgnomecanvas) -PLIST_SRC+= PLIST.gnome -.endif - PLIST_SRC+= PLIST |