The /usr/local/share/nls tree for localized message catalogs has
barely ever been used throughout the whole history of the ports
tree. The main user was shells/tcsh and that stopped four years
ago. Now, a single port is left that installs a single file there.
I would like to stop creating those directories by default in
mtree/4.4BSD.dist and the ports tree infrastructure.
Separate patches for src and ports attached.
OK?
--
Christian "naddy" Weisgerber na...@mips.inka.de
-----------------------------------------------
commit 44bc262d8170b10e6949c2836a820b7fee533de4 (local)
from: Christian Weisgerber <na...@mips.inka.de>
date: Tue Oct 24 14:09:57 2023 UTC
do not create /usr/local/share/nls and subdirectories by default
The share/nls/<locale> paths are unused.
diff 85c70083e85910ddc7626ad658e5652c024b844a 44bc262d8170b10e6949c2836a820b7fee533de4
commit - 85c70083e85910ddc7626ad658e5652c024b844a
commit + 44bc262d8170b10e6949c2836a820b7fee533de4
blob - e72a9aa77292f4533044e3d97d6462141f8dfea3
blob + e3ce8a743046f036830fa1c4824ba426cad23ed6
--- etc/mtree/4.4BSD.dist
+++ etc/mtree/4.4BSD.dist
@@ -318,82 +318,6 @@ usr
misc
..
- # ./usr/local/share/nls
- nls
- C
- ..
- da_DK.ISO_8859-1
- ..
- de_AT.ISO_8859-1
- ..
- de_CH.ISO_8859-1
- ..
- de_DE.ISO_8859-1
- ..
- el_GR.ISO_8859-7
- ..
- en_AU.ISO_8859-1
- ..
- en_CA.ISO_8859-1
- ..
- en_GB.ISO_8859-1
- ..
- en_US.ISO_8859-1
- ..
- es_ES.ISO_8859-1
- ..
- et_EE.ISO-8859-1
- ..
- fi_FI.ISO_8859-1
- ..
- fr_BE.ISO_8859-1
- ..
- fr_CA.ISO_8859-1
- ..
- fr_CH.ISO_8859-1
- ..
- fr_FR.ISO_8859-1
- ..
- hr_HR.ISO_8859-2
- ..
- is_IS.ISO_8859-1
- ..
- it_CH.ISO_8859-1
- ..
- it_IT.ISO_8859-1
- ..
- ja_JP.EUC
- ..
- ko_KR.EUC
- ..
- lt_LN.ASCII
- ..
- lt_LN.ISO_8859-1
- ..
- lt_LN.ISO_8859-2
- ..
- nl_BE.ISO_8859-1
- ..
- nl_NL.ISO_8859-1
- ..
- no_NO.ISO_8859-1
- ..
- pl_PL.ISO_8859-2
- ..
- pt_PT.ISO_8859-1
- ..
- ru_RU.CP866
- ..
- ru_RU.ISO_8859-5
- ..
- ru_RU.KOI8-R
- ..
- sv_SE.ISO_8859-1
- ..
- uk_UA.KOI8-U
- ..
- ..
-
# ./usr/local/share/pkgconfig
pkgconfig
..
-----------------------------------------------
commit f51da98f32c02018f7547f68db21d3c6ad474d99 (local)
from: Christian Weisgerber <na...@mips.inka.de>
date: Tue Oct 24 14:49:39 2023 UTC
do not create the ${PREFIX}/share/nls directory tree by default
The share/nls directories have been barely ever used throughout the
27-year history of the ports tree. Let the single port that still
installs a file there create the directory itself.
diff 16cf88f8fc810c890a483bf6ef62386b8610f8bd f51da98f32c02018f7547f68db21d3c6ad474d99
commit - 16cf88f8fc810c890a483bf6ef62386b8610f8bd
commit + f51da98f32c02018f7547f68db21d3c6ad474d99
blob - a189b247f6abf8b457c66bc4986770be81f639fe
blob + 32347397d0c4912d3b015aef226b9d2b652ac086
--- infrastructure/mk/bsd.port.mk
+++ infrastructure/mk/bsd.port.mk
@@ -2018,7 +2018,6 @@ _wrap_install_commands += ${_PBUILD} install -m ${BINM
_cat = {cat1,cat2,cat3,cat3f,cat3p,cat4,cat5,cat6,cat7,cat8,cat9,catl,catn}
_man = ${_cat:S/cat/man/g}
_treebase = ${WRKINST}${LOCALBASE}
-_nls = ${_treebase}/share/nls
_FAKE_TREE_LIST = \
${WRKINST}${BASESYSCONFDIR}/{firmware,rc.d} \
${_treebase}/bin \
@@ -2035,18 +2034,6 @@ _FAKE_TREE_LIST = \
${_treebase}/sbin \
${_treebase}/share/{dict,examples,misc,pkgconfig,skel} \
${_treebase}/share/doc/pkg-readmes \
- ${_nls}/{C,da_DK.ISO_8859-1,de_AT.ISO_8859-1,de_CH.ISO_8859-1} \
- ${_nls}/{de_DE.ISO_8859-1,el_GR.ISO_8859-7,en_AU.ISO_8859-1} \
- ${_nls}/{en_CA.ISO_8859-1,en_GB.ISO_8859-1,en_US.ISO_8859-1} \
- ${_nls}/{es_ES.ISO_8859-1,et_EE.ISO-8859-1,fi_FI.ISO_8859-1} \
- ${_nls}/{fr_BE.ISO_8859-1,fr_CA.ISO_8859-1,fr_CH.ISO_8859-1} \
- ${_nls}/fr_FR.ISO_8859-1 \
- ${_nls}/{hr_HR.ISO_8859-2,is_IS.ISO_8859-1,it_CH.ISO_8859-1} \
- ${_nls}/{it_IT.ISO_8859-1,ja_JP.EUC,ko_KR.EUC,lt_LN.ASCII} \
- ${_nls}/{lt_LN.ISO_8859-1,lt_LN.ISO_8859-2,nl_BE.ISO_8859-1} \
- ${_nls}/{no_NO.ISO_8859-1,pl_PL.ISO_8859-2,pt_PT.ISO_8859-1} \
- ${_nls}/{ru_RU.CP866,ru_RU.ISO_8859-5,ru_RU.KOI8-R} \
- ${_nls}/{sv_SE.ISO_8859-1,uk_UA.KOI8-U} \
${WRKINST}${VARBASE}/{db,games,log,spool,www}
# packing list utilities. This generates a packing list from the WRKINST
blob - 8a60c6e333f1233fa0ec0163413320f880f41a8d
blob + cabadaae177c2472097c9d4fd50bc88cd5d2d4b3
--- mail/elm/Makefile
+++ mail/elm/Makefile
@@ -1,7 +1,7 @@
COMMENT= once-popular mail user agent
DISTNAME= elm-2.4ME+66
-REVISION= 4
+REVISION= 5
CATEGORIES= mail
SITES= ftp://ftp.ozone.fmi.fi/KEH/
@@ -42,6 +42,7 @@ post-configure:
NO_TEST= Yes
post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/nls/C
@cd ${WRKSRC}/nls; make install
${INSTALL_DATA} \
${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist
blob - 314681602e8997062143d140549c21134d8acec0
blob + 45a5e14a8cee458796c114761125749a5c313795
--- mail/elm/pkg/PLIST
+++ mail/elm/pkg/PLIST
@@ -36,4 +36,6 @@ lib/elmrc-info
@man man/man1/printmail.1
@man man/man1/readmsg.1
@man man/man1/wnewmail.1
+share/nls/
+share/nls/C/
share/nls/C/elm2.4me+.cat
