Date: Sun, 18 Jan 2004 08:53:24 +1100 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: trevor@FreeBSD.org Subject: ports/61500: [patch] fix "make fetch" for audio/mbrolavox Message-ID: <20040117215324.7F21A6A7101@k7.mavetju> Resent-Message-ID: <200401172200.i0HM0ORx036805@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61500 >Category: ports >Synopsis: [patch] fix "make fetch" for audio/mbrolavox >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 17 14:00:24 PST 2004 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 4.8-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 4.8-RELEASE FreeBSD 4.8-RELEASE #1: Mon Jan 5 18:59:31 EST 2004 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386 >Description: 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 >How-To-Repeat: >Fix: Please note the two new files in the files directory. Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/mbrolavox/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 10 Nov 2003 17:39:00 -0000 1.2 +++ Makefile 17 Jan 2004 21:51:56 -0000 @@ -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,17 +33,23 @@ ${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: Index: files/default-fetchdirs.conf =================================================================== RCS file: files/default-fetchdirs.conf diff -N files/default-fetchdirs.conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/default-fetchdirs.conf 17 Jan 2004 21:51:56 -0000 @@ -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 Index: files/default-voices.conf =================================================================== RCS file: files/default-voices.conf diff -N files/default-voices.conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/default-voices.conf 17 Jan 2004 21:51:56 -0000 @@ -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 Index: scripts/configure =================================================================== RCS file: /home/pcvs/ports/audio/mbrolavox/scripts/configure,v retrieving revision 1.2 diff -u -r1.2 configure --- scripts/configure 10 Nov 2003 17:39:00 -0000 1.2 +++ scripts/configure 17 Jan 2004 21:51:56 -0000 @@ -91,7 +91,9 @@ ;; 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" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040117215324.7F21A6A7101>