Add Russian, Canadian and French sounds.

PR:		ports/167874
Submitted by:	Richard Neese (maintainer)

3 files changed, 87 insertions, 41 deletions

diff --git a/audio/freeswitch-sounds/Makefile b/audio/freeswitch-sounds/Makefile
index cd68c97f4f2f..6f43d6c6231a 100644
--- a/audio/freeswitch-sounds/Makefile
+++ b/audio/freeswitch-sounds/Makefile
@@ -5,28 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freeswitch-sounds
-PORTVERSION=	1.0.16
+PORTNAME=	freeswitch
+DISTVERSION=	1.0.18
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://files.freeswitch.org/
+PKGNAMESUFFIX=	-sounds
 DIST_SUBDIR=	freeswitch-sounds
 
 MAINTAINER=	r.neese@gmail.com
 COMMENT=	FreeSwitch Sounds (All Bitrates)
 
+RUN_DEPENDS=    freeswitch:${PORTSDIR}/net/freeswitch-core
+
 PLIST=		${WRKDIR}/plist
 NO_WRKSUBDIR=	yes
+SHAREOWN=	${PORTNAME}
+SHAREGRP=	${SHAREOWN}
 
-BASE_PORTNAME=	freeswitch
-
-OPTIONS=	DOWNLOAD     "Don't resample, download all." on \
-		8K           "Compile sounds for 8K" on \
-		16K          "Compile sounds for 16K" on \
-		32K          "Compile sounds for 32K" on \
-		48K          "Compile sounds for 48K" on \
-		ENGLISH      "Compile English Language Sounds" on \
-		RUSSIAN      "Compile Russian Language Sounds" off
-
+OPTIONS=	DOWNLOAD	"Don't resample, download all." off \
+		8K		"Compile sounds for 8K" on \
+		16K		"Compile sounds for 16K" on \
+		32K		"Compile sounds for 32K" on \
+		48K		"Compile sounds for 48K" on \
+		ENGLISH		"Compile US English Language Sounds" on \
+		FRENCH		"Compile French Canadian Language Sounds" off \
+		RUSSIAN		"Compile Russian Language Sounds" off
+		
 .include <bsd.port.options.mk>
 
 .if ! defined(WITH_DOWNLOAD)
@@ -49,24 +54,35 @@ BITRATES+=	48000
 .if defined(WITH_ENGLISH)
 .if defined(WITH_DOWNLOAD)
 .for rate in ${BITRATES}
-DISTFILES+=	${PORTNAME}-en-us-callie-${rate}-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-${rate}-${DISTVERSION}${EXTRACT_SUFX}
 .endfor
 .else
-DISTFILES+=	${PORTNAME}-en-us-callie-48000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-48000-${DISTVERSION}${EXTRACT_SUFX}
+.endif
+.endif
+.if defined(WITH_FRENCH)
+.if defined(WITH_DOWNLOAD)
+.for rate in ${BITRATES}
+DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-${rate}-1.0.14${EXTRACT_SUFX}
+.endfor
+.else
+DISTFILES+=     ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-48000-1.0.14${EXTRACT_SUFX}
 .endif
 .endif
 .if defined(WITH_RUSSIAN)
 .if defined(WITH_DOWNLOAD)
 .for rate in ${BITRATES}
-DISTFILES+=	${PORTNAME}-ru-RU-elena-${rate}-1.0.12${EXTRACT_SUFX}
+DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-${rate}-1.0.12${EXTRACT_SUFX}
 .endfor
 .else
-DISTFILES+=	${PORTNAME}-ru-RU-elena-48000-1.0.12${EXTRACT_SUFX}
+DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-48000-1.0.12${EXTRACT_SUFX}
 .endif
 .endif
-.if ! defined(WITH_ENGLISH) && ! defined(WITH_RUSSIAN)
-BROKEN=	you must build with either English, Russian, or both
+
+.if ! defined(WITH_ENGLISH) && ! defined(WITH_FRENCH) && ! defined(WITH_RUSSIAN)
+BROKEN=	you must build with atleast English or French or Russian, 
 .endif
+
 .if ! defined(WITH_8K) && ! defined(WITH_16K) && ! defined(WITH_32K) && \
 	! defined(WITH_48K)
 BROKEN=	you must build with at least one of 8K, 16K, 32K, or 48K sounds
