head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.182 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.180 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.178 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.176 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.174 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.172 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.170 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.168 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.166 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.164 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.162 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.160 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.158 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.156 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.154 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.152 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.150 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.148 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.146 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.144 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.142 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.140 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.138 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.134 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.114 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.136 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.132 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.130 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.128 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.126 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.124 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.122 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.120 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.118 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.116 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.112 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.110 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.108 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.106 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.104 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.102 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.100 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.98 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.96 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.94 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.92 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.90 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.88 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.86 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.84 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.82 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.80 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.78 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.76 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.74 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.72 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.70 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.68 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.66 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.64 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.62 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.60 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.58 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.56 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.54 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.52 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.50 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.48 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.46 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.44 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.42 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.40 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.38 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.36 pkgsrc-2008Q1:1.6.0.34 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.32 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.30 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.28 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.26 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.3.0.4 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.6 date 2004.02.20.00.41.16; author abs; state Exp; branches; next 1.5; 1.5 date 2003.09.03.12.35.13; author martin; state Exp; branches; next 1.4; 1.4 date 2002.10.03.15.46.57; author abs; state Exp; branches; next 1.3; 1.3 date 2002.08.02.23.01.47; author abs; state Exp; branches; next 1.2; 1.2 date 2002.07.31.14.02.45; author abs; state Exp; branches; next 1.1; 1.1 date 2002.06.14.20.04.08; author abs; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.14.20.04.08; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.39.01; author jlam; state Exp; branches; next ; desc @@ 1.6 log @Update mserv to 0.35nb8: Fix parsing of ID3v1 data, fix some off by one malloc()s and default album author to tracks' author. @ text @$NetBSD$ --- mserv/opt.c.orig Sun Aug 3 15:57:20 2003 +++ mserv/opt.c @@@@ -115,7 +115,7 @@@@ int opt_read(const char *root) sprintf(m, "%s/%s", root, val); } else { /* value is absolute path */ - if ((m = malloc(strlen(val))) == NULL) { + if ((m = malloc(strlen(val)+1)) == NULL) { fprintf(stderr, "%s: out of memory building path\n", progname); return -1; } @@@@ -164,8 +164,8 @@@@ int opt_read(const char *root) /* special case - player variable is an indirected to another variable */ if ((val = conf_getvalue("player")) == NULL) { if (mserv_verbose) - printf("No player specified, defaulting to /usr/local/bin/mpg123\n"); - opt_player = "/usr/local/bin/mpg123"; + printf("No player specified, defaulting to " PATH_MPG123 "\n"); + opt_player = PATH_MPG123; } else { if ((opt_player = conf_getvalue(val)) == NULL) { fprintf(stderr, "%s: player setting '%s' not found\n", progname, @ 1.5 log @Update to mserv-0.35. Most previus patches have been integrated, various fixes. This version is compatible with a new nifty win32 gui client, see the homepage for links. @ text @d3 22 a24 19 --- mserv/defines.h.orig 2003-08-03 16:57:20.000000000 +0200 +++ mserv/defines.h 2003-09-03 13:24:27.000000000 +0200 @@@@ -1,3 +1,7 @@@@ +#ifndef PATH_MPG123 +#define PATH_MPG123 BINDIR "/mpg123" +#endif + /* maximum amount to queue in each output buffer */ #define OUTBUFLEN 32*1024 @@@@ -39,7 +43,7 @@@@ #define MISCINFOLEN 128 /* maximum number of tracks in each album */ -#define TRACKSPERALBUM 200 +#define TRACKSPERALBUM 250 /* maximum language line length */ #define LANGLINELEN 1024 @ 1.4 log @Update mserv to mserv-0.33nb5: Correctly parse ID3V2 headers. @ text @d3 3 a5 6 --- mserv/defines.h.orig Thu Jul 13 22:35:18 2000 +++ mserv/defines.h @@@@ -16,6 +16,10 @@@@ #define PATH_LANGUAGE SHAREDIR "/english.lang" */ d7 1 a7 1 +#define PATH_MPG123 BINDIR "/mpg123" d13 1 a13 1 @@@@ -57,7 +61,7 @@@@ @ 1.3 log @Updated mserv to 0.33nb4: Ensure reset message is flushed before restart starts, and fix volume control to correctly report new value so 'volume -' and 'volume +' will always reduce/increase the volume by the minimum value. @ text @@ 1.2 log @Update mserv to 0.33nb3: Broadcast an information line both on server RESET initiation and on completion. @ text @@ 1.1 log @Update mserv to mserv-0.33nb2 - Clip TRACKSPERALBUM to 250 not 1200 as more than 255 loses - Fix default pathname to mpg123 - Add DEPENDS for mpg123 - Fix soundcard support @ text @d3 5 a7 5 --- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 +++ mserv/mservplay.c @@@@ -14,10 +14,6 @@@@ #include "defines.h" #include "misc.h" d9 16 a24 7 -#ifndef PATH_MPG123 -#define PATH_MPG123 "/usr/local/bin/mpg123" -#endif - int main(int argc, char *argv[]) { const pid_t pid = getpid(); @ 1.1.2.1 log @file patch-ag was added on branch buildlink2 on 2002-06-23 18:39:01 +0000 @ text @d1 15 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 15 $NetBSD: patch-ag,v 1.1.2.1 2002/06/23 18:39:01 jlam Exp $ --- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 +++ mserv/mservplay.c @@@@ -14,10 +14,6 @@@@ #include "defines.h" #include "misc.h" -#ifndef PATH_MPG123 -#define PATH_MPG123 "/usr/local/bin/mpg123" -#endif - int main(int argc, char *argv[]) { const pid_t pid = getpid(); @