Index: head/audio/baresip/Makefile
===================================================================
--- head/audio/baresip/Makefile	(revision 416829)
+++ head/audio/baresip/Makefile	(revision 416830)
@@ -1,130 +1,129 @@
 # $FreeBSD$
 
 PORTNAME=	baresip
-PORTVERSION=	0.4.8
-PORTREVISION=	4
+PORTVERSION=	0.4.19
 CATEGORIES=	audio
 MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Small SIP client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-BUILD_DEPENDS=	re>=0.4.6:audio/re \
-		rem>=0.4.4:audio/rem
+BUILD_DEPENDS=	re>=0.4.14:audio/re \
+		rem>=0.4.7:audio/rem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake pkgconfig
 USE_OPENSSL=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
 MAKE_ARGS=	MOD_AUTODETECT=""
 PLIST_FILES=	bin/baresip
 PORTDATA=	*
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
 #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 \
+OPTIONS_DEFINE=	CONS DOCS EXAMPLES 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
 PLC_DESC=	Packet Loss Concealment
 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 [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,^.,,:tl} module
 .  endif
 .endfor
 
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/Makefile.depends"
 
 # Port calls it GST, standard OPTION is GSTREAMER
 .if ${PORT_OPTIONS:MGSTREAMER}
 PORT_OPTIONS+=	GST
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl sound
 .endif
 
 # SPEEX forces install of speex, therefore may as well enable all methods
 .if ${PORT_OPTIONS:MSPEEX}
 . for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP
 MAKE_ARGS+=	USE_$s=yes
 . endfor
 MAKE_ARGS+=	HAVE_SPEEXDSP=yes
 .endif
 
-.for o in CELT SRTP V4L DTLS_SRTP V4L2 X11
+.for o in 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
 
 .for o in ${PORT_OPTIONS}
 MAKE_ARGS+=	USE_$o=yes
 BUILD_DEPENDS+=	${$o_DEPEND}
 RUN_DEPENDS+=	${$o_DEPEND}
 .endfor
 
 # GNU Make does not do make -V, which makes life difficult
 post-patch:
 	${ECHO_CMD} >> ${WRKSRC}/Makefile
 	${ECHO_CMD} ".PHONY: showmodules" >> ${WRKSRC}/Makefile
 	${ECHO_CMD} "showmodules:" >> ${WRKSRC}/Makefile
 	${ECHO_CMD} '	@${ECHO_CMD} $$(MODULES)' >> ${WRKSRC}/Makefile
