summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2012-11-01 19:28:26 +0000
committerjoerg <joerg>2012-11-01 19:28:26 +0000
commit2eaf2244670621c0dd74d271ea2aa4f922a139d6 (patch)
tree67d39a84880fa9236fcd43ce71a7456583d17968
parenteb42c6f1432c54948478ffe0d8ce566cf3e205dc (diff)
downloadpkgsrc-2eaf2244670621c0dd74d271ea2aa4f922a139d6.tar.gz
Fix 64bit time_t issue. Fix inline usage. Bump revision.
-rw-r--r--time/wmzcalock/Makefile3
-rw-r--r--time/wmzcalock/distinfo4
-rw-r--r--time/wmzcalock/patches/patch-wmzcalock.c30
3 files changed, 29 insertions, 8 deletions
diff --git a/time/wmzcalock/Makefile b/time/wmzcalock/Makefile
index 92d9710406e..d8c58882200 100644
--- a/time/wmzcalock/Makefile
+++ b/time/wmzcalock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/11/01 19:28:26 joerg Exp $
#
DISTNAME= wmzcalock-0.1
+PKGREVISION= 1
CATEGORIES= time x11
MASTER_SITES= http://zapatopi.net/zapatoware/
diff --git a/time/wmzcalock/distinfo b/time/wmzcalock/distinfo
index abd33e031ac..6f2188df5d6 100644
--- a/time/wmzcalock/distinfo
+++ b/time/wmzcalock/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $
+$NetBSD: distinfo,v 1.2 2012/11/01 19:28:26 joerg Exp $
SHA1 (wmzcalock-0.1.tgz) = e18a377464f688140c0388cf7dd29c96ecb27233
RMD160 (wmzcalock-0.1.tgz) = 902383d9046fe38932ed0e700d678cd5e5e82ed2
Size (wmzcalock-0.1.tgz) = 47451 bytes
-SHA1 (patch-wmzcalock.c) = 55b316964a342248cfa70cf680e61129892303f7
+SHA1 (patch-wmzcalock.c) = 9a2a3d97953f4870b83a7198f64a0aafcb97066a
diff --git a/time/wmzcalock/patches/patch-wmzcalock.c b/time/wmzcalock/patches/patch-wmzcalock.c
index f110a98bbb2..33ad133e689 100644
--- a/time/wmzcalock/patches/patch-wmzcalock.c
+++ b/time/wmzcalock/patches/patch-wmzcalock.c
@@ -1,8 +1,28 @@
-$NetBSD: patch-wmzcalock.c,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $
+$NetBSD: patch-wmzcalock.c,v 1.2 2012/11/01 19:28:26 joerg Exp $
---- wmzcalock.c.orig 2000-07-11 18:11:00.000000000 +0100
-+++ wmzcalock.c 2010-01-14 16:24:40.000000000 +0000
-@@ -645,7 +645,7 @@
+--- wmzcalock.c.orig 2000-07-11 17:11:00.000000000 +0000
++++ wmzcalock.c
+@@ -144,7 +144,7 @@ int use_font_wday = TRUE;
+
+ void clock_routine(int, char **);
+ void set_locale_vars(void);
+-inline void draw_display(void);
++void draw_display(void);
+ void set_time_strings (void);
+ void draw_string (char *, int, int, unsigned long, int, unsigned long);
+ void draw_binary_time (void);
+@@ -258,7 +258,9 @@ int main(int argc, char *argv[])
+ {
+ i++; if (i == argc) usage (1);
+ gmt = TRUE;
+- sscanf(argv[i],"%i",&tzoff);
++ int off;
++ sscanf(argv[i],"%i",&off);
++ tzoff = off;
+ }
+
+ else if (!strcmp(argv[i],"-swatch") |
+@@ -645,7 +647,7 @@ void set_time_strings (void)
{
gettimeofday(&timeV, NULL);
dday = ((float)hour/24)+((float)min/1440)+
@@ -11,7 +31,7 @@ $NetBSD: patch-wmzcalock.c,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $
}
switch (tmmode)
-@@ -803,7 +803,7 @@
+@@ -803,7 +805,7 @@ Pixmap colorized_pixmap_file(char *pixma
{
fprintf(stderr,
"Warning: Couldn't open file '%s', using font instead\n",pixmap_file);