Module Name: src
Committed By: bouyer
Date: Wed May 21 21:25:48 UTC 2014
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: mi
src/share/zoneinfo [netbsd-6]: Makefile
Log Message:
share/zoneinfo/Makefile patch
distrib/sets/lists/base/mi patch
Remove the the Asia/Riyadh{87,88,89} timezones, and their
Mideast/* aliases. These zones were removed upstream in
tzdata2013i (December 2013).
[apb, ticket #1065]
To generate a diff of this commit:
cvs rdiff -u -r1.984.2.17 -r1.984.2.18 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.43 -r1.43.8.1 src/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.984.2.17 src/distrib/sets/lists/base/mi:1.984.2.18
--- src/distrib/sets/lists/base/mi:1.984.2.17 Wed May 21 21:23:14 2014
+++ src/distrib/sets/lists/base/mi Wed May 21 21:25:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.17 2014/05/21 21:23:14 bouyer Exp $
+# $NetBSD: mi,v 1.984.2.18 2014/05/21 21:25:48 bouyer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4578,9 +4578,9 @@
./usr/share/zoneinfo/Asia/Qyzylorda base-sys-share share
./usr/share/zoneinfo/Asia/Rangoon base-sys-share share
./usr/share/zoneinfo/Asia/Riyadh base-sys-share share
-./usr/share/zoneinfo/Asia/Riyadh87 base-sys-share share
-./usr/share/zoneinfo/Asia/Riyadh88 base-sys-share share
-./usr/share/zoneinfo/Asia/Riyadh89 base-sys-share share
+./usr/share/zoneinfo/Asia/Riyadh87 base-obsolete obsolete
+./usr/share/zoneinfo/Asia/Riyadh88 base-obsolete obsolete
+./usr/share/zoneinfo/Asia/Riyadh89 base-obsolete obsolete
./usr/share/zoneinfo/Asia/Saigon base-sys-share share
./usr/share/zoneinfo/Asia/Sakhalin base-sys-share share
./usr/share/zoneinfo/Asia/Samarkand base-sys-share share
@@ -4841,9 +4841,9 @@
./usr/share/zoneinfo/Mexico/BajaSur base-sys-share share
./usr/share/zoneinfo/Mexico/General base-sys-share share
./usr/share/zoneinfo/Mideast base-sys-share
-./usr/share/zoneinfo/Mideast/Riyadh87 base-sys-share share
-./usr/share/zoneinfo/Mideast/Riyadh88 base-sys-share share
-./usr/share/zoneinfo/Mideast/Riyadh89 base-sys-share share
+./usr/share/zoneinfo/Mideast/Riyadh87 base-obsolete obsolete
+./usr/share/zoneinfo/Mideast/Riyadh88 base-obsolete obsolete
+./usr/share/zoneinfo/Mideast/Riyadh89 base-obsolete obsolete
./usr/share/zoneinfo/Moscow base-obsolete obsolete
./usr/share/zoneinfo/NZ base-sys-share share
./usr/share/zoneinfo/NZ-CHAT base-sys-share share
Index: src/share/zoneinfo/Makefile
diff -u src/share/zoneinfo/Makefile:1.43 src/share/zoneinfo/Makefile:1.43.8.1
--- src/share/zoneinfo/Makefile:1.43 Fri Apr 10 16:16:12 2009
+++ src/share/zoneinfo/Makefile Wed May 21 21:25:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: Makefile,v 1.43.8.1 2014/05/21 21:25:48 bouyer Exp $
.include <bsd.own.mk>
@@ -44,10 +44,9 @@ YDATA= africa antarctica asia australas
europe northamerica southamerica pacificnew etcetera factory \
backward
NDATA= systemv
-SDATA= solar87 solar88 solar89
-TDATA= $(YDATA) $(NDATA) $(SDATA)
+TDATA= $(YDATA) $(NDATA)
TABDATA= iso3166.tab zone.tab
-DATA= $(YDATA) $(NDATA) $(SDATA) leapseconds # yearistype.sh
+DATA= $(YDATA) $(NDATA) leapseconds # yearistype.sh
USNO= usno1988 usno1989
TZBUILDDIR= ${.OBJDIR}/builddir
