3 files changed, 82 insertions, 24 deletions

diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile
index cbd93b7f7f48..a2b117edece6 100644
--- a/audio/mbrolavox/Makefile
+++ b/audio/mbrolavox/Makefile
@@ -14,8 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Voices for MBROLA voice synthesizer
 
-BROKEN=		Size mismatch
-
 USE_ZIP=	yes
 NO_BUILD=	yes
 RESTRICTED=	No commercial nor military use, no sale
@@ -37,7 +35,8 @@ ALLOPTIONS!=	${CUT} -f 1 -d '|' < ${VOICESCONF}
 .for ii in ${ALLOPTIONS}
 FILE_${ii}!=	${AWK} -F'|' '$$1 == "${ii}" { print $$2 }' < ${VOICESCONF}
 .   if defined(WITH_${ii})
-MASTER_SITES+=	http://www.festvox.org/mbrola/dba/${ii}/:${ii} \
+MASTER_SITES+=	http://www.tcts.fpms.ac.be/synthesis/mbrola/dba/${ii}/:${ii} \
+		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}
diff --git a/audio/mbrolavox/distinfo b/audio/mbrolavox/distinfo
index f2d23e670034..841d5181be6d 100644
--- a/audio/mbrolavox/distinfo
+++ b/audio/mbrolavox/distinfo
@@ -1,3 +1,6 @@
+MD5 (mbrolavox/af1.zip) = 1391c7745585f12f423e0d9bb04fcc5a
+SHA256 (mbrolavox/af1.zip) = 97e935304da04216ca26dc1bc2ec354f31b050c69e8fcc6c85f59e686b271f1a
+SIZE (mbrolavox/af1.zip) = 6684945
 MD5 (mbrolavox/ar1-981103.zip) = 2e7012597e1cec0072f177c369fc3e38
 SHA256 (mbrolavox/ar1-981103.zip) = 38e65ce5f667fc6a9ded5e8c45f1924f2b4cd920c12ba1fbc9dfbe190a573d42
 SIZE (mbrolavox/ar1-981103.zip) = 5159891
@@ -19,6 +22,9 @@ SIZE (mbrolavox/bz1-980116.zip) = 24885509
 MD5 (mbrolavox/ca1.zip) = 79b43fb8f9f6ef3ff0c8d63a2d5223b9
 SHA256 (mbrolavox/ca1.zip) = 7e48b52f9e9e162b4167d50e571fb76d6376729939a8b4581080e800977cfaed
 SIZE (mbrolavox/ca1.zip) = 12856509
+MD5 (mbrolavox/ca2.zip) = 48934187a27b2b70fffbabe60c6a43cb
+SHA256 (mbrolavox/ca2.zip) = 84948b5c2e505598626640cd70a240f8a75cbade2a64aef41cb4e4b26ba080c2
+SIZE (mbrolavox/ca2.zip) = 9748948
 MD5 (mbrolavox/cr1-981028.zip) = c2a9be187e0c1d6dec17af909f099fdb
 SHA256 (mbrolavox/cr1-981028.zip) = 687356a01f7497d0feaf79f0338eebf6655d5dcf1a2083c060223ff623fbae37
 SIZE (mbrolavox/cr1-981028.zip) = 2982962
@@ -46,6 +52,12 @@ SIZE (mbrolavox/de5.zip) = 13134662
 MD5 (mbrolavox/de6.zip) = 989d86647c6099a3b3faceb1999efd18
 SHA256 (mbrolavox/de6.zip) = 29d530b63d92dedbab7b5ef720e0a3ff69259fba86d7924fae1a7ea2db69424e
 SIZE (mbrolavox/de6.zip) = 48479957
+MD5 (mbrolavox/de7.zip) = 16229636034e134b880a132553ca7adb
+SHA256 (mbrolavox/de7.zip) = 5324c29fb0bb3ce1719c11b96e20d49261d13502200947f3621bba22602ebaf1
+SIZE (mbrolavox/de7.zip) = 47642004
+MD5 (mbrolavox/de8.zip) = 4033d4063919d0c6d98620293ff31c7c
+SHA256 (mbrolavox/de8.zip) = 2df96f039f4875318f22400561dedf8d9a9f54cc8f517da6fa220d6248ceac4c
+SIZE (mbrolavox/de8.zip) = 9693603
 MD5 (mbrolavox/ee1.zip) = 38377e171c4a3d3d30e9b214798d3d8c
 SHA256 (mbrolavox/ee1.zip) = 1702fd58d47ea5cd29e7a7ffd33f8f3e4231555d0ad6d0724ba313fa86effd5e
 SIZE (mbrolavox/ee1.zip) = 8940712
