git: 3af7fd92d368 - main - multimedia/pipewire: correct OSVERSION check to use proper ncurses (+)

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 17 Dec 2021 13:25:06 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3af7fd92d3686822bfe4f077c7655934c685828e

commit 3af7fd92d3686822bfe4f077c7655934c685828e
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2021-12-17 13:15:58 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2021-12-17 13:15:58 +0000

    multimedia/pipewire: correct OSVERSION check to use proper ncurses (+)
    
    Since 1400035 FreeBSD have imported into base libtinfo split from ncurses
    which required to build pw-top utility.
    
    Force ncurses:port to proper build on systems < 1400035
    Bump PORTREVISION to force rebuild
    
    Approved by:    arrowd via IRC
    Largest pointy hat available: arrowd :)
    Sponsored by:   Netzkommune GmbH
---
 multimedia/pipewire/Makefile  | 11 ++++++-----
 multimedia/pipewire/pkg-plist |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index 25399def9389..78d07182923e 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	pipewire
+PORTREVISION=	1
 DISTVERSION=	0.3.42
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session
@@ -65,12 +66,12 @@ MESON_ARGS=	-D pw-cat=enabled \
 		-D pipewire-v4l2=disabled \
 		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1400000
-PLIST_SUB+=	FREEBSD14="@comment "
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1400035
+USES+=		ncurses:base
 .else
-PLIST_SUB+=	FREEBSD14=""
+USES+=		ncurses:port
 .endif
 
 post-extract:
@@ -84,4 +85,4 @@ post-patch-MEDIASESSION-on:
 	@${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \
 		${WRKSRC}/src/daemon/pipewire.conf.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index b8540c66bf5a..99fc41673348 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -17,7 +17,7 @@ bin/pw-play
 bin/pw-profiler
 bin/pw-record
 bin/pw-reserve
-%%FREEBSD14%%bin/pw-top
+bin/pw-top
 %%MEDIASESSION%%bin/spa-acp-tool
 bin/spa-inspect
 bin/spa-json-dump