cal(1): Rename to use de_AT.ISO8859-15 calendar.
authorzrj <rimvydas.jasinskas@gmail.com>
Tue, 2 Jan 2018 07:03:55 +0000 (09:03 +0200)
committerzrj <zrj@dragonflybsd.org>
Tue, 2 Jan 2018 17:39:45 +0000 (19:39 +0200)
Makefile_upgrade.inc
etc/mtree/BSD.usr.dist
usr.bin/calendar/Makefile
usr.bin/calendar/calendars/de_AT.ISO8859-15/calendar.feiertag [moved from usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag with 89% similarity]

index 56a27fa..5c79df5 100644 (file)
@@ -3368,6 +3368,7 @@ TO_REMOVE+=/usr/share/man/man1/rlogin.1.gz
 TO_REMOVE+=/usr/share/man/man1/rsh.1.gz
 TO_REMOVE+=/usr/share/man/man8/rlogind.8.gz
 TO_REMOVE+=/usr/share/man/man8/rshd.8.gz
+TO_REMOVE+=/usr/share/calendar/de_AT.ISO_8859-15
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 0d7f1ad..39b4484 100644 (file)
     ..
     share
         calendar
-            de_AT.ISO_8859-15
+            de_AT.ISO8859-15
             ..
             de_DE.ISO8859-1
             ..
index 1d8384b..fcb1fd2 100644 (file)
@@ -5,7 +5,7 @@ PROG=   calendar
 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 \
+INTER=         de_AT.ISO8859-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.ISO8859-15
@@ -18,7 +18,7 @@ beforeinstall:
 .for lang in ${INTER}
        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
                ${.CURDIR}/calendars/${lang}/calendar.* \
-               ${DESTDIR}${SHAREDIR}/calendar/${lang} 
+               ${DESTDIR}${SHAREDIR}/calendar/${lang}
 .endfor
 .for link in ${DE_LINKS}
        rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
@@ -2,7 +2,6 @@
  * Feiertage
  *
  * $FreeBSD: src/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag,v 1.1 2004/05/23 13:22:01 josef Exp $
- * $DragonFly: src/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag,v 1.1 2007/09/24 21:38:18 pavalos Exp $
  */
 
 #ifndef _de_AT_ISO8859_15_feiertag_
@@ -51,7 +50,7 @@ Dec Sun+3             4. Advent
 03/20* Frühlingsanfang
 06/21* Sommeranfang
 09/23* Herbstanfang
-12/21* Winteranfang    
+12/21* Winteranfang
 
 /* Sommer- und Winterzeit */
 03/SundayLast  Anfang der Sommerzeit