Update Baresip to 0.4.8, and the supporting re and rem libraries

to their latest versions

Several new modules, however some will no longer work after changes to the
core code; a best effort has been made to investigate and mark such broken
modules.

9 files changed, 73 insertions, 38 deletions

diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 8d382960d106..2cbd8b756705 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,48 +1,66 @@
 # $FreeBSD$
 
 PORTNAME=	baresip
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Small SIP client
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-BUILD_DEPENDS=	re>=${PORTVERSION}:${PORTSDIR}/audio/re \
-		rem>=${PORTVERSION}:${PORTSDIR}/audio/rem
+BUILD_DEPENDS=	re>=0.4.6:${PORTSDIR}/audio/re \
+		rem>=0.4.4:${PORTSDIR}/audio/rem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_STAGE=	yes
-USES=		gmake
-
+USES=		gmake pkgconfig
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
 MAKE_ARGS=	MOD_AUTODETECT=""
 PLIST_FILES=	bin/baresip
 PORTDATA=	*
 PORTDOCS=	*
 
-#OPTIONS_NOT_YET_WORKING=	ALSA BV32 G722_1 PLC
-OPTIONS_DEFINE=	CELT CONS DOCS FFMPEG G711 G722 GSM GSTREAMER ILBC L16 OPUS \
-		OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11
-OPTIONS_DEFAULT=CONS G711 G722 L16
+#OPTIONS_NOT_YET_WORKING=	ALSA BV32 G722_1 PLC ISAC OPENGLES
+OPTIONS_DEFINE=	CELT CONS DOCS FFMPEG G711 G722 G726 GSM GSTREAMER ILBC L16 \
+	OPUS OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11 \
+	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \
+	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \
+	MENU PRESENCE SYSLOG VIDLOOP
+OPTIONS_DEFAULT=CONS G711 G722 G726 L16
 
+AULOOP_DESC=	Audio-loop test module
 BV32_DESC=	BroadVoice32 Wideband Audio codec
+CELT_DESC=	Celt support [broken]
+CONTACT_DESC=	Contacts module
 CONS_DESC=	Console input driver
+DTLS_SRTP_DESC=	DTLS Secure RTP module [broken]
 G711_DESC=	G.711 audio codec
 G722_DESC=	G.722 audio codec
 G722_1_DESC=	G.722.1 audio codec
+G726_DESC=	G.726 audio codec
 ILBC_DESC=	iLBC audio codec
 L16_DESC=	L16 audio codec
+MENU_DESC=	Interactive menu
+OPENGLES_DESC=	OpenGL ES video output
 OPUS_DESC=	Opus audio codec
 PLC_DESC=	Packet Loss Concealment
-SRTP_DESC=	Secure RTP module
+PRESENCE_DESC=	Presence module
+SRTP_DESC=	Secure RTP module [broken]
 STDIO_DESC=	stdio input driver
+SYSLOG_DESC=	Syslog module
 UUID_DESC=	UUID module
-V4L_DESC=	Video4Linux module
-V4L2_DESC=	Video4Linux2 module
+V4L_DESC=	Video4Linux module [broken]
+V4L2_DESC=	Video4Linux2 module [broken]
+VIDLOOP_DESC=	Video-loop test module
+X11_DESC=	X11 module [broken]
+
+.for o in ${OPTIONS_DEFINE}
+.  ifndef $o_DESC
+$o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:L} module
+.  endif
+.endfor
 
 .include <bsd.port.options.mk>
 
@@ -65,6 +83,12 @@ MAKE_ARGS+=	USE_$s=yes
 MAKE_ARGS+=	HAVE_SPEEXDSP=yes
 .endif
 
