Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Oct 2021 10:21:47 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e2d2f3bbe972 - main - x11-toolkits/ocaml-lablgtk2: add GLADE option back (missed in 52585a1d23)
Message-ID:  <202110151021.19FALlKI005754@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e2d2f3bbe972b6e5a59cc69ac1d5d97b30d9334e

commit e2d2f3bbe972b6e5a59cc69ac1d5d97b30d9334e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-10-15 10:20:48 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-10-15 10:20:51 +0000

    x11-toolkits/ocaml-lablgtk2: add GLADE option back (missed in 52585a1d23)
---
 x11-toolkits/ocaml-lablgtk2/Makefile  | 12 ++++++++----
 x11-toolkits/ocaml-lablgtk2/pkg-plist | 10 ++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 6a07a365a647..fc389856ec6d 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lablgtk2
 PORTVERSION=	2.18.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	ocaml-
 
@@ -32,7 +32,7 @@ PORTSCOUT=	limit:^${PORTVERSION:R:R}
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \
 		--without-gtksourceview --without-gnomeui \
-		--without-panel --without-glade --without-gnomecanvas
+		--without-panel --without-gnomecanvas
 CONFIGURE_ENV=	CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo"
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
@@ -40,14 +40,18 @@ PORTDOCS=	COPYING README
 EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2
-OPTIONS_DEFAULT=	GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2
+OPTIONS_DEFINE=	DOCS EXAMPLES GLADE GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2
+OPTIONS_DEFAULT=	GLADE GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2
 OPTIONS_SUB=	yes
 
 GTKGLAREA_DESC=	GtkGLArea support
 GTKSOURCEVIEW2_DESC=	GtkSourceView 2 support
 GTKSPELL_DESC=	GtkSpell support
 
+GLADE_CONFIGURE_WITH=glade
+GLADE_USE=	GNOME=libglade2
+GLADE_VARS=	EXAMPLES_SUBDIRS+=glade
+
 GTKGLAREA_BUILD_DEPENDS=lablgl:graphics/ocaml-lablgl
 GTKGLAREA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 GTKGLAREA_RUN_DEPENDS=	lablgl:graphics/ocaml-lablgl
diff --git a/x11-toolkits/ocaml-lablgtk2/pkg-plist b/x11-toolkits/ocaml-lablgtk2/pkg-plist
index 5b4b09842eb0..ffd1ed381471 100644
--- a/x11-toolkits/ocaml-lablgtk2/pkg-plist
+++ b/x11-toolkits/ocaml-lablgtk2/pkg-plist
@@ -1,7 +1,9 @@
 bin/gdk_pixbuf_mlsource
+%%GLADE%%bin/lablgladecc2
 bin/lablgtk2
 %%OCAML_SITELIBDIR%%/lablgtk2/META
 %%OCAML_SITELIBDIR%%/lablgtk2/build.ml
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/dlllablglade2.so
 %%OCAML_SITELIBDIR%%/lablgtk2/dlllablgtk2.so
 %%GTKGLAREA%%%%OCAML_SITELIBDIR%%/lablgtk2/dlllablgtkgl2.so
 %%GTKSOURCEVIEW2%%%%OCAML_SITELIBDIR%%/lablgtk2/dlllablgtksourceview2.so
@@ -130,6 +132,9 @@ bin/lablgtk2
 %%GTKGLAREA%%%%OCAML_SITELIBDIR%%/lablgtk2/glGtk.cmx
 %%GTKGLAREA%%%%OCAML_SITELIBDIR%%/lablgtk2/glGtk.ml
 %%OCAML_SITELIBDIR%%/lablgtk2/glGtk.mli
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/glade.cmi
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/glade.cmx
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/glade.ml
 %%OCAML_SITELIBDIR%%/lablgtk2/glade.mli
 %%OCAML_SITELIBDIR%%/lablgtk2/glib.cmi
 %%OCAML_SITELIBDIR%%/lablgtk2/glib.cmx
@@ -288,6 +293,10 @@ bin/lablgtk2
 %%OCAML_SITELIBDIR%%/lablgtk2/gutf8.cmx
 %%OCAML_SITELIBDIR%%/lablgtk2/gutf8.ml
 %%OCAML_SITELIBDIR%%/lablgtk2/gutf8.mli
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/lablglade.a
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/lablglade.cma
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/lablglade.cmxa
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/lablglade.cmxs
 %%OCAML_SITELIBDIR%%/lablgtk2/lablgtk.a
 %%OCAML_SITELIBDIR%%/lablgtk2/lablgtk.cma
 %%OCAML_SITELIBDIR%%/lablgtk2/lablgtk.cmxa
@@ -308,6 +317,7 @@ bin/lablgtk2
 %%LIBRSVG2%%%%OCAML_SITELIBDIR%%/lablgtk2/lablrsvg.cma
 %%LIBRSVG2%%%%OCAML_SITELIBDIR%%/lablgtk2/lablrsvg.cmxa
 %%LIBRSVG2%%%%OCAML_SITELIBDIR%%/lablgtk2/lablrsvg.cmxs
+%%GLADE%%%%OCAML_SITELIBDIR%%/lablgtk2/liblablglade2.a
 %%OCAML_SITELIBDIR%%/lablgtk2/liblablgtk2.a
 %%GTKGLAREA%%%%OCAML_SITELIBDIR%%/lablgtk2/liblablgtkgl2.a
 %%GTKSOURCEVIEW2%%%%OCAML_SITELIBDIR%%/lablgtk2/liblablgtksourceview2.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110151021.19FALlKI005754>