A missed case of last problem.... dclock -veg and dclock -lab.

4 files changed, 21 insertions, 7 deletions

diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile
index b4cc790f0be..1a1e2b19740 100644
--- a/x11/xlockmore-lite/Makefile
+++ b/x11/xlockmore-lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2012/10/15 15:29:10 is Exp $
+# $NetBSD: Makefile,v 1.17 2012/10/15 20:47:57 is Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-lite-/}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	"lite" version of xlockmore
 
 CONFIGURE_ARGS+=	--without-xpm
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index ecce28e7447..c86376f43c0 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2012/10/15 15:29:09 is Exp $
+# $NetBSD: Makefile,v 1.101 2012/10/15 20:47:56 is Exp $
 
 .include "Makefile.common"
-PKGREVISION=	6
+PKGREVISION=	7
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index d02fb57b6b7..5692764b647 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2012/10/15 15:29:09 is Exp $
+$NetBSD: distinfo,v 1.50 2012/10/15 20:47:56 is Exp $
 
 SHA1 (xlockmore-5.38.tar.bz2) = 5a0fd27209dfc0966a1ec691f9ea4416587082bf
 RMD160 (xlockmore-5.38.tar.bz2) = 227a2c13c8cf1ddb027138dc520874accf5c0f72
@@ -8,4 +8,4 @@ SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
 SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
 SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
-SHA1 (patch-modes_dclock.c) = b5863dab4153cbe19b54c2838c85df1a84f09a14
+SHA1 (patch-modes_dclock.c) = e0722e290a52a744bd171741108ab42d457996fb
diff --git a/x11/xlockmore/patches/patch-modes_dclock.c b/x11/xlockmore/patches/patch-modes_dclock.c
index b48c4cb9fd3..9dc74332409 100644
--- a/x11/xlockmore/patches/patch-modes_dclock.c
+++ b/x11/xlockmore/patches/patch-modes_dclock.c
@@ -1,7 +1,21 @@
-$NetBSD: patch-modes_dclock.c,v 1.1 2012/10/15 15:29:10 is Exp $
+$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)
  }