Date: Thu, 29 Apr 2021 18:58:46 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: 52585a1d23d8 - main - Partially revert a2980c0e843b2c2a and convert to option helpers. What had been discussed was the support for higher-level Gnomish components, while lower-lever Gtkish ones are apparently still in use by the ports, e.g. `math/alt-ergo' and possibly other out-of-tree consumers. Message-ID: <202104291858.13TIwkO5094104@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=52585a1d23d8329defbb46239442f7f8e60f1ce7 commit 52585a1d23d8329defbb46239442f7f8e60f1ce7 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-04-29 18:48:56 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-04-29 18:58:04 +0000 Partially revert a2980c0e843b2c2a and convert to option helpers. What had been discussed was the support for higher-level Gnomish components, while lower-lever Gtkish ones are apparently still in use by the ports, e.g. `math/alt-ergo' and possibly other out-of-tree consumers. Requested by: amdmi3 --- x11-toolkits/ocaml-lablgtk2/Makefile | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index b7c5271be2e4..9cd576ac71fd 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -2,7 +2,7 @@ PORTNAME= lablgtk2 PORTVERSION= 2.18.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= ocaml- @@ -21,8 +21,12 @@ USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAML_WASH= yes -OPTIONS_DEFINE= LIBRSVG2 DOCS EXAMPLES -OPTIONS_DEFAULT= LIBRSVG2 +OPTIONS_DEFINE= DOCS EXAMPLES GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2 +OPTIONS_DEFAULT= GTKGLAREA GTKSOURCEVIEW2 GTKSPELL LIBRSVG2 + +GTKGLAREA_DESC= GtkGLArea support +GTKSOURCEVIEW2_DESC= GtkSourceView 2 support +GTKSPELL_DESC= GtkSpell support HAS_CONFIGURE= yes ALL_TARGET= all opt @@ -34,8 +38,7 @@ GH_PROJECT= lablgtk CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \ --without-gtksourceview --without-gnomeui \ - --without-panel --without-gtkspell --without-gl \ - --without-gtksourceview2 --without-glade --without-gnomecanvas + --without-panel --without-glade --without-gnomecanvas CONFIGURE_ENV= CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo" PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] @@ -45,6 +48,19 @@ PORTDOCS= COPYING README EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} PORTEXAMPLES= * +GTKGLAREA_BUILD_DEPENDS=lablgl:graphics/ocaml-lablgl +GTKGLAREA_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 +GTKGLAREA_RUN_DEPENDS= lablgl:graphics/ocaml-lablgl +GTKGLAREA_CONFIGURE_WITH=gl +GTKGLAREA_VARS= EXAMPLES_SUBDIRS+=GL + +GTKSOURCEVIEW2_CONFIGURE_WITH=gtksourceview2 +GTKSOURCEVIEW2_USE= GNOME=gtksourceview2 +GTKSOURCEVIEW2_VARS= EXAMPLES_SUBDIRS+=sourceview + +GTKSPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell +GTKSPELL_CONFIGURE_WITH=gtkspell + LIBRSVG2_CONFIGURE_WITH=rsvg LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_VARS= EXAMPLES_SUBDIRS+=rsvg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104291858.13TIwkO5094104>