make upgrade: Clean up after the "locale megapatch".
authorSascha Wildner <saw@online.de>
Wed, 16 Oct 2013 18:24:34 +0000 (20:24 +0200)
committerSascha Wildner <saw@online.de>
Wed, 16 Oct 2013 18:24:34 +0000 (20:24 +0200)
Makefile_upgrade.inc
etc/mtree/BSD.usr.dist

index 4e011d4..96b5c49 100644 (file)
@@ -2146,13 +2146,210 @@ TO_REMOVE+=/boot/kernel/drmn.ko
 TO_REMOVE+=/boot/kernel/i915.ko
 TO_REMOVE+=/usr/share/man/cat4/i915drm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i915drm.4.gz
+TO_REMOVE+=/usr/include/regexp.h
+TO_REMOVE+=/usr/share/locale/ASCII
+TO_REMOVE+=/usr/share/locale/US-ASCII
+TO_REMOVE+=/usr/share/locale/af_ZA.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/af_ZA.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/cs_CZ.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/da_DK.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/da_DK.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/de_AT.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/de_AT.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/de_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/de_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/de_DE.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/de_DE.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/el_GR.ISO_8859-7
+TO_REMOVE+=/usr/share/locale/en_AU.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/en_AU.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/en_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/en_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/en_GB.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/en_GB.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/en_NZ.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/en_NZ.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/en_US.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/en_US.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/es_ES.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/es_ES.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/et_EE.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/fi_FI.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/fi_FI.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/fo_FO.ISO8859-1
+TO_REMOVE+=/usr/share/locale/fr_BE.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/fr_BE.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/fr_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/fr_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/fr_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/fr_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/fr_FR.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/fr_FR.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/hr_HR.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/hu_HU.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/is_IS.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/is_IS.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/it_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/it_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/it_IT.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/it_IT.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/ja_JP.EUC
+TO_REMOVE+=/usr/share/locale/ja_JP.ISO2022-JP
+TO_REMOVE+=/usr/share/locale/ja_JP.ISO2022-JP2
+TO_REMOVE+=/usr/share/locale/ja_JP.Shift_JIS
+TO_REMOVE+=/usr/share/locale/ja_JP.ct
+TO_REMOVE+=/usr/share/locale/ko_KR.EUC
+TO_REMOVE+=/usr/share/locale/la_LN.ASCII
+TO_REMOVE+=/usr/share/locale/la_LN.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/la_LN.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/la_LN.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/la_LN.ISO_8859-4
+TO_REMOVE+=/usr/share/locale/la_LN.UTF-8
+TO_REMOVE+=/usr/share/locale/locale.alias
+TO_REMOVE+=/usr/share/locale/lt_LT.ISO_8859-4
+TO_REMOVE+=/usr/share/locale/nl_BE.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/nl_BE.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/nl_NL.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/nl_NL.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/no_NO.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/no_NO.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/pl_PL.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/pt_PT.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/pt_PT.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/ru_BY.CP1251
+TO_REMOVE+=/usr/share/locale/ru_RU.ISO_8859-5
+TO_REMOVE+=/usr/share/locale/ru_SU.CP866
+TO_REMOVE+=/usr/share/locale/ru_SU.ISO8859-5
+TO_REMOVE+=/usr/share/locale/ru_SU.ISO_8859-5
+TO_REMOVE+=/usr/share/locale/ru_SU.KOI8-R
+TO_REMOVE+=/usr/share/locale/sk_SK.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/sl_SI.ISO_8859-2
+TO_REMOVE+=/usr/share/locale/sr_ME.ISO8859-2
+TO_REMOVE+=/usr/share/locale/sr_ME.ISO8859-5
+TO_REMOVE+=/usr/share/locale/sr_RS.ISO8859-2
+TO_REMOVE+=/usr/share/locale/sr_RS.ISO8859-5
+TO_REMOVE+=/usr/share/locale/sv_SE.ISO_8859-1
+TO_REMOVE+=/usr/share/locale/sv_SE.ISO_8859-15
+TO_REMOVE+=/usr/share/locale/tr_TR.ISO_8859-9
+TO_REMOVE+=/usr/share/locale/zh_CN.EUC
+TO_REMOVE+=/usr/share/locale/zh_TW.eucTW
+TO_REMOVE+=/usr/share/man/cat3/regexp.3.gz
+TO_REMOVE+=/usr/share/man/man3/regexp.3.gz
+TO_REMOVE+=/usr/share/man/cat3/regsub.3.gz
+TO_REMOVE+=/usr/share/man/man3/regsub.3.gz
+TO_REMOVE+=/usr/share/nls/ASCII
+TO_REMOVE+=/usr/share/nls/US-ASCII
+TO_REMOVE+=/usr/share/nls/af_ZA.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/af_ZA.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/cs_CZ.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/da_DK.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/da_DK.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/de_AT.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/de_AT.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/de_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/de_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/de_DE.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/de_DE.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/el_GR.ISO_8859-7
+TO_REMOVE+=/usr/share/nls/en_AU.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/en_AU.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/en_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/en_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/en_GB.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/en_GB.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/en_NZ.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/en_NZ.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/en_US.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/en_US.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/es_ES.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/es_ES.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/et_EE.ISO_8859-15
 TO_REMOVE+=/usr/share/nls/eu_ES.ISO8859-1
 TO_REMOVE+=/usr/share/nls/eu_ES.ISO8859-15
 TO_REMOVE+=/usr/share/nls/eu_ES.UTF-8
