summaryrefslogtreecommitdiff
path: root/audio/mserv/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mserv/patches/patch-ag')
-rw-r--r--audio/mserv/patches/patch-ag43
1 files changed, 23 insertions, 20 deletions
diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag
index b2fcd268e2c..5b3188778e7 100644
--- a/audio/mserv/patches/patch-ag
+++ b/audio/mserv/patches/patch-ag
@@ -1,21 +1,24 @@
-$NetBSD: patch-ag,v 1.5 2003/09/03 12:35:13 martin Exp $
+$NetBSD: patch-ag,v 1.6 2004/02/20 00:41:16 abs Exp $
---- 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
+--- 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,