Index: branches/2016Q2/net/freeswitch/Makefile
===================================================================
--- branches/2016Q2/net/freeswitch/Makefile	(revision 414283)
+++ branches/2016Q2/net/freeswitch/Makefile	(revision 414284)
@@ -1,130 +1,131 @@
 # Created by: Corey Smith <corsmith@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	freeswitch
 PORTVERSION=	1.6.6
 PORTREVISION=	1
 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 \
 		libyuv.so:graphics/libyuv \
 		libvpx.so:multimedia/libvpx \
 		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:S/:sounds$//}
 .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: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 414283)
+++ branches/2016Q2	(revision 414284)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r413022