-	${REINPLACE_CMD} 's,-lcelt[0-9]*,$$(pkg-config --libs celt),' \
-		${WRKSRC}/modules/celt/module.mk
 	${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib -lportaudio,' \
 		${WRKSRC}/modules/portaudio/module.mk
 
 do-install:
 	${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} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules
 	for m in $$(${SETENV} ${MAKE_ENV} ${MAKE_CMD} -sC ${WRKSRC} ${MAKE_ARGS} showmodules); \
 	do ${INSTALL_LIB} ${WRKSRC}/$$m.so \
 		${STAGEDIR}${PREFIX}/lib/baresip/modules; \
 	   ${ECHO_CMD} lib/${PORTNAME}/modules/$$m.so >> ${TMPPLIST}; \
 	done
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	${RMDIR} ${STAGEDIR}${DOCSDIR}/examples
 
 .include <bsd.port.mk>
Index: head/audio/baresip/Makefile.depends
===================================================================
--- head/audio/baresip/Makefile.depends	(revision 416829)
+++ head/audio/baresip/Makefile.depends	(revision 416830)
@@ -1,29 +1,28 @@
 # $FreeBSD$
 
 ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
 BV32_DEPEND=	# nonexistent
-CELT_DEPEND=	${LOCALBASE}/include/celt/celt.h:audio/celt
 CONS_DEPEND=	# unnecessary
 DTLS_SRTP_DEPEND=	# unnecessary
 EVDEV_DEPEND=
 FFMPEG_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
 G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
 G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
 G722_1_DEPEND=	# nonexistent
 GSM_DEPEND=	${LOCALBASE}/include/gsm.h:audio/gsm
 GST_DEPEND=	gst-launch:multimedia/gstreamer
 ILBC_DEPEND=	${LOCALBASE}/include/ilbc/iLBC_define.h:net/ilbc
 L16_DEPEND=	
 OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
 OSS_DEPEND=	# In base
 PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
 PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
 SDL_DEPEND=	# Handled with USE_SDL in Makefile
 SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
 SPEEX_DEPEND=	${LOCALBASE}/include/speex/speex.h:audio/speex
 SRTP_DEPEND=	${LOCALBASE}/include/srtp/srtp.h:net/libsrtp
 STDIO_DEPEND=	# In base
 UUID_DEPEND=	${LOCALBASE}/include/uuid/uuid.h:misc/e2fsprogs-libuuid
 V4L_DEPEND=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
 X11_DEPEND=	# Handled with USE_XORG in Makefile
Index: head/audio/baresip/distinfo
===================================================================
--- head/audio/baresip/distinfo	(revision 416829)
+++ head/audio/baresip/distinfo	(revision 416830)
@@ -1,2 +1,3 @@
-SHA256 (baresip-0.4.8.tar.gz) = f13f63aa27bd565dcd08d5fd56cc5eae9043495b27513a7e488bd2935c2932f7
-SIZE (baresip-0.4.8.tar.gz) = 360486
+TIMESTAMP = 1465682412
+SHA256 (baresip-0.4.19.tar.gz) = bb8c62da225d7ee30ad371e6e0cd0f4bb663635e73b8c09cd43b054b981eb0d1
+SIZE (baresip-0.4.19.tar.gz) = 449660
Index: head/audio/re/Makefile
===================================================================
--- head/audio/re/Makefile	(revision 416829)
+++ head/audio/re/Makefile	(revision 416830)
@@ -1,28 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	re
-PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTVERSION=	0.4.16
 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=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 USES=		gmake
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
 PORTDATA=	re.mk
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/include && \
 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
 	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
 	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
Index: head/audio/re/distinfo
===================================================================
--- head/audio/re/distinfo	(revision 416829)
+++ head/audio/re/distinfo	(revision 416830)
@@ -1,2 +1,3 @@
-SHA256 (re-0.4.6.tar.gz) = 7e12582254f17fc3e24d0cbca9303117392501a024550f3ed08138decd0127ee
-SIZE (re-0.4.6.tar.gz) = 272017
+TIMESTAMP = 1465679980
+SHA256 (re-0.4.16.tar.gz) = bc36fcf37302bfdb964374f2842179f1521d78df79e42e74c4fd102e61fa4b29
+SIZE (re-0.4.16.tar.gz) = 308213
Index: head/audio/re/pkg-plist
===================================================================
--- head/audio/re/pkg-plist	(revision 416829)
+++ head/audio/re/pkg-plist	(revision 416830)
@@ -1,45 +1,51 @@
-include/re/re_net.h
-include/re/re_list.h
-include/re/re_hash.h
-include/re/re_stun.h
-include/re/re_tls.h
-include/re/re_lock.h
+include/re/re.h
+include/re/re_aes.h
 include/re/re_base64.h
 include/re/re_bfcp.h
-include/re/re_sip.h
-include/re/re_dbg.h
-include/re/re_sys.h
-include/re/re_tmr.h
-include/re/re_types.h
-include/re/re_mbuf.h
-include/re/re_mem.h
-include/re/re_mqueue.h
+include/re/re_bitv.h
+include/re/re_conf.h
 include/re/re_crc32.h
-include/re/re_main.h
-include/re/re_uri.h
-include/re/re_jbuf.h
-include/re/re_sipevent.h
-include/re/re_telev.h
+include/re/re_dbg.h
+include/re/re_dns.h
+include/re/re_fmt.h
+include/re/re_hash.h
+include/re/re_hmac.h
 include/re/re_http.h
 include/re/re_httpauth.h
-include/re/re_dns.h
 include/re/re_ice.h
-include/re/re_sdp.h
-include/re/re.h
-include/re/re_conf.h
-include/re/re_rtp.h
+include/re/re_jbuf.h
+include/re/re_json.h
+include/re/re_list.h
+include/re/re_lock.h
+include/re/re_main.h
+include/re/re_mbuf.h
 include/re/re_md5.h
-include/re/re_fmt.h
-include/re/re_turn.h
-include/re/re_sipreg.h
+include/re/re_mem.h
+include/re/re_mod.h
+include/re/re_mqueue.h
+include/re/re_msg.h
 include/re/re_natbd.h
-include/re/re_bitv.h
+include/re/re_net.h
+include/re/re_odict.h
+include/re/re_rtp.h
 include/re/re_sa.h
+include/re/re_sdp.h
 include/re/re_sha.h
-include/re/re_mod.h
+include/re/re_sip.h
+include/re/re_sipevent.h
+include/re/re_sipreg.h
 include/re/re_sipsess.h
-include/re/re_hmac.h
+include/re/re_srtp.h
+include/re/re_stun.h
+include/re/re_sys.h
 include/re/re_tcp.h
+include/re/re_telev.h
+include/re/re_tls.h
+include/re/re_tmr.h
+include/re/re_turn.h
+include/re/re_types.h
 include/re/re_udp.h
-lib/libre.so
+include/re/re_uri.h
+include/re/re_websock.h
 lib/libre.a
+lib/libre.so
Index: head/audio/rem/Makefile
===================================================================
--- head/audio/rem/Makefile	(revision 416829)
+++ head/audio/rem/Makefile	(revision 416830)
@@ -1,29 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	rem
-PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTVERSION=	0.4.7
 CATEGORIES=	audio devel
 MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Library for real-time audio and video processing
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	(cd ${WRKSRC}/include && \
 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
 	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
Index: head/audio/rem/distinfo
===================================================================
--- head/audio/rem/distinfo	(revision 416829)
+++ head/audio/rem/distinfo	(revision 416830)
@@ -1,2 +1,3 @@
-SHA256 (rem-0.4.4.tar.gz) = 2551dc0888846af59d6392b5dfbb7e845d3bc70b98b03ff93c4ccdbafe2d7d43
-SIZE (rem-0.4.4.tar.gz) = 34381
+TIMESTAMP = 1465679998
+SHA256 (rem-0.4.7.tar.gz) = 5d084f5ee17b839680ab6b978357c095c2a85d04bdf61fa03192019e3435954e
+SIZE (rem-0.4.7.tar.gz) = 36986
Index: head/audio/rem/pkg-plist
===================================================================
--- head/audio/rem/pkg-plist	(revision 416829)
+++ head/audio/rem/pkg-plist	(revision 416830)
@@ -1,17 +1,18 @@
+include/rem/rem.h
 include/rem/rem_au.h
 include/rem/rem_aubuf.h
+include/rem/rem_auconv.h
+include/rem/rem_audio.h
 include/rem/rem_aufile.h
-include/rem/rem_g711.h
+include/rem/rem_aumix.h
+include/rem/rem_auresamp.h
+include/rem/rem_autone.h
 include/rem/rem_dsp.h
-include/rem/rem_video.h
-include/rem/rem.h
 include/rem/rem_fir.h
+include/rem/rem_g711.h
 include/rem/rem_vid.h
-include/rem/rem_auresamp.h
-include/rem/rem_vidmix.h
-include/rem/rem_aumix.h
-include/rem/rem_audio.h
-include/rem/rem_autone.h
 include/rem/rem_vidconv.h
-lib/librem.so
+include/rem/rem_video.h
+include/rem/rem_vidmix.h
 lib/librem.a
+lib/librem.so