On Mon, May 13, 2013 at 09:16:39AM +0100, Stuart Henderson wrote:
Please send unified diffs, the default diff format is very hard to read
echo diff -uNp >> ~/.cvsrc
Sorry and thank you, attached is unified
--
Dios, gracias por tu amor infinito.
--
Vladimir Támara Patiño. http://vtamara.pasosdeJesus.org/
http://www.pasosdejesus.org/dominio_publico_colombia.html
Index: Makefile
===================================================================
RCS file: /cvs/src/share/locale/ctype/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 16 Jul 2011 21:33:30 -0000 1.6
+++ Makefile 13 May 2013 11:00:16 -0000
@@ -80,14 +80,15 @@ LOCALES += en_US.ISO8859-15
LOCALES += en_US.UTF-8
LOCALESRC_en_US.UTF-8 = en_US.UTF-8
-LOCALES += es_ES.ISO8859-1
- LOCALESRC_es_ES.ISO8859-1 = en_US.ISO_8859-1
-
-LOCALES += es_ES.ISO8859-15
- LOCALESRC_es_ES.ISO8859-15 = en_US.DIS_8859-15
-
-LOCALES += es_ES.UTF-8
- LOCALESRC_es_ES.UTF-8 = en_US.UTF-8
+LOCALES_ES = es_AR es_BO es_CH es_CO es_CR es_CU es_DO es_EC es_ES es_GQ es_GT
es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
+.for c in ${LOCALES_ES}
+LOCALES += ${c}.ISO8859-1
+ LOCALESRC_${c}.ISO8859-1 = en_US.ISO_8859-1
+LOCALES += ${c}.ISO8859-15
+ LOCALESRC_${c}.ISO8859-15 = en_US.DIS_8859-15
+LOCALES += ${c}.UTF-8
+ LOCALESRC_${c}.UTF-8 = en_US.UTF-8
+.endfor
LOCALES += fa_IR.UTF-8
LOCALESRC_fa_IR.UTF-8 = en_US.UTF-8
@@ -293,7 +294,6 @@ LOCALESRCS+= ${LOCALESRC_${locale}}
.endfor
CLEANFILES+= ${LOCALES:S/$/.out/g}
-# TODO: more use of symlinks?
FILES= ${LOCALES:S/$/.out/g}
.for locale in ${LOCALES}
FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
@@ -304,14 +304,21 @@ install:
.for locale in ${LOCALES}
install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${DIRMODE} -d \
${DESTDIR}${LOCALEDIR}/${locale}
- install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${LOCALEMODE} \
- ${locale}.out ${DESTDIR}${LOCALEDIR}/${locale}/LC_CTYPE
+ if (test "${LOCALESRC_${locale}:S/ISO_/ISO/g:S/DIS_/ISO/g}" !=
"${locale}") then { \
+ ln -fs
../${LOCALESRC_${locale}:S/ISO_/ISO/g:S/DIS_/ISO/g}/LC_CTYPE
${DESTDIR}${LOCALEDIR}/${locale}/LC_CTYPE; \
+ } else { \
+ install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${LOCALEMODE} \
+ ${locale}.out ${DESTDIR}${LOCALEDIR}/${locale}/LC_CTYPE; \
+ } fi;
+
.endfor
.for locale in ${LOCALES}
${locale}.out: ${LOCALESRC_${locale}}.src
- ${CPP} -I${.CURDIR} < ${.CURDIR}/${LOCALESRC_${locale}}.src | \
- sed -e '/^#/d' | mklocale -o ${.TARGET}
+ if (test "${LOCALESRC_${locale}:S/ISO_/ISO/g:S/DIS_/ISO/g}" =
"${locale}") then { \
+ ${CPP} -I${.CURDIR} <
${.CURDIR}/${LOCALESRC_${locale}:S/ISO_/ISO/g:S/DIS_/ISO/g}.src | \
+ sed -e '/^#/d' | mklocale -o ${.TARGET}; \
+ } fi;
.endfor
.SUFFIXES: .src .out
