5 files changed, 92 insertions, 246 deletions

diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile
index acb1dd0b23ff..30e679655088 100644
--- a/audio/mbrolavox/Makefile
+++ b/audio/mbrolavox/Makefile
@@ -8,12 +8,23 @@
 PORTNAME=	mbrolavox
 PORTVERSION=	3.0.1
 CATEGORIES=	audio accessibility
-MASTER_SITES=
 DIST_SUBDIR=	mbrolavox
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Voices for MBROLA voice synthesizer
 
+VOICESCONF=	${.CURDIR}/voices.conf
+
+.if !defined(OPTIONS)
+OPTIONS!=	/usr/bin/awk -F\| '{ print $$1 " \"" $$3 "\" " $$4 }' < ${VOICESCONF}
+.endif
+.if !defined(ALLOPTIONS)
+ALLOPTIONS!=	/usr/bin/awk -F\| '{ print $$1 }' < ${VOICESCONF}
+.for ii in ${ALLOPTIONS}
+FILE_${ii}!=	/usr/bin/grep ^${ii} ${VOICESCONF} | /usr/bin/awk -F\| '{ print $$2 }'
+.endfor
+.endif
+
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	yes
@@ -22,42 +33,39 @@ USE_ZIP=	yes
 PLIST=		${WRKDIR}/plist
 WRKSRC=		${WRKDIR}/voices
 
-BROKEN=		"Does not fetch"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2004-06-18
-
 .if !defined(BATCH)
 IS_INTERACTIVE=	yes
 .endif
-
-pre-everything::
-	${MKDIR} ${WRKSRC}
-.if !exists(${WRKDIRPREFIX}${.CURDIR}/work/voices.conf)
-.if !defined(BATCH)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-.endif
+.if defined(PACKAGE_BUILDING)	# Ugly hack until OPTIONS and PACKAGE_BUILDING is fixed. Can be removed when ports/63682 has been commited.
+WITH_us1?=	yes
 .endif
-DISTFILES?=	us1-980512.zip
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/work/voices.conf)
-DISTFILES!=${CAT} ${WRKDIRPREFIX}${.CURDIR}/work/voices.conf
-PATCHDIRS!=${CAT} ${WRKDIRPREFIX}${.CURDIR}/work/fetchdirs.conf
-.endif
-.for ii in ${PATCHDIRS}
-MASTER_SITES+=	http://www.festvox.org/mbrola/dba/${ii}/ \
-	http://mambo.ucsc.edu/psl/mbrola/dba/${ii}/ \
-	ftp://ftp.loria.fr/pub/pc/mbrpsola/${ii}/ \
-	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/${ii}/
+.for ii in ${ALLOPTIONS}
+. if defined(WITH_${ii})
+FILEDIRS+=	${ii}
+MYDISTFILES+=	${FILE_${ii}}:${ii}
+MYFILES+=	${FILE_${ii}}
+MYWITH+=	${ii}
+. endif
 .endfor
+DISTFILES=	${MYDISTFILES}
 
-do-extract:
-.for ii in ${DISTFILES}
-	@unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC}
+.for ii in ${FILEDIRS}
+MASTER_SITES+=	http://www.festvox.org/mbrola/dba/${ii}/:${ii} \
+		http://mambo.ucsc.edu/psl/mbrola/dba/${ii}/:${ii} \
+		ftp://ftp.loria.fr/pub/pc/mbrpsola/${ii}/:${ii} \
+		ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/${ii}/:${ii}
 .endfor
 
-do-patch:
+do-build:
 	@${DO_NADA}
 
+do-extract:
+	@${MKDIR} ${WRKSRC}
+.for ii in ${MYFILES}
+	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC}
+.endfor
+
 pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC}; \
