From: John Marino <draco@marino.st>
Date: Sun, 5 Apr 2015 13:38:06 +0000 (+0200)
Subject: make distribution: Remove references to deleted nls dirs
X-Git-Tag: v4.2.0rc~380
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/154c52fef37875c55ee0b4ae69267dacd2a04706

make distribution: Remove references to deleted nls dirs

reported by:	zrj on irc
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 066189f7b6..6c73298761 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -101,8 +101,6 @@ TO_REMOVE+=/usr/sbin/prebind
 TO_REMOVE+=/modules/checkpt.ko
 TO_REMOVE+=/usr/share/man/man1aout
 TO_REMOVE+=/usr/share/man/cat1aout
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/man1aout
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/cat1aout
 TO_REMOVE+=/usr/libdata/perl
 TO_REMOVE+=/usr/bin/find2perl
 TO_REMOVE+=/usr/bin/perl5
@@ -740,7 +738,6 @@ TO_REMOVE+=/usr/share/man/mann
 TO_REMOVE+=/usr/share/man/catn
 TO_REMOVE+=/usr/share/man/ja/mann
 TO_REMOVE+=/usr/share/man/ja/catn
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/catn
 TO_REMOVE+=/usr/share/man/man9/psignal.9.gz
 TO_REMOVE+=/usr/share/man/cat9/psignal.9.gz
 TO_REMOVE+=/usr/share/openssl/man/man7/Modes_of_DES.7.gz
diff --git a/etc/Makefile b/etc/Makefile
index 142488012f..048733b8b1 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -355,16 +355,6 @@ distrib-dirs:
 	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 	cd ${DESTDIR}/; test -e sys || (rm -f sys;  ${LN} -s usr/src/sys sys)
-	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ${LN} -sf ../man* .
-	cd ${DESTDIR}/usr/share/man; \
-	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		rm -rf "$$1"; \
-		${LN} -s "$$2" "$$1"; \
-		shift; shift; \
-	done
-	cd ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1; ${LN} -sf ../man* .
 	cd ${DESTDIR}/usr/share/nls; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; \
diff --git a/etc/man.alias b/etc/man.alias
deleted file mode 100644
index 03d660208c..0000000000
--- a/etc/man.alias
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD: src/etc/man.alias,v 1.2.2.1 2002/01/05 15:31:31 phantom Exp $
-# $DragonFly: src/etc/man.alias,v 1.2 2003/06/17 04:24:45 dillon Exp $
-
-en.ISO8859-15   en.ISO8859-1
-
diff --git a/share/nls/nls.alias b/share/nls/nls.alias
index b6319901b5..d36b8efe8c 100644
--- a/share/nls/nls.alias
+++ b/share/nls/nls.alias
@@ -5,29 +5,13 @@
 # (The first word is an alias name and the second
 # one is nls catalog name.)
 
-be_BY.CP1131 be
-be_BY.CP1251 be
-be_BY.ISO8859-5 be
 ca_ES.ISO8859-1	ca
-ca_ES.ISO8859-15	ca
-cs_CZ.ISO8859-2	cs
-#da_DK.ISO8859-1	da
-#da_DK.ISO8859-15	da
 de_AT.ISO8859-1	de
 de_AT.ISO8859-15	de
 de_CH.ISO8859-1	de
 de_CH.ISO8859-15	de
 de_DE.ISO8859-1	de
 de_DE.ISO8859-15	de
-#en_AU.ISO8859-1	en
-#en_AU.ISO8859-15	en
-#en_CA.ISO8859-1	en
-#en_CA.ISO8859-15	en
-#en_GB.ISO8859-1	en
-#en_GB.ISO8859-15	en
-#en_US.ISO8859-1	en
-#en_US.ISO8859-15	en
-#en_US.UTF-8	en
 es_ES.ISO8859-1	es
 es_ES.ISO8859-15	es
 fi_FI.ISO8859-1	fi
@@ -40,38 +24,8 @@ fr_CH.ISO8859-1	fr
 fr_CH.ISO8859-15	fr
 fr_FR.ISO8859-1	fr
 fr_FR.ISO8859-15	fr
-#hr_HR.ISO8859-2	hr
-#hu_HU.ISO8859-2	hu
-#is_IS.ISO8859-1	is
-#is_IS.ISO8859-15	is
-#it_CH.ISO8859-1	it
-#it_CH.ISO8859-15	it
-#it_IT.ISO8859-1	it
-#it_IT.ISO8859-15	it
-#ja_JP.ISO2022-JP	ja
-#ja_JP.ISO2022-JP2	ja
-#ja_JP.SJIS	ja
-#ja_JP.ct	ja
-#ja_JP.eucJP	ja
-#ko_KR.eucKR	ko
-#lt_LT.ISO8859-4	lt
-nl_BE.ISO8859-1	nl
-nl_BE.ISO8859-15	nl
 nl_NL.ISO8859-1	nl
-nl_NL.ISO8859-15	nl
 no_NO.ISO8859-1	no
-no_NO.ISO8859-15	no
 pl_PL.ISO8859-2	pl
-#pt_PT.ISO8859-1	pt
-#pt_PT.ISO8859-15	pt
-#ru_RU.CP866	ru
-#ru_RU.ISO8859-5	ru
-#ru_RU.KOI8-R	ru
-#sl_SI.ISO8859-2	sl
 sk_SK.ISO8859-2	sk
 sv_SE.ISO8859-1	sv
-sv_SE.ISO8859-15	sv
-#uk_UA.KOI8-U	uk
-#zh_CN.eucCN	zh
-#zh_TW.Big5	zh
-#zh_TW.eucTW	zh