diff options
| author | jgh <jgh@FreeBSD.org> | 2012-12-01 02:15:53 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2012-12-01 02:15:53 +0800 |
| commit | 86fc97faa08ba04714a6c202bb3373600d9b82ad (patch) | |
| tree | 324ecc06ca5eee36494177a68fa8cd0e6cc28443 /x11 | |
| parent | aac1cf2be63b25404924282caae2fe550cfd4c15 (diff) | |
| download | freebsd-ports-gnome-86fc97faa08ba04714a6c202bb3373600d9b82ad.tar.gz freebsd-ports-gnome-86fc97faa08ba04714a6c202bb3373600d9b82ad.tar.zst freebsd-ports-gnome-86fc97faa08ba04714a6c202bb3373600d9b82ad.zip | |
- update to 5.41 , merged upstream security patch, and verified [1]
- while here take maintainership [2]
PR: 173687
Submitted by: umeno@rr.iij4u.or.jp [1], jgh@ [2]
Approved by: maintainer, marius@nuenneri.ch
Feature safe: yes
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xlockmore/Makefile | 10 | ||||
| -rw-r--r-- | x11/xlockmore/distinfo | 4 | ||||
| -rw-r--r-- | x11/xlockmore/files/patch-modes__dclock.c | 52 |
3 files changed, 5 insertions, 61 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 3ce49b9e629d..b16dc112a1c3 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,19 +1,15 @@ -# New ports collection makefile for: xlockmore -# Date created: 9 November 1994 -# Whom: smace +# Created by: smace # # $FreeBSD$ -# 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}/ \ CRITICAL -MAINTAINER= marius@nuenneri.ch +MAINTAINER= jgh@FreeBSD.org COMMENT= Like XLock session locker/screen saver, but just more USE_BZIP2= yes diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 43d93754dd5c..fd72f9f878ca 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,2 +1,2 @@ -SHA256 (xlockmore-5.40.tar.bz2) = 38ff3e32983b3f9df957431f7f8ed50e823d10246aeb0319e83876793ce5c1b3 -SIZE (xlockmore-5.40.tar.bz2) = 1962001 +SHA256 (xlockmore-5.41.tar.bz2) = a1feb0120f5caf806656db06180e1a937db5ef84467b2227db11039bb5dba323 +SIZE (xlockmore-5.41.tar.bz2) = 1962608 diff --git a/x11/xlockmore/files/patch-modes__dclock.c b/x11/xlockmore/files/patch-modes__dclock.c deleted file mode 100644 index 7af126dd8365..000000000000 --- a/x11/xlockmore/files/patch-modes__dclock.c +++ /dev/null @@ -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); |