diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD index ed748ed4..91034dc8 100644 --- a/tzcode/PKGBUILD +++ b/tzcode/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=tzcode -_ver=2014b +_ver=2014g # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -21,10 +21,10 @@ source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar tzcode-man1.patch tzcode-man3.patch tzcode-man8.patch) -sha1sums=('cabc82066aa337c109e3e2f0e3f98a138841ff41' - 'e35461362701c5f55a98c72bf0822dd0b47f2076' - '9d85e92e6fb8d823b48591508bcf77728dff2fa8' - '64687b89afddcb31418d28deabc2ac138dda78c8' +sha1sums=('95313f1753d0fb05409f4fe5434504cde52afdb0' + '20be4323055278a4a789d9c95926dd38733afa8d' + 'c6a8a818e2d6926f6b00fb6d6549fcf05af0e150' + 'ea2354956f2ae3c09527647486f7f501049d01da' '46feb526f958e4cc027e253345fbe31b41dc5bf4' '2095c6a471634cc9574b24a9b661d1f32952a11a' '1a207233e2746933df6334f0316fb62a0505830b' @@ -52,7 +52,7 @@ prepare() { build() { cd ${srcdir} - make CFLAGS='-O2 -std=gnu99' + make CFLAGS="${CFLAGS} -std=gnu99" } package() { @@ -62,10 +62,10 @@ package() { mv ${pkgdir}/usr/share/zoneinfo-leaps ${pkgdir}/usr/share/zoneinfo/right mv ${pkgdir}/usr/share/zoneinfo-posix ${pkgdir}/usr/share/zoneinfo/posix - /sbin/zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]} - /sbin/zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]} - /sbin/zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]} + ./zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]} + ./zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]} + ./zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]} - /sbin/zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York + ./zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone.tab } diff --git a/tzcode/tzcode-makefile-exe-extensions.patch b/tzcode/tzcode-makefile-exe-extensions.patch index 6c87f85f..69a5395f 100644 --- a/tzcode/tzcode-makefile-exe-extensions.patch +++ b/tzcode/tzcode-makefile-exe-extensions.patch @@ -1,15 +1,15 @@ ---- src/Makefile.orig 2013-11-05 11:36:15.455800000 +0400 -+++ src/Makefile 2013-11-05 11:40:42.433600000 +0400 -@@ -350,7 +350,7 @@ +--- src/Makefile.orig 2014-09-09 12:56:58.023649200 +0900 ++++ src/Makefile 2014-09-09 13:00:19.092405500 +0900 +@@ -379,7 +379,7 @@ $(ZIC) -y $(YEARISTYPE) \ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -+ cp tzselect zic.exe zdump.exe $(DESTDIR)$(ETCDIR)/. ++ cp tzselect zic.exe zdump.exe $(DESTDIR)$(ETCDIR)/ cp libtz.a $(DESTDIR)$(LIBDIR)/. $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. -@@ -366,7 +366,7 @@ +@@ -388,7 +388,7 @@ INSTALL: ALL install date.1 mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 diff --git a/tzcode/tzcode-makefile.patch b/tzcode/tzcode-makefile.patch index ebb50db1..08d578f4 100644 --- a/tzcode/tzcode-makefile.patch +++ b/tzcode/tzcode-makefile.patch @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2013-10-01 08:10:49.000000000 +0400 -+++ src/Makefile 2013-11-05 11:34:27.547600000 +0400 -@@ -20,7 +20,7 @@ +--- src/Makefile.orig 2014-08-29 04:32:04.000000000 +0900 ++++ src/Makefile 2014-09-09 12:55:02.881446900 +0900 +@@ -19,7 +19,7 @@ # make zonenames # to get a list of the values you can use for LOCALTIME. @@ -9,7 +9,7 @@ # If you want something other than Eastern United States time as a template # for handling POSIX-style time zone environment variables, -@@ -45,21 +45,21 @@ +@@ -44,21 +44,21 @@ # Everything gets put in subdirectories of. . . @@ -34,7 +34,7 @@ # If you "make INSTALL", the "date" command gets installed in. . . -@@ -67,7 +67,7 @@ +@@ -66,7 +66,7 @@ # Manual pages go in subdirectories of. . . @@ -43,7 +43,7 @@ # Library functions are put in an archive in LIBDIR. -@@ -232,7 +232,7 @@ +@@ -233,7 +233,7 @@ # before the first Monday in January when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. @@ -52,16 +52,16 @@ # Linker flags. Default to $(LFLAGS) for backwards compatibility # to tzcode2012h and earlier. -@@ -245,7 +245,7 @@ +@@ -246,7 +246,7 @@ ZFLAGS= - # The name of a Posix-compliant `awk' on your system. + # The name of a Posix-compliant 'awk' on your system. -AWK= awk +AWK= gawk - # The full path name of a Posix-compliant shell that supports the Korn shell's - # 'select' statement, as an extension. These days, Bash is the most popular. -@@ -295,7 +295,7 @@ + # The full path name of a Posix-compliant shell, preferably one that supports + # the Korn shell's 'select' statement as an extension. +@@ -321,7 +321,7 @@ ############################################################################### @@ -69,4 +69,4 @@ +cc= gcc CC= $(cc) -DTZDIR=\"$(TZDIR)\" - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c + AR= ar