head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.112 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.110 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.108 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.106 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.104 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.102 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.100 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.98 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.96 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.94 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.92 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.90 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.88 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.86 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.84 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.82 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.80 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.78 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.76 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.74 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.72 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.70 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.68 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.64 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.44 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.66 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.62 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.60 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.58 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.56 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.54 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.52 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.50 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.48 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.46 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.42 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.40 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.38 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.36 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.34 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.32 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.30 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.28 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.26 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.24 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.22 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.20 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.18 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.16 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.14 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.12 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.10 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.8 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.4 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.2 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.5.0.6 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.4.0.50 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.48 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.6 date 2012.06.02.20.00.50; author dholland; state Exp; branches; next 1.5; 1.5 date 2011.09.04.22.05.39; author dholland; state Exp; branches 1.5.6.1; next 1.4; 1.4 date 2005.12.11.20.48.46; author joerg; state Exp; branches; next 1.3; 1.3 date 99.09.06.16.37.43; author tron; state Exp; branches; next 1.2; 1.2 date 99.09.06.16.36.33; author tron; state Exp; branches; next 1.1; 1.1 date 98.08.23.06.49.30; author garbled; state Exp; branches; next ; 1.5.6.1 date 2012.06.06.11.47.54; author tron; state Exp; branches; next ; desc @@ 1.6 log @Call time() correctly; fixes netbsd-5 build. @ text @$NetBSD: patch-al,v 1.5 2011/09/04 22:05:39 dholland Exp $ - needs stdlib.h - needs time.h - support BSD cdrom interface - use the right debug on/off flag - don't use own declarations of standard functions - use malloc() properly - call time() correctly --- shuffle.c.orig 1993-01-12 18:59:38.000000000 +0000 +++ shuffle.c @@@@ -15,9 +15,14 @@@@ # include # include +# include +# include # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@@@ -29,15 +34,10 @@@@ static unsigned char *random_tracks; +extern AppData app_data; + void shuffle_setup() { - extern char *malloc(); -#ifdef sgi - extern time_t time(time_t *); -#else - extern long time(); -#endif - extern long random(); unsigned long seed, now; char state[128]; int try; @@@@ -63,12 +63,12 @@@@ shuffle_setup() { random_tracks = NULL; } - if ((random_tracks = (unsigned char *) malloc(cdi.ntracks)) == NULL) { + if ((random_tracks = malloc(cdi.ntracks)) == NULL) { perror("malloc"); exit(1); } - now = time((long *) 0); + now = time(NULL); seed = now & 0xfff; initstate(seed, state, sizeof(state)); @@@@ -97,7 +97,7 @@@@ shuffle_setup() { random_tracks[i] = try; } - if (debug == True) { + if (app_data.debug == True) { debug_printf(1, "shuffle_setup: "); for (i = 0; i < cdi.ntracks; i++) debug_printf(1, "%d ", random_tracks[i]); @ 1.5 log @Fix void main, caught by clang. While here, fix other problems caught by gcc: - casting malloc instead of including - casting calloc instead of including - failing to include with bad consequences for -current. PKGREVISION -> 5. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.4 2005/12/11 20:48:46 joerg Exp $ a4 1 - use malloc properly d7 3 d28 1 a28 1 @@@@ -29,9 +34,10 @@@@ d37 10 a46 4 #ifdef sgi extern time_t time(time_t *); #else @@@@ -63,7 +69,7 @@@@ shuffle_setup() { d55 7 a61 1 @@@@ -97,7 +103,7 @@@@ shuffle_setup() { @ 1.5.6.1 log @Pullup ticket #3821 - requested by tron audio/xcdplayer: build fix Revisions pulled up: - audio/xcdplayer/distinfo 1.9 - audio/xcdplayer/patches/patch-al 1.6 --- Module Name: pkgsrc Committed By: dholland Date: Sat Jun 2 20:00:50 UTC 2012 Modified Files: pkgsrc/audio/xcdplayer: distinfo pkgsrc/audio/xcdplayer/patches: patch-al Log Message: Call time() correctly; fixes netbsd-5 build. @ text @d1 1 a1 1 $NetBSD$ d5 1 a7 3 - don't use own declarations of standard functions - use malloc() properly - call time() correctly d26 1 a26 1 @@@@ -29,15 +34,10 @@@@ d35 4 a38 10 -#ifdef sgi - extern time_t time(time_t *); -#else - extern long time(); -#endif - extern long random(); unsigned long seed, now; char state[128]; int try; @@@@ -63,12 +63,12 @@@@ shuffle_setup() { d47 1 a47 7 - now = time((long *) 0); + now = time(NULL); seed = now & 0xfff; initstate(seed, state, sizeof(state)); @@@@ -97,7 +97,7 @@@@ shuffle_setup() { @ 1.4 log @DragonFly support. XXX Is sys/buf.h needed at all in cdrom_freebsd.c? @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.3 1999/09/06 16:37:43 tron Exp $ d3 14 a16 3 --- shuffle.c.orig Tue Jan 12 19:59:38 1993 +++ shuffle.c Mon Sep 6 18:37:05 1999 @@@@ -18,6 +18,9 @@@@ d26 1 a26 1 @@@@ -29,6 +32,8 @@@@ d34 14 a47 2 extern char *malloc(); @@@@ -97,7 +102,7 @@@@ @ 1.3 log @Fix RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) @ 1.2 log @Convert patches to unified output format. @ text @d1 1 a1 1 $NetBSD d4 1 a4 1 +++ shuffle.c Mon Sep 6 18:22:07 1999 @ 1.1 log @Added and fixed patches to allow build on alpha. Closes PR 5815 (Tim Rightnour) @ text @d1 7 a7 4 $NetBSD$ --- shuffle.c.orig Tue Jan 12 11:59:38 1993 +++ shuffle.c Wed Jul 22 21:53:16 1998 @@@@ -20,2 +20,5 @@@@ d13 5 a17 1 @@@@ -31,2 +34,4 @@@@ d22 5 a26 1 @@@@ -99,3 +104,3 @@@@ d31 2 @