From nobody Thu Aug 29 20:17:22 2024 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 4WvsyV3ytBz52YYg; Thu, 29 Aug 2024 20:17:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WvsyV34P1z4JGk; Thu, 29 Aug 2024 20:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724962642; 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=XeRSebKG52SbhEIiQ+ipY90i4UT7mUaENJTrCU/HK58=; b=OJF79HrERkTapUAP7ZZ3CwLppfiWPSx3++XQWn36rSC7GcSCz5aoToMK3TvPpWrhaxs/xS neL0Qf1qmWnAFm06vqFsLoVAKbMfqKILLJgzGLZQZ9d2jg803ib4x5BZPMIZBNJA1iYt7y DGAYivwJ2OHEi9EjGRpl8NIbAk0x7IbIVZO10D+TBRiRvlph5Dvuup5wAL5JrPwkev1+No xEUJSv7FL4oTWG4bw6doBqreC8M6GPPDW49ge/y2pCURn78w689ppIhRoC3vPE+/ab40EM +mFEI1vEr8vXa5zFVsN4j6cTvcvpwpnc2SFTy93ThOuhVD+azhrtZC9IhhMCRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724962642; a=rsa-sha256; cv=none; b=qUlVoIzVx5NpVnK20sTLPd9Qo69Fd7j8P66BM5SisBcmODms/mYgu8kNY3/SliMrpL/2oG mDyYvCMQF7feyxlKcdDZWgyd9xCGURMHj/nnyXU0BleQ5Pc5tttYeOBRFy7ttw1CE0MCFp JzGPwVz11DGSFX5U9C9aZPHvRB9TucywFYkaC2MqxKCjD+VRhPd0LtfoqOkISb+lHNvQBu vmFd4lBQeJ8vlwezU86UR8Toh4DG8nveOsstdC7SUJ1nJXKversccDl2oIhKSKypzblaD1 St8d9Q41c4IKZfefyFBs+8UBWW9kJFEFoidNHd9Fs44ZkvuvVp4SXlIgaa2zKQ== 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=1724962642; 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=XeRSebKG52SbhEIiQ+ipY90i4UT7mUaENJTrCU/HK58=; b=okD1vEQuRXOSFez3yKHxr45/2jTBrYyM2RBeaRSNSTmACFxrLQwy6owaxSvcytsKFXWpDE 43WLLM5OGf592jEQiQwgNmV+DrjXIi54BKOxOf1180UrjDjg8aCCEMvb7jTu3GAQaIkTt7 TlpGLNEWbazjy3nNuWjEFYIox2pcd1gFNPZKbH1vbtClpndK+twbYjcu3jUytpBB7mbdaJ zjK8rXYYvw1Ikh2L43s6wAU6SfCyiCwvCtj/yHsqnwnX2CVPmifrojJcNSavBQoVFcjto+ QoEEDW8N9/w21SeSpCxJRDOyD0JydXg6x5Hb8fK7eIHPEV1pV49mP9vl+quVjw== 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 4WvsyV2YtBzX7R; Thu, 29 Aug 2024 20:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47TKHMKD004672; Thu, 29 Aug 2024 20:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47TKHMcD004669; Thu, 29 Aug 2024 20:17:22 GMT (envelope-from git) Date: Thu, 29 Aug 2024 20:17:22 GMT Message-Id: <202408292017.47TKHMcD004669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 35db13a201c4 - main - audio/pulseaudio-module-sndio: Fix build with poudriere 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35db13a201c4e9314accbf051083265e45dee758 Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=35db13a201c4e9314accbf051083265e45dee758 commit 35db13a201c4e9314accbf051083265e45dee758 Author: Nicola Vitale AuthorDate: 2024-08-29 20:07:37 +0000 Commit: Nicola Vitale CommitDate: 2024-08-29 20:07:37 +0000 audio/pulseaudio-module-sndio: Fix build with poudriere As pointed out by arrowd@, the previous patch doesn't work in poudriere "because the pkg-config executable isn't there at the time the variable value is evaluated". So put the variables in the standard position in the Makefile and fix the regular expression of sed(1). Reported by: arrowd --- audio/pulseaudio-module-sndio/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/audio/pulseaudio-module-sndio/Makefile b/audio/pulseaudio-module-sndio/Makefile index a904bfa5a2a3..6c2cb3d3a3bc 100644 --- a/audio/pulseaudio-module-sndio/Makefile +++ b/audio/pulseaudio-module-sndio/Makefile @@ -19,14 +19,12 @@ USES= pkgconfig SUB_FILES= pkg-message PLIST_FILES= ${PULSE_MODDIR}/module-sndio.so +PULSE_MODDIR= `${LOCALBASE}/bin/pkg-config --variable=modlibexecdir libpulse` +PULSE_VERSION= `${LOCALBASE}/bin/pkg-config --modversion libpulse` + post-patch: ${REINPLACE_CMD} \ - -e '/^PA_MODULE_VERSION/s/0.0/${PULSE_VERSION}/1' \ + -e "/^PA_MODULE_VERSION/s/0.0/${PULSE_VERSION}/1" \ ${WRKSRC}/module-sndio.c -.include - -PULSE_MODDIR!= ${LOCALBASE}/bin/pkg-config --variable=modlibexecdir libpulse -PULSE_VERSION!= ${LOCALBASE}/bin/pkg-config --modversion libpulse - -.include +.include