@@ -89,7 +105,7 @@ do-build:
 			for dir in `ls ${WRKSRC}/en/us/callie/`; do \
 				${MKDIR} ${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/; \
 				for filename in `ls ${WRKSRC}/en/us/callie/$${dir}/48000`; do \
-					echo "share/${BASE_PORTNAME}/sounds/en/us/callie/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \
+					echo "${DATADIR_REL}/sounds/en/us/callie/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \
 					if [ ! -e "${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename}" ]; then \
 						if [ "${WITH_DOWNLOAD}" = "true" ]; then \
 							${ECHO} -n "."; \
@@ -101,11 +117,37 @@ do-build:
 					fi \
 				done; \
 				${ECHO} ""; \
-				echo "@rmdir share/${BASE_PORTNAME}/sounds/en/us/callie/$${dir}/$${rate}/" >> ${PLIST}; \
+				echo "@rmdir share/${PORTNAME}/sounds/en/us/callie/$${dir}/$${rate}/" >> ${PLIST}; \
 			done; \
 		done; \
 		${TOUCH} ${WRKDIR}/ENGLISH.done; \
 	fi
+
+	if [ "${WITH_FRENCH}" != "" -a ! -e "${WRKDIR}/FRENCH.done" ]; then \
+		${ECHO_MSG} "====> French selected."; \
+		for rate in ${BITRATES}; do \
+			${ECHO_MSG} "WORKING on $${rate}!"; \
+			 for dir in `ls ${WRKSRC}/fr/ca/june/`; do \
+				${MKDIR} ${WRKDIR}/tmp/fr/ca/june/$${dir}/$${rate}/; \
+					 for filename in `ls ${WRKSRC}/fr/ca/june/$${dir}/48000`; do \
+					echo "${DATADIR_REL}/sounds/fr/ca/june/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \
+					if [ ! -e "${WRKDIR}/tmp/fr/ca/june/$${dir}/$${rate}/$${filename}" ]; then \
+						if [ "${WITH_DOWNLOAD}" = "true" ]; then \
+							${ECHO} -n "."; \
+							${MV} ${WRKSRC}/fr/ca/june/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/fr/ca/june/$${dir}/$${rate}/$${filename} ; \
+						else \
+							${ECHO} -n "."; \
+							${LOCALBASE}/bin/sox -v ${SCALE} "${WRKSRC}/fr/ca/june/$${dir}/48000/$${filename}" -r $${rate} -c 1 "${WRKDIR}/tmp/fr/ca/$${dir}/$${rate}/$${filename}"; \
+						fi \
+					fi \
+				done; \
+				${ECHO} ""; \
+				echo "@rmdir share/${PORTNAME}/sounds/fr/ca/june/$${dir}/$${rate}/" >> ${PLIST}; \
+			done; \
+		done; \
+		${TOUCH} ${WRKDIR}/FRENCH.done; \
+	fi
+
 	if [ "${WITH_RUSSIAN}" != "" -a ! -e "${WRKDIR}/RUSSIAN.done" ]; then \
 		${ECHO_MSG} "====> Russian selected."; \
 		for rate in ${BITRATES}; do \
@@ -113,7 +155,7 @@ do-build:
 			for dir in `ls ${WRKSRC}/ru/RU/elena/`; do \
 				${MKDIR} ${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/; \
 				for filename in `ls ${WRKSRC}/ru/RU/elena/$${dir}/48000`; do \
-					echo "share/${BASE_PORTNAME}/sounds/ru/RU/elena/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \
+					echo "share/${DATADIR_REL}/sounds/ru/RU/elena/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \
 					if [ ! -e "${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}" ]; then \
 						if [ "${WITH_DOWNLOAD}" = "true" ]; then \
 							${ECHO} -n "."; \
@@ -125,26 +167,22 @@ do-build:
 					fi \
 				done; \
 				${ECHO} ""; \
-				echo "@rmdir share/${BASE_PORTNAME}/sounds/ru/RU/elena/$${dir}/$${rate}/" >> ${PLIST}; \
+				echo "@dirrm share/${PORTNAME}/sounds/ru/RU/elena/$${dir}/$${rate}/" >> ${PLIST}; \
 			done; \
 		done; \
 		${TOUCH} ${WRKDIR}/RUSSIAN.done; \
 	fi
 
 pre-install:
-	@${RM} -rf ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKDIR}/tmp && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
-	${ECHO} .freeswitch-sounds >> ${PLIST}; \
-	${SED} -i "" -e "s:^:share/${BASE_PORTNAME}/sounds/:" ${PLIST}; \
-	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm share/${BASE_PORTNAME}/sounds/:" | ${GREP} / >> ${PLIST}; \
-	${ECHO} "@dirrmtry share/${BASE_PORTNAME}/sounds" >> ${PLIST}; \
-	${ECHO} "@dirrmtry share/${BASE_PORTNAME}" >> ${PLIST};
-	${CHMOD} -R 0755 ${WRKDIR}/tmp/
+	${ECHO} .${PORTNAME}${PKGNAMESUFFIX} >> ${PLIST}; \
+	${REINPLACE_CMD} -e "s:^:${DATADIR_REL}/sounds/:" ${PLIST}; \
+	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm ${DATADIR_REL}/sounds/:" | ${GREP} / >> ${PLIST}
 
 do-install:
 	@${ECHO_MSG} "Installing files..."
-	${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
-	${TOUCH} ${PREFIX}/share/${BASE_PORTNAME}/sounds/.freeswitch-sounds
-	(cd ${WRKDIR}/tmp/ &&${COPYTREE_SHARE} \* ${PREFIX}/share/${BASE_PORTNAME}/sounds/)
+	${TOUCH} ${DATADIR}/sounds/.freeswitch-sounds
+	(cd ${WRKDIR}/tmp/ && ${COPYTREE_SHARE} \* ${DATADIR}/sounds/)
 
 .include <bsd.port.mk>
diff --git a/audio/freeswitch-sounds/distinfo b/audio/freeswitch-sounds/distinfo
index 1cff2441773f..3a5316f35a95 100644
--- a/audio/freeswitch-sounds/distinfo
+++ b/audio/freeswitch-sounds/distinfo
@@ -1,11 +1,19 @@
-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.16.tar.gz) = c88c360f4cf234597ba7ecbb9693be8ed42b31882ffc7ba02d10d180b2369899
-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.16.tar.gz) = 12910395
-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.16.tar.gz) = bf0e3f38ff2e1fd3ba0414f6983ed7ef9871bc86c75775235f6077471a5e8ea1
-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.16.tar.gz) = 25739233
-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz) = 63eb497b86fa5e6da353970cdf76da17df43f246d3ea9979fa76083eacc9a449
-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz) = 50567956
-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.16.tar.gz) = 51d84024d6091c13521fea4397e5d8d21c087770aa4984308d7157a10b034505
-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.16.tar.gz) = 87130408
+SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz) = 131b87a4c190d40ce3c5a67c2d2096158f11e85a1659eeb2bbf38e08bf7be812
+SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz) = 14180974
+SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz) = c1c6d4405055db31eeb47d3a90ffaf9fb5ca5eecc962749f1409780223fd761a
+SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz) = 28161362
+SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz) = cbd55b6355829bb559741700d2a310718a95800f8cf8b229e1d15eb99b94d3a4
+SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz) = 55081458
+SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz) = a060fc118090b679408f8e712af9e556816e0d7f4c59422f7504066c693d71e9
+SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz) = 80491982
+SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz) = 2a10fdae75cdd6cbb12c5e99a854b01433221ebe99c49d6db024164fdc72d252
+SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz) = 9203881
+SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz) = 0dc4351534547994daf7b3bfdbb8df9b4bf75e8e4f576819468e6c708578b0a2
+SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz) = 18198669
+SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz) = efb3842a638dcfa9376f602b80ef00416bfa4fc5922f05aea772009690a6792f
+SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz) = 35601264
+SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz) = a53f53604b38e5313637cb057f3f61e48bea335b312ad822165dde9bc8cfc6ff
+SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz) = 52402291
 SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz) = 44db35574216af8ccbb48a7f1a08065df253adb4cebed8bc7ece7d0a4da920e7
 SIZE (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz) = 9115259
 SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz) = aef0d3dc7fed657bc9c9d5ebbb458bc28e55c62af0087623ad060f1b4de3c74c
diff --git a/audio/freeswitch-sounds/pkg-descr b/audio/freeswitch-sounds/pkg-descr
index b88fd397e75c..5564f94dbd29 100644
--- a/audio/freeswitch-sounds/pkg-descr
+++ b/audio/freeswitch-sounds/pkg-descr
@@ -1 +1 @@
-FreeSwitch 48k English US Sounds
+FreeSwitch Sounds for English Russian and French Canadian