- Update net/pjsip to 2.7.2

- Sort options and option helpers
- Remove stray YUV_DESC variable

2 files changed, 19 insertions, 20 deletions

diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index d2e86e31eb5e..ccf5d81476d2 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pjsip
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
@@ -24,11 +24,12 @@ USE_LDCONFIG=	yes
 PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 \
-		OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \
-		SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP WEBRTC
+OPTIONS_DEFINE=	AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \
+		L16 OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \
+		SHARED SOUND SPEEX SPEEXAEC V4L VIDEO WEBRTC
 OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC
 
+EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk13 pjsip backend)
 G711_DESC=	G.711 codec support
 G722_DESC=	G.722 codec support
 G7221_DESC=	G.722.1 codec support
@@ -41,23 +42,28 @@ RESAMPLEDLL_DESC=	Build libresample as shared library
 SHARED_DESC=	Build shared libraries (other ports may depend on this)
 SPEEXAEC_DESC=	Speex Acoustic Echo Canceller/AEC
 V4L_DESC=	Video4Linux2 support
-YUV_DESC=	Libyuv support
-EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk13 pjsip backend)
 WEBRTC_DESC=	Build linwebrtc
 
 OPTIONS_SUB=	yes
 
+AMR_CONFIGURE_WITH=		opencore-amr
+AMR_LIB_DEPENDS=		libopencore-amrwb.so:audio/opencore-amr \
+				libvo-amrwbenc.so:audio/vo-amrwbenc
 DEBUG_CFLAGS=			-DNDEBUG=0
 DEBUG_CFLAGS_OFF=		-DNDEBUG=1
+EXTSRTP_CONFIGURE_WITH=		external-srtp
+EXTSRTP_CONFLICTS_OFF=		libsrtp-[0-9]*
+EXTSRTP_LIB_DEPENDS=		libsrtp.so:net/libsrtp
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
 FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
 G711_CONFIGURE_ENABLE=		g711-codec
 G722_CONFIGURE_ENABLE=		g722-codec
 G7221_CONFIGURE_ENABLE=		g7221-codec
 GSM_CONFIGURE_ENABLE=		gsm-codec
-GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ON=		--with-external-gsm
+GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 ILBC_CONFIGURE_ENABLE=		ilbc-codec
+IPV6_CFLAGS=			"-DPJ_HAS_IPV6=1"
 IPV6_CFLAGS=			-DPJ_HAS_IPV6=1
 IPV6_CFLAGS_OFF=		-DPJ_HAS_IPV6=1
 L16_CONFIGURE_ENABLE=		l16-codec
@@ -70,23 +76,16 @@ SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SDL_CONFIGURE_ENABLE=		sdl
 SDL_USE=			SDL=sdl
 SHARED_CONFIGURE_ENABLE=	shared
+SOUND_CONFIGURE_ENABLE=		sound
+SPEEXAEC_CONFIGURE_ENABLE=	speex-aec
 SPEEX_CONFIGURE_ENABLE=		speex-codec
 SPEEX_CONFIGURE_ON=		--with-external-speex
 SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex \
 				libspeexdsp.so:audio/speexdsp
-SPEEXAEC_CONFIGURE_ENABLE=	speex-aec
-V4L_CONFIGURE_ENABLE=		v4l2
 V4L_BUILD_DEPENDS=		v4l_compat>=0:multimedia/v4l_compat
+V4L_CONFIGURE_ENABLE=		v4l2
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
-IPV6_CFLAGS=			"-DPJ_HAS_IPV6=1"
-SOUND_CONFIGURE_ENABLE=		sound
 VIDEO_CONFIGURE_ENABLE=		video
-AMR_CONFIGURE_WITH=		opencore-amr
-AMR_LIB_DEPENDS=		libopencore-amrwb.so:audio/opencore-amr \
-				libvo-amrwbenc.so:audio/vo-amrwbenc
-EXTSRTP_CONFIGURE_WITH=		external-srtp
-EXTSRTP_LIB_DEPENDS=		libsrtp.so:net/libsrtp
-EXTSRTP_CONFLICTS_OFF=		libsrtp-[0-9]*
 WEBRTC_CONFIGURE_OFF=		--disable-libwebrtc
 
 post-patch:
diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo
index f386a48e72a9..e88493062579 100644
--- a/net/pjsip/distinfo
+++ b/net/pjsip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510760850
-SHA256 (pjproject-2.7.1.tar.bz2) = 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126
-SIZE (pjproject-2.7.1.tar.bz2) = 4880007
+TIMESTAMP = 1519204408
+SHA256 (pjproject-2.7.2.tar.bz2) = 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772
+SIZE (pjproject-2.7.2.tar.bz2) = 4994233