Fix core dump on 32 bit hosts running 64 bit time_t OSes. Bump PKGREVISION.

5 files changed, 81 insertions, 3 deletions

diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index ac6392f1d4f..deb25b2dd10 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2009/07/07 20:25:27 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/04 13:52:21 tsutsui Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_FREEBSD}
 
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo
index ffb76b96afb..176821d9380 100644
--- a/time/emiclock/distinfo
+++ b/time/emiclock/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/07/07 20:25:27 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/06/04 13:52:21 tsutsui Exp $
 
 SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179
@@ -8,3 +8,6 @@ SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
 SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
 SHA1 (patch-ad) = 47a12bfb61ed37f5ad9625f161e5e2a6c1d3e47f
 SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0
+SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503
+SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d
+SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562
diff --git a/time/emiclock/patches/patch-af b/time/emiclock/patches/patch-af
new file mode 100644
index 00000000000..c82651facb2
--- /dev/null
+++ b/time/emiclock/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2010/06/04 13:52:21 tsutsui Exp $
+
+--- main.c	1999-09-27 01:18:18.000000000 +0900
++++ main.c
+@@ -185,7 +185,7 @@
+ {
+     XtAppContext	appContext;
+     Boolean		isRcFile;
+-    long		now;
++    time_t		now;
+     struct tm		*tm;
+ 
+     static String	trans = "#override\n\
diff --git a/time/emiclock/patches/patch-ag b/time/emiclock/patches/patch-ag
new file mode 100644
index 00000000000..85c69ec88ca
--- /dev/null
+++ b/time/emiclock/patches/patch-ag
@@ -0,0 +1,49 @@
+$NetBSD: patch-ag,v 1.1 2010/06/04 13:52:21 tsutsui Exp $
+
+--- EmiClock.c	1999-09-27 01:18:18.000000000 +0900
++++ EmiClock.c
+@@ -509,7 +509,7 @@
+ EmiClockRandomInit(w)
+     EmiClockWidget	w;
+ {
+-    long	now;
++    time_t	now;
+     struct tm	*tm;
+ 
+     /* $B;~4V$r<h$j=P$9(B */
+@@ -567,7 +567,7 @@
+     XSetWindowAttributes	*attrs;
+ {
+     EmiClockWidget	cw = (EmiClockWidget)w;
+-    long		now;
++    time_t		now;
+     struct tm		*tm;
+ 
+     XtCreateWindow(w, (unsigned)InputOutput, (Visual *)CopyFromParent,
+@@ -951,7 +951,7 @@
+ NewTime(w)
+     EmiClockWidget	w;
+ {
+-    long	now;
++    time_t	now;
+     struct tm	*tm;
+     int		year;
+ 
+@@ -1066,7 +1066,7 @@
+ 				/* 1000 milliseconds == 1 second */
+ 			(XtTimerCallbackProc)NewTime, w);
+     } else {
+-	long		now;
++	time_t		now;
+ 	struct tm	*tm;
+ 
+ 	time(&now);
+@@ -1426,7 +1426,7 @@
+ GenPixmapAndDraw(w)
+     EmiClockWidget	w;
+ {
+-    long	now;
++    time_t	now;
+     struct tm	*tm;
+ 
+     TimerBasePixmapGen(w, NULL);	/* $B2<3($N:n@.(B */
diff --git a/time/emiclock/patches/patch-ah b/time/emiclock/patches/patch-ah
new file mode 100644
index 00000000000..77c5e43a5f8
--- /dev/null
+++ b/time/emiclock/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/06/04 13:52:21 tsutsui Exp $
+
+--- rcfile.c	1999-09-02 23:33:49.000000000 +0900
++++ rcfile.c
+@@ -256,7 +256,7 @@
+     int		token;
+     char	tokenStr[MAXPATHLEN];
+     char	buffer[MAXPATHLEN];
+-    long	now;
++    time_t	now;
+     struct tm	*tm;
+ 
+     if ((rcFileName = GetRcFileName()) == NULL) {