@@ -68,8 +80,10 @@ MD5 (mbrolavox/fr2-980806.zip) = 1488ea8ef76e97f1cf8af67963accf42
 SHA256 (mbrolavox/fr2-980806.zip) = 3b836361676ed00da9d33bbfb60b32388f4769f02f0e226d0c573d2030271307
 SIZE (mbrolavox/fr2-980806.zip) = 5744598
 MD5 (mbrolavox/fr3-990324.zip) = bd70729fa1ad93f06dda7a768a6466d1
+SHA256 (mbrolavox/fr3-990324.zip) = 8c04c8835521114193f37bae78877497a3561d0e84d7907ffd5398a1fa04630b
 SIZE (mbrolavox/fr3-990324.zip) = 4701636
 MD5 (mbrolavox/fr4-990521.zip) = 934c3dda73c9d0e782a646194c415425
+SHA256 (mbrolavox/fr4-990521.zip) = 6aa2c42e2327937c96e672c4c2b16a94003dbd788de6a5c6c238c35fa7da9d6b
 SIZE (mbrolavox/fr4-990521.zip) = 5538552
 MD5 (mbrolavox/fr5-991020.zip) = 2ebf4105702ab2aa037491338ed05ebb
 SHA256 (mbrolavox/fr5-991020.zip) = 1f7f763911bb5251faba8dcf7cfa3e977216fe71389c219824f51f66f109f424
@@ -89,9 +103,18 @@ SIZE (mbrolavox/gr2-010521.zip) = 5853609
 MD5 (mbrolavox/hb1-000308.zip) = c702dd7210fdd8225bf79456839c2d6f
 SHA256 (mbrolavox/hb1-000308.zip) = 4bc1df601b1caae9c20139b5793b1cc08457f79b66fa44ae43b38f68193e6554
 SIZE (mbrolavox/hb1-000308.zip) = 3380159
+MD5 (mbrolavox/hb2.zip) = 479d927422ee026d7bb08cfbeb752d3a
+SHA256 (mbrolavox/hb2.zip) = 08501914caa484020d87b2ef07e64c12514448d1dd6e55704fa666eef856243d
+SIZE (mbrolavox/hb2.zip) = 5632140
 MD5 (mbrolavox/hn1-990923.zip) = 29aa2ad017882c9791db704801409a24
 SHA256 (mbrolavox/hn1-990923.zip) = bf4c6371c780caa604183275ef149bf36486f8d54e02a81faf5e8ba77fb0308e
 SIZE (mbrolavox/hn1-990923.zip) = 9513818
+MD5 (mbrolavox/hu1.zip) = 60d1442be32c3c5b87b7a9cea8e1c24a
+SHA256 (mbrolavox/hu1.zip) = 3776fffd07c0cca079819568f76b65308a12a9be8357ffedad821f1c8d43b88f
+SIZE (mbrolavox/hu1.zip) = 7467691
+MD5 (mbrolavox/ic1.zip) = 541607bbfb265a562fba8b9c1adfee31
+SHA256 (mbrolavox/ic1.zip) = 8cc1edf121d6abe48e800cdd60680962e36c4b21817f202dcd0bf807108e3f51
+SIZE (mbrolavox/ic1.zip) = 9932144
 MD5 (mbrolavox/id1-001010.zip) = 33cd63ec6d231ac91b8156485a381207
 SHA256 (mbrolavox/id1-001010.zip) = d310eb470827e9033aaec688d644eade7ab9118d2baf0a3f21e1188c2cd575dc
 SIZE (mbrolavox/id1-001010.zip) = 4446704
@@ -101,6 +124,9 @@ SIZE (mbrolavox/in1-010206.zip) = 3720944
 MD5 (mbrolavox/in2-010202.zip) = fdba924b95353c0bdfa3aa4abec30a6b
 SHA256 (mbrolavox/in2-010202.zip) = 4606db5df6ced873dee169d6eb79a77a345b62f84df54fbb342d1625d7e5d36a
 SIZE (mbrolavox/in2-010202.zip) = 3881552
