- Update to 1.6.13

PR:		215063
Submitted by:	corsmith@gmail.com(maintainer)

6 files changed, 24 insertions, 63 deletions

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index bc0cae302a61..4ae2bd09e554 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeswitch
-PORTVERSION=	1.6.8
-PORTREVISION=	3
+PORTVERSION=	1.6.13
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
 		http://files.freeswitch.org/releases/sounds/:sounds
@@ -17,19 +16,21 @@ LICENSE=	MPL
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
+		libspeexdsp.so:audio/speexdsp \
 		libspeex.so:audio/speex \
 		libldns.so:dns/ldns \
 		libopus.so:audio/opus \
-		libsndfile.so:audio/libsndfile
+		libsndfile.so:audio/libsndfile \
+		libfreetype.so:print/freetype2 \
+		libpng16.so:graphics/png \
+		libjbig.so:graphics/jbigkit
 
 CONFLICTS_BUILD=	xmlrpc-c-*
 
-BROKEN=			unfetchable (checksum mismatch) and attempts to strip libfreeswitch.a\
-			(returns file format not recognized)
 BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
 ONLY_FOR_ARCHS=	amd64
 
-USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz
+USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
 USE_LDCONFIG=	yes
 
 ALL_MODULES_DESC=	Build all modules
@@ -50,6 +51,7 @@ OPTIONS_DEFAULT=	8K 16K ENGLISH
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 
+ALL_MODULES_CONFLICTS_BUILD+=	apr
 ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
 
 GNU_CONFIGURE=		yes
@@ -70,11 +72,13 @@ CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALL_MODULES}
+USE_XORG=	x11
 BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
 		${LOCALBASE}/bin/aclocal:devel/automake
 RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
-		libopencv_legacy.so:graphics/opencv2 \
+		libopencv_gpu.so:graphics/opencv2 \
+		libopencv_core.so:graphics/opencv2-core \
 		libhiredis.so:databases/hiredis \
 		libmemcached.so:databases/libmemcached \
 		libSoundTouch.so:audio/soundtouch \
@@ -88,7 +92,6 @@ LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
 		libvlc.so:multimedia/vlc \
 		libyaml.so:textproc/libyaml
 USE_OPENLDAP=	yes
-USE_OPENSSL=	yes
 .if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
 .else
diff --git a/net/freeswitch/distinfo b/net/freeswitch/distinfo
index 7f94c0939fc7..b17eda813412 100644
--- a/net/freeswitch/distinfo
+++ b/net/freeswitch/distinfo
@@ -1,34 +1,11 @@
-SHA256 (freeswitch-1.6.8.tar.xz) = a9834667c0afc164631611b4862acd6411e4e6ddb706e4af4b51eab4adbe4fc1
-SIZE (freeswitch-1.6.8.tar.xz) = 33460304
+TIMESTAMP = 1482581188
+SHA256 (freeswitch-1.6.13.tar.xz) = 64a8a14fc5df92893d956868f144042891cc3e2d096bbf56241fec706635a8b7
+SIZE (freeswitch-1.6.13.tar.xz) = 33568084
 SHA256 (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
 SIZE (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
 SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
 SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
-SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
-SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
-SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
-SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
 SHA256 (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e
 SIZE (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 27993050
 SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
 SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
-SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
-SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
-SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
-SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
-SHA256 (freeswitch-sounds-music-32000-1.0.51.tar.gz) = c6b6a5ea1b68ee1eb0d879e449052d07dc9ed6371a50cd173fbe09b532becf1e
-SIZE (freeswitch-sounds-music-32000-1.0.51.tar.gz) = 53016061
-SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
-SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
-SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
-SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
-SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
-SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
-SHA256 (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 13ca541c76e42c13e686ff8da3b93cf21fdcff5388e6353856daef4d7bac30fd
-SIZE (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 75546338
-SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
-SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
-SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
-SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
-SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
-SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
diff --git a/net/freeswitch/files/extrapatch-modules.conf b/net/freeswitch/files/extrapatch-modules.conf
index e8ff9b7510d1..8ab8b497eced 100644
--- a/net/freeswitch/files/extrapatch-modules.conf
+++ b/net/freeswitch/files/extrapatch-modules.conf
@@ -1,17 +1,17 @@
---- modules.conf.orig	2016-05-05 16:42:20.000000000 -0400
-+++ modules.conf	2016-05-06 16:42:38.276496730 -0400
-@@ -1,161 +1,161 @@
+--- modules.conf.orig	2016-08-25 12:35:35 UTC
++++ modules.conf
+@@ -1,162 +1,162 @@
 -#applications/mod_abstraction
 -#applications/mod_av
 -#applications/mod_avmd
-+applications/mod_abstraction
-+applications/mod_av
-+applications/mod_avmd
 -#applications/mod_bert
 -#applications/mod_blacklist
 -#applications/mod_callcenter
 -#applications/mod_cidlookup
 -#applications/mod_cluechoo
++applications/mod_abstraction
++applications/mod_av
++applications/mod_avmd
 +applications/mod_bert
 +applications/mod_blacklist
 +applications/mod_callcenter
@@ -69,6 +69,7 @@
 +applications/mod_redis
 +applications/mod_rss
  applications/mod_sms
+ #applications/mod_sms_flowroute
 -#applications/mod_snapshot
 -#applications/mod_snom
 -#applications/mod_sonar
diff --git a/net/freeswitch/files/patch-configure b/net/freeswitch/files/patch-configure
deleted file mode 100644
index 80cc68925700..000000000000
--- a/net/freeswitch/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-05-18 22:49:18.753911000 +0000
-+++ configure	2016-05-18 22:49:38.480978000 +0000
-@@ -20062,7 +20062,7 @@
- fi
- 
- 
--for luaversion in lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
-+for luaversion in lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
- 
-   succeeded=no
- 
diff --git a/net/freeswitch/files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c b/net/freeswitch/files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c
deleted file mode 100644
index 3d1ffe810073..000000000000
--- a/net/freeswitch/files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig	2016-05-05 20:42:20 UTC
-+++ src/mod/applications/mod_avmd/avmd_fast_acosf.c
-@@ -23,6 +23,9 @@
- #include "avmd_fast_acosf.h"
- #include "avmd_options.h"
-
-+#ifndef MAP_POPULATE
-+#define MAP_POPULATE 0
-+#endif
-
- typedef union {
-     uint32_t i;
diff --git a/net/freeswitch/pkg-plist b/net/freeswitch/pkg-plist
index 809d26110b1a..260349f08f59 100644
--- a/net/freeswitch/pkg-plist
+++ b/net/freeswitch/pkg-plist
@@ -24,6 +24,7 @@ include/freeswitch/switch_core_video.h
 include/freeswitch/switch_cpp.h
 include/freeswitch/switch_curl.h
 include/freeswitch/switch_dso.h
+include/freeswitch/switch_estimators.h
 include/freeswitch/switch_event.h
 include/freeswitch/switch_frame.h
 include/freeswitch/switch_hashtable.h
@@ -632,6 +633,7 @@ libdata/pkgconfig/freeswitch.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/cdr_csv.conf.xml
@@ -689,6 +691,7 @@ libdata/pkgconfig/freeswitch.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sms_flowroute.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sofia.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/spandsp.conf.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/switch.conf.xml