From owner-svn-ports-all@freebsd.org Thu Feb 4 13:07:51 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7172554311C; Thu, 4 Feb 2021 13:07:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWf3q2lYmz3qb0; Thu, 4 Feb 2021 13:07:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5152144F5; Thu, 4 Feb 2021 13:07:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 114D7pJs047117; Thu, 4 Feb 2021 13:07:51 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 114D7oX9047115; Thu, 4 Feb 2021 13:07:51 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202102041307.114D7oX9047115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 4 Feb 2021 13:07:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564026 - head/x11-toolkits/ocaml-lablgtk2 X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/x11-toolkits/ocaml-lablgtk2 X-SVN-Commit-Revision: 564026 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 13:07:51 -0000 Author: bapt Date: Thu Feb 4 13:07:50 2021 New Revision: 564026 URL: https://svnweb.freebsd.org/changeset/ports/564026 Log: Remove dependency on Gnome2 libraries which are unused in the ports tree Discussed with: danfe (maintainer) Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile head/x11-toolkits/ocaml-lablgtk2/pkg-plist Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile ============================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile Thu Feb 4 13:04:24 2021 (r564025) +++ head/x11-toolkits/ocaml-lablgtk2/Makefile Thu Feb 4 13:07:50 2021 (r564026) @@ -3,7 +3,7 @@ PORTNAME= lablgtk2 PORTVERSION= 2.18.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= ocaml- @@ -21,18 +21,9 @@ USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAML_WASH= yes -OPTIONS_DEFINE= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ - GTKSPELL LIBRSVG2 DOCS EXAMPLES -OPTIONS_DEFAULT= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ - GTKSPELL LIBRSVG2 +OPTIONS_DEFINE= LIBRSVG2 DOCS EXAMPLES +OPTIONS_DEFAULT= LIBRSVG2 -GNOMECANVAS_DESC= GnomeCanvas support -GNOMEUI_DESC= GNOME 2 UI support -GTKGLAREA_DESC= GtkGLArea support -GTKSOURCEVIEW2_DESC= GtkSourceView 2 support -GTKSPELL_DESC= GtkSpell support -#GNOMEPANEL_DESC= GNOME Panel support - HAS_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes @@ -42,7 +33,9 @@ GH_ACCOUNT= garrigue GH_PROJECT= lablgtk CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \ - --without-gtksourceview + --without-gtksourceview --without-gnomeui \ + --without-panel --without-gtkspell --without-gl \ + --without-gtksourceview2 --without-glade --without-gnomecanvas CONFIGURE_ENV= CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo" PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] @@ -59,70 +52,12 @@ EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} PORTEXAMPLES= * .endif -.if ${PORT_OPTIONS:MGTKGLAREA} -CONFIGURE_ARGS+= --with-gl -BUILD_DEPENDS+= lablgl:graphics/ocaml-lablgl -RUN_DEPENDS+= lablgl:graphics/ocaml-lablgl -LIB_DEPENDS+= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 -EXAMPLES_SUBDIRS+= GL -.else -CONFIGURE_ARGS+= --without-gl -.endif - -.if ${PORT_OPTIONS:MGLADE} -CONFIGURE_ARGS+= --with-glade -USE_GNOME+= libglade2 -PLIST_SUB+= GLADE="" -EXAMPLES_SUBDIRS+= glade -.else -CONFIGURE_ARGS+= --without-glade -PLIST_SUB+= GLADE="@comment " -.endif - -.if ${PORT_OPTIONS:MGNOMEUI} -CONFIGURE_ARGS+= --with-gnomeui -USE_GNOME+= libgnomeui -.else -CONFIGURE_ARGS+= --without-gnomeui -.endif - -.if ${PORT_OPTIONS:MGNOMECANVAS} -CONFIGURE_ARGS+= --with-gnomecanvas -USE_GNOME+= libgnomecanvas -EXAMPLES_SUBDIRS+= canvas -.else -CONFIGURE_ARGS+= --without-gnomecanvas -.endif - .if ${PORT_OPTIONS:MLIBRSVG2} CONFIGURE_ARGS+= --with-rsvg USE_GNOME+= librsvg2 EXAMPLES_SUBDIRS+= rsvg .else CONFIGURE_ARGS+= --without-rsvg -.endif - -#.if ${PORT_OPTIONS:MGNOMEPANEL} -#CONFIGURE_ARGS+= --with-panel -#USE_GNOME+= gnomepanel -#EXAMPLES_SUBDIRS+= panel -#.else -CONFIGURE_ARGS+= --without-panel -#.endif - -.if ${PORT_OPTIONS:MGTKSOURCEVIEW2} -CONFIGURE_ARGS+= --with-gtksourceview2 -USE_GNOME+= gtksourceview2 -EXAMPLES_SUBDIRS+= sourceview -.else -CONFIGURE_ARGS+= --without-gtksourceview2 -.endif - -.if ${PORT_OPTIONS:MGTKSPELL} -LIB_DEPENDS+= libgtkspell.so:textproc/gtkspell -CONFIGURE_ARGS+= --with-gtkspell -.else -CONFIGURE_ARGS+= --without-gtkspell .endif post-patch: Modified: head/x11-toolkits/ocaml-lablgtk2/pkg-plist ============================================================================== --- head/x11-toolkits/ocaml-lablgtk2/pkg-plist Thu Feb 4 13:04:24 2021 (r564025) +++ head/x11-toolkits/ocaml-lablgtk2/pkg-plist Thu Feb 4 13:07:50 2021 (r564026) @@ -1,3 +1,2 @@ bin/gdk_pixbuf_mlsource -%%GLADE%%bin/lablgladecc2 bin/lablgtk2