[pkgsrc/trunk]: pkgsrc/x11/ocaml-lablgtk ocaml-lablgtk: Drop support for bind...

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/ocaml-lablgtk ocaml-lablgtk: Drop support for bind...
From: nia <nia%pkgsrc.org@localhost>
Date: Fri, 15 May 2020 11:36:52 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d77387793a1e
branches:  trunk
changeset: 431635:d77387793a1e
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri May 15 10:32:59 2020 +0000

description:
ocaml-lablgtk: Drop support for binding GNOME 2

Bump PKGREVISION

diffstat:

 x11/ocaml-lablgtk/Makefile            |   8 ++++++--
 x11/ocaml-lablgtk/PLIST.gnome         |  14 --------------
 x11/ocaml-lablgtk/PLIST.gnomecanvas   |  13 -------------
 x11/ocaml-lablgtk/PLIST.gnomepanel    |  11 -----------
 x11/ocaml-lablgtk/PLIST.gtksourceview |  17 -----------------
 x11/ocaml-lablgtk/buildlink3.mk       |  16 ++--------------
 x11/ocaml-lablgtk/options.mk          |  34 +++-------------------------------
 7 files changed, 11 insertions(+), 102 deletions(-)

diffs (180 lines):

diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/Makefile
--- a/x11/ocaml-lablgtk/Makefile        Fri May 15 10:22:42 2020 +0000
+++ b/x11/ocaml-lablgtk/Makefile        Fri May 15 10:32:59 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2020/04/12 08:28:13 adam Exp $
+# $NetBSD: Makefile,v 1.61 2020/05/15 10:32:59 nia Exp $
 
 GITHUB_PROJECT=        lablgtk
 DISTNAME=      ${GITHUB_PROJECT}-2.18.10
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=garrigue/}
 
@@ -15,6 +15,10 @@
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-debug
+CONFIGURE_ARGS+=       --without-gnomecanvas
+CONFIGURE_ARGS+=       --without-gnomeui
+CONFIGURE_ARGS+=       --without-gtksourceview
+CONFIGURE_ARGS+=       --without-panel
 USE_TOOLS+=            gmake pkg-config
 OCAML_USE_FINDLIB=     yes
 OCAML_FINDLIB_DIRS=    lablgtk2
diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/PLIST.gnome
--- a/x11/ocaml-lablgtk/PLIST.gnome     Fri May 15 10:22:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST.gnome,v 1.2 2016/06/25 14:33:11 jaapb Exp $
-${OCAML_SITELIB}/lablgtk2/gnoDruid.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnoDruid.cmx
-${OCAML_SITELIB}/lablgtk2/gnoDruid.ml
-${OCAML_SITELIB}/lablgtk2/gnomeDruid.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnomeDruid.cmx
-${OCAML_SITELIB}/lablgtk2/gnomeDruid.ml
-${OCAML_SITELIB}/lablgtk2/gnomeui_tags.h
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.a
-${OCAML_SITELIB}/lablgtk2/lablgnomeui.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.cmxs
-${OCAML_SITELIB}/lablgtk2/liblablgnomeui.a
-${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgnomeui.so
diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/PLIST.gnomecanvas
--- a/x11/ocaml-lablgtk/PLIST.gnomecanvas       Fri May 15 10:22:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-@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
-${OCAML_SITELIB}/lablgtk2/gnomeCanvas.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnomeCanvas.cmx
-${OCAML_SITELIB}/lablgtk2/gnomeCanvas.ml
-${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
-${OCAML_SITELIB}/lablgtk2/liblablgnomecanvas.a
-${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgnomecanvas.so
diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/PLIST.gnomepanel
--- a/x11/ocaml-lablgtk/PLIST.gnomepanel        Fri May 15 10:22:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-@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 -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/PLIST.gtksourceview
--- a/x11/ocaml-lablgtk/PLIST.gtksourceview     Fri May 15 10:22:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST.gtksourceview,v 1.2 2016/06/25 14:33:11 jaapb Exp $
-${OCAML_SITELIB}/lablgtk2/gSourceView.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gSourceView.cmx
-${OCAML_SITELIB}/lablgtk2/gSourceView.ml
-${OCAML_SITELIB}/lablgtk2/gtkSourceView.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkSourceView.cmx
-${OCAML_SITELIB}/lablgtk2/gtkSourceView.ml
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.a
-${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cmxs
-${OCAML_SITELIB}/lablgtk2/liblablgtksourceview.a
-${OCAML_SITELIB}/lablgtk2/sourceViewEnums.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/sourceViewEnums.cmx
-${OCAML_SITELIB}/lablgtk2/sourceViewEnums.ml
-${OCAML_SITELIB}/lablgtk2/sourceView_tags.h
-${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgtksourceview.so
diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/buildlink3.mk
--- a/x11/ocaml-lablgtk/buildlink3.mk   Fri May 15 10:22:42 2020 +0000
+++ b/x11/ocaml-lablgtk/buildlink3.mk   Fri May 15 10:32:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2020/04/21 11:32:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2020/05/15 10:32:59 nia Exp $
 
 BUILDLINK_TREE+=       ocaml-lablgtk
 
@@ -13,22 +13,10 @@
 pkgbase := ocaml-lablgtk
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgnomecanvas)
-.  include "../../graphics/libgnomecanvas/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgtksourceview)
-.  include "../../x11/gtksourceview/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgtksourceview2)
+.if ${PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgtksourceview2}
 .  include "../../x11/gtksourceview2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgnome)
-.  include "../../x11/gnome-panel/buildlink3.mk"
-.endif
-
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # OCAML_LABLGTK_BUILDLINK3_MK
 
diff -r ac228c9ecb28 -r d77387793a1e x11/ocaml-lablgtk/options.mk
--- a/x11/ocaml-lablgtk/options.mk      Fri May 15 10:22:42 2020 +0000
+++ b/x11/ocaml-lablgtk/options.mk      Fri May 15 10:32:59 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2017/09/05 04:22:09 dholland Exp $
+# $NetBSD: options.mk,v 1.3 2020/05/15 10:32:59 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lablgtk
-PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg gnome
-PKG_SUGGESTED_OPTIONS= glade gnomecanvas gtksourceview gtksourceview2 gtkspell svg gnome
+PKG_SUPPORTED_OPTIONS= glade gtksourceview2 gtkspell svg
+PKG_SUGGESTED_OPTIONS= glade gtksourceview2 gtkspell svg
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,34 +22,6 @@
 CONFIGURE_ARGS+=       --without-gtkspell
 .endif
 
-.if !empty(PKG_OPTIONS:Mgnomecanvas)
-.include "../../graphics/libgnomecanvas/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
-PLIST_SRC+=            PLIST.gtksourceview
-.else
-CONFIGURE_ARGS+=       --without-gtksourceview
-.endif
-
 .if !empty(PKG_OPTIONS:Mgtksourceview2)
 .include "../../x11/gtksourceview2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-gtksourceview2
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: Remove -pie on SunOS.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Removed mono GNOME 2 packages
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: Remove -pie on SunOS.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Removed mono GNOME 2 packages
Indexes:
Home | Main Index | Thread Index | Old Index