+.for o in CELT SRTP V4L DTLS_SRTP V4L2 X11
+.  if ${PORT_OPTIONS:M$o}
+BROKEN=	OPTIONS marked as BROKEN have not been updated to the new Baresip API
+.  endif
+.endfor
+
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 .endif
@@ -87,22 +111,21 @@ post-patch:
 		${WRKSRC}/modules/portaudio/module.mk
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/share/* ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/share/* ${STAGEDIR}${DATADIR}
 
 # Install modules and add to plist
 post-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules
 	for m in $$(${GMAKE} -sC ${WRKSRC} ${MAKE_ARGS} showmodules); \
-	do ${INSTALL_LIB} ${WRKSRC}/$$m.so ${PREFIX}/lib/baresip/modules; \
+	do ${INSTALL_LIB} ${WRKSRC}/$$m.so \
+		${STAGEDIR}${PREFIX}/lib/baresip/modules; \
 	   ${ECHO_CMD} lib/${PORTNAME}/modules/$$m.so >> ${TMPPLIST}; \
 	done
 	${ECHO_CMD} "@dirrm lib/baresip/modules" >> ${TMPPLIST}
 	${ECHO_CMD} "@dirrm lib/baresip" >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index d5ea40e05a72..12f78e4f8829 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -4,6 +4,7 @@ ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:${PORTSDIR}/audio/alsa-lib
 BV32_DEPEND=	# nonexistent
 CELT_DEPEND=	${LOCALBASE}/include/celt/celt.h:${PORTSDIR}/audio/celt
 CONS_DEPEND=	# unnecessary
+DTLS_SRTP_DEPEND=	# unnecessary
 EVDEV_DEPEND=
 FFMPEG_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:${PORTSDIR}/multimedia/ffmpeg
 G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:${PORTSDIR}/comms/spandsp
diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo
index 5df7c3d4cb36..bf6ad9d396c5 100644
--- a/audio/baresip/distinfo
+++ b/audio/baresip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (baresip-0.4.2.tar.gz) = 3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7
-SIZE (baresip-0.4.2.tar.gz) = 323824
+SHA256 (baresip-0.4.8.tar.gz) = f13f63aa27bd565dcd08d5fd56cc5eae9043495b27513a7e488bd2935c2932f7
+SIZE (baresip-0.4.8.tar.gz) = 360486
diff --git a/audio/re/Makefile b/audio/re/Makefile
index 412f06b37091..5bfdef70f3f5 100644
--- a/audio/re/Makefile
+++ b/audio/re/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	re
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.6
 CATEGORIES=	audio devel
 MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Library for real-time comms with async IO support
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 USES=		gmake
diff --git a/audio/re/distinfo b/audio/re/distinfo
index c8a7affb4a27..e6eac70d0a70 100644
--- a/audio/re/distinfo
+++ b/audio/re/distinfo
@@ -1,2 +1,2 @@
-SHA256 (re-0.4.2.tar.gz) = 1585e2f954abda8e9b97a8eafa2165e816aea46fb0b7ac80220d6243f4f329b1
-SIZE (re-0.4.2.tar.gz) = 263172
+SHA256 (re-0.4.6.tar.gz) = 7e12582254f17fc3e24d0cbca9303117392501a024550f3ed08138decd0127ee
+SIZE (re-0.4.6.tar.gz) = 272017
diff --git a/audio/re/files/patch-mk-re.mk b/audio/re/files/patch-mk-re.mk
new file mode 100644
index 000000000000..ca4eac1b3c22
--- /dev/null
+++ b/audio/re/files/patch-mk-re.mk
@@ -0,0 +1,12 @@
+--- mk/re.mk.orig	2013-12-20 13:16:19.461335812 +0000
++++ mk/re.mk	2013-12-20 13:16:30.914336263 +0000
+@@ -73,9 +73,6 @@
+ ifeq ($(CC),)
+ 	CC := gcc
+ endif
+-ifeq ($(CC),cc)
+-	CC := gcc
+-endif
+ LD := $(CC)
+ CC_LONGVER := $(shell if $(CC) -v 2>/dev/null; then \
+ 						$(CC) -v 2>&1 ;\
diff --git a/audio/re/pkg-plist b/audio/re/pkg-plist
index 2e3fef03775f..f28e7ce5c413 100644
--- a/audio/re/pkg-plist
+++ b/audio/re/pkg-plist
@@ -20,6 +20,7 @@ include/re/re_uri.h
 include/re/re_jbuf.h
 include/re/re_sipevent.h
 include/re/re_telev.h
+include/re/re_http.h
 include/re/re_httpauth.h
 include/re/re_dns.h
 include/re/re_ice.h
diff --git a/audio/rem/Makefile b/audio/rem/Makefile
index 63482cf7e447..3d679360c30d 100644
--- a/audio/rem/Makefile
+++ b/audio/rem/Makefile
@@ -1,28 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	rem
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.4.4
 CATEGORIES=	audio devel
 MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Library for real-time audio and video processing
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:${PORTSDIR}/audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 USES=		gmake
 
 do-install:
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	(cd ${WRKSRC}/include && \
-	    ${COPYTREE_SHARE} \*.h ${PREFIX}/include/${PORTNAME})
-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${PREFIX}/lib
+	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/audio/rem/distinfo b/audio/rem/distinfo
index a9d3dee4b578..1b585d9649c0 100644
--- a/audio/rem/distinfo
+++ b/audio/rem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rem-0.4.2.tar.gz) = 55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7
-SIZE (rem-0.4.2.tar.gz) = 32978
+SHA256 (rem-0.4.4.tar.gz) = 2551dc0888846af59d6392b5dfbb7e845d3bc70b98b03ff93c4ccdbafe2d7d43
+SIZE (rem-0.4.4.tar.gz) = 34381