Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_150458532943310"
MIME-Version: 1.0
Date: Tue, 5 Sep 2017 04:22:09 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/x11/ocaml-lablgtk
To: pkgsrc-changes@NetBSD.org
Reply-To: dholland@netbsd.org
Message-Id: <20170905042209.C0FF2FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_150458532943310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dholland
Date:		Tue Sep  5 04:22:09 UTC 2017

Modified Files:
	pkgsrc/x11/ocaml-lablgtk: PLIST.gnomecanvas options.mk
Added Files:
	pkgsrc/x11/ocaml-lablgtk: PLIST.gnomepanel

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/ocaml-lablgtk/PLIST.gnomepanel
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/ocaml-lablgtk/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_150458532943310
Content-Disposition: inline
Content-Length: 4215
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas
diff -u pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas:1.2 pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas:1.3
--- pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas:1.2	Sat Jun 25 14:33:11 2016
+++ pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas	Tue Sep  5 04:22:09 2017
@@ -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}/lablg
 ${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

Index: pkgsrc/x11/ocaml-lablgtk/options.mk
diff -u pkgsrc/x11/ocaml-lablgtk/options.mk:1.1 pkgsrc/x11/ocaml-lablgtk/options.mk:1.2
--- pkgsrc/x11/ocaml-lablgtk/options.mk:1.1	Fri Oct 10 08:37:49 2014
+++ pkgsrc/x11/ocaml-lablgtk/options.mk	Tue Sep  5 04:22:09 2017
@@ -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

Added files:

Index: pkgsrc/x11/ocaml-lablgtk/PLIST.gnomepanel
diff -u /dev/null pkgsrc/x11/ocaml-lablgtk/PLIST.gnomepanel:1.1
--- /dev/null	Tue Sep  5 04:22:09 2017
+++ pkgsrc/x11/ocaml-lablgtk/PLIST.gnomepanel	Tue Sep  5 04:22:09 2017
@@ -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


--_----------=_150458532943310--