diff --git a/audio/mbrolavox/files/default-fetchdirs.conf b/audio/mbrolavox/files/default-fetchdirs.conf
deleted file mode 100644
index 5d4a0d44d980..000000000000
--- a/audio/mbrolavox/files/default-fetchdirs.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-us1
-us2
-us3
-ar1
-ar2
-br1
-br2
-br3
-bz1
-en1
-ca1
-cr1
-cz1
-cz2
-nl1
-nl2
-nl3
-nz1
-ee1
-pt1
-fr1
-fr2
-fr3
-fr4
-fr5
-fr6
-fr7
-de1
-de2
-de3
-de4
-de5
-de6
-gr1
-gr2
-hb1
-id1
-in1
-in2
-it1
-it2
-it3
-it4
-hn1
-jp1
-jp2
-jp3
-pl1
-es1
-es2
-es4
-mx1
-ro1
-sw1
-sw2
-tl1
-tr1
-tr2
diff --git a/audio/mbrolavox/files/default-voices.conf b/audio/mbrolavox/files/default-voices.conf
deleted file mode 100644
index 61666ceea1f8..000000000000
--- a/audio/mbrolavox/files/default-voices.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-us1-980512.zip:us1
-us2-980812.zip:us2
-us3-990208.zip:us3
-ar1-981103.zip:ar1
-ar2-001015.zip:ar2
-br1-971105.zip:br1
-br2-000119.zip:br2
-br3-000119.zip:br3
-bz1-980116.zip:bz1
-en1-980910.zip:en1
-ca1.zip:ca1
-cr1-981028.zip:cr1
-cz1-991020.zip:cz1
-cz2-001009.zip:cz2
-nl1-980609.zip:nl1
-nl2-990507.zip:nl2
-nl3-001013.zip:nl3
-nz1-000911.zip:nz1
-ee1.zip:ee1
-pt1-000509.zip:pt1
-fr1-990204.zip:fr1
-fr2-980806.zip:fr2
-fr3-990324.zip:fr3
-fr4-990521.zip:fr4
-fr5-991020.zip:fr5
-fr6-010330.zip:fr6
-fr7-010330.zip:fr7
-de1-980227.zip:de1
-de2-990106.zip:de2
-de3-000307.zip:de3
-de4.zip:de4
-de5.zip:de5
-de6.zip:de6
-gr1-990610.zip:gr1
-gr2-010521.zip:gr2
-hb1-000308.zip:hb1
-id1-001010.zip:id1
-in1-010206.zip:in1
-in2-010202.zip:in2
-it1-010213.zip:it1
-it2-010406.zip:it2
-it3-010304.zip:it3
-it4-010926.zip:it4
-hn1-990923.zip:hn1
-jp1-000314.zip:jp1
-jp2-270202.zip:jp2
-jp3.zip:jp3
-pl1.zip:pl1
-es1-980610.zip:es1
-es2-989825.zip:es2
-es4.zip:es4
-mx1-990208.zip:mx1
-ro1-980317.zip:ro1
-sw1-980623.zip:sw1
-sw2-140102.zip:sw2
-tl1.zip:tl1
-tr1-010209.zip:tr1
-tr2-010212.zip:tr2
diff --git a/audio/mbrolavox/scripts/configure b/audio/mbrolavox/scripts/configure
deleted file mode 100644
index 0097deb545fc..000000000000
--- a/audio/mbrolavox/scripts/configure
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-echo ${WRKDIR}/voices.conf
-if [ -f ${WRKDIR}/voices.conf ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ -z "${BATCH}" ]; then
-
-/usr/bin/dialog --title "MBROLA voice selection" --clear \
-	--checklist "\n\
-Choose voices to download and install. \n\
-Press the space bar to toggle selections." -1 -1 18 \
-us1-980512.zip	"American English female (6.8 MB) by Babel Technology"	OFF \
-us2-980812.zip	"American English male (6.3 MB) by Babel Technology"	OFF \
-us3-990208.zip	"American English male (6.1 MB) by Mike Macon"		OFF \
-ar1-981103.zip	"Arabic male (5.1 MB) by Faculte Polytech. de Mons"	OFF \
-ar2-001015.zip	"Arabic male (5.6 MB) by Abdel Muez Abukhalaf"		OFF \
-br1-971105.zip	"Brazilian Portuguese male (5.0 MB) by Denis R. Costa"	OFF \
-br2-000119.zip	"Brazilian Portuguese male (8.3 MB) by Denis R. Costa"	OFF \
-br3-000119.zip	"Brazilian Portuguese male (8.6 MB) by Denis R. Costa"	OFF \
-bz1-980116.zip	"Breton female (25.0 MB) by Jean Pierre Messager"	OFF \
-en1-980910.zip	"British English male (5.7 MB) by Alan V. Black"	OFF \
-ca1.zip		"Canadian French male (12.8 MB) by Vincent Arnaud"	OFF \
-cr1-981028.zip	"Croation male (2.9 MB) by Juraj Bakran"		OFF \
-cz1-991020.zip	"Czech female (2.2 MB) by Mikulas Pinos"		OFF \
-cz2-001009.zip	"Czech male (8 MB) by Mikulas Pinos"			OFF \
-nl1-980609.zip	"Dutch male (0.4 MB) by Arthur Dirksen"			OFF \
-nl2-990507.zip	"Dutch male (13 MB) by Arthur Dirksen"			OFF \
-nl3-001013.zip	"Dutch female (8.6 MB) by Raymond Veldhuis"		OFF \
-nz1-000911.zip	"Maori male (2.3 MB) by Mark R. Laws"			OFF \
-ee1.zip		"Estonian male (9.2 MB) by Meelis Mihkla"		OFF \
-pt1-000509.zip	"Portuguese female (7.8 MB) by Babel Technology"	OFF \
-fr1-990204.zip	"French male (4.4 MB) by Faculte Polytech. de Mons"	OFF \
-fr2-980806.zip	"French female (4.8 MB) by Celine Egea"			OFF \
-fr3-990324.zip	"French male (4.8 MB) by Babel Technology"		OFF \
-fr4-990521.zip	"French female (5.4 MB) by Babel Technology"		OFF \
-fr5-991020.zip	"French Belgian (4.8 MB) by Faculte Polytech. de Mons"	OFF \
-fr6-010330.zip	"French male (4.4 MB) by Faculte Polytech. de Mons"	OFF \
-fr7-010330.zip	"French Belgian (3.7 MB) by Faculte Polytech. de Mons"	OFF \
-de1-980227.zip	"German female (9.9 MB) by Fred Englert"		OFF \
-de2-990106.zip	"German male (9.3 MB) by ATIP"				OFF \
-de3-000307.zip	"German female (10.4 MB) by ATIP"			OFF \
-de4.zip		"German male (18.6 MB) by University of Stuttgart"	OFF \
-de5.zip		"German female (13.3 MB) by ATIP"			OFF \
-de6.zip		"German male (48.5 MB) by Saarland University"		OFF \
-gr1-990610.zip	"Greek male (1.6 MB) by George Sergiadis"		OFF \
-gr2-010521.zip	"Greek male (5.6 MB) by ]Gerasimos Xydas"		OFF \
-hb1-000308.zip	"Hebrew male (3.4 MB) by Yoram Meron"			OFF \
-id1-001010.zip	"Indonesian male (4 MB) by Arry Arman"			OFF \
-in1-010206.zip	"Hindi male (3.6 MB) by Amin Charaniya"			OFF \
-in2-010202.zip	"Hindi female (3.7 MB) by Amin Charaniya"		OFF \
-it1-010213.zip	"Italian male (5.2 MB) by Claudia Citta"		OFF \
-it2-010406.zip	"Italian female (5.2 MB) by Claudia Citta"		OFF \
-it3-010304.zip	"Italian male (5.1 MB) by Piero Cosi"			OFF \
-it4-010926.zip	"Italian female (4.9 MB) by ITC-irst"			OFF \
-hn1-990923.zip	"Korean male (9.9 MB) by Kyongsok Gim"			OFF \
-jp1-000314.zip	"Japanese male (1.8 MB) by Yoram Meron"			OFF \
-jp2-270202.zip	"Japanese female (5.6 MB) by Tomohisa Tachiki"		OFF \
-jp3.zip		"Japanese female (1.7 MB) by Yoram Meron"		OFF \
-pl1.zip		"Polish female (4.0 MB) by PJWSTK"			OFF \
-es1-980610.zip	"Spanish male (2.1 MB) by Alistair Conkie"		OFF \
-es2-989825.zip	"Spanish male (5.1 MB) by TCC Communications Corp."	OFF \
-es4.zip		"Spanish male (2.8 MB) by Universidad de Valladolid"	OFF \
-mx1-990208.zip	"Spanish Mexican male (1.8 MB) by OGI"			OFF \
-ro1-980317.zip	"Romanian male (2.9 MB) by Marian Boldea"		OFF \
-sw1-980623.zip	"Swedish male (9.3 MB) by Marcus Filipsson"		OFF \
-sw2-140102.zip	"Swedish female (5.6 MB) by Adina Svensson"		OFF \
-tl1.zip		"Telugu female (6.9 MB) by Kalpana Reddy KVK"		OFF \
-tr1-010209.zip	"Turkish male (3.7 MB) by Faculte Polytech. de Mons"	OFF \
-tr2-010212.zip	"Turkish female (4.3 MB) by Faculte Polytech. de Mons"	OFF \
-2> /tmp/checklist.tmp.$$
-
-retval=$?
-
-choice=`cat /tmp/checklist.tmp.$$`
-rm -f /tmp/checklist.tmp.$$
-
-case $retval in
-	0)	if [ -z "$choice" ]; then
-			echo "Nothing selected"
-			exit 1;
-	fi
-	;;
-	1)	echo "Cancel pressed."
-		exit 1
-	;;
-esac
-
-echo $choice | tr ' ' '\012' | tr -d \" | \
-	awk -F\- '{ print $0 ":" $1 }' | sed -e 's/\.zip$//' \
-	> ${WRKDIR}/voices.conf
-cut -c1-3 < ${WRKDIR}/voices.conf > ${WRKDIR}/fetchdirs.conf
-
-echo "* Your choices are saved.  You must run the \"make\" command again to"
-echo "* complete the build.  Ignore the \"Error code 1\" below."
-exit 1
-else
-exit 0
-fi
diff --git a/audio/mbrolavox/voices.conf b/audio/mbrolavox/voices.conf
new file mode 100644
index 000000000000..739c74e58eb7
--- /dev/null
+++ b/audio/mbrolavox/voices.conf
@@ -0,0 +1,58 @@
+us1|us1-980512.zip|American English female (6.8 MB) by Babel Technology|On
+us2|us2-980812.zip|American English male (6.3 MB) by Babel Technology|Off
+us3|us3-990208.zip|American English male (6.1 MB) by Mike Macon|Off
+ar1|ar1-981103.zip|Arabic male (5.1 MB) by Faculte Polytech. de Mons|Off
+ar2|ar2-001015.zip|Arabic male (5.6 MB) by Abdel Muez Abukhalaf|Off
+br1|br1-971105.zip|Brazilian Portuguese male (5.0 MB) by Denis R. Costa|Off
+br2|br2-000119.zip|Brazilian Portuguese male (8.3 MB) by Denis R. Costa|Off
+br3|br3-000119.zip|Brazilian Portuguese male (8.6 MB) by Denis R. Costa|Off
+bz1|bz1-980116.zip|Breton female (25.0 MB) by Jean Pierre Messager|Off
+en1|en1-980910.zip|British English male (5.7 MB) by Alan V. Black|Off
+ca1|ca1.zip|Canadian French male (12.8 MB) by Vincent Arnaud|Off
+cr1|cr1-981028.zip|Croation male (2.9 MB) by Juraj Bakran|Off
+cz1|cz1-991020.zip|Czech female (2.2 MB) by Mikulas Pinos|Off
+cz2|cz2-001009.zip|Czech male (8 MB) by Mikulas Pinos|Off
+nl1|nl1-980609.zip|Dutch male (0.4 MB) by Arthur Dirksen|On
+nl2|nl2-990507.zip|Dutch male (13 MB) by Arthur Dirksen|Off
+nl3|nl3-001013.zip|Dutch female (8.6 MB) by Raymond Veldhuis|Off
+nz1|nz1-000911.zip|Maori male (2.3 MB) by Mark R. Laws|Off
+ee1|ee1.zip|Estonian male (9.2 MB) by Meelis Mihkla|Off
+pt1|pt1-000509.zip|Portuguese female (7.8 MB) by Babel Technology|Off
+fr1|fr1-990204.zip|French male (4.4 MB) by Faculte Polytech. de Mons|Off
+fr2|fr2-980806.zip|French female (4.8 MB) by Celine Egea|Off
+fr3|fr3-990324.zip|French male (4.8 MB) by Babel Technology|Off
+fr4|fr4-990521.zip|French female (5.4 MB) by Babel Technology|Off
+fr5|fr5-991020.zip|French Belgian (4.8 MB) by Faculte Polytech. de Mons|Off
+fr6|fr6-010330.zip|French male (4.4 MB) by Faculte Polytech. de Mons|Off
+fr7|fr7-010330.zip|French Belgian (3.7 MB) by Faculte Polytech. de Mons|Off
+de1|de1-980227.zip|German female (9.9 MB) by Fred Englert|Off
+de2|de2-990106.zip|German male (9.3 MB) by ATIP|Off
+de3|de3-000307.zip|German female (10.4 MB) by ATIP|Off
+de4|de4.zip|German male (18.6 MB) by University of Stuttgart|Off
+de5|de5.zip|German female (13.3 MB) by ATIP|Off
+de6|de6.zip|German male (48.5 MB) by Saarland University|Off
+gr1|gr1-990610.zip|Greek male (1.6 MB) by George Sergiadis|Off
+gr2|gr2-010521.zip|Greek male (5.6 MB) by ]Gerasimos Xydas|Off
+hb1|hb1-000308.zip|Hebrew male (3.4 MB) by Yoram Meron|Off
+id1|id1-001010.zip|Indonesian male (4 MB) by Arry Arman|Off
+in1|in1-010206.zip|Hindi male (3.6 MB) by Amin Charaniya|Off
+in2|in2-010202.zip|Hindi female (3.7 MB) by Amin Charaniya|Off
+it1|it1-010213.zip|Italian male (5.2 MB) by Claudia Citta|Off
+it2|it2-010406.zip|Italian female (5.2 MB) by Claudia Citta|Off
+it3|it3-010304.zip|Italian male (5.1 MB) by Piero Cosi|Off
+it4|it4-010926.zip|Italian female (4.9 MB) by ITC-irst|Off
+hn1|hn1-990923.zip|Korean male (9.9 MB) by Kyongsok Gim|Off
+jp1|jp1-000314.zip|Japanese male (1.8 MB) by Yoram Meron|Off
+jp2|jp2-270202.zip|Japanese female (5.6 MB) by Tomohisa Tachiki|Off
+jp3|jp3.zip|Japanese female (1.7 MB) by Yoram Meron|Off
+pl1|pl1.zip|Polish female (4.0 MB) by PJWSTK|Off
+es1|es1-980610.zip|Spanish male (2.1 MB) by Alistair Conkie|Off
+es2|es2-989825.zip|Spanish male (5.1 MB) by TCC Communications Corp.|Off
+es4|es4.zip|Spanish male (2.8 MB) by Universidad de Valladolid|Off
+mx1|mx1-990208.zip|Spanish Mexican male (1.8 MB) by OGI|Off
+ro1|ro1-980317.zip|Romanian male (2.9 MB) by Marian Boldea|Off
+sw1|sw1-980623.zip|Swedish male (9.3 MB) by Marcus Filipsson|Off
+sw2|sw2-140102.zip|Swedish female (5.6 MB) by Adina Svensson|Off
+tl1|tl1.zip|Telugu female (6.9 MB) by Kalpana Reddy KVK|Off
+tr1|tr1-010209.zip|Turkish male (3.7 MB) by Faculte Polytech. de Mons|Off
+tr2|tr2-010212.zip|Turkish female (4.3 MB) by Faculte Polytech. de Mons|Off