From 9124a610d0f5ce1743940af49cdf9516c0ca30a8 Mon Sep 17 00:00:00 2001
From: phantom <phantom@FreeBSD.org>
Date: Mon, 4 Mar 2002 12:29:21 +0000
Subject: [PATCH] Use NLSLINKS to setup symbolic links in NLS area

---
 bin/csh/nls/Makefile | 37 ++++++++++---------------------------
 usr.bin/ee/Makefile  | 16 ++++++----------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/bin/csh/nls/Makefile b/bin/csh/nls/Makefile
index 38381b8d9908..54efa4d383e4 100644
--- a/bin/csh/nls/Makefile
+++ b/bin/csh/nls/Makefile
@@ -13,39 +13,22 @@ CATALOGS= et:et_EE.ISO8859-15 \
 	spanish:es_ES.ISO8859-1 \
 	ukrainian:uk_UA.KOI8-U
 
-CATALOGS_LINKS=	fi_FI.ISO8859-1 fi_FI.ISO8859-15 \
-	fr_FR.ISO8859-1 fr_BE.ISO8859-1 \
-	fr_FR.ISO8859-1 fr_BE.ISO8859-15 \
-	fr_FR.ISO8859-1 fr_CA.ISO8859-1 \
-	fr_FR.ISO8859-1 fr_CA.ISO8859-15 \
-	fr_FR.ISO8859-1 fr_CH.ISO8859-1 \
-	fr_FR.ISO8859-1 fr_CH.ISO8859-15 \
-	fr_FR.ISO8859-1 fr_FR.ISO8859-15 \
-	de_DE.ISO8859-1 de_AT.ISO8859-1 \
-	de_DE.ISO8859-1 de_AT.ISO8859-15 \
-	de_DE.ISO8859-1 de_CH.ISO8859-1 \
-	de_DE.ISO8859-1 de_CH.ISO8859-15 \
-	de_DE.ISO8859-1 de_DE.ISO8859-15 \
-	it_IT.ISO8859-1 it_CH.ISO8859-1 \
-	it_IT.ISO8859-1 it_CH.ISO8859-15 \
-	it_IT.ISO8859-1 it_IT.ISO8859-15 \
-	es_ES.ISO8859-1 es_ES.ISO8859-15
+NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
+NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+	fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
+	fr_FR.ISO8859-15
+NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+	de_CH.ISO8859-15 de_DE.ISO8859-15
+NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
+NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
 
 NLSNAME= tcsh
 
+NLSSRCFILES= set[0-9]*
+
 .for catalog in ${CATALOGS}
 NLSSRCDIR_${catalog:C/.*://g}.msg:= ${BASESRC}/${catalog:C/:.*//g}
-NLSSRCFILES_${catalog:C/.*://g}.msg= set[0-9]*
 NLS+=${catalog:C/.*://g}.msg
 .endfor
 
-afterinstall:
-	@set ${CATALOGS_LINKS}; \
-	while test $$# -ge 2; do \
-		f=$$1/${NLSNAME}.cat; shift; \
-		l=$$1/${NLSNAME}.cat; shift; \
-		${ECHO} "$$f -> $$l"; \
-		ln -fs ../$$f ${DESTDIR}${NLSDIR}/$$l; \
-	done; true
-
 .include <bsd.nls.mk>
diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile
index ab388677df81..a7ec37f8c503 100644
--- a/usr.bin/ee/Makefile
+++ b/usr.bin/ee/Makefile
@@ -12,23 +12,19 @@ LDADD=	-lncurses
 
 LANGS=	en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
 	uk_UA.KOI8-U ru_RU.KOI8-R
-8859_15_LINKS = fr_FR de_DE
-ENUS_LINKS =	ISO8859-1 ISO8859-15
+
+NLSLINKS_en_US.US-ASCII= C en_US.ISO8859-1 en_US.ISO8859-15
+NLSLINKS_fr_FR.ISO8859-1= fr_FR.ISO8859-15
+NLSLINKS_de_DE.ISO8859-1= de_DE.ISO8859-15
 
 NLSNAME=ee
 
+NLSSRCFILES=ee.msg
+
 .for lang in ${LANGS}
 NLSSRCDIR_${lang}.msg=${.CURDIR}/nls/${lang}
-NLSSRCFILES_${lang}.msg=ee.msg
 NLS+=${lang}.msg
 .endfor
 
-.for link in ${ENUS_LINKS}
-SYMLINKS+=	../en_US.US-ASCII/ee.cat ${NLSDIR}/en_US.${link}/ee.cat
-.endfor
-.for link in ${8859_15_LINKS}
-SYMLINKS+=	../${link}.ISO8859-1/ee.cat ${NLSDIR}/${link}.ISO8859-15/ee.cat
-.endfor
-
 .include <bsd.prog.mk>
 .include <bsd.nls.mk>