[arch-commits] Commit in tzdata/trunk (Makefile.patch PKGBUILD)
Allan McRae
allan at archlinux.org
Sat Mar 24 08:42:35 UTC 2012
Date: Saturday, March 24, 2012 @ 04:42:34
Author: allan
Revision: 154185
upgpkg: tzdata 2012b-2
binaries now provided by glibc
Modified:
tzdata/trunk/PKGBUILD
Deleted:
tzdata/trunk/Makefile.patch
----------------+
Makefile.patch | 140 -------------------------------------------------------
PKGBUILD | 43 +++++-----------
2 files changed, 14 insertions(+), 169 deletions(-)
Deleted: Makefile.patch
===================================================================
--- Makefile.patch 2012-03-24 08:25:04 UTC (rev 154184)
+++ Makefile.patch 2012-03-24 08:42:34 UTC (rev 154185)
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
---- src/Makefile 2007-08-20 16:47:41.000000000 +0200
-+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200
-@@ -34,17 +34,17 @@
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -52,7 +52,7 @@
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -83,7 +83,7 @@
-
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
-
- # Add the following to the end of the "CFLAGS=" line as needed.
- # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
-
--CFLAGS=
-+CFLAGS += -std=gnu99
-
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS= -s
-@@ -220,7 +220,7 @@
- ZIC= $(zic) $(ZFLAGS)
-
- # The name of a Posix-compliant `awk' on your system.
--AWK= nawk
-+AWK= awk
-
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+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
-@@ -282,14 +284,16 @@
-
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-- -mkdir $(TOPDIR) $(MANDIR) \
-+ -mkdir -p $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir -p $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
-+ -mkdir -p $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- -rm -f $(MANDIR)/man3/newctime.3 \
- $(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
- $(MANDIR)/man8/zdump.8 \
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-- -mkdir $(TOPDIR) $(BINDIR)
-+ -mkdir -p $(TOPDIR) $(BINDIR)
- cp date $(BINDIR)/.
-- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
- -rm -f $(MANDIR)/man1/date.1
- cp date.1 $(MANDIR)/man1/.
-
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-
-@@ -367,7 +369,7 @@
- <$? >$@
- chmod +x $@
-
--check: check_tables check_web
-+check: check_tables
-
- check_tables: checktab.awk $(PRIMARY_YDATA)
- $(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Naur src/tzselect.ksh src-p/tzselect.ksh
---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200
-+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
-
- # '@(#)tzselect.ksh 8.1'
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-03-24 08:25:04 UTC (rev 154184)
+++ PKGBUILD 2012-03-24 08:42:34 UTC (rev 154185)
@@ -3,45 +3,30 @@
pkgname=tzdata
pkgver=2012b
-pkgrel=1
+pkgrel=2
_tzcode=2012b
_tzdata=2012b
pkgdesc="Sources for time zone and daylight saving time data"
arch=('i686' 'x86_64')
url="http://www.iana.org/time-zones"
license=('GPL')
-depends=()
-makedepends=()
optdepends=('bash: required by tzselect')
options=('!emptydirs')
-source=(#http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz
- ftp://munnari.oz.au/pub/tzcode${_tzcode}.tar.gz
- #http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz
- ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
- Makefile.patch)
-md5sums=('6137322ffd36e1fd5128885be1c57008'
- '0615fd29def380a917e528433c820368'
- 'a64ed97d1fc03c66ee8612c0d9f40507')
+source=(#http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz
+ ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz)
+md5sums=('0615fd29def380a917e528433c820368')
-build() {
- cd ${srcdir}
+timezones=('africa' 'antarctica' 'asia' 'australasia'
+ 'europe' 'northamerica' 'southamerica'
+ 'pacificnew' 'etcetera' 'backward'
+ 'systemv' 'factory'
+ 'solar87' 'solar88' 'solar89')
- tar -xf tzcode${_tzcode}.tar.gz
- tar -xf ${pkgname}${_tzdata}.tar.gz
-
- patch -Np1 -i "${srcdir}/Makefile.patch"
-
- make
-}
-
-check() {
- cd ${srcdir}
- make -k check # || /bin/true
-}
-
package() {
cd ${srcdir}
- make DESTDIR="${pkgdir}" install
-
- rm "${pkgdir}/usr/share/zoneinfo/localtime"
+ 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[@]}
+ zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York
+ install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone.tab
}
More information about the arch-commits
mailing list