5.41 - includes the dclock patch.

4 files changed, 7 insertions, 62 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index c86376f43c0..5e322e3c648 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2012/10/15 20:47:56 is Exp $
+# $NetBSD: Makefile,v 1.102 2012/10/28 20:21:11 is Exp $
 
 .include "Makefile.common"
-PKGREVISION=	7
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index ea4ec0dd73b..45266035bd5 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2012/03/31 10:43:19 dholland Exp $
+# $NetBSD: Makefile.common,v 1.67 2012/10/28 20:21:11 is Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,7 +8,7 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=	xlockmore-5.38
+DISTNAME=	xlockmore-5.41
 CATEGORIES=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 5692764b647..a3e7ebcf8f9 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2012/10/15 20:47:56 is Exp $
+$NetBSD: distinfo,v 1.51 2012/10/28 20:21:11 is Exp $
 
-SHA1 (xlockmore-5.38.tar.bz2) = 5a0fd27209dfc0966a1ec691f9ea4416587082bf
-RMD160 (xlockmore-5.38.tar.bz2) = 227a2c13c8cf1ddb027138dc520874accf5c0f72
-Size (xlockmore-5.38.tar.bz2) = 1970750 bytes
+SHA1 (xlockmore-5.41.tar.bz2) = 68115d9f7b92fea3fa55ce07f03a3fe4a42952ec
+RMD160 (xlockmore-5.41.tar.bz2) = 98eda44768f5d757ad12dc1c0eed1692e6ee725f
+Size (xlockmore-5.41.tar.bz2) = 1962608 bytes
 SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
 SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
diff --git a/x11/xlockmore/patches/patch-modes_dclock.c b/x11/xlockmore/patches/patch-modes_dclock.c
deleted file mode 100644
index 9dc74332409..00000000000
--- a/x11/xlockmore/patches/patch-modes_dclock.c
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-modes_dclock.c,v 1.2 2012/10/15 20:47:57 is Exp $
-
---- modes/dclock.c.orig	2012-01-23 13:19:21.000000000 +0000
-+++ modes/dclock.c
-@@ -376,11 +376,11 @@ static dclockstruct *dclocks = (dclockst
- extern char *message;
- 
- static unsigned long
--timeAtLastNewYear(long timeNow)
-+timeAtLastNewYear(time_t timeNow)
- {
- 	struct tm *t;
- 
--	t = localtime((const time_t *) &timeNow);
-+	t = localtime(&timeNow);
- 	return (unsigned long)(t->tm_year);
- }
- 
-@@ -420,7 +420,7 @@ convert(double x, char *string)
- }
- 
- static void
--dayhrminsec(long timeCount, int tzoffset, char *string)
-+dayhrminsec(time_t timeCount, int tzoffset, char *string)
- {
- 	int days, hours, minutes, secs;
- 	int bufsize, i;
-@@ -675,7 +675,7 @@ drawDclock(ModeInfo * mi)
- 				"%a %b %d %Y", localtime(&(dp->timeold)));
- 		}
- 	  } else {
--		long timeNow, timeLocal;
-+		time_t timeNow, timeLocal;
- 		timeNow = seconds();
- 		timeLocal = timeNow + dp->tzoffset;
- 
-@@ -950,7 +950,7 @@ init_dclock(ModeInfo * mi)
- {
- 	Display *display = MI_DISPLAY(mi);
- 	dclockstruct *dp;
--	long timeNow, timeLocal;
-+	time_t timeNow, timeLocal;
- 	int i, j;
- 
- 	if (dclocks == NULL) {
-@@ -1252,7 +1252,7 @@ defined(MODE_dclock_mayan)
- 			dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]);
- 			dp->strpta[1] = dp->strnew[1];
- 		} else {
--			struct tm *t = localtime((const time_t *) &timeLocal);
-+			struct tm *t = localtime(&timeLocal);
- 
- 			if (dp->time24)
- 			  (void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t);