CVS commit: pkgsrc/time/saytime

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul  7 08:35:34 UTC 2023

Modified Files:
        pkgsrc/time/saytime: Makefile distinfo
        pkgsrc/time/saytime/patches: patch-aa

Log Message:
saytime: Properly skip building when /dev/audio is unavailable.

Don't force static linking.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/time/saytime/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/time/saytime/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/saytime/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/saytime/Makefile
diff -u pkgsrc/time/saytime/Makefile:1.9 pkgsrc/time/saytime/Makefile:1.10
--- pkgsrc/time/saytime/Makefile:1.9    Sun Nov 20 18:28:44 2022
+++ pkgsrc/time/saytime/Makefile        Fri Jul  7 08:35:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/11/20 18:28:44 is Exp $
+# $NetBSD: Makefile,v 1.10 2023/07/07 08:35:34 nia Exp $
 #
 
 DISTNAME=              saytime_27jan2015
@@ -9,15 +9,17 @@ MASTER_SITES=         https://www.acme.com/soft
 MAINTAINER=            is%NetBSD.org@localhost
 HOMEPAGE=              https://www.acme.com/software/saytime/
 COMMENT=               Talking clock
+LICENSE=               2-clause-bsd
 
 USE_TOOLS+=    pax
 
-# Needs /dev/audio.
-NOT_FOR_PLATFORM=      Interix-*-*
+.include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/saytime
+.if ${OPSYS} != "SunOS" && !exists(/usr/include/sys/audioio.h)
+PKG_SKIP_REASON+=      "Needs /dev/audio"
+.endif
 
-.include "../../mk/bsd.prefs.mk"
+WRKSRC=                        ${WRKDIR}/saytime
 
 pre-configure:
        ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.template

Index: pkgsrc/time/saytime/distinfo
diff -u pkgsrc/time/saytime/distinfo:1.8 pkgsrc/time/saytime/distinfo:1.9
--- pkgsrc/time/saytime/distinfo:1.8    Sun Nov 20 18:26:21 2022
+++ pkgsrc/time/saytime/distinfo        Fri Jul  7 08:35:34 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2022/11/20 18:26:21 is Exp $
+$NetBSD: distinfo,v 1.9 2023/07/07 08:35:34 nia Exp $
 
 BLAKE2s (saytime_27jan2015.tar.gz) = 2f9d2c5681d672663bdb4394b4627157ce7f3bebba89921bce8b68dd68d9cedb
 SHA512 (saytime_27jan2015.tar.gz) = bde4fc67bb18271baa5fb5b9ff0c7027869dbd132805425dbc5e8460196ed46bb9f43df3ffd66b0d4733e707b41caeeef0b90118d0080cd0b837daab00b85c55
 Size (saytime_27jan2015.tar.gz) = 105160 bytes
-SHA1 (patch-aa) = e20301da0f63c238609fe4a163bb3e3445f70183
+SHA1 (patch-aa) = 14b2ba5cd8a4cdd4a2b5933a3744e9b280c56978
 SHA1 (patch-ab) = a578185627da19a4274df3d96d2a6c3c3c8f2b0b

Index: pkgsrc/time/saytime/patches/patch-aa
diff -u pkgsrc/time/saytime/patches/patch-aa:1.4 pkgsrc/time/saytime/patches/patch-aa:1.5
--- pkgsrc/time/saytime/patches/patch-aa:1.4    Sun Nov 20 18:26:21 2022
+++ pkgsrc/time/saytime/patches/patch-aa        Fri Jul  7 08:35:34 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2022/11/20 18:26:21 is Exp $
+$NetBSD: patch-aa,v 1.5 2023/07/07 08:35:34 nia Exp $
 
 Use pkgsrc layout/flags.
 
---- Makefile.orig      1995-11-11 20:39:27.000000000 +0100
+--- Makefile.orig      2015-01-27 20:13:39.000000000 +0000
 +++ Makefile
-@@ -1,16 +1,13 @@
+@@ -1,25 +1,19 @@
  # Makefile for saytime
  
 -#SOUND_DIR =  \"/usr/local/lib/saytime\"
@@ -26,7 +26,17 @@ Use pkgsrc layout/flags.
  #DEFINES =    -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT -DAUDIO_HEADER
  #DEFINES =    -DSOUND_DIR=$(SOUND_DIR) -DWRITE_STDOUT
  
-@@ -30,10 +26,10 @@ saytime:   saytime.o
+ 
+ CC =          cc
+-CFLAGS =      -O $(DEFINES)
+-
+-#LDFLAGS =    -s
+-LDFLAGS =     -s -static
++CFLAGS+=      -O $(DEFINES)
+ 
+ all:          saytime
+ 
+@@ -30,10 +24,10 @@ saytime:   saytime.o
        $(CC) $(CFLAGS) -c $<
  
  install:        all