audio/baresip: remove audio/rem dependency

audio/rem is now merged into audio/re [1]

[1] https://github.com/baresip/re/pull/683

Reported by:	Herbert J. Skuhra <herbert@gojira.at> (by email)

1 files changed, 50 insertions, 60 deletions

diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 850d9852924b..c867820fedab 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
@@ -10,11 +11,10 @@ WWW=		https://github.com/baresip
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	re>=${PORTVERSION}:audio/re \
-		rem>0:audio/rem
+BUILD_DEPENDS=	re>=${PORTVERSION}:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		cmake ssl pkgconfig
+USES=		cmake pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	baresip
 
@@ -23,47 +23,39 @@ ABI_MAJOR=	9
 ABI_AGE=	4
 ABI_REV=	0
 PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
-PLIST_SUB+=	ABI_AGE=${ABI_AGE}
-PLIST_SUB+=	ABI_REV=${ABI_REV}
-
-OPTIONS_DEFINE=	\
-	ALSA AV1 AVCODEC AVFILTER AVFORMAT \
-	CTRL_DBUS \
-	DOCS \
-	EXAMPLES \
-	G711 G722 G726 GST \
-	MQTT \
-	OPUS OPUS_MS \
-	PLC PORTAUDIO PULSEAUDIO \
-	SDL SNAPSHOT SNDFILE SWSCALE \
-	V4L2 VPX \
-	X11
-OPTIONS_DEFAULT=DOCS EXAMPLES
-OPTIONS_SUB=	yes
-
-ALSA_DESC=	ALSA audio driver
-AV1_DESC=	AV1 Video Codec
-AVCODEC_DESC=	Video codecs using libavcodec
-AVFILTER_DESC=	Video filter using libavfilter
-AVFORMAT_DESC=	libavformat media-source
-CTRL_DBUS_DESC=	[broken] DBUS interface for baresip
-G711_DESC=	G.711 audio codec
-G722_DESC=	G.722 audio codec
-G726_DESC=	G.726 audio codec
-GST_DESC=	Gstreamer audio module
-MQTT_DESC=	Message Queue Telemetry Transport (MQTT) client
-OPUS_DESC=	Opus audio codec
-OPUS_MS_DESC=	Opus Multistream audio codec
-PLC_DESC=	Packet Loss Concealment
-PORTAUDIO_DESC=	Portaudio audio driver
+PLIST_SUB+=	ABI_AGE=${ABI_AGE} \
+		ABI_REV=${ABI_REV}
+
+OPTIONS_DEFINE=		ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \
+			EXAMPLES G711 G722 G726 GST MQTT OPUS OPUS_MS PLC \
+			PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE V4L2 \
+			VPX X11
+OPTIONS_DEFAULT=	DOCS EXAMPLES
+OPTIONS_SUB=		yes
+
+ALSA_DESC=		ALSA audio driver
+AV1_DESC=		AV1 Video Codec
+AVCODEC_DESC=		Video codecs using libavcodec
+AVFILTER_DESC=		Video filter using libavfilter
+AVFORMAT_DESC=		libavformat media-source
+CTRL_DBUS_DESC=		[broken] DBUS interface for baresip
+G711_DESC=		G.711 audio codec
+G722_DESC=		G.722 audio codec
+G726_DESC=		G.726 audio codec
+GST_DESC=		Gstreamer audio module
+MQTT_DESC=		Message Queue Telemetry Transport (MQTT) client
+OPUS_DESC=		Opus audio codec
+OPUS_MS_DESC=		Opus Multistream audio codec
+PLC_DESC=		Packet Loss Concealment
+PORTAUDIO_DESC=		Portaudio audio driver
 PULSEAUDIO_DESC=	Pulseaudio audio driver
