From nobody Sat Jun 17 10:29:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qjshn3JZGz4fFcR; Sat, 17 Jun 2023 10:29:29 +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 4Qjshn2r4Nz3vgl; Sat, 17 Jun 2023 10:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686997769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DlAmBdLTzU7oUnwPx4mgslki9VKC+SLsXri240pEmM=; b=I0c3rEtl0nWOpjU5hyoKScV7/P5vCjzW/GGX1V5imBe1rsEX4SUXl/gJn6cH0KXl7Ek0Ud I3qCH0lNXm+Z1O9lgaLX6jnmW/8noH5Ie9jeYAjnChK7Du8CPiIj5kcb4xZGRxPgcBlI7Q GN9ktQkTpn1/9v9f54Y7Bu3LzFtu4cRYyNeUnOuBXZur3x/rYtpJYwb2asW8mIx3jaHp/I WSn0hZEXbSP/O7yoYMGyM2OBQv9Ufo3kFaTVwp5UqW65+7tk1lzQEnsnTiVFkZnfhrK5Le zssdVb/SS5UCnnaSLajwxUmBD65yMTlTkJA9nvh7WU+LaDk4kTc4mKLi6S3DKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686997769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DlAmBdLTzU7oUnwPx4mgslki9VKC+SLsXri240pEmM=; b=II3s6fc+SgMGz0Nf71rPNtVAEZQ4ohLTNr6g9C8LEF/8ApOcePASs358n+OCbWk2Qc5R/K 6YBCEa0SGIX4oqiTr+k40KAdt254uDUsgwIqwLFl08aIY0xOnIqZGwjY+hbuDEUb2Vy847 SJuezWEs4ZU/fgYHWx1xHmkSWkMn2NPTX8ttxOCVnNthGj3ApbymNNMBWLhv3gaLLUFc4h +nARSLVL+Czw+hpy2Pra1WlAsO8RFqj3+LL528XXuZ3XyHXbHgV18Xm3Ec5ChQDqdN4JRF 31tEvsBBcm1DWeEqVHOgbnVQZQYbtn5LNxPG54CyuNymuh50HHpfDGyrsb/1ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686997769; a=rsa-sha256; cv=none; b=TclL1hdXEvUdNcbQEt3/Yqadt+F5T7GDND/YZ+/IUec2nisOqgnnvnZuZh4HViutJxsesq crERzqGlMmyD5HBFkpsnYj7h93sdEP3+F84LcX+8xjl5JIcDTQwNq1MW/8f9xPKC2gdW7b saWLB4fayUo5rqVCPEG0q2E0z7U9BqESp3N9p/dNxxe0+c43xGIjLb8LmsBfBShQESa2tT LK5vw2ojjwiWAO+ntCyrJi2bzRNeHihK73cmBsPkxyNvjUT7YHla6o4j0vNgxAhsVUwSNM +s/ZY9vb+7+YHPOXXRoPHvIi3LoXDAPq5cS47sB3bdGiG7mO2JW1jej1zk7zdg== 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 4Qjshn1tzxz15wH; Sat, 17 Jun 2023 10:29:29 +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 35HATTjk023909; Sat, 17 Jun 2023 10:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35HATT09023908; Sat, 17 Jun 2023 10:29:29 GMT (envelope-from git) Date: Sat, 17 Jun 2023 10:29:29 GMT Message-Id: <202306171029.35HATT09023908@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 22a9ae807211 - main - sysutils/tracker3: add SOUP2 and SOUP3 multi options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22a9ae807211b4e93266a3857293c98b3790c9b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=22a9ae807211b4e93266a3857293c98b3790c9b4 commit 22a9ae807211b4e93266a3857293c98b3790c9b4 Author: Dimitry Andric AuthorDate: 2023-06-17 10:28:17 +0000 Commit: Dimitry Andric CommitDate: 2023-06-17 10:28:34 +0000 sysutils/tracker3: add SOUP2 and SOUP3 multi options Because Tracker can support libsoup2 and libsoup3 backend, and also at the same time, it makes sense to add a multi option to give the user the possibility of selecting them. The default is still libsoup2, so the default dependencies of this port will not change at this time. PR: 272017 MFH: 2023Q2 --- sysutils/tracker3/Makefile | 27 +++++++++++++++++++++++++-- sysutils/tracker3/pkg-plist | 3 ++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile index bedd2f4b0346..676172a46220 100644 --- a/sysutils/tracker3/Makefile +++ b/sysutils/tracker3/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} LIB_DEPENDS= libdbus-1.so:devel/dbus \ libicutu.so:devel/icu \ libjson-glib-1.0.so:devel/json-glib \ - libsoup-2.4.so:devel/libsoup \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} @@ -36,14 +35,38 @@ PORTSCOUT= limitw:1,even OPTIONS_DEFINE= DOCS MAN OPTIONS_SUB= yes + +OPTIONS_MULTI= SOUP +OPTIONS_MULTI_SOUP= SOUP2 SOUP3 + +OPTIONS_DEFAULT= SOUP2 + +SOUP2_DESC= libsoup 2 backend (from devel/libsoup) +SOUP3_DESC= libsoup 3 backend (from devel/libsoup3) + DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc DOCS_MESON_TRUE= docs MAN_BUILD_DEPENDS= asciidoc:textproc/asciidoc MAN_MESON_TRUE= man MAN_DESC= Install manual pages +SOUP2_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup +SOUP3_LIB_DEPENDS= libsoup-3.0.so:devel/libsoup3 + +.include + +.if ${PORT_OPTIONS:MSOUP2} && ${PORT_OPTIONS:MSOUP3} +MESON_ARGS+= -Dsoup=soup2,soup3 +.elif ${PORT_OPTIONS:MSOUP2} +MESON_ARGS+= -Dsoup=soup2 +.else # SOUP3 +MESON_ARGS+= -Dsoup=soup3 +.endif + +.include + post-patch: ${REINPLACE_CMD} -e 's|/etc/asciidoc|${PYTHONPREFIX_SITELIBDIR}/asciidoc/resources|' \ ${WRKSRC}/docs/manpages/meson.build -.include +.include diff --git a/sysutils/tracker3/pkg-plist b/sysutils/tracker3/pkg-plist index cad2fbd88e5c..45f781c5d96c 100644 --- a/sysutils/tracker3/pkg-plist +++ b/sysutils/tracker3/pkg-plist @@ -22,7 +22,8 @@ lib/girepository-1.0/Tracker-3.0.typelib lib/libtracker-sparql-3.0.so lib/libtracker-sparql-3.0.so.0 lib/libtracker-sparql-3.0.so.0.503.0 -lib/tracker-3.0/libtracker-http-soup2.so +%%SOUP2%%lib/tracker-3.0/libtracker-http-soup2.so +%%SOUP3%%lib/tracker-3.0/libtracker-http-soup3.so lib/tracker-3.0/libtracker-parser-libicu.so lib/tracker-3.0/trackertestutils/__init__.py lib/tracker-3.0/trackertestutils/__main__.py