diff options
author | marino <marino@FreeBSD.org> | 2014-09-07 05:06:15 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-09-07 05:06:15 +0800 |
commit | a24b03cb07180d5ce6425737cdae6dd00785e880 (patch) | |
tree | ace7f1218c1a734adb570f2eedccdab353202e3a /audio | |
parent | 4bc551d465c5fd7185c2227c128d4f9b801a47f3 (diff) | |
download | freebsd-ports-gnome-a24b03cb07180d5ce6425737cdae6dd00785e880.tar.gz freebsd-ports-gnome-a24b03cb07180d5ce6425737cdae6dd00785e880.tar.zst freebsd-ports-gnome-a24b03cb07180d5ce6425737cdae6dd00785e880.zip |
Remove 4 (mostly) unstaged freeswitch ports
The audio/freeswitch-music port was actually staged, but it lost its
purpose after the other 3 ports supporting the development version of
FreeSwitch were removed due to lack of maintenance and staging.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/Makefile | 2 | ||||
-rw-r--r-- | audio/freeswitch-music/Makefile | 44 | ||||
-rw-r--r-- | audio/freeswitch-music/distinfo | 8 | ||||
-rw-r--r-- | audio/freeswitch-music/pkg-descr | 3 | ||||
-rw-r--r-- | audio/freeswitch-music/pkg-plist | 28 | ||||
-rw-r--r-- | audio/freeswitch-sounds/Makefile | 198 | ||||
-rw-r--r-- | audio/freeswitch-sounds/distinfo | 24 | ||||
-rw-r--r-- | audio/freeswitch-sounds/pkg-descr | 1 |
8 files changed, 0 insertions, 308 deletions
diff --git a/audio/Makefile b/audio/Makefile index 5d2a295cb21d..b87565794161 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -166,8 +166,6 @@ SUBDIR += freealut SUBDIR += freedesktop-sound-theme SUBDIR += freepats - SUBDIR += freeswitch-music - SUBDIR += freeswitch-sounds SUBDIR += funktrackergold SUBDIR += gbemol SUBDIR += gbsplay diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile deleted file mode 100644 index 9d4ca26d64d7..000000000000 --- a/audio/freeswitch-music/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Created by: Eric F Crist <ecrist@secure-computing.net> -# $FreeBSD$ - -PORTNAME= freeswitch -PORTVERSION= 1.0.8 -PORTREVISION= 2 -CATEGORIES= audio -MASTER_SITES= http://files.freeswitch.org/ -PKGNAMESUFFIX= -music -DIST_SUBDIR= freeswitch - -MAINTAINER= ports@FreeBSD.org -COMMENT= FreeSwitch Music - All Bitrates - -NO_WRKSUBDIR= yes -NO_BUILD= yes -USERS= ${PORTNAME} -GROUPS= ${USERS} -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - -OPTIONS_DEFINE= 8K 16K 32K 48K - -8K_DESC= 8000Hz Music -16K_DESC= 16000Hz Music -32K_DESC= 32000Hz Music -48K_DESC= 48000Hz Music - -OPTIONS_DEFAULT= 8K 16K -NO_OPTIONS_SORT= yes - -8K_DISTFILES= freeswitch-sounds-music-8000-${DISTVERSION}${EXTRACT_SUFX} -16K_DISTFILES= freeswitch-sounds-music-16000-${DISTVERSION}${EXTRACT_SUFX} -32K_DISTFILES= freeswitch-sounds-music-32000-${DISTVERSION}${EXTRACT_SUFX} -48K_DISTFILES= freeswitch-sounds-music-48000-${DISTVERSION}${EXTRACT_SUFX} - -OPTIONS_SUB= yes - -do-install: - @${ECHO_MSG} "Installing files..." - @${MKDIR} ${STAGEDIR}${DATADIR}/sounds - ${TOUCH} ${STAGEDIR}${DATADIR}/sounds/.freeswitch-music - cd ${WRKSRC} && ${COPYTREE_SHARE} music ${STAGEDIR}${DATADIR}/sounds - -.include <bsd.port.mk> diff --git a/audio/freeswitch-music/distinfo b/audio/freeswitch-music/distinfo deleted file mode 100644 index 2261f2460e61..000000000000 --- a/audio/freeswitch-music/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -SHA256 (freeswitch/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 02de6a0a4617c36b3ae3b8ad4f8d78aa39d5856d153d7da54cfd1fa6792a8837 -SIZE (freeswitch/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 14122644 -SHA256 (freeswitch/freeswitch-sounds-music-16000-1.0.8.tar.gz) = d1e1dbaec323691f7630f834e5bddc3683303f297bdbbc3694dd2d51430f58d2 -SIZE (freeswitch/freeswitch-sounds-music-16000-1.0.8.tar.gz) = 27233654 -SHA256 (freeswitch/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 68c7b1e8254438e622dbce7db321009a68b3c1620241354655440a0904423e12 -SIZE (freeswitch/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 52284585 -SHA256 (freeswitch/freeswitch-sounds-music-48000-1.0.8.tar.gz) = ebca40460bcbe4ec6e17a62a9b4dbde5b8facfaf5ae66575484f33c5d09dde6a -SIZE (freeswitch/freeswitch-sounds-music-48000-1.0.8.tar.gz) = 75215628 diff --git a/audio/freeswitch-music/pkg-descr b/audio/freeswitch-music/pkg-descr deleted file mode 100644 index d78771414b98..000000000000 --- a/audio/freeswitch-music/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -FreeSWITCH Music - -This port installs default music files for FreeSWITCH music-on-hold. diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist deleted file mode 100644 index 17c9de64cba5..000000000000 --- a/audio/freeswitch-music/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -@owner freeswitch -@group freeswitch -%%DATADIR%%/sounds/.freeswitch-music -%%8K%%%%DATADIR%%/sounds/music/8000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav -%%8K%%%%DATADIR%%/sounds/music/8000/ponce-preludio-in-e-major.wav -%%8K%%%%DATADIR%%/sounds/music/8000/suite-espanola-op-47-leyenda.wav -%%8K%%%%DATADIR%%/sounds/music/8000/danza-espanola-op-37-h-142-xii-arabesca.wav -%%16K%%%%DATADIR%%/sounds/music/16000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav -%%16K%%%%DATADIR%%/sounds/music/16000/ponce-preludio-in-e-major.wav -%%16K%%%%DATADIR%%/sounds/music/16000/suite-espanola-op-47-leyenda.wav -%%16K%%%%DATADIR%%/sounds/music/16000/danza-espanola-op-37-h-142-xii-arabesca.wav -%%32K%%%%DATADIR%%/sounds/music/32000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav -%%32K%%%%DATADIR%%/sounds/music/32000/ponce-preludio-in-e-major.wav -%%32K%%%%DATADIR%%/sounds/music/32000/suite-espanola-op-47-leyenda.wav -%%32K%%%%DATADIR%%/sounds/music/32000/danza-espanola-op-37-h-142-xii-arabesca.wav -%%48K%%%%DATADIR%%/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav -%%48K%%%%DATADIR%%/sounds/music/48000/ponce-preludio-in-e-major.wav -%%48K%%%%DATADIR%%/sounds/music/48000/suite-espanola-op-47-leyenda.wav -%%48K%%%%DATADIR%%/sounds/music/48000/danza-espanola-op-37-h-142-xii-arabesca.wav -%%8K%%@dirrm %%DATADIR%%/sounds/music/8000 -%%16K%%@dirrm %%DATADIR%%/sounds/music/16000 -%%32K%%@dirrm %%DATADIR%%/sounds/music/32000 -%%48K%%@dirrm %%DATADIR%%/sounds/music/48000 -@dirrm %%DATADIR%%/sounds/music -@dirrmtry %%DATADIR%%/sounds -@owner -@group -@dirrmtry %%DATADIR%% diff --git a/audio/freeswitch-sounds/Makefile b/audio/freeswitch-sounds/Makefile deleted file mode 100644 index 238074f913e0..000000000000 --- a/audio/freeswitch-sounds/Makefile +++ /dev/null @@ -1,198 +0,0 @@ -# Created by: Eric F Crist <ecrist@secure-computing.net> -# $FreeBSD$ - -PORTNAME= freeswitch -DISTVERSION= 1.0.24 -CATEGORIES= audio -MASTER_SITES= http://files.freeswitch.org/ -PKGNAMESUFFIX= -sounds -DIST_SUBDIR= ${PORTNAME}${PORTNAMESUFFIX} - -MAINTAINER= ports@FreeBSD.org -COMMENT= FreeSwitch Sounds (All Bitrates) - -PLIST= ${WRKDIR}/plist -NO_WRKSUBDIR= yes -SHAREOWN= ${PORTNAME} -SHAREGRP= ${SHAREOWN} -USERS= ${PORTNAME} -NO_STAGE= yes -GROUPS= ${USERS} -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - -DOWNLOAD_DESC= Download Sounds -8K_DESC= 8000Hz Audio Files -16K_DESC= 16000Hz Audio Files -32K_DESC= 32000Hz Audio Files -48K_DESC= 48000Hz Audio Files -ENGLISH_DESC= Compile US English Language Sounds -FRENCH_DESC= Compile French Canadian Language Sounds -RUSSIAN_DESC= Compile Russian Language Sounds - -OPTIONS_DEFINE= DOWNLOAD - -OPTIONS_SINGLE= LANG -OPTIONS_SINGLE_LANG= ENGLISH FRENCH RUSSIAN - -OPTIONS_MULTI= AUDIO -OPTIONS_MULTI_AUDIO= 8K 16K 32K 48K - -OPTIONS_DEFAULT= 8K 16K ENGLISH -NO_OPTIONS_SORT= yes - -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MDOWNLOAD) -BUILD_DEPENDS+= sox:${PORTSDIR}/audio/sox -.endif - -.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 - -.if ${PORT_OPTIONS:MENGLISH} -.if ${PORT_OPTIONS:MDOWNLOAD} -.for rate in ${BITRATES} -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-${rate}-${DISTVERSION}${EXTRACT_SUFX} -.endfor -.else -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-48000-${DISTVERSION}${EXTRACT_SUFX} -.endif -.endif -.if ${PORT_OPTIONS:MFRENCH} -.if ${PORT_OPTIONS:MDOWNLOAD} -.for rate in ${BITRATES} -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-${rate}-1.0.18${EXTRACT_SUFX} -.endfor -.else -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-48000-1.0.18${EXTRACT_SUFX} -.endif -.endif -.if ${PORT_OPTIONS:MRUSSIAN} -.if ${PORT_OPTIONS:MDOWNLOAD} -.for rate in ${BITRATES} -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-${rate}-1.0.13${EXTRACT_SUFX} -.endfor -.else -DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-48000-1.0.13${EXTRACT_SUFX} -.endif -.endif - -.if defined(FREESWITCH_VSCALE) -SCALE=${FREESWITCH_VSCALE} -.else -SCALE=0.2 -.endif - -.for opt in ${ALL_OPTIONS} -.if ${PORT_OPTIONS:M${opt}} -PLIST_SUB+= ${opt}="" -.else -PLIST_SUB+= ${opt}="@comment " -.endif -.endfor - -do-build: - @${ECHO_MSG} "===> Building for bitrates: ${BITRATES}" - @${ECHO_MSG} "===> Download >>>${PORT_OPTIONS:MDOWNLOAD}<<<" - @${ECHO_MSG} "===> Scaling audio to ${SCALE}" - if [ -n "${PORT_OPTIONS:MENGLISH}" -a ! -e "${WRKDIR}/ENGLISH.done" ]; then \ - ${ECHO_MSG} "====> English selected."; \ - for rate in ${BITRATES}; do \ - ${ECHO_MSG} "WORKING on $${rate}!"; \ - 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 "${DATADIR_REL}/sounds/en/us/callie/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \ - if [ ! -e "${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename}" ]; then \ - if [ "${PORT_OPTIONS:MDOWNLOAD}" = "true" ]; then \ - ${ECHO} -n "."; \ - ${MV} ${WRKSRC}/en/us/callie/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename} ; \ - else \ - ${ECHO} -n "."; \ - ${LOCALBASE}/bin/sox -v ${SCALE} "${WRKSRC}/en/us/callie/$${dir}/48000/$${filename}" -r $${rate} -c 1 "${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename}"; \ - fi \ - fi \ - done; \ - ${ECHO} ""; \ - echo "@rmdir share/${PORTNAME}/sounds/en/us/callie/$${dir}/$${rate}/" >> ${PLIST}; \ - done; \ - done; \ - ${TOUCH} ${WRKDIR}/ENGLISH.done; \ - fi - - if [ -n "${PORT_OPTIONS:MFRENCH}" -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 [ "${PORT_OPTIONS:MDOWNLOAD}" = "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/june/$${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 [ -n "${PORT_OPTIONS:MRUSSIAN}" -a ! -e "${WRKDIR}/RUSSIAN.done" ]; then \ - ${ECHO_MSG} "====> Russian selected."; \ - for rate in ${BITRATES}; do \ - ${ECHO_MSG} "WORKING on $${rate}!"; \ - 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/${DATADIR_REL}/sounds/ru/RU/elena/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \ - if [ ! -e "${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}" ]; then \ - if [ "${PORT_OPTIONS:MDOWNLOAD}" = "true" ]; then \ - ${ECHO} -n "."; \ - ${MV} ${WRKSRC}/ru/RU/elena/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}; \ - else \ - ${ECHO} -n "."; \ - ${LOCALBASE}/bin/sox -v ${SCALE} "${WRKSRC}/ru/RU/elena/$${dir}/48000/$${filename}" -r $${rate} -c 1 "${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}"; \ - fi \ - fi \ - done; \ - ${ECHO} ""; \ - echo "@dirrm share/${PORTNAME}/sounds/ru/RU/elena/$${dir}/$${rate}/" >> ${PLIST}; \ - done; \ - done; \ - ${TOUCH} ${WRKDIR}/RUSSIAN.done; \ - fi - -pre-install: - @${RM} ${PLIST} - @cd ${WRKDIR}/tmp && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ - ${ECHO_CMD} .${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} - @${ECHO_CMD} "@dirrmtry ${DATADIR_REL}/sounds" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry ${DATADIR_REL}" >> ${PLIST} - -do-install: - @${ECHO_MSG} "Installing files..." - ${MKDIR} ${DATADIR}/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 deleted file mode 100644 index 1b25fe9264e9..000000000000 --- a/audio/freeswitch-sounds/distinfo +++ /dev/null @@ -1,24 +0,0 @@ -SHA256 (freeswitch/freeswitch-sounds-en-us-callie-8000-1.0.24.tar.gz) = 52ef0747a13469696491c7ec16b3850a401af4b2dd19a146ff7996b2804f7866 -SIZE (freeswitch/freeswitch-sounds-en-us-callie-8000-1.0.24.tar.gz) = 17741850 -SHA256 (freeswitch/freeswitch-sounds-en-us-callie-16000-1.0.24.tar.gz) = d668ee34c17851b8762bc6d7bec55071b12b2d933f157a4d4d9b775e008fe386 -SIZE (freeswitch/freeswitch-sounds-en-us-callie-16000-1.0.24.tar.gz) = 35337077 -SHA256 (freeswitch/freeswitch-sounds-en-us-callie-32000-1.0.24.tar.gz) = 691e817e5385eaba8534b36051cd6054e0c3289067a7e23d8890b10870189020 -SIZE (freeswitch/freeswitch-sounds-en-us-callie-32000-1.0.24.tar.gz) = 69411929 -SHA256 (freeswitch/freeswitch-sounds-en-us-callie-48000-1.0.24.tar.gz) = d84230c7d7502ca18e9738e39fe05ad69651551035200d671bbda2e6d834294d -SIZE (freeswitch/freeswitch-sounds-en-us-callie-48000-1.0.24.tar.gz) = 100018897 -SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-8000-1.0.18.tar.gz) = f7fd5c84ff9b1c1929167a4b33f38d6770a44c5bcad4e5f96b86e3165bfd05d4 -SIZE (freeswitch/freeswitch-sounds-fr-ca-june-8000-1.0.18.tar.gz) = 13468498 -SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-16000-1.0.18.tar.gz) = 5c4e45be5988e7763b196a453722f3a5dd41f79b280a37a8960cf65d390318a7 -SIZE (freeswitch/freeswitch-sounds-fr-ca-june-16000-1.0.18.tar.gz) = 26607279 -SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz) = b0c30f112bfd40e0422a93b30d251072e9847274a39d3407a06f3528d8935bfe -SIZE (freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz) = 52075212 -SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz) = 4c7f6d373b72b5af5bad028b3b193d1b862abcee4466bb6f398f1d3f20befd0b -SIZE (freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz) = 76712496 -SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz) = a04f0d33462a782c9fe8e81331a7c0928950c3fcc83f90cdf774974114bf1e53 -SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz) = 14363334 -SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz) = f68bf958625d7fec95ffdec374b197bdddceff372e43c01d6502f39a362a0e15 -SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz) = 28650196 -SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz) = 621fbe1d6d4c7bafc407aac9898676fe2807a74e5f907a27870095804f6f5652 -SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz) = 56843560 -SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz) = f2db5f456e94e10f262ee08407484e4faf538a28e38c67867a8598636cca0d4a -SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz) = 84394475 diff --git a/audio/freeswitch-sounds/pkg-descr b/audio/freeswitch-sounds/pkg-descr deleted file mode 100644 index 5564f94dbd29..000000000000 --- a/audio/freeswitch-sounds/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -FreeSwitch Sounds for English Russian and French Canadian |