+MD5 (mbrolavox/ir1.zip) = 466f2ee8aedd6f78a3ab30fbdd2f98cb
+SHA256 (mbrolavox/ir1.zip) = d995c3f45305dcaf63f533f86341fa3a42f492a22526a5a07796b546767951c7
+SIZE (mbrolavox/ir1.zip) = 5041137
 MD5 (mbrolavox/it1-010213.zip) = 8a356360b8f6f6c65597c50d237836db
 SHA256 (mbrolavox/it1-010213.zip) = 41ea08c061308a7529d21ce095896c9d34faec50f165af1d4d3407988736c688
 SIZE (mbrolavox/it1-010213.zip) = 5493706
@@ -122,9 +148,24 @@ SIZE (mbrolavox/jp2-270202.zip) = 5601826
 MD5 (mbrolavox/jp3.zip) = 8e01d49d5f51d02e16638f1477f76ecc
 SHA256 (mbrolavox/jp3.zip) = 0d3f1831fcc783200a7f83e071868ae0ad1b7353bb2700cd8520267263d75b59
 SIZE (mbrolavox/jp3.zip) = 1563983
+MD5 (mbrolavox/la1.zip) = f7663f3391479b606466e0cc2277b871
+SHA256 (mbrolavox/la1.zip) = 6f86749c79127125b4bcd347852e3b0d15722398fb3e0ca53b0c9d902e0aad27
+SIZE (mbrolavox/la1.zip) = 7627631
+MD5 (mbrolavox/lt1.zip) = 9293674e01dc29bd92e4a251c09d215a
+SHA256 (mbrolavox/lt1.zip) = 121ca04d10a537159438d53e22a8a6fe88ce31c5fd0597555b5095e217811ffc
+SIZE (mbrolavox/lt1.zip) = 23818851
+MD5 (mbrolavox/lt2.zip) = f7f78b06a0d3df4a05f8ba9a8f173327
+SHA256 (mbrolavox/lt2.zip) = ccdeb618d486c93c5038016dfc935d90702ffb4062a3117895818e967719b50a
+SIZE (mbrolavox/lt2.zip) = 19215965
+MD5 (mbrolavox/ma1.zip) = 3985335d4157d1fb38524c145de5a80d
+SHA256 (mbrolavox/ma1.zip) = a45a2b1cfe3066907782f1f0f84b3874f41de8eb0315cbc9e90283dc3f5faa24
+SIZE (mbrolavox/ma1.zip) = 2903550
 MD5 (mbrolavox/mx1-990208.zip) = 911b6e6fc6392095b074ed17f48bc7a9
 SHA256 (mbrolavox/mx1-990208.zip) = 98162e66ca7a84fff6d7a4e84d494a6925bd476aa8780e74876c33d5b5b10055
 SIZE (mbrolavox/mx1-990208.zip) = 1889853
+MD5 (mbrolavox/mx2.zip) = a8f668fd73a4c3c65ae1a2cae9a4824e
+SHA256 (mbrolavox/mx2.zip) = b51f1e9b6523e053d3ca82667c551169a53e2dcd4e33228de89eae7bea861617
+SIZE (mbrolavox/mx2.zip) = 3486662
 MD5 (mbrolavox/nl1-980609.zip) = 711ccc96832ada58a0482ef4441a1507
 SHA256 (mbrolavox/nl1-980609.zip) = dd589360bb05f468ed128398681aab2d7a2a913f4f1077c8a5875db36027e5b9
 SIZE (mbrolavox/nl1-980609.zip) = 468679
@@ -132,6 +173,7 @@ MD5 (mbrolavox/nl2-990507.zip) = 2e55bcec092a4d760badd5a6eb421d43
 SHA256 (mbrolavox/nl2-990507.zip) = 7d4bb88fddd699c8e52afdaaca789273a37ed68a0e4330354b9a4d5f5750ec6f
 SIZE (mbrolavox/nl2-990507.zip) = 13259370
 MD5 (mbrolavox/nl3-001013.zip) = c5a70517532f8004ff177b0d36528762
+SHA256 (mbrolavox/nl3-001013.zip) = 9436874b095702a9bcd4724cc9abb19d86ed02e5c7fe92ca049c9fffdc2d7fc9
 SIZE (mbrolavox/nl3-001013.zip) = 8692692
 MD5 (mbrolavox/nz1-000911.zip) = 9c9ac4a5295fd8a9eb16f0723545a97b
 SHA256 (mbrolavox/nz1-000911.zip) = 05e454219415343dde49bceddf2fd17163ec5b5819e6f7ec9c7c320038daacd5
