Kill LOCALECHARSETS machinery, we only support ASCII and UTF-8 LC_CTYPE

Remove Makefile.inc and inline rules to produce LC_CTYPE for UTF-8.

ok guenther@ stsp@

2 files changed, 8 insertions, 49 deletions

diff --git a/share/locale/ctype/Makefile b/share/locale/ctype/Makefile
index 47ac4691cbc..71c90ea69b5 100644
--- a/share/locale/ctype/Makefile
+++ b/share/locale/ctype/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/07/01 00:36:12 fgsch Exp $
+# $OpenBSD: Makefile,v 1.11 2016/03/20 15:45:40 jca Exp $
 # $NetBSD: Makefile,v 1.20 2005/02/10 18:03:02 tnozaki Exp $
 
 NOMAN=	# defined
@@ -6,53 +6,18 @@ NOMAN=	# defined
 # pull LOCALEDIR and other declarations
 .include <bsd.own.mk>
 
-# pull in LOCALECHARSETS
-.include "${.CURDIR}/Makefile.inc"
+all: UTF-8.out
 
-LOCALESRC_ARMSCII-8 = hy_AM.ARMSCII-8
-LOCALESRC_CP1251 = bg_BG.CP1251
-LOCALESRC_CP866 = ru_RU.CP866
-LOCALESRC_ISO8859-1 = en_US.ISO_8859-1
-LOCALESRC_ISO8859-2 = en_US.ISO_8859-2
-LOCALESRC_ISO8859-4 = en_US.ISO_8859-4
-LOCALESRC_ISO8859-5 = ru_RU.ISO_8859-5
-LOCALESRC_ISO8859-7 = el_GR.ISO8859-7
-LOCALESRC_ISO8859-9 = tr_TR.ISO8859-9
-LOCALESRC_ISO8859-13 = lt_LT.ISO8859-13
-LOCALESRC_ISO8859-15 = en_US.DIS_8859-15
-LOCALESRC_KOI8-R = ru_RU.KOI8-R
-LOCALESRC_KOI8-U = uk_UA.KOI8-U
-LOCALESRC_UTF-8 = en_US.UTF-8
-
-all: ${LOCALECHARSETS:S/$/.out/g}
-realall: ${LOCALECHARSETS:S/$/.out/g}
-
-CLEANFILES+=	${LOCALECHARSETS:S/$/.out/g}
+UTF-8.out: en_US.UTF-8.src
+	${CPP} < ${.CURDIR}/en_US.UTF-8.src | \
+	    sed -e '/^#/d' | mklocale -o ${.TARGET}
 
-FILES=	${LOCALECHARSETS:S/$/.out/g}
-.for locale in ${LOCALECHARSETS}
-FILESDIR_${locale}.out=	${LOCALEDIR}/${locale}
-FILESNAME_${locale}.out=	LC_CTYPE
-.endfor
+CLEANFILES+=	UTF-8.out
 
 install:
-.for locale in ${LOCALECHARSETS}
 	install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${DIRMODE} -d \
-	    ${DESTDIR}${LOCALEDIR}/${locale}
+	    ${DESTDIR}${LOCALEDIR}/UTF-8
 	install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${LOCALEMODE} \
-	    ${locale}.out ${DESTDIR}${LOCALEDIR}/${locale}/LC_CTYPE
-.endfor
-
-.for locale in ${LOCALECHARSETS}
-${locale}.out: ${LOCALESRC_${locale}}.src
-	${CPP} -I${.CURDIR} < ${.CURDIR}/${LOCALESRC_${locale}}.src | \
-	    sed -e '/^#/d' | mklocale -o ${.TARGET}
-.endfor
-
-.SUFFIXES: .src .out
-.src.out:
-	${CPP} -I${.CURDIR} < ${.IMPSRC} | sed -e '/^#/d' | \
-            mklocale -o ${.TARGET}
-
+	    UTF-8.out ${DESTDIR}${LOCALEDIR}/UTF-8/LC_CTYPE
 
 .include <bsd.prog.mk>
diff --git a/share/locale/ctype/Makefile.inc b/share/locale/ctype/Makefile.inc
deleted file mode 100644
index a963144017e..00000000000
--- a/share/locale/ctype/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.2 2013/07/01 00:35:22 fgsch Exp $
-
-# Charsets supported by LC_CTYPE locale
-LOCALECHARSETS=	ARMSCII-8 CP1251 CP866 ISO8859-1 ISO8859-13 ISO8859-15 \
-		ISO8859-2 ISO8859-4 ISO8859-5 ISO8859-7 ISO8859-9 KOI8-R \
-		KOI8-U UTF-8