From nobody Tue Sep 05 09:00:04 2023 X-Original-To: dev-commits-ports-all@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 4Rfzwj1RSjz4sLxP; Tue, 5 Sep 2023 09:00:05 +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 4Rfzwj0D0Qz3NSH; Tue, 5 Sep 2023 09:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904405; 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=gTcLt5c80GiVcyhe+rxkciw9rB+kehled6UXzpPLy+c=; b=wci5MrppoKEK2LuwCP06PnnKdGCNCpvdamWotzJ+XBFsPAMX9FTInn0m8GHH5tNT5UsKI9 kUNYuBs5gN+aGLW5hTY3FSyS8E3nJ/j9qefqoQjbhSNESXfTuKA/mhnNzBHMNMY9XGT/rH r0PQ4SMNU8rS9bJMSiy41dyYmpsSgCGpT8Zyd0Wj2Masx0zhjzAM5T6aZad+hG6kXupsHR JcgJcI46LtBf1+4ieza2UjudwMC1RsvLB29WMgumMofIhdAui7faONAdjyyJzxUij6sGD8 w3rj+sf476Abhso37+xlS1BA8CTQfgmOmAWnrAAkKQ7spfMmMwPzzM/NOow0Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904405; a=rsa-sha256; cv=none; b=bQdZ+UJU5KYdpd/x2Lk2SLx2CVypRSkSqtKOk/ock97KpLO7vljRF1QVpcClBHpj3KRWbi KNac0DNU6PHfsgBEePhgLqXcuARpZudGt5aG6buTvROQ5Q5NJq41ZM4BUTwkBvobcTC8Qr 6p1uqT5Ilnk9TqYLO8n4lTi2KGcrdepV2qZ9MJd8mS4SnkvTau6jRDwjPcUiaqEWlnkfgR FL22yo1HJ6HFgY9FcyNs3ec+wQxmR8zF7uY5KUBZV4W2cU+4foYtM7wI3M5jpRQMdL2htM 9xafkqdRN9pygGtqYBmhRmEXUgBrodBtAhHeTUGvFKhlR32XVD0oDxcgo3myzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904405; 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=gTcLt5c80GiVcyhe+rxkciw9rB+kehled6UXzpPLy+c=; b=ffJf+0sbkyulNtlz6an5IWjmn+ih38X6fSKOSzOe+J2yD+srX1yNTHzacpbZshmD45kfKI kMJXle+3yIUgO4L4xVr6IJBwnowbVAd30P+K3K9rQGgQZsycq3pYvc56dB3XI5Kt6MS3+D MLnT87/v0zvSmbr0842GHmNvX9GXlGOTePkFM1DYi2t/kKHhtkCjOmHQnSeOEpBDlFKqfQ ngv1lhIQnS2hsmz/umOlt3mA6GI8+GreiQq1mOPhzWcQbmnleCCvcpqluZwiK2JuEPM8st hMzKOec+8wqFzDW16RxFAdsifRNrdVxbU01Uo5GHduCtipXlz9/ce10lHZl+JA== 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 4Rfzwh64HNzC0T; Tue, 5 Sep 2023 09:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385904UB035319; Tue, 5 Sep 2023 09:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385904SN035314; Tue, 5 Sep 2023 09:00:04 GMT (envelope-from git) Date: Tue, 5 Sep 2023 09:00:04 GMT Message-Id: <202309050900.385904SN035314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 53705c8b604a - main - devel/sdbus-cpp: unbreak pkg-config support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53705c8b604a4ccc55220a9b742aa5a9324c4124 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=53705c8b604a4ccc55220a9b742aa5a9324c4124 commit 53705c8b604a4ccc55220a9b742aa5a9324c4124 Author: Jan Beich AuthorDate: 2023-09-05 07:49:17 +0000 Commit: Jan Beich CommitDate: 2023-09-05 08:58:49 +0000 devel/sdbus-cpp: unbreak pkg-config support $ pkg-config --libs sdbus-c++ Package libsystemd was not found in the pkg-config search path. Perhaps you should add the directory containing `libsystemd.pc' to the PKG_CONFIG_PATH environment variable Package 'libsystemd', required by 'sdbus-c++', not found --- devel/sdbus-cpp/Makefile | 1 + devel/sdbus-cpp/files/patch-basu | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/devel/sdbus-cpp/Makefile b/devel/sdbus-cpp/Makefile index 660beb7d2f71..623c2cd39ac0 100644 --- a/devel/sdbus-cpp/Makefile +++ b/devel/sdbus-cpp/Makefile @@ -1,6 +1,7 @@ PORTNAME= sdbus-cpp DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/sdbus-cpp/files/patch-basu b/devel/sdbus-cpp/files/patch-basu index b31aa3a37623..c0fd46fa455d 100644 --- a/devel/sdbus-cpp/files/patch-basu +++ b/devel/sdbus-cpp/files/patch-basu @@ -1,17 +1,24 @@ libsystemd is Linux-only, so replace with basu ---- CMakeLists.txt.orig 2021-12-22 12:17:31 UTC +--- CMakeLists.txt.orig 2023-08-20 09:45:44 UTC +++ CMakeLists.txt -@@ -16,7 +16,7 @@ option(BUILD_LIBSYSTEMD "Build libsystemd static libra +@@ -12,13 +12,13 @@ include(GNUInstallDirs) # Installation directories for + # PERFORMING CHECKS & PREPARING THE DEPENDENCIES + #------------------------------- + +-set(LIBSYSTEMD "libsystemd") ++set(LIBSYSTEMD "basu") + + option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF) if(NOT BUILD_LIBSYSTEMD) find_package(PkgConfig REQUIRED) - pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236) + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu) if(NOT TARGET PkgConfig::Systemd) - message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found " - "(if you have systemd in your OS, you may want to install package containing pkgconfig " -@@ -25,8 +25,7 @@ if(NOT BUILD_LIBSYSTEMD) + message(WARNING "libsystemd not found, checking for libelogind instead") + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236) +@@ -36,8 +36,7 @@ if(NOT BUILD_LIBSYSTEMD) "and incorporate libsystemd as embedded library within sdbus-c++)") endif() add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd)