Merge branch 'master' of git+ssh://openadk.org/git/openadk

2 files changed, 114 insertions, 0 deletions

diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
new file mode 100644
index 000000000..e6a1bbda0
--- /dev/null
+++ b/package/tzdata/Makefile
@@ -0,0 +1,50 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		tzdata
+PKG_VERSION:=		2010o
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5cae5c56fad81dc29f8fcd933a05768e a7a776a5713831993e814fe0c05f9fd5
+PKG_DESCR:=		Timezone data (/usr/share/zoneinfo)
+PKG_SECTION:=		utils
+PKG_URL:=		ftp://elsie.nci.nih.gov/pub/
+PKG_SITES:=		ftp://elsie.nci.nih.gov/pub/
+PKG_NOPARALLEL:=	1
+
+# Note that tzcode does NOT have the same version as tzdata does :[
+DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode2010n.tar.gz
+# both archives do not extract into subdirectories
+WRKDIST=		${WRKDIR}
+
+# no use for tzselect, since that is a ksh-script
+PKG_SUBPKGS:=		TZDATA ZDUMP ZIC DATE
+PKGSD_ZDUMP:=		timezone file dumper
+PKGSD_ZIC:=		timezone file compiler
+PKGSD_DATE:=		famous date utility
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TZDATA,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ZDUMP,zdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZDUMP},${PKG_SECTION}))
+$(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZIC},${PKG_SECTION}))
+$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		TOPDIR="${WRKINST}" TZDIR="${WRKINST}/usr/share/zoneinfo" cc="${TARGET_CC}"
+# the uppercase targets enable building and installation of the date utility
+ALL_TARGET:=		ALL
+INSTALL_TARGET:=	INSTALL
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share
+	$(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share
+	${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_DATE}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile
new file mode 100644
index 000000000..d8b759a8c
--- /dev/null
+++ b/package/tzdata/patches/patch-Makefile
@@ -0,0 +1,64 @@
+--- w-tzdata-2010o-1.orig/Makefile	2010-10-12 18:36:50.000000000 +0200
++++ w-tzdata-2010o-1/Makefile	2011-01-22 22:10:00.358658180 +0100
+@@ -212,13 +212,13 @@ GCC_DEBUG_FLAGS = -Dlint -g -O -fno-comm
+ # before the first Monday in January when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS=
++CFLAGS?=
+ 
+ # If you want zic's -s option used when installing, uncomment the next line
+ # ZFLAGS=	-s
+ 
+ zic=		./zic
+-ZIC=		$(zic) $(ZFLAGS)
++ZIC=		./zic_for_build $(ZFLAGS)
+ 
+ # The name of a Posix-compliant `awk' on your system.
+ AWK=		nawk
+@@ -279,7 +279,7 @@ ENCHILADA=	$(DOCS) $(SOURCES) $(DATA) $(
+ 
+ SHELL=		/bin/sh
+ 
+-all:		tzselect zic zdump $(LIBOBJS)
++all:		zic_for_build tzselect zic zdump $(LIBOBJS)
+ 
+ ALL:		all date
+ 
+@@ -309,6 +309,14 @@ INSTALL:	ALL install date.1
+ 		-rm -f $(MANDIR)/man1/date.1
+ 		cp date.1 $(MANDIR)/man1/.
+ 
++zic_for_build:
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) zic.c -o zic_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) localtime.c -o localtime_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) scheck.c -o scheck_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) ialloc.c -o ialloc_build.o
++		$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o scheck_build.o ialloc_build.o 
++
+ zdump:		$(TZDOBJS)
+ 		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+ 
+@@ -319,10 +327,10 @@ yearistype:	yearistype.sh
+ 		cp yearistype.sh yearistype
+ 		chmod +x yearistype
+ 
+-posix_only:	zic $(TDATA)
++posix_only:	zic_for_build $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
+ 
+-right_only:	zic leapseconds $(TDATA)
++right_only:	zic_for_build leapseconds $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
+ 
+ # In earlier versions of this makefile, the other two directories were
+@@ -334,7 +342,7 @@ right_only:	zic leapseconds $(TDATA)
+ # Therefore, the other two directories are now siblings of $(TZDIR).
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+-other_two:	zic leapseconds $(TDATA)
++other_two:	zic_for_build leapseconds $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+ 			-d $(TZDIR)-leaps -L leapseconds $(TDATA)