-SDL_DESC=	libSDL2 video output
-SNAPSHOT_DESC=	Snapshot video module
-SNDFILE_DESC=	sndfile wav dumper
-SWSCALE_DESC=	Video filter for scaling and pixel conversion
-V4L2_DESC=	Video4Linux2 module
-VPX_DESC=	VP8/VP9 video codecs
-X11_DESC=	X11 video output
+SDL_DESC=		libSDL2 video output
+SNAPSHOT_DESC=		Snapshot video module
+SNDFILE_DESC=		sndfile wav dumper
+SWSCALE_DESC=		Video filter for scaling and pixel conversion
+V4L2_DESC=		Video4Linux2 module
+VPX_DESC=		VP8/VP9 video codecs
+X11_DESC=		X11 video output
 
 MODULES_LIST:=	account;aubridge;auconv;aufile;auresamp;ausine
 MODULES_LIST:=	$(MODULES_LIST);cons;contact;ctrl_tcp
@@ -89,18 +81,18 @@ MODULES_LIST:=	$(MODULES_LIST);av1
 
 .if ${PORT_OPTIONS:MAVCODEC}
 AVCODEC_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg \
-			libdrm>0:graphics/libdrm
+		libdrm>0:graphics/libdrm
 MODULES_LIST:=	$(MODULES_LIST);avcodec
 .endif
 
 .if ${PORT_OPTIONS:MAVFILTER}
 AVFILTER_DEPEND=	${LOCALBASE}/include/libavfilter/avfilter.h:multimedia/ffmpeg
-MODULES_LIST:=	$(MODULES_LIST);avfilter
+MODULES_LIST:=		$(MODULES_LIST);avfilter
 .endif
 
 .if ${PORT_OPTIONS:MAVFORMAT}
 AVFORMAT_DEPEND=	${LOCALBASE}/include/libavformat/avformat.h:multimedia/ffmpeg
-MODULES_LIST:=	$(MODULES_LIST);avformat
+MODULES_LIST:=		$(MODULES_LIST);avformat
 .endif
 
 .if ${PORT_OPTIONS:MG711}
@@ -119,10 +111,10 @@ MODULES_LIST:=	$(MODULES_LIST);g726
 .endif
 
 .if ${PORT_OPTIONS:MGST}
-GST_DEPEND=	${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1
-PORT_OPTIONS+=	GSTREAMER
-USES+=		gnome
-USE_GNOME+=	glib20
+GST_DEPEND=		${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1
+PORT_OPTIONS+=		GSTREAMER
+USES+=			gnome
+USE_GNOME+=		glib20
 USE_GSTREAMER1+=	yes
 .endif
 
@@ -148,14 +140,14 @@ MODULES_LIST:=	$(MODULES_LIST);plc
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
 PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
-MODULES_LIST:=	$(MODULES_LIST);portaudio
+MODULES_LIST:=		$(MODULES_LIST);portaudio
 .endif
 
 # Port calls it PULSE, standard OPTION is PULSEAUDIO
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-PORT_OPTIONS+=	PULSE
+PORT_OPTIONS+=		PULSE
 PULSEAUDIO_DEPEND=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
-MODULES_LIST:=	$(MODULES_LIST);pulse
+MODULES_LIST:=		$(MODULES_LIST);pulse
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
@@ -182,7 +174,7 @@ MODULES_LIST:=	$(MODULES_LIST);swscale
 
 .if ${PORT_OPTIONS:MV4L2}
 V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l \
-                v4l_compat>0:multimedia/v4l_compat
+		v4l_compat>0:multimedia/v4l_compat
 
 MODULES_LIST:=	$(MODULES_LIST);v4l2
 .endif
@@ -195,9 +187,7 @@ MODULES_LIST:=	$(MODULES_LIST);vp8;vp9
 .if ${PORT_OPTIONS:MX11}
 USES+=		xorg
 USE_XORG=	x11
-USE_XORG+=	xext
-USE_XORG+=	sm
-USE_XORG+=	ice
+USE_XORG+=	ice sm xext
 MODULES_LIST:=	$(MODULES_LIST);x11
 .endif
 
@@ -206,9 +196,9 @@ BUILD_DEPENDS+=	${$o_DEPEND}
 RUN_DEPENDS+=	${$o_DEPEND}
 .endfor
 
-CMAKE_ARGS+=	-DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \
-		-DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem" \
-		-DMODULES="$(MODULES_LIST)"
+CMAKE_ARGS+=	-DMODULES="$(MODULES_LIST)" \
+		-DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \
+		-DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}