Added options to x11/ocaml-lablgtk3

4 files changed, 75 insertions, 4 deletions

diff --git a/x11/ocaml-lablgtk3/Makefile b/x11/ocaml-lablgtk3/Makefile
index 7c6e5110e3d..c820ac23a01 100644
--- a/x11/ocaml-lablgtk3/Makefile
+++ b/x11/ocaml-lablgtk3/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2020/01/24 14:07:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/24 14:50:42 jaapb Exp $
 
 GITHUB_PROJECT=	lablgtk
 GITHUB_TAG=	${VERSION}
 VERSION=	3.0.beta8
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${GITHUB_PROJECT}3-3.0beta8
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=garrigue/}
 
@@ -16,6 +17,10 @@ LICENSE=	gnu-lgpl-v2
 USE_TOOLS+=	pkg-config
 
 OCAML_USE_DUNE=		yes
+OCAML_FINDLIB_DIRS=	lablgtk3
+OPAM_INSTALL_FILES=	lablgtk3
+DUNE_BUILD_PACKAGES=	lablgtk3
+
 
 .include "../../mk/ocaml.mk"
 
diff --git a/x11/ocaml-lablgtk3/PLIST b/x11/ocaml-lablgtk3/PLIST
index 9d649478805..f1b1ecb5ce1 100644
--- a/x11/ocaml-lablgtk3/PLIST
+++ b/x11/ocaml-lablgtk3/PLIST
@@ -1,6 +1,53 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/24 14:07:02 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/24 14:50:42 jaapb Exp $
 bin/gdk_pixbuf_mlsource3
 bin/lablgladecc3
+${OCAML_SITELIB}/lablgtk3-gtkspell3/META
+${OCAML_SITELIB}/lablgtk3-gtkspell3/dune-package
+${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmi
+${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmt
+${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmx
+${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.ml
+${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.a
+${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxs
+${OCAML_SITELIB}/lablgtk3-gtkspell3/liblablgtk3_gtkspell3_stubs.a
+${OCAML_SITELIB}/lablgtk3-gtkspell3/opam
+${OCAML_SITELIB}/lablgtk3-sourceview3/META
+${OCAML_SITELIB}/lablgtk3-sourceview3/dune-package
+${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmt
+${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmx
+${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.ml
+${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.mli
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmx
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.ml
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmx
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.ml
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmti
+${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.a
+${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxs
+${OCAML_SITELIB}/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
+${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmx
+${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.ml
+${OCAML_SITELIB}/lablgtk3-sourceview3/opam
+${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmi
+${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmx
+${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.ml
 ${OCAML_SITELIB}/lablgtk3/META
 ${OCAML_SITELIB}/lablgtk3/cairo_pango.cmi
 ${OCAML_SITELIB}/lablgtk3/cairo_pango.cmt
@@ -434,7 +481,19 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3/pangoEnums.cmx
 ${OCAML_SITELIB}/lablgtk3/pangoEnums.ml
 ${OCAML_SITELIB}/lablgtk3/pango_tags.h
 ${OCAML_SITELIB}/lablgtk3/wrappers.h
+${OCAML_SITELIB}/stublibs/dlllablgtk3_gtkspell3_stubs.so
+${OCAML_SITELIB}/stublibs/dlllablgtk3_sourceview3_stubs.so
 ${OCAML_SITELIB}/stublibs/dlllablgtk3_stubs.so
+share/doc/lablgtk3-gtkspell3/CHANGELOG.API
+share/doc/lablgtk3-gtkspell3/CHANGES.md
+share/doc/lablgtk3-gtkspell3/LICENSE
+share/doc/lablgtk3-gtkspell3/README.dune.md
+share/doc/lablgtk3-gtkspell3/README.md
+share/doc/lablgtk3-sourceview3/CHANGELOG.API
+share/doc/lablgtk3-sourceview3/CHANGES.md
+share/doc/lablgtk3-sourceview3/LICENSE
+share/doc/lablgtk3-sourceview3/README.dune.md
+share/doc/lablgtk3-sourceview3/README.md
 share/doc/lablgtk3/CHANGELOG.API
 share/doc/lablgtk3/CHANGES.md
 share/doc/lablgtk3/LICENSE
diff --git a/x11/ocaml-lablgtk3/buildlink3.mk b/x11/ocaml-lablgtk3/buildlink3.mk
index c6be1282dfc..4c6b2abe0b2 100644
--- a/x11/ocaml-lablgtk3/buildlink3.mk
+++ b/x11/ocaml-lablgtk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/01/24 14:07:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/01/24 14:50:42 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-lablgtk3
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-lablgtk3
 OCAML_LABLGTK3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lablgtk3+=	ocaml-lablgtk3>=3.0beta8
+BUILDLINK_ABI_DEPENDS.ocaml-lablgtk3+=	ocaml-lablgtk3>=3.0beta8nb1
 BUILDLINK_PKGSRCDIR.ocaml-lablgtk3?=	../../x11/ocaml-lablgtk3
 
 # options must be exposed if and only if we built with them
diff --git a/x11/ocaml-lablgtk3/options.mk b/x11/ocaml-lablgtk3/options.mk
index 856449c1ae7..dfdc46ed5d7 100644
--- a/x11/ocaml-lablgtk3/options.mk
+++ b/x11/ocaml-lablgtk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/01/24 14:07:02 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2020/01/24 14:50:42 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lablgtk3
 PKG_SUPPORTED_OPTIONS=	gtksourceview3 gtkspell
@@ -11,6 +11,9 @@ PLIST_VARS+=		gtkspell gtksourceview
 .include "../../textproc/gtkspell3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gtkspell
 PLIST.gtkspell=	yes
+OCAML_FINDLIB_DIRS+=	lablgtk3-gtkspell3
+OPAM_INSTALL_FILES+=	lablgtk3-gtkspell3
+DUNE_BUILD_PACKAGES+=	lablgtk3-gtkspell3
 .else
 CONFIGURE_ARGS+=	--without-gtkspell
 .endif
@@ -19,6 +22,9 @@ CONFIGURE_ARGS+=	--without-gtkspell
 .include "../../x11/gtksourceview3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gtksourceview3
 PLIST.gtksourceview=	yes
+OCAML_FINDLIB_DIRS+=	lablgtk3-sourceview3
+OPAM_INSTALL_FILES+=	lablgtk3-sourceview3
+DUNE_BUILD_PACKAGES+=	lablgtk3-sourceview3
 .else
 CONFIGURE_ARGS+=	--without-gtksourceview3
 .endif