[patch] fix "make fetch" for audio/mbrolavox

When building audio/mbrolavox on bento, it doesn't do
	anything usefull because it there are no voices selected.

	Furthermore, the fetch stage tries to download each file
	from each subdirectory, which is inefficient.

	See also
	http://bento.freebsd.org/errorlogs/i386-4-exp-latest/mbrolavox-3.0.1.log

PR:		ports/61500
Submitted by:	Edwin Groothuis <edwin@mavetju.org>
Approved by:	maintainer timeout

audio/mbrolavox/Makefile

@@ -8,7 +8,7 @@
 PORTNAME=	mbrolavox
 PORTVERSION=	3.0.1
 CATEGORIES=	audio accessibility
-MASTER_SITES=
+MASTER_SITES=	# filled in later after the configure script has run
 DIST_SUBDIR=	mbrolavox
 
 MAINTAINER=	trevor@FreeBSD.org
@@ -33,22 +33,28 @@ pre-everything::
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 .endif
-DISTFILES?=	us1-980512.zip
+
+.if defined(PACKAGE_BUILDING)
+.BEGIN:
+	${MKDIR} ${WRKDIR}
+	${CP} ${FILESDIR}/default-voices.conf ${WRKDIR}/voices.conf
+	${CP} ${FILESDIR}/default-fetchdirs.conf ${WRKDIR}/fetchdirs.conf
+.endif
 
 .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}/
+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-extract:
 .for ii in ${DISTFILES}
-	@unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC}
+	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC}
 .endfor
 
 do-patch:

audio/mbrolavox/files/default-fetchdirs.conf

@@ -0,0 +1,58 @@
+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

audio/mbrolavox/files/default-voices.conf

@@ -0,0 +1,58 @@
+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

audio/mbrolavox/scripts/configure

@@ -91,7 +91,9 @@ case $retval in
 	;;
 esac
 
-echo $choice | tr ' ' '\012' | tr -d \" > ${WRKDIR}/voices.conf
+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"