Sun Nov 20 18:26:21 2022 UTC ()
Update to upstream 27jan2015


(is)
diff -r1.7 -r1.8 pkgsrc/time/saytime/Makefile
diff -r1.7 -r1.8 pkgsrc/time/saytime/distinfo
diff -r1.3 -r1.4 pkgsrc/time/saytime/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/time/saytime/patches/patch-ab
cvs diff -r1.7 -r1.8 pkgsrc/time/saytime/Makefile (expand / switch to unified diff)

--- pkgsrc/time/saytime/Makefile 2020/01/26 17:32:19 1.7
+++ pkgsrc/time/saytime/Makefile 2022/11/20 18:26:21 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2020/01/26 17:32:19 rillig Exp $ 1# $NetBSD: Makefile,v 1.8 2022/11/20 18:26:21 is Exp $
2# 2#
3 3
4DISTNAME= saytime_11nov1995 4DISTNAME= saytime_27jan2015
5PKGNAME= saytime-19951111 5PKGNAME= saytime-20150127
6CATEGORIES= time audio 6CATEGORIES= time audio
7MASTER_SITES= http://www.acme.com/software/saytime/ 7MASTER_SITES= http://www.acme.com/software/saytime/
8 8
9MAINTAINER= is@NetBSD.org 9MAINTAINER= is@NetBSD.org
10HOMEPAGE= https://www.acme.com/software/saytime/ 10HOMEPAGE= https://www.acme.com/software/saytime/
11COMMENT= Talking clock 11COMMENT= Talking clock
12 12
13USE_TOOLS+= pax 13USE_TOOLS+= pax
14 14
15# Needs /dev/audio. 15# Needs /dev/audio.
16NOT_FOR_PLATFORM= Interix-*-* 16NOT_FOR_PLATFORM= Interix-*-*
17 17
18WRKSRC= ${WRKDIR}/saytime 18WRKSRC= ${WRKDIR}/saytime
cvs diff -r1.7 -r1.8 pkgsrc/time/saytime/distinfo (expand / switch to unified diff)

