diff options
Diffstat (limited to 'time/sunclock')
| -rw-r--r-- | time/sunclock/Makefile | 4 | ||||
| -rw-r--r-- | time/sunclock/distinfo | 5 | ||||
| -rw-r--r-- | time/sunclock/patches/patch-aa | 19 | ||||
| -rw-r--r-- | time/sunclock/patches/patch-ab | 38 |
4 files changed, 59 insertions, 7 deletions
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile index ca1905ff107..8f59da110cf 100644 --- a/time/sunclock/Makefile +++ b/time/sunclock/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:39 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2008/08/30 08:25:26 dholland Exp $ # DISTNAME= sunclock-1.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 time MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} diff --git a/time/sunclock/distinfo b/time/sunclock/distinfo index e85db0eaff9..c1d4700da41 100644 --- a/time/sunclock/distinfo +++ b/time/sunclock/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 19:14:55 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/08/30 08:25:26 dholland Exp $ SHA1 (sunclock-1.5.tar.gz) = 4be620bdff39da118b26e6de256b8dfc71b4d5df RMD160 (sunclock-1.5.tar.gz) = 92d6fe7a695f517ccf7583c63e1a2a202deeb295 Size (sunclock-1.5.tar.gz) = 29360 bytes -SHA1 (patch-aa) = 1e315cb6a68bf7d97a849ef9437aff277d3a4862 +SHA1 (patch-aa) = 775b77c0bd2ebbdcaa114b8be95af553521a7ec7 +SHA1 (patch-ab) = e3432958d8e302643bb751717d3a8462bd0a841b diff --git a/time/sunclock/patches/patch-aa b/time/sunclock/patches/patch-aa index e6ae63a329c..9a266f3dbce 100644 --- a/time/sunclock/patches/patch-aa +++ b/time/sunclock/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1 2004/05/23 23:28:29 danw Exp $ +$NetBSD: patch-aa,v 1.2 2008/08/30 08:25:27 dholland Exp $ ---- tildepath.c.orig Sun Mar 29 16:08:21 1998 -+++ tildepath.c +--- tildepath.c.orig 1998-03-29 16:08:21.000000000 -0500 ++++ tildepath.c 2008-08-30 04:18:54.000000000 -0400 @@ -37,7 +37,6 @@ static char SccsId[] = { "@(#) tildepath #include <stdio.h> #include <stdlib.h> @@ -10,3 +10,16 @@ $NetBSD: patch-aa,v 1.1 2004/05/23 23:28:29 danw Exp $ #include <string.h> #include <unistd.h> +@@ -68,12 +67,6 @@ char *path; /* Path starting with ~ */ + int size; /* Length of new path */ + + /* +- * Functions +- */ +- +- char *strdup(); /* Make a copy of a path */ +- +- /* + * If the path doesn't start with ~ quit right now + */ + diff --git a/time/sunclock/patches/patch-ab b/time/sunclock/patches/patch-ab new file mode 100644 index 00000000000..fc9eac9540e --- /dev/null +++ b/time/sunclock/patches/patch-ab @@ -0,0 +1,38 @@ +$NetBSD: patch-ab,v 1.1 2008/08/30 08:25:27 dholland Exp $ + +--- sunclock.c~ 1999-04-07 10:00:49.000000000 -0400 ++++ sunclock.c 2008-08-30 04:24:42.000000000 -0400 +@@ -102,13 +102,13 @@ struct sunclock { + short * s_wtab1; /* current width table (?) */ + short * s_wtab; /* previous width table (?) */ + long s_increm; /* increment for fake time */ +- long s_time; /* time - real or fake, see flags */ ++ time_t s_time; /* time - real or fake, see flags */ + GC s_gc; /* GC for writing text into window */ + char * (*s_tfunc)(); /* function to return the text */ + char s_text[80]; /* and the current text that's there */ + int s_textx; /* where to draw the text */ + int s_texty; /* where to draw the text */ +- long s_projtime; /* last time we projected illumination */ ++ time_t s_projtime; /* last time we projected illumination */ + int s_timeout; /* time until next image update */ + int s_win_offset; /* offset for drawing into window */ + struct sunclock * s_next; /* pointer to next clock context */ +@@ -720,7 +720,7 @@ void + setTimeout(s) + register struct sunclock * s; + { +- long t; ++ time_t t; + + if (s->s_flags & S_ICON) { + if(!AnimateIcon) { +@@ -1297,7 +1297,7 @@ SetIconName() + */ + + char name[128];/* Used to change icon name */ +- long c; /* Current time on the clock */ ++ time_t c; /* Current time on the clock */ + struct tm *lt; /* Used to get timezone name */ + + /* Change the timezone displayed in the icon */ |