+TO_REMOVE+=/usr/share/nls/fi_FI.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/fi_FI.ISO_8859-15
 TO_REMOVE+=/usr/share/nls/fo_FO.ISO8859-1
 TO_REMOVE+=/usr/share/nls/fo_FO.UTF-8
+TO_REMOVE+=/usr/share/nls/fr_BE.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/fr_BE.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/fr_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/fr_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/fr_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/fr_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/fr_FR.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/fr_FR.ISO_8859-15
 TO_REMOVE+=/usr/share/nls/hi_IN.UTF-8
+TO_REMOVE+=/usr/share/nls/hr_HR.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/hu_HU.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/is_IS.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/is_IS.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/it_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/it_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/it_IT.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/it_IT.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/ja_JP.EUC
+TO_REMOVE+=/usr/share/nls/ja_JP.Shift_JIS
+TO_REMOVE+=/usr/share/nls/ko_KR.EUC
+TO_REMOVE+=/usr/share/nls/la_LN.ASCII
+TO_REMOVE+=/usr/share/nls/la_LN.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/la_LN.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/la_LN.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/la_LN.ISO_8859-4
 TO_REMOVE+=/usr/share/nls/la_LN.UTF-8
+TO_REMOVE+=/usr/share/nls/lt_LT.ISO_8859-4
+TO_REMOVE+=/usr/share/nls/nl_BE.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/nl_BE.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/nl_NL.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/nl_NL.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/no_NO.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/no_NO.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/pl_PL.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/pt_PT.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/pt_PT.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/ru_RU.ISO_8859-5
+TO_REMOVE+=/usr/share/nls/ru_SU.CP866
+TO_REMOVE+=/usr/share/nls/ru_SU.ISO8859-5
+TO_REMOVE+=/usr/share/nls/ru_SU.ISO_8859-5
+TO_REMOVE+=/usr/share/nls/ru_SU.KOI8-R
+TO_REMOVE+=/usr/share/nls/sk_SK.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/sl_SI.ISO_8859-2
+TO_REMOVE+=/usr/share/nls/sv_SE.ISO_8859-1
+TO_REMOVE+=/usr/share/nls/sv_SE.ISO_8859-15
+TO_REMOVE+=/usr/share/nls/tr_TR.ISO_8859-9
+TO_REMOVE+=/usr/share/nls/zh_CN.EUC
+TO_REMOVE+=/usr/share/vi/catalog/ASCII
+TO_REMOVE+=/usr/share/vi/catalog/US-ASCII
+TO_REMOVE+=/usr/share/vi/catalog/de_AT.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/de_AT.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/de_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/de_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/de_DE.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/de_DE.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/en_AU.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/en_AU.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/en_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/en_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/en_GB.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/en_GB.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/en_US.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/en_US.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/es_ES.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/es_ES.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/fr_BE.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/fr_BE.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/fr_CA.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/fr_CA.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/fr_CH.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/fr_CH.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/fr_FR.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/fr_FR.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/nl_NL.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/nl_NL.ISO_8859-15
+TO_REMOVE+=/usr/share/vi/catalog/pl_PL.ISO_8859-2
+TO_REMOVE+=/usr/share/vi/catalog/ru_SU.KOI8-R
+TO_REMOVE+=/usr/share/vi/catalog/sv_SE.ISO_8859-1
+TO_REMOVE+=/usr/share/vi/catalog/sv_SE.ISO_8859-15
 TO_REMOVE+=/usr/share/man/cat9/idr_init1.9.gz
 TO_REMOVE+=/usr/share/man/man9/idr_init1.9.gz
 TO_REMOVE+=/boot/kernel/radeon.ko
index 20ce7fd..71606d3 100644 (file)
             ..
             fi_FI.UTF-8
             ..
-            fo_FO.ISO8859-1
-            ..
             fr_BE.ISO8859-1
             ..
             fr_BE.ISO8859-15
             ..
             it_IT.UTF-8
             ..
-            ja_JP.ISO2022-JP
-            ..
-            ja_JP.ISO2022-JP2
-            ..
             ja_JP.SJIS
             ..
             ja_JP.UTF-8
             ..
-            ja_JP.ct
-            ..
             ja_JP.eucJP
             ..
             kk_KZ.PT154
             ..
             la_LN.US-ASCII
             ..
-            la_LN.UTF-8
-            ..
             lt_LT.ISO8859-13
             ..
             lt_LT.ISO8859-4
             ..
             ro_RO.UTF-8
             ..
-            ru_BY.CP1251
-            ..
             ru_RU.CP1251
             ..
             ru_RU.CP866
             ..
             sl_SI.UTF-8
             ..
-            sr_ME.ISO8859-2
-            ..
-            sr_ME.ISO8859-5
-            ..
-            sr_RS.ISO8859-2
-            ..
-            sr_RS.ISO8859-5
-            ..
             sr_YU.ISO8859-2
             ..
             sr_YU.ISO8859-5
             ..
             zh_TW.UTF-8
             ..
-            zh_TW.eucTW
-            ..
         ..
         man
 /set uname=man