--- pkgsrc/time/saytime/distinfo 2021/10/26 11:24:37 1.7
+++ pkgsrc/time/saytime/distinfo 2022/11/20 18:26:21 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 11:24:37 nia Exp $ 1$NetBSD: distinfo,v 1.8 2022/11/20 18:26:21 is Exp $
2 2
3BLAKE2s (saytime_11nov1995.tar.gz) = 75c424939d371d4495c986b4d446efc8699623532de0c8f86057d12c2e45b501 3BLAKE2s (saytime_27jan2015.tar.gz) = 2f9d2c5681d672663bdb4394b4627157ce7f3bebba89921bce8b68dd68d9cedb
4SHA512 (saytime_11nov1995.tar.gz) = deb5eed59dfe39380e4484a5df47def5835d16c1ece3da14c0fc1d11264f3e807a3542d3aabb29a57fe86b46eeec878af1802691ef8ca2470c2e4652d3b80fa9 4SHA512 (saytime_27jan2015.tar.gz) = bde4fc67bb18271baa5fb5b9ff0c7027869dbd132805425dbc5e8460196ed46bb9f43df3ffd66b0d4733e707b41caeeef0b90118d0080cd0b837daab00b85c55
5Size (saytime_11nov1995.tar.gz) = 104245 bytes 5Size (saytime_27jan2015.tar.gz) = 105160 bytes
6SHA1 (patch-aa) = 4c6ebab0038db3dc910f9bcde8fd93d76d3c203a 6SHA1 (patch-aa) = e20301da0f63c238609fe4a163bb3e3445f70183
7SHA1 (patch-ab) = cbdc4bf11a5f3a4648f7370f222bebad272e95d5 7SHA1 (patch-ab) = a578185627da19a4274df3d96d2a6c3c3c8f2b0b
cvs diff -r1.3 -r1.4 pkgsrc/time/saytime/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/time/saytime/patches/patch-aa 2016/03/30 08:45:32 1.3
+++ pkgsrc/time/saytime/patches/patch-aa 2022/11/20 18:26:21 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2016/03/30 08:45:32 jperkin Exp $ 1$NetBSD: patch-aa,v 1.4 2022/11/20 18:26:21 is Exp $
2 2
3Use pkgsrc layout/flags. 3Use pkgsrc layout/flags.
4 4
5--- Makefile.orig 1995-11-11 20:39:27.000000000 +0100 5--- Makefile.orig 1995-11-11 20:39:27.000000000 +0100
6+++ Makefile 6+++ Makefile
7@@ -1,16 +1,13 @@ 7@@ -1,16 +1,13 @@
8 # Makefile for saytime 8 # Makefile for saytime
9  9
10-#SOUND_DIR = \"/usr/local/lib/saytime\" 10-#SOUND_DIR = \"/usr/local/lib/saytime\"
11-SOUND_DIR = \"/jef/times\" 11-SOUND_DIR = \"/jef/times\"
12-#SOUND_DIR = \"/home/ee/u0/jef/web/times\" 12-#SOUND_DIR = \"/home/ee/u0/jef/web/times\"
13+SOUND_DIR = \"@LOCALBASE@/share/saytime\" 13+SOUND_DIR = \"@LOCALBASE@/share/saytime\"
14  14
@@ -16,36 +16,26 @@ Use pkgsrc layout/flags. @@ -16,36 +16,26 @@ Use pkgsrc layout/flags.
16-BINDIR = /home/ee/u0/www/bin 16-BINDIR = /home/ee/u0/www/bin
17+BINDIR = @LOCALBASE@/bin 17+BINDIR = @LOCALBASE@/bin
18  18
19-MANDIR = /usr/local/man/man1 19-MANDIR = /usr/local/man/man1
20+MANDIR = @LOCALBASE@/${PKGMANDIR}/man1 20+MANDIR = @LOCALBASE@/${PKGMANDIR}/man1
21  21
22-#DEFINES = -DSOUND_DIR=$(SOUND_DIR) 22-#DEFINES = -DSOUND_DIR=$(SOUND_DIR)
23-DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DCGI 23-DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DCGI
24+DEFINES = -DSOUND_DIR=$(SOUND_DIR) 24+DEFINES = -DSOUND_DIR=$(SOUND_DIR)
25+#DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DCGI 25+#DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DCGI
26 #DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT -DAUDIO_HEADER 26 #DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT -DAUDIO_HEADER
27 #DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT 27 #DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT
28  28
29@@ -18,8 +15,7 @@ DEFINES = -DSOUND_DIR=$(SOUND_DIR) -DCGI 
30 CC = gcc 
31 CFLAGS = -O $(DEFINES) 
32  
33-#LDFLAGS = -s 
34-LDFLAGS = -s -static 
35+LDFLAGS = -s 
36  
37 all: saytime 
38  
39@@ -30,10 +26,10 @@ saytime: saytime.o 29@@ -30,10 +26,10 @@ saytime: saytime.o
40 $(CC) $(CFLAGS) -c $< 30 $(CC) $(CFLAGS) -c $<
41  31
42 install: all 32 install: all
43- rm -f $(BINDIR)/saytime 33- rm -f $(BINDIR)/saytime
44- cp saytime $(BINDIR) 34- cp saytime $(BINDIR)
45- rm -f $(MANDIR)/saytime.1 35- rm -f $(MANDIR)/saytime.1
46- cp saytime.1 $(MANDIR) 36- cp saytime.1 $(MANDIR)
47+ rm -f ${DESTDIR}$(BINDIR)/saytime 37+ rm -f ${DESTDIR}$(BINDIR)/saytime
48+ cp saytime ${DESTDIR}$(BINDIR) 38+ cp saytime ${DESTDIR}$(BINDIR)
49+ rm -f ${DESTDIR}$(MANDIR)/saytime.1 39+ rm -f ${DESTDIR}$(MANDIR)/saytime.1
50+ cp saytime.1 ${DESTDIR}$(MANDIR) 40+ cp saytime.1 ${DESTDIR}$(MANDIR)
51  41
cvs diff -r1.3 -r1.4 pkgsrc/time/saytime/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/time/saytime/patches/patch-ab 2016/03/30 08:45:32 1.3
+++ pkgsrc/time/saytime/patches/patch-ab 2022/11/20 18:26:21 1.4
@@ -1,22 +1,17 @@ @@ -1,22 +1,17 @@
1$NetBSD: patch-ab,v 1.3 2016/03/30 08:45:32 jperkin Exp $ 1$NetBSD: patch-ab,v 1.4 2022/11/20 18:26:21 is Exp $
2 2
3Use time_t. 3--- saytime.c.orig 2015-01-27 20:15:03.000000000 +0000
4 
5--- saytime.c.orig 1995-11-11 01:04:52.000000000 +0000 
6+++ saytime.c 4+++ saytime.c
7@@ -495,12 +495,12 @@ saynumber( int n, int leadingzero ) 5@@ -502,10 +502,10 @@ saynumber( int n, int leadingzero )
8 } 6 int
9  7 main( int argc, char** argv )
10  
11-main( int argc, char* argv ) 
12+main( int argc, char** argv ) 
13 { 8 {
14- long clock; 9- long clock;
15+ time_t clock; 10+ time_t clock;
16 struct tm* t; 11 struct tm* t;
17  12
18- clock = time( (long*) 0 ); 13- clock = time( (long*) 0 );
19+ clock = time( 0 ); 14+ clock = time( (time_t*) 0 );
20 t = localtime( &clock ); 15 t = localtime( &clock );
21  16
22 sayphrase( PH_THE_TIME_IS ); 17 sayphrase( PH_THE_TIME_IS );