From 76b0b5370fb46d3851998f185176652bcadaea50 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Tue, 7 Nov 2017 08:35:41 +0200
Subject: [PATCH] cal(1): Fix locales handling.

 * Remove long deprecated locale name symlinks.
 * Remove 'mkdir -p' that was hiding missing mtree entries.
 * Add missing mtree entries.
---
 Makefile_upgrade.inc      |  3 +++
 etc/mtree/BSD.usr.dist    |  6 ++++++
 usr.bin/calendar/Makefile | 14 +++++---------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index c9799767f7..7d908104c9 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -3267,6 +3267,9 @@ TO_REMOVE+=/usr/bin/rdist
 TO_REMOVE+=/usr/share/man/man1/rdist.1.gz
 TO_REMOVE+=/usr/libexec/sm.bin
 TO_REMOVE+=/usr/lib/aout
+TO_REMOVE+=/usr/share/calendar/de_DE.ISO_8859-1
+TO_REMOVE+=/usr/share/calendar/de_DE.ISO_8859-15
+TO_REMOVE+=/usr/share/calendar/hr_HR.ISO_8859-2
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index cd03fb3bf8..dd0379a9d0 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -127,14 +127,20 @@
     ..
     share
         calendar
+            de_AT.ISO_8859-15
+            ..
             de_DE.ISO8859-1
             ..
             fr_FR.ISO8859-1
             ..
             hr_HR.ISO8859-2
             ..
+            hu_HU.ISO8859-2
+            ..
             ru_RU.KOI8-R
             ..
+            uk_UA.KOI8-U
+            ..
         ..
         dict
         ..
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 0fbd328edf..1d8384be22 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -2,20 +2,20 @@
 # $FreeBSD: src/usr.bin/calendar/Makefile,v 1.12.8.6 2003/04/06 20:04:56 dwmalone Exp $
 
 PROG=	calendar
-SRCS=   calendar.c io.c day.c ostern.c paskha.c
+SRCS=	calendar.c io.c day.c ostern.c paskha.c
+
 .if !defined(NO_SHARE)
 INTER=          de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
-		hr_HR.ISO8859-2 hu_HU.ISO8859-2 ru_RU.KOI8-R uk_UA.KOI8-U
-DE_LINKS=       de_DE.ISO_8859-1 de_DE.ISO8859-15 de_DE.ISO_8859-15
+		hr_HR.ISO8859-2 hu_HU.ISO8859-2 \
+		ru_RU.KOI8-R uk_UA.KOI8-U
+DE_LINKS=       de_DE.ISO8859-15
 FR_LINKS=       fr_FR.ISO8859-15
-HR_LINKS=       hr_HR.ISO_8859-2
 TEXTMODE?=	444
 
 beforeinstall:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
 .for lang in ${INTER}
-	mkdir -p ${DESTDIR}${SHAREDIR}/calendar/${lang}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 		${.CURDIR}/calendars/${lang}/calendar.* \
 		${DESTDIR}${SHAREDIR}/calendar/${lang} 
@@ -28,10 +28,6 @@ beforeinstall:
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
 	${LN} -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
-.for link in ${HR_LINKS}
-	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	${LN} -s hr_HR.ISO8859-2 ${DESTDIR}${SHAREDIR}/calendar/${link}
-.endfor
 .endif
 
 .include <bsd.prog.mk>
-- 
2.41.0