Merge itojun's y2k patch into patch-ab, where the rest of the modifications

for Dclock.c are - pointed out by Robert Elz in the continuing saga of
PR pkg/9092.

Regenerate patch sums.

3 files changed, 26 insertions, 22 deletions

diff --git a/x11/dclock/files/md5 b/x11/dclock/files/md5
index 2f232f39df2..41d9a5bea80 100644
--- a/x11/dclock/files/md5
+++ b/x11/dclock/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $
+$NetBSD: md5,v 1.2 2000/01/01 04:46:10 agc Exp $
 
 MD5 (dclock.shar.Z) = c02279a04e7ca617b327bc4963920593
diff --git a/x11/dclock/files/patch-sum b/x11/dclock/files/patch-sum
index 82806513dd0..1c650079e25 100644
--- a/x11/dclock/files/patch-sum
+++ b/x11/dclock/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.3 1999/12/31 17:29:08 itojun Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/01 04:46:10 agc Exp $
 
 MD5 (patch-aa) = b0a7daf0ae06bbf8f85f07b36f5aea35
-MD5 (patch-ab) = 014efaa8ae11f187896ad6607e3fc0ba
+MD5 (patch-ab) = 0600cf1bb1fe710c2fb22b85fd566e13
 MD5 (patch-ac) = e334cb6a3f14ac3d893c258063dce668
-MD5 (patch-ad) = f292a53f7e022ab2bb5f952438ad03fd
diff --git a/x11/dclock/patches/patch-ab b/x11/dclock/patches/patch-ab
index 47c8067e8fc..a1a8bc5830a 100644
--- a/x11/dclock/patches/patch-ab
+++ b/x11/dclock/patches/patch-ab
@@ -1,10 +1,11 @@
-$NetBSD: patch-ab,v 1.2 1999/10/20 11:01:18 agc Exp $
+$NetBSD: patch-ab,v 1.3 2000/01/01 04:46:11 agc Exp $
 
 Patch from Robert Elz to make the clock behave as a clock,
 rather than a sundial.
+itojun's y2k patch
 
---- Dclock.c.orig	Fri Sep 10 16:51:04 1999
-+++ Dclock.c	Fri Sep 10 17:06:19 1999
+--- Dclock.c	2000/01/01 04:40:38	1.1
++++ Dclock.c	2000/01/01 04:40:53
 @@ -21,8 +21,6 @@
  #define CLOCK_WIDTH	256
  #define CLOCK_HEIGHT	80
@@ -61,7 +62,7 @@ rather than a sundial.
   
  	for (j = 1; j != FADE_ITER; ++j)
  	{
-@@ -875,27 +873,35 @@
+@@ -875,27 +873,36 @@
  	if (*p != '%')
  	    *datep++ = *p;
  	else switch (*++p) {
@@ -87,15 +88,19 @@ rather than a sundial.
  		    *datep++ = (now->tm_mday / 10 + '0');
  		*datep++ = now->tm_mday % 10 + '0';
 -	    when 'Y':
+-		*datep++ = '1', *datep++ = '9';
+-		/* fall thru */
 +		break;
 +	    case 'Y':
- 		*datep++ = '1', *datep++ = '9';
--		/* fall thru */
++                *datep++ = (now->tm_year + 1900) / 1000 + '0';
++                *datep++ = (now->tm_year + 1900) % 1000 / 100 + '0';
 +		/* FALLTHROUGH */
  	    case 'y':
- 		*datep++ = now->tm_year / 10 + '0';
- 		*datep++ = now->tm_year % 10 + '0';
+-		*datep++ = now->tm_year / 10 + '0';
+-		*datep++ = now->tm_year % 10 + '0';
 -	    when '%':
++               *datep++ = now->tm_year % 100 / 10 + '0';
++               *datep++ = now->tm_year % 10 + '0';
 +		break;
 +	    case '%':
  		*datep++ = *p;
@@ -106,7 +111,7 @@ rather than a sundial.
  	}
      }
      *datep = 0;
-@@ -906,7 +912,7 @@
+@@ -906,7 +913,7 @@
  
      /* remove what was there in case the whole thing isn't overwritten */
      XFillRectangle(XtDisplay(w), XtWindow(w), w->dclock.backGC,
@@ -115,7 +120,7 @@ rather than a sundial.
  	winwidth, w->dclock.font->ascent + w->dclock.font->descent);
  
      XDrawString(XtDisplay(w), XtWindow(w), w->dclock.foreGC,
-@@ -924,7 +930,8 @@
+@@ -924,7 +931,8 @@
  {
      Boolean alarm_went_off = show_time(w);
      w->dclock.interval_id =
@@ -125,7 +130,7 @@ rather than a sundial.
  			timeout, (XtPointer)w);
  }
  
-@@ -960,8 +967,8 @@
+@@ -960,8 +968,8 @@
      ||  new->dclock.tails != current->dclock.tails
      ||  new->dclock.fade != current->dclock.fade
      ||  new->dclock.miltime != current->dclock.miltime) {
@@ -136,7 +141,7 @@ rather than a sundial.
  	GetGC(new);
  	Resize(new); /* pixmaps need to be redrawn */
  	do_redraw = True;
-@@ -1024,7 +1031,7 @@
+@@ -1024,7 +1032,7 @@
      Arg arg;
  
      XtSetArg(arg, XtNreverseVideo, !w->dclock.reverse);
@@ -145,7 +150,7 @@ rather than a sundial.
  }
  
  static void
-@@ -1038,7 +1045,7 @@
+@@ -1038,7 +1046,7 @@
  	return;
      }
      XtSetArg(arg, XtNmilitaryTime, !w->dclock.miltime);
@@ -154,7 +159,7 @@ rather than a sundial.
  }
  
  static void
-@@ -1052,7 +1059,7 @@
+@@ -1052,7 +1060,7 @@
  	return;
      }
      XtSetArg(arg, XtNseconds, !w->dclock.seconds);
@@ -163,7 +168,7 @@ rather than a sundial.
  }
  
  static void
-@@ -1062,7 +1069,7 @@
+@@ -1062,7 +1070,7 @@
      Arg arg;
  
      XtSetArg(arg, XtNfade, !w->dclock.fade);
@@ -172,7 +177,7 @@ rather than a sundial.
      if (w->dclock.fade && w->dclock.scroll)
  	toggle_scroll(w);
  }
-@@ -1074,7 +1081,7 @@
+@@ -1074,7 +1082,7 @@
      Arg arg;
  
      XtSetArg(arg, XtNtails, !w->dclock.tails);
@@ -181,7 +186,7 @@ rather than a sundial.
  }
  
  static void
-@@ -1084,7 +1091,7 @@
+@@ -1084,7 +1092,7 @@
      Arg arg;
  
      XtSetArg(arg, XtNalarm, !w->dclock.alarm);
@@ -190,7 +195,7 @@ rather than a sundial.
  }
  
  static void
-@@ -1124,20 +1131,24 @@
+@@ -1124,20 +1132,24 @@
  		    int digit = w->dclock.alarm_time[i>1?i+1:i] - '0';
  		    int mod;
  		    switch (i) {