diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index 8e97b3f3cb0d..8e133a3ca49e 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,88 +1,86 @@
 PORTNAME=	pipewire
-PORTREVISION=	1
 DISTVERSION=	0.3.42
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session
 DISTFILES=	media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Server and user space API to deal with multimedia pipelines
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libdbus-1.so:devel/dbus \
 		libinotify.so:devel/libinotify \
 		libepoll-shim.so:devel/libepoll-shim \
 		libsndfile.so:audio/libsndfile \
 		libudev.so:devel/libudev-devd \
 		libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
 
 USES=		compiler:c11 gettext-tools gnome localbase:ldflags meson \
-		pkgconfig python:3.6+,build readline
+		ncurses pkgconfig python:3.6+,build readline
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PipeWire
 
 OPTIONS_DEFINE=		GSTREAMER MANPAGES MEDIASESSION PULSEAUDIO SDL VULKAN
 OPTIONS_DEFAULT=	GSTREAMER MANPAGES MEDIASESSION
 OPTIONS_SUB=	yes
 
 GSTREAMER_MESON_ENABLED=gstreamer
 GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \
 			libgstaudio-1.0.so:multimedia/gstreamer1-plugins
 
 MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 MANPAGES_MESON_ENABLED=	man
 
 MEDIASESSION_DESC=	Session manager support
 MEDIASESSION_MESON_ENABLED=	alsa pipewire-alsa
 MEDIASESSION_MESON_ON=		-Dsession-managers=media-session
 MEDIASESSION_MESON_OFF=		-Dsession-managers=''
 
 PULSEAUDIO_MESON_ENABLED=	libpulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio \
 				libavahi-common.so:net/avahi-app \
 				libavahi-client.so:net/avahi-app
 
 SDL_MESON_ENABLED=	sdl2
 SDL_USES=		sdl
 SDL_USE=		sdl=sdl2
 
 VULKAN_DESC=		Enable Vulkan integration
 VULKAN_MESON_ENABLED=	vulkan
 VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 MEDIA_SESSION_VERSION=	0.4.1
 
 MESON_ARGS=	-D pw-cat=enabled \
 		-D bluez5=disabled \
 		-D jack=disabled -D pipewire-jack=disabled \
 		-D systemd=disabled \
 		-D pipewire-v4l2=disabled \
 		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1400035
-USES+=		ncurses
-.else
-USES+=		ncurses:port
+# Fake pkg-config support before https://cgit.freebsd.org/src/commit/?id=396851c20aeb
+# but only if devel/ncurses isn't installed
+.if !exists(/usr/libdata/pkgconfig/ncursesw.pc)
+CONFIGURE_ENV+=	${ncurses_ARGS:Mbase:C/.+/PKG_CONFIG_PATH="${FILESDIR}"/}
 .endif
 
 post-extract:
 	${LN} -s ${WRKDIR}/media-session-${MEDIA_SESSION_VERSION} ${WRKSRC}/subprojects/media-session
 
 post-patch-MEDIASESSION-on:
 # alsa-seq is not supported & causes SIGSEGV with media session
 	@${REINPLACE_CMD} 's| alsa-seq|\ #alsa-seq|g' \
 		${WRKDIR}/media-session-${MEDIA_SESSION_VERSION}/media-session.d/media-session.conf
 # start media session by default
 	@${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \
 		${WRKSRC}/src/daemon/pipewire.conf.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/pipewire/files/ncursesw.pc b/multimedia/pipewire/files/ncursesw.pc
new file mode 100644
index 000000000000..f36e98b73009
--- /dev/null
+++ b/multimedia/pipewire/files/ncursesw.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: ncursesw
+Description: ncurses 5.9 library (wide-char/UTF-8 flavor)
+Version: 5.9.20140222
+URL: https://invisible-island.net/ncurses
+Libs: -lncursesw