diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD index d42d3b84..ed748ed4 100644 --- a/tzcode/PKGBUILD +++ b/tzcode/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=tzcode -_ver=2013g +_ver=2014b # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -14,17 +14,17 @@ groups=('base') depends=('coreutils' 'gawk' 'sed') source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata${_ver}.tar.gz - tzcode-makefile.patch - tzcode-makefile-exe-extensions.patch - tzcode-tzfile.patch - tzcode-cygwin.patch - tzcode-man1.patch - tzcode-man3.patch - tzcode-man8.patch) -sha1sums=('d5a8be5e2414c5f500de9ab2d3472009583ad9dc' - 'be5ec909a9ee363a80dc88b2d1ae9690cacac4b2' + tzcode-makefile.patch + tzcode-makefile-exe-extensions.patch + tzcode-tzfile.patch + tzcode-cygwin.patch + tzcode-man1.patch + tzcode-man3.patch + tzcode-man8.patch) +sha1sums=('cabc82066aa337c109e3e2f0e3f98a138841ff41' + 'e35461362701c5f55a98c72bf0822dd0b47f2076' '9d85e92e6fb8d823b48591508bcf77728dff2fa8' - '0e68dd20610f1b1807f34a9e681b772f1a00d3ff' + '64687b89afddcb31418d28deabc2ac138dda78c8' '46feb526f958e4cc027e253345fbe31b41dc5bf4' '2095c6a471634cc9574b24a9b661d1f32952a11a' '1a207233e2746933df6334f0316fb62a0505830b' @@ -34,8 +34,7 @@ sha1sums=('d5a8be5e2414c5f500de9ab2d3472009583ad9dc' timezones=('africa' 'antarctica' 'asia' 'australasia' 'europe' 'northamerica' 'southamerica' 'pacificnew' 'etcetera' 'backward' - 'systemv' 'factory' - 'solar87' 'solar88' 'solar89') + 'systemv' 'factory') prepare() { cd ${srcdir} diff --git a/tzcode/tzcode-makefile-exe-extensions.patch b/tzcode/tzcode-makefile-exe-extensions.patch index fa617b43..6c87f85f 100644 --- a/tzcode/tzcode-makefile-exe-extensions.patch +++ b/tzcode/tzcode-makefile-exe-extensions.patch @@ -1,50 +1,20 @@ --- src/Makefile.orig 2013-11-05 11:36:15.455800000 +0400 +++ src/Makefile 2013-11-05 11:40:42.433600000 +0400 -@@ -350,9 +350,9 @@ - -rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \ - $(DESTDIR)$(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. -- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR) +@@ -350,7 +350,7 @@ + $(ZIC) -y $(YEARISTYPE) \ + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ -+ -mkdir -p $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR) + cp tzselect zic.exe zdump.exe $(DESTDIR)$(ETCDIR)/. -+ -mkdir -p $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ - $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ - $(DESTDIR)$(MANDIR)/man8 - -rm -f $(DESTDIR)$(MANDIR)/man3/newctime.3 \ -@@ -366,9 +366,9 @@ - cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. + cp libtz.a $(DESTDIR)$(LIBDIR)/. + $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +@@ -366,7 +366,7 @@ INSTALL: ALL install date.1 -- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 - cp date $(DESTDIR)$(BINDIR)/. -- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ -+ -mkdir -p $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) -+ cp date.exe $(DESTDIR)$(BINDIR)/tz-date.exe -+ -mkdir -p $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ - $(DESTDIR)$(MANDIR)/man1 - -rm -f $(DESTDIR)$(MANDIR)/man1/date.1 - cp date.1 $(DESTDIR)$(MANDIR)/man1/. -@@ -519,7 +519,7 @@ - check_public: $(ENCHILADA) - make maintainer-clean - make "CFLAGS=$(GCC_DEBUG_FLAGS)" $(ENCHILADA) all -- mkdir tzpublic -+ mkdir -p tzpublic - for i in $(TDATA) ; do \ - $(zic) -v -d tzpublic $$i 2>&1 || exit; \ - done -@@ -529,10 +529,10 @@ - # Check that the code works under various alternative - # implementations of time_t. - check_time_t_alternatives: -- mkdir tzpublic -+ mkdir -p tzpublic - zones=`$(AWK) '/^[^#]/ { print $$3 }'