ports/173687: Update Request: xlockmore-5.41

[UMENO Takashi]

>Number:         173687
>Category:       ports
>Synopsis:       Update Request: xlockmore-5.41
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 17 18:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     UMENO Takashi
>Release:        FreeBSD 8.3-STABLE i386
>Organization:
individual
>Environment:
System: FreeBSD belldandy.unnumbered.net 8.3-STABLE FreeBSD 8.3-STABLE #3 r243166: Sat Nov 17 11:46:45 JST 2012 root at belldandy.unnumbered.net:/usr/obj/usr/src/sys/ZFS i386


	
>Description:
Update Request: xlockmore-5.41
remove file:  files/patch-modes__dclock.c
>How-To-Repeat:
N/A
>Fix:

diff -urN xlockmore.orig/Makefile xlockmore/Makefile
--- xlockmore.orig/Makefile	2012-11-17 15:40:48.000000000 +0900
+++ xlockmore/Makefile	2012-11-17 22:42:01.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.40
-PORTREVISION=	1
+PORTVERSION=	5.41
 CATEGORIES?=	x11
 MASTER_SITES=	ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
 		http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
diff -urN xlockmore.orig/distinfo xlockmore/distinfo
--- xlockmore.orig/distinfo	2012-11-17 15:40:48.000000000 +0900
+++ xlockmore/distinfo	1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-SHA256 (xlockmore-5.40.tar.bz2) = 38ff3e32983b3f9df957431f7f8ed50e823d10246aeb0319e83876793ce5c1b3
-SIZE (xlockmore-5.40.tar.bz2) = 1962001
diff -urN xlockmore.orig/files/patch-modes__dclock.c xlockmore/files/patch-modes__dclock.c
--- xlockmore.orig/files/patch-modes__dclock.c	2012-11-17 15:40:48.000000000 +0900
+++ xlockmore/files/patch-modes__dclock.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,52 +0,0 @@
---- ./modes/dclock.c.orig	2012-01-23 05:19:21.000000000 -0800
-+++ ./modes/dclock.c	2012-10-17 15:20:26.000000000 -0700
-@@ -376,11 +376,11 @@
- 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 @@
- }
- 
- 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 @@
- 				"%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 @@
- {
- 	Display *display = MI_DISPLAY(mi);
- 	dclockstruct *dp;
--	long timeNow, timeLocal;
-+	time_t timeNow, timeLocal;
- 	int i, j;
- 
- 	if (dclocks == NULL) {
-@@ -1252,7 +1252,7 @@
- 			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);



>Release-Note:
>Audit-Trail:
>Unformatted: