From 5e1f5eeddc4024bc165e38450add0af87acca431 Mon Sep 17 00:00:00 2001 From: Chris Rees Date: Sat, 4 May 2013 12:52:28 +0000 Subject: [PATCH] audio/mbrolavox: Fix options generation to get sane defaults --- audio/mbrolavox/Makefile | 4 ++-- audio/mbrolavox/Makefile.options | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile index 07db01489564..4567b8a052c1 100644 --- a/audio/mbrolavox/Makefile +++ b/audio/mbrolavox/Makefile @@ -63,7 +63,7 @@ Makefile.options.unsorted: ${VOICESCONF} ${ECHO_CMD} "$${opt}_DESC= $$define" >> ${.TARGET}; \ ${ECHO_CMD} "FILE_$${opt}= $$file" >> ${.TARGET}; \ case $$default in \ - on) optdefault="$$optdefault $$opt" ;; \ + [Oo][Nn]) optdefault="$$optdefault $$opt" ;; \ *) ;; \ esac; \ done < ${.ALLSRC}; \ @@ -71,6 +71,6 @@ Makefile.options.unsorted: ${VOICESCONF} ${SED} 's,^[[:space:]]*,OPTIONS_DEFINE+= ,;s,[[:space:]]*$$,,' >> ${.TARGET}; \ [ -z "$$optdefault" ] || \ ${ECHO_CMD} $$optdefault | /usr/bin/fold -sw 50 | \ - ${SED} 's,^,OPTIONS_DEFAULT+= ,' >> ${.TARGET} + ${SED} 's,^[[:space:]]*,OPTIONS_DEFAULT+= ,' >> ${.TARGET} .include diff --git a/audio/mbrolavox/Makefile.options b/audio/mbrolavox/Makefile.options index b1df5c14345a..c43ca3396230 100644 --- a/audio/mbrolavox/Makefile.options +++ b/audio/mbrolavox/Makefile.options @@ -1,5 +1,5 @@ # $FreeBSD$ -# Autogenerated from /usr/home/crees/mbrolavox/voices.conf using make Makefile.options +# Autogenerated from /usr/ports/workspace/mbrolavox/voices.conf using make Makefile.options FILE_af1= af1.zip FILE_ar1= ar1-981103.zip FILE_ar2= ar2-001015.zip @@ -72,6 +72,7 @@ FILE_us1= us1-980512.zip FILE_us2= us2-980812.zip FILE_us3= us3-990208.zip FILE_vz1= vz1.zip +OPTIONS_DEFAULT+= nl1 us1 OPTIONS_DEFINE+= af1 ar1 ar2 br1 br2 br3 bz1 ca1 ca2 cr1 cz1 cz2 OPTIONS_DEFINE+= de1 de2 de3 de4 de5 de6 de7 de8 ee1 en1 es1 es2 OPTIONS_DEFINE+= es4 fr1 fr2 fr3 fr4 fr5 fr6 fr7 gr1 gr2 hb1 hb2