* Updated to 1.6.19

* Modernized port
* Moved ONLY_FOR_ARCHS, Comes before *_DEPENDS and after LICENSE section
* Moved and sorted USES, and USE_x section
* Sorted Options section

PR:		220149
Submitted by:	Šimun Mikecin <numisemis@yahoo.com>
Reviewed by:	matthew (mentor)
Approved by:	matthew (mentor), maintainer timeout (2+ weeks)
Differential Revision:	https://reviews.freebsd.org/D11736

5 files changed, 72 insertions, 78 deletions

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 596a95e9bf81..3acab4630373 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeswitch
-PORTVERSION=	1.6.13
-PORTREVISION=	3
+PORTVERSION=	1.6.19
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
 		http://files.freeswitch.org/releases/sounds/:sounds
@@ -14,6 +13,8 @@ COMMENT=	Multi-protocol soft switch for telephony applications
 
 LICENSE=	MPL
 
+ONLY_FOR_ARCHS=	amd64
+
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
@@ -26,12 +27,31 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libpng16.so:graphics/png \
 		libjbig.so:graphics/jbigkit
 
+USES=		gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	freeswitch
+SHEBANG_FILES=	scripts/fsxs.in
+
 CONFLICTS_BUILD=	xmlrpc-c-*
 
-ONLY_FOR_ARCHS=	amd64
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+		--enable-zrtp
+CFLAGS+=	-Wno-c11-extensions -Wno-deprecated-declarations \
+		-Wno-zero-length-array -Wno-incompatible-pointer-types
 
-USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
-USE_LDCONFIG=	yes
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
+
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=		ALL_MODULES X11
+OPTIONS_DEFAULT=	8K 16K ENGLISH
+OPTIONS_MULTI=		BITRATE LANGUAGE
+OPTIONS_MULTI_BITRATE=	8K 16K 32K 48K
+OPTIONS_MULTI_LANGUAGE=	ENGLISH FRENCH RUSSIAN
+OPTIONS_SUB=		yes
+NO_OPTIONS_SORT=	yes
 
 ALL_MODULES_DESC=	Build all modules
 X11_DESC=		graphics/ImageMagick[-nox11] dependency
@@ -43,58 +63,41 @@ ENGLISH_DESC=	US English Language Sounds
 FRENCH_DESC=	French Canadian Language Sounds
 RUSSIAN_DESC=	Russian Language Sounds
 
-OPTIONS_DEFINE=		ALL_MODULES X11
-OPTIONS_MULTI=		BITRATE LANGUAGE
-OPTIONS_MULTI_BITRATE=	8K 16K 32K 48K
-OPTIONS_MULTI_LANGUAGE=	ENGLISH FRENCH RUSSIAN
-OPTIONS_DEFAULT=	8K 16K ENGLISH
-NO_OPTIONS_SORT=	yes
-OPTIONS_SUB=		yes
-
-ALL_MODULES_CONFLICTS_BUILD+=	apr
+ALL_MODULES_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+				${LOCALBASE}/bin/aclocal:devel/automake
+ALL_MODULES_CONFLICTS_BUILD=	apr
 ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
+ALL_MODULES_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
+				libopencv_gpu.so:graphics/opencv \
+				libopencv_core.so:graphics/opencv-core \
+				libhiredis.so:databases/hiredis \
+				libmemcached.so:databases/libmemcached \
+				libSoundTouch.so:audio/soundtouch \
+				libasound.so:audio/alsa-lib \
+	     			libportaudio.so:audio/portaudio \
+	      			libmp4v2.so:multimedia/mp4v2 \
+				libshout.so:audio/libshout \
+				libmpg123.so:audio/mpg123 \
+				libmp3lame.so:audio/lame \
+				libnetsnmp.so:net-mgmt/net-snmp \
+				libvlc.so:multimedia/vlc \
+				libyaml.so:textproc/libyaml
+ALL_MODULES_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+ALL_MODULES_USE=		XORG=x11 OPENLDAP=yes
+
+8K_VARS=	BITRATES+=8000
+16K_VARS=	BITRATES+=16000
+32K_VARS=	BITRATES+=32000
+48K_VARS=	BITRATES+=48000
 
-GNU_CONFIGURE=		yes
 # install-strip causes `make stage' to fail:
 # libtool: install: strip --strip-debug /wrkdirs/usr/ports/net/freeswitch/work/stage/usr/local/lib/libfreeswitch.a
 # strip: file format not recognized
 # INSTALL_TARGET=		install-strip
-SHEBANG_FILES=		scripts/fsxs.in
-USE_RC_SUBR=		freeswitch
-
-USERS=		${PORTNAME}
-GROUPS=		${USERS}
-SUB_FILES=	pkg-message
-
-CFLAGS+=	-Wno-c11-extensions -Wno-deprecated-declarations \
-		-Wno-zero-length-array -Wno-incompatible-pointer-types
-
-CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
-		--enable-zrtp
 
 .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_gpu.so:graphics/opencv \
-		libopencv_core.so:graphics/opencv-core \
-		libhiredis.so:databases/hiredis \
-		libmemcached.so:databases/libmemcached \
-		libSoundTouch.so:audio/soundtouch \
-		libasound.so:audio/alsa-lib \
-		libportaudio.so:audio/portaudio \
-		libmp4v2.so:multimedia/mp4v2 \
-		libshout.so:audio/libshout \
-		libmpg123.so:audio/mpg123 \
-		libmp3lame.so:audio/lame \
-		libnetsnmp.so:net-mgmt/net-snmp \
-		libvlc.so:multimedia/vlc \
-		libyaml.so:textproc/libyaml
-USE_OPENLDAP=	yes
 .if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick
 .else
