Index: head/net/freeswitch/Makefile
===================================================================
--- head/net/freeswitch/Makefile	(revision 413021)
+++ head/net/freeswitch/Makefile	(revision 413022)
@@ -1,127 +1,128 @@
 # Created by: Corey Smith <corsmith@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	freeswitch
 PORTVERSION=	1.6.7
 CATEGORIES=	net
-MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/
+MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
+		http://files.freeswitch.org/releases/sounds/:sounds
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Multi-protocol soft switch for telephony applications
 
 LICENSE=	MPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
 		${LOCALBASE}/bin/aclocal:devel/automake
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
 		libspeex.so:audio/speex \
 		libldns.so:dns/ldns \
 		libopus.so:audio/opus \
 		libsndfile.so:audio/libsndfile \
 		libavformat.so:multimedia/ffmpeg \
 		libopencv_legacy.so:graphics/opencv \
 		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 \
 		libMagickWand-6.so:graphics/ImageMagick-nox11
 
 CONFLICTS_BUILD=	xmlrpc-c-devel-*
 
 BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
 ONLY_FOR_ARCHS=	amd64
 
 USES=		gmake jpeg pkgconfig lua libtool shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 8K_DESC=	8kHz Audio Files
 16K_DESC=	16kHz Audio Files
 32K_DESC=	32kHz Audio Files
 48K_DESC=	48kHz Audio Files
 ENGLISH_DESC=	US English Language Sounds
 FRENCH_DESC=	French Canadian Language Sounds
 RUSSIAN_DESC=	Russian Language Sounds
 
 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
 
 GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
 #INSTALL_TARGET=		install-strip
 SHEBANG_FILES=		scripts/fsxs.in
 USE_RC_SUBR=		freeswitch
 USE_OPENLDAP=		yes
 USE_OPENSSL=		yes
 WITH_OPENSSL_PORT=	yes
 
 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>
 
 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
 
 .for rate in ${BITRATES}
-EXTRADISTFILES+=	../sounds/${EDPRE}-music-${rate}-${EDPOST}
+EXTRADISTFILES+=	${EDPRE}-music-${rate}-${EDPOST}:sounds
 .if ${PORT_OPTIONS:MENGLISH}
-EXTRADISTFILES+=	../sounds/${EDPRE}-en-us-callie-${rate}-${EDPOST}
+EXTRADISTFILES+=	${EDPRE}-en-us-callie-${rate}-${EDPOST}:sounds
 .endif
 .if ${PORT_OPTIONS:MFRENCH}
-EXTRADISTFILES+=	../sounds/${EDPRE}-fr-ca-june-${rate}-${EDPOST}
+EXTRADISTFILES+=	${EDPRE}-fr-ca-june-${rate}-${EDPOST}:sounds
 .endif
 .if ${PORT_OPTIONS:MRUSSIAN}
-EXTRADISTFILES+=	../sounds/${EDPRE}-ru-RU-elena-${rate}-${EDPOST}
+EXTRADISTFILES+=	${EDPRE}-ru-RU-elena-${rate}-${EDPOST}:sounds
 .endif
 .endfor
 
 DISTFILES+=	${EXTRADISTFILES}
 
 post-install:
 		${MKDIR} ${STAGEDIR}${DATADIR}/sounds
 .for distfile in ${EXTRADISTFILES}
 		${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile}
 .endfor
 		${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 		${RM} -r ${STAGEDIR}${ETCDIR}
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freeswitch/mod/mod_png.so
 		(cd ${WRKSRC}/conf && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/net/freeswitch/distinfo
===================================================================
--- head/net/freeswitch/distinfo	(revision 413021)
+++ head/net/freeswitch/distinfo	(revision 413022)
@@ -1,34 +1,34 @@
 SHA256 (freeswitch-1.6.7.tar.xz) = 9c7ca2d39985fdc39659054179465540e926880f032f855c0df74d6eec41a794
 SIZE (freeswitch-1.6.7.tar.xz) = 33440160
-SHA256 (../sounds/freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
-SIZE (../sounds/freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
-SHA256 (../sounds/freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
-SIZE (../sounds/freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
-SHA256 (../sounds/freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
-SIZE (../sounds/freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
-SHA256 (../sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
-SIZE (../sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
-SHA256 (../sounds/freeswitch-sounds-music-16000-1.0.51.tar.gz) = 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e
-SIZE (../sounds/freeswitch-sounds-music-16000-1.0.51.tar.gz) = 27993050
-SHA256 (../sounds/freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
-SIZE (../sounds/freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
-SHA256 (../sounds/freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
-SIZE (../sounds/freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
-SHA256 (../sounds/freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
-SIZE (../sounds/freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
-SHA256 (../sounds/freeswitch-sounds-music-32000-1.0.51.tar.gz) = c6b6a5ea1b68ee1eb0d879e449052d07dc9ed6371a50cd173fbe09b532becf1e
-SIZE (../sounds/freeswitch-sounds-music-32000-1.0.51.tar.gz) = 53016061
-SHA256 (../sounds/freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
-SIZE (../sounds/freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
-SHA256 (../sounds/freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
-SIZE (../sounds/freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
-SHA256 (../sounds/freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
-SIZE (../sounds/freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
-SHA256 (../sounds/freeswitch-sounds-music-48000-1.0.51.tar.gz) = 13ca541c76e42c13e686ff8da3b93cf21fdcff5388e6353856daef4d7bac30fd
-SIZE (../sounds/freeswitch-sounds-music-48000-1.0.51.tar.gz) = 75546338
-SHA256 (../sounds/freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
-SIZE (../sounds/freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
-SHA256 (../sounds/freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
-SIZE (../sounds/freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
-SHA256 (../sounds/freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
-SIZE (../sounds/freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
+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