main/tzdata: upgrade to 2013h

2 files changed, 27 insertions, 47 deletions

diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index 661b66893c..03f2e750dd 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tzdata
-pkgver=2013g
+pkgver=2013h
 _tzcodever=2013g
 _ptzver=0.3
 pkgrel=0
@@ -50,17 +50,17 @@ package() {
 }
 
 md5sums="cc2a52297310ba1a673dc60973ea3ad8  tzcode2013g.tar.gz
-76dbc3b5a81913fc0d824376c44a5d15  tzdata2013g.tar.gz
+d310abe42cbe87e76ceb69e2c7003c92  tzdata2013h.tar.gz
 99efce32b3f870e1b071ce47f3a98a18  posixtz-0.3.tar.bz2
-8c44bb07b4e86568f5ed4bdf10de6a0f  Makefile.patch
+c2e1116e7e689b880c6cfaa8c2925bd0  Makefile.patch
 0b4d86d855f7daa3f79c9f28f04a48f9  0001-posixtz-fix-up-lseek.patch"
 sha256sums="c7c358b459bb65cfab7b7bdd6a9689233fc393f1f9fdf4f0f46ca7dac5a9587b  tzcode2013g.tar.gz
-b6cdd3998dcc732a6ae5e101e1394f9d4d6dff68bd48a8fb78c44c2b997d3a4f  tzdata2013g.tar.gz
+6b9e17e823eec0e09e12f74b452a70be4face1ef14c2fb1917b7c7e60564de27  tzdata2013h.tar.gz
 574a765e0569458d7ccb76e97b3a96de2f0c19ad093c6811675b8a57f7088a53  posixtz-0.3.tar.bz2
-7437b00386ee673467e0fa01a0dbae1a3a32d709e444443c1eefd00b890ed725  Makefile.patch
+a10ba18bcba80de1b4d66016a109a2131876319d81b738780f6add45e1acb2af  Makefile.patch
 e0b6de6a3d389f96dc95e5b75c2ada9afc63858e3770a0f07a62e1e56a77561e  0001-posixtz-fix-up-lseek.patch"
 sha512sums="dd4475916fe36609155d72cfe434b387455ba860cee15fbbbb5caf37cc77757d467c4ae80e81396280e8d3fb68e131373151e8d0eee9bbf8674b96f99e0a9cbd  tzcode2013g.tar.gz
-84107da6eb8bbc9063b06e422eb6ef4a5952039b90b4c86f6cc6ccecb370d1482dddf8be472d498b98cbb3ac6f7a0ed374f8b83613989a7d7a3a228b8910ac71  tzdata2013g.tar.gz
+4f584e4a71726182e9cc2f13baea2f02b15f4c5603595f6493318a3920903074ad0b073b4c6f888baa33f648422a02600a6fd8d3345120f45da0f5d5453fb8d8  tzdata2013h.tar.gz
 57dfd38a4050230e49ec9a23bfec5e995dd48ed1fa338a72c4d2c3b86590d4c7357d3dc6d12b4f1564beebcf48f0d0ed855574e4ba29268160d8f84928a477fd  posixtz-0.3.tar.bz2
-5ab04af020cca764179885f7c7b93402bc16a625a92acdde0e52ba56552aaa04c50723d2e0f98e13d7090a1a34b450818a86119d20301e2b8518bccc0cbdd10f  Makefile.patch
+19e2f3891aece9d30a6dfc386134884d4e89c638db00cf99614a639c7372ce4e861cb4cf78fd7a2d592ea0e446e7884775718e47899ef98fab4c6e2987e07881  Makefile.patch
 c7ddb4eecf8e55e6153f641d478a3affa2522e093e94e95e2ee43039a5c6eed28dcc472bcaa3a7c7c1b84747744c25028467e0048765ef0fc75b89345fc29318  0001-posixtz-fix-up-lseek.patch"
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch
index f496098f30..49693efac8 100644
--- a/main/tzdata/Makefile.patch
+++ b/main/tzdata/Makefile.patch
@@ -1,13 +1,5 @@
- - Fix up default paths
- - Support env CC
- - Don't build/install libtz.a
- - Don't install man-pages provided by sys-apps/man-pages
- - Move zic, zdump to sbin and tzselect to bin ala glibc
- - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
- - Install leaps zoneinfo into zoneinfo/right/ ala glibc
-
---- a/Makefile
-+++ b/Makefile
+--- ./Makefile.orig	2013-10-25 22:34:35.000000000 +0000
++++ ./Makefile	2013-10-29 07:15:04.554083434 +0000
 @@ -45,21 +45,21 @@
  
  # Everything gets put in subdirectories of. . .
@@ -42,7 +34,7 @@
  
  # Library functions are put in an archive in LIBDIR.
  
-@@ -294,8 +294,10 @@
+@@ -298,8 +298,10 @@
  
  ###############################################################################
  
@@ -53,43 +45,31 @@
 +CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
 +endif
  
- TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -338,14 +340,16 @@
+ AR=		ar
  
- ALL:		all date
- 
--install:	all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS)
-+install:	all $(DATA) $(REDO) $(MANS)
+@@ -352,12 +354,14 @@
+ install:	all $(DATA) $(REDO) $(MANS)
+ 		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
+ 			$(DESTDIR)$(LIBDIR) \
++			$(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
+ 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
+ 			$(DESTDIR)$(MANDIR)/man8
  		$(ZIC) -y $(YEARISTYPE) \
  			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \
- 			$(DESTDIR)$(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
--		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR)
+ 		cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
 -		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(SBINDIR)
 +		cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
 +		cp tzselect $(DESTDIR)$(BINDIR)/.
- 		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \
- 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- 			$(DESTDIR)$(MANDIR)/man8
-@@ -356,8 +360,6 @@
- 			$(DESTDIR)$(MANDIR)/man8/zdump.8 \
- 			$(DESTDIR)$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
--		cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
- 		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
-@@ -405,17 +407,17 @@
+ 		cp libtz.a $(DESTDIR)$(LIBDIR)/.
+ 		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
+ 		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
+@@ -406,18 +410,18 @@
+ # to using them, or vice versa.
  right_posix:	right_only leapseconds
  		rm -fr $(DESTDIR)$(TZDIR)-leaps
 -		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-+		ln -s . $(DESTDIR)$(TZDIR)/right || \
 -		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
++		ln -s . $(DESTDIR)$(TZDIR)/right || \
 +		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
  			-L leapseconds $(TDATA)
 -		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
@@ -99,8 +79,8 @@
  posix_right:	posix_only leapseconds
  		rm -fr $(DESTDIR)$(TZDIR)-posix
 -		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-+		ln -s . $(DESTDIR)$(TZDIR)/posix || \
 -		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
++		ln -s . $(DESTDIR)$(TZDIR)/posix || \
 +		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
  			-L /dev/null $(TDATA)
 -		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
@@ -108,7 +88,7 @@
  			-L leapseconds $(TDATA)
  
  zones:		$(REDO)
-@@ -442,7 +442,7 @@
+@@ -440,7 +444,7 @@
  			<$? >$@
  		chmod +x $@