pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/ocaml-lablgtk
Module Name: pkgsrc
Committed By: nia
Date: Fri May 15 10:32:59 UTC 2020
Modified Files:
pkgsrc/x11/ocaml-lablgtk: Makefile buildlink3.mk options.mk
Removed Files:
pkgsrc/x11/ocaml-lablgtk: PLIST.gnome PLIST.gnomecanvas
PLIST.gnomepanel PLIST.gtksourceview
Log Message:
ocaml-lablgtk: Drop support for binding GNOME 2
Bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/ocaml-lablgtk/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/ocaml-lablgtk/PLIST.gnome \
pkgsrc/x11/ocaml-lablgtk/PLIST.gtksourceview
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/ocaml-lablgtk/PLIST.gnomecanvas
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/ocaml-lablgtk/PLIST.gnomepanel
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 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.
Modified files:
Index: pkgsrc/x11/ocaml-lablgtk/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/Makefile:1.60 pkgsrc/x11/ocaml-lablgtk/Makefile:1.61
--- pkgsrc/x11/ocaml-lablgtk/Makefile:1.60 Sun Apr 12 08:28:13 2020
+++ pkgsrc/x11/ocaml-lablgtk/Makefile Fri May 15 10:32:59 2020
@@ -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 @@ LICENSE= gnu-lgpl-v2
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
Index: pkgsrc/x11/ocaml-lablgtk/buildlink3.mk
diff -u pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.45 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.46
--- pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.45 Tue Apr 21 11:32:58 2020
+++ pkgsrc/x11/ocaml-lablgtk/buildlink3.mk Fri May 15 10:32:59 2020
@@ -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 @@ BUILDLINK_PKGSRCDIR.ocaml-lablgtk?= ../.
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
Index: pkgsrc/x11/ocaml-lablgtk/options.mk
diff -u pkgsrc/x11/ocaml-lablgtk/options.mk:1.2 pkgsrc/x11/ocaml-lablgtk/options.mk:1.3
--- pkgsrc/x11/ocaml-lablgtk/options.mk:1.2 Tue Sep 5 04:22:09 2017
+++ pkgsrc/x11/ocaml-lablgtk/options.mk Fri May 15 10:32:59 2020
@@ -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 @@ PLIST_SRC+= PLIST.gtkspell
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
Home |
Main Index |
Thread Index |
Old Index