@@ -104,22 +107,10 @@ LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick-nox11
 
 EDPRE=	freeswitch-sounds
 EDPOST=	1.0.51.tar.gz
-
-.if ${PORT_OPTIONS:M8K}
-BITRATES+=	8000
-.endif
-.if ${PORT_OPTIONS:M16K}
-BITRATES+=	16000
-.endif
-.if ${PORT_OPTIONS:M32K}
-BITRATES+=	32000
-.endif
-.if ${PORT_OPTIONS:M48K}
-BITRATES+=	48000
-.endif
+EDPOST_MUSIC=	1.0.52.tar.gz
 
 .for rate in ${BITRATES}
-EXTRADISTFILES+=	${EDPRE}-music-${rate}-${EDPOST}
+EXTRADISTFILES+=	${EDPRE}-music-${rate}-${EDPOST_MUSIC}
 .if ${PORT_OPTIONS:MENGLISH}
 EXTRADISTFILES+=	${EDPRE}-en-us-callie-${rate}-${EDPOST}
 .endif
diff --git a/net/freeswitch/distinfo b/net/freeswitch/distinfo
index 8aaf11fc62c7..f079e43182bc 100644
--- a/net/freeswitch/distinfo
+++ b/net/freeswitch/distinfo
@@ -1,32 +1,32 @@
-TIMESTAMP = 1483979772
-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
+TIMESTAMP = 1500379394
+SHA256 (freeswitch-1.6.19.tar.xz) = e8d271a0d876ba4cca551682af0a4f5047bfd79438fcebdcc17d00711c04a8ff
+SIZE (freeswitch-1.6.19.tar.xz) = 33497296
+SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07
+SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675
 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-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a
+SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592
 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-music-32000-1.0.52.tar.gz) = 4129788a638b77c5f85ff35abfcd69793d8aeb9d7833a75c74ec77355b2657a9
+SIZE (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 53007947
 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-music-48000-1.0.52.tar.gz) = cc31cdb5b1bd653850bf6e054d963314bcf7c1706a9bf05f5a69bcbd00858d2a
+SIZE (freeswitch-sounds-music-48000-1.0.52.tar.gz) = 75551487
 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
diff --git a/net/freeswitch/files/extrapatch-modules.conf b/net/freeswitch/files/extrapatch-modules.conf
index 8ab8b497eced..248c3f4374b3 100644
--- a/net/freeswitch/files/extrapatch-modules.conf
+++ b/net/freeswitch/files/extrapatch-modules.conf
@@ -1,6 +1,6 @@
---- modules.conf.orig	2016-08-25 12:35:35 UTC
-+++ modules.conf
-@@ -1,162 +1,162 @@
+--- modules.conf.orig	2017-04-17 16:23:36.000000000 +0200
++++ modules.conf	2017-04-25 21:25:33.251657000 +0200
+@@ -1,163 +1,163 @@
 -#applications/mod_abstraction
 -#applications/mod_av
 -#applications/mod_avmd
@@ -103,6 +103,8 @@
 +codecs/mod_amrwb
  codecs/mod_b64
  #codecs/mod_bv
+-#codecs/mod_clearmode
++codecs/mod_clearmode
  #codecs/mod_codec2
 -#codecs/mod_com_g729
 +codecs/mod_com_g729
diff --git a/net/freeswitch/files/patch-build_Makefile.in b/net/freeswitch/files/patch-build_Makefile.in
index 60afe68dfac0..b67d5ad03441 100644
--- a/net/freeswitch/files/patch-build_Makefile.in
+++ b/net/freeswitch/files/patch-build_Makefile.in
@@ -1,6 +1,6 @@
---- build/Makefile.in.orig	2016-03-07 21:11:29 UTC
+--- build/Makefile.in.orig	2017-06-13 13:22:10 UTC
 +++ build/Makefile.in
-@@ -588,76 +588,9 @@ uninstall-am:
+@@ -594,76 +594,9 @@ uninstall-am:
  
  all:
  	@echo " +---------- FreeSWITCH Build Complete ----------+"
@@ -73,7 +73,7 @@
 -	@echo " +                                                 +"
 -	@echo " +-------------------------------------------------+"
 -	@cat $(switch_srcdir)/cluecon2.tmpl
--	@sh $(switch_srcdir)/build/modcheck.sh $(modulesdir)
+-	@sh $(switch_srcdir)/build/modcheck.sh $(DESTDIR)$(modulesdir)
  
  .PHONY: check dvi html info install-data \
          install-dvi install-exec install-html install-info install-pdf install-ps installcheck installdirs pdf \
diff --git a/net/freeswitch/pkg-plist b/net/freeswitch/pkg-plist
index 260349f08f59..ec828b8dbfa2 100644
--- a/net/freeswitch/pkg-plist
+++ b/net/freeswitch/pkg-plist
@@ -69,6 +69,7 @@ lib/freeswitch/mod/mod_cdr_csv.so
 %%ALL_MODULES%%lib/freeswitch/mod/mod_cdr_mongodb.so
 lib/freeswitch/mod/mod_cdr_sqlite.so
 %%ALL_MODULES%%lib/freeswitch/mod/mod_cidlookup.so
+%%ALL_MODULES%%lib/freeswitch/mod/mod_clearmode.so
 %%ALL_MODULES%%lib/freeswitch/mod/mod_cluechoo.so
 lib/freeswitch/mod/mod_commands.so
 lib/freeswitch/mod/mod_conference.so