@@ -155,8 +197,8 @@ MD5 (mbrolavox/tl1.zip) = 67eb7b80bb702a3b2adc4205d3d86afb
 SHA256 (mbrolavox/tl1.zip) = 70f1397fe803f14796692eeb47c9f321f6e3d37686c9f491848085344703aaa9
 SIZE (mbrolavox/tl1.zip) = 7233186
 MD5 (mbrolavox/tr1-010209.zip) = 79fabdd56d0e361941d98a2b40fc4631
-SIZE (mbrolavox/tr1-010209.zip) = 3863131
 SHA256 (mbrolavox/tr1-010209.zip) = 13f9fc06447eace49abd3fb786d6ddc93969e77d0c60d989cc613abadce2d8e5
+SIZE (mbrolavox/tr1-010209.zip) = 3863131
 MD5 (mbrolavox/tr2-010212.zip) = 263eadb96341b1c7b672b502cf78eabf
 SHA256 (mbrolavox/tr2-010212.zip) = 834b84dc68bcc60cfbb8d6fb949e5060c20bc0f94e4bc95707396fea1e0a0196
 SIZE (mbrolavox/tr2-010212.zip) = 4545223
@@ -169,3 +211,6 @@ SIZE (mbrolavox/us2-980812.zip) = 6387442
 MD5 (mbrolavox/us3-990208.zip) = 544840204a6e120cef67176769629ecb
 SHA256 (mbrolavox/us3-990208.zip) = ebaf8af32dab2b7f3b7483b824f86b1d8151cde7e0ef50d2d88488948564b601
 SIZE (mbrolavox/us3-990208.zip) = 6195800
+MD5 (mbrolavox/vz1.zip) = 9fe85b878516254d9157bc8c47a0f08b
+SHA256 (mbrolavox/vz1.zip) = 5cae31374fc3b2c826fd55395737715bdecad2b7f3baaf9c1e4a2f836f650837
+SIZE (mbrolavox/vz1.zip) = 2382572
diff --git a/audio/mbrolavox/voices.conf b/audio/mbrolavox/voices.conf
index 739c74e58eb7..55d88d11e7ce 100644
--- a/audio/mbrolavox/voices.conf
+++ b/audio/mbrolavox/voices.conf
@@ -1,23 +1,28 @@
-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
+af1|af1.zip|Afrikaans Male (6.6Mb) by Daan Wissing|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
+ca2|ca2.zip|Canadian French male (9.8Mb) by Silex Creations Inc|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
+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
+de7|de7.zip|German Female (46.5Mb) by DFKI|Off
+de8|de8.zip|German-Bavarian Male (9.7Mb) by Markus Binsteiner|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
+en1|en1-980910.zip|British English male (5.7 MB) by Alan V. Black|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
 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
@@ -25,34 +30,43 @@ 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
+hb2|hb2.zip|Hebrew Female (5.6Mb) by Esther Raizen|Off
+hn1|hn1-990923.zip|Korean male (9.9 MB) by Kyongsok Gim|Off
+hu1|hu1.zip|Hungarian Female (8.9Mb) by Eleonora Klein|Off
+ic1|ic1.zip|Icelandic Male (9.9Mb) by Björn Kristinsson|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
+ir1|ir1.zip|Iranian Male (5Mb) by Alireza Farhadi|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
+la1|la1.zip|Classical Latin Male (7.6Mb) by Olivier Bianchi|Off
+lt1|lt1.zip|Lithuanian Male (22.7Mb) by PK & AG|Off
+lt2|lt2.zip|Lithuanian Male (18.3Mb) by PK & AG|Off
+ma1|ma1.zip|Malay Female (2.9Mb) by Kow Weng Onn|Off
 mx1|mx1-990208.zip|Spanish Mexican male (1.8 MB) by OGI|Off
+mx2|mx2.zip|Spanish Mexican male (3.5Mb) by Humberto Pérez Espinosa|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
+pl1|pl1.zip|Polish female (4.0 MB) by PJWSTK|Off
+pt1|pt1-000509.zip|Portuguese female (7.8 MB) by Babel Technology|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
+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
+vz1|vz1.zip|Venezuelan Spanish (2.3Mb) by MRH|Off