From owner-dev-commits-ports-all@freebsd.org Tue May 18 21:51:57 2021 Return-Path: Delivered-To: dev-commits-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 54DBB6307D9; Tue, 18 May 2021 21:51:57 +0000 (UTC) (envelope-from git@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 4Fl8q06yggz3sVg; Tue, 18 May 2021 21:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D801F26D6D; Tue, 18 May 2021 21:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14ILpuYg025307; Tue, 18 May 2021 21:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14ILpuj1025306; Tue, 18 May 2021 21:51:56 GMT (envelope-from git) Date: Tue, 18 May 2021 21:51:56 GMT Message-Id: <202105182151.14ILpuj1025306@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: adca3208aa62 - main - devel/libsoup: make NTLM (Samba) an option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adca3208aa62ada4fd7ea758902d2164b9fe9d41 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 21:51:57 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=adca3208aa62ada4fd7ea758902d2164b9fe9d41 commit adca3208aa62ada4fd7ea758902d2164b9fe9d41 Author: Barbara AuthorDate: 2021-05-18 21:44:10 +0000 Commit: Adriaan de Groot CommitDate: 2021-05-18 21:51:42 +0000 devel/libsoup: make NTLM (Samba) an option Having Samba as a build-dep can still be heavy, so add an OPTION to turn it off again; this just means that the runtime check for ntlm will be skipped. Thanks Barbara for insisting on a more configurable approach. --- devel/libsoup/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 4e3f17c4bd02..ab65d9a4bc01 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -2,7 +2,7 @@ PORTNAME= libsoup PORTVERSION= 2.72.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -20,9 +20,13 @@ RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking PORTSCOUT= limitw:1,even -OPTIONS_SINGLE= GSSAPI +OPTIONS_DEFINE= SMB +OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_DEFAULT= GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} +OPTIONS_DEFAULT= SMB GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} + +SMB_USES= samba:build +SMB_MESON_ENABLED= ntlm GSSAPI_BASE_USES= gssapi GSSAPI_BASE_MESON_ON= -Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG} @@ -36,7 +40,7 @@ GSSAPI_MIT_MESON_ON= -Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG} GSSAPI_NONE_MESON_DISABLED= gssapi USES= gettext gnome localbase meson \ - pkgconfig python:3.6+,build samba:build sqlite ssl tar:xz + pkgconfig python:3.6+,build sqlite ssl tar:xz USE_GNOME= glib20 intlhack introspection:build \ libxml2 USE_LDCONFIG= yes @@ -44,8 +48,7 @@ MESON_ARGS= -Dvapi=disabled \ -Dsysprof=disabled \ -Dtests=false \ -Dgnome=true \ - -Dbrotli=disabled \ - -Dntlm=enabled + -Dbrotli=disabled LIBVERSION= 1.11.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}