From d04bfbb2f364f741bc2005f6663668b6dc1b1d9b Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Sat, 7 Jun 2003 11:06:13 +0000
Subject: Escape newlines in literal string for gcc3. No change to compiled
 package.

---
 audio/mserv/distinfo         |  4 +-
 audio/mserv/patches/patch-af | 95 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo
index 9ebbd8412e9..e3cbfea73d8 100644
--- a/audio/mserv/distinfo
+++ b/audio/mserv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/04/17 15:09:19 abs Exp $
+$NetBSD: distinfo,v 1.8 2003/06/07 11:06:13 abs Exp $
 
 SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785
 Size (mserv-0.33.tar.gz) = 136456 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 920641a518272fc3b10c0d1fca4f4b926dd26c35
 SHA1 (patch-ac) = a8c5fa8039b92318afae6e48329e799e3acc226a
 SHA1 (patch-ad) = 59497df92f71a54b34752086a27db1e05482e7dc
 SHA1 (patch-ae) = 6954c13dc501ff0ea55cee19301d584130ca0d24
-SHA1 (patch-af) = 819c178948b6aff9352ef35b45e13ab8f0ff84df
+SHA1 (patch-af) = f8993697dd58a4c518dc78a98f176f811a056986
 SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc
 SHA1 (patch-ah) = ca0dc3be3c02f82d033cab93aaa454d6918d45de
 SHA1 (patch-ai) = 62709c796913aae2e5866a94b22f929189b57d9a
diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af
index 2ac054016dd..a7ae96ee0ba 100644
--- a/audio/mserv/patches/patch-af
+++ b/audio/mserv/patches/patch-af
@@ -1,13 +1,94 @@
-$NetBSD: patch-af,v 1.4 2002/10/03 15:46:57 abs Exp $
+$NetBSD: patch-af,v 1.5 2003/06/07 11:06:14 abs Exp $
 
 --- mserv/defconf.c.orig	Thu Jul 13 22:20:42 2000
 +++ mserv/defconf.c
-@@ -15,7 +15,7 @@ path_language=" SHAREDIR "/english.lang
+@@ -1,47 +1,47 @@
+ #include "defines.h"
  
- # Define player invokation methods
- # mservplay is our special wrapper, the first parameter is a 'nice' level
+-const char defconf_file[] = "# Mserv configuration file for 0.30 and later
+-
+-# File locations, / at start is absolute, otherwise relative to mserv root
+-path_acl=acl
+-path_webacl=webacl
+-path_logfile=log
+-path_tracks=tracks
+-path_trackinfo=trackinfo
+-path_playout=player.out
+-path_idea=idea
+-path_mixer=/dev/mixer
+-path_language=" SHAREDIR "/english.lang
+-
+-# Define player invokation methods
+-# mservplay is our special wrapper, the first parameter is a 'nice' level
 -mpg123=/usr/local/bin/mpg123 -b 1024
-+mpg123=" PATH_MPG123 " -b 1024
- freeamp=/usr/local/bin/freeamp -ui mpg123
- mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024
+-freeamp=/usr/local/bin/freeamp -ui mpg123
+-mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024
+-
+-# Set default player from list above
+-player=mpg123
+-
+-# Set default random mode, either on or off.  You must still tell mserv to
+-# start playing (PLAY).
+-random=off
+-
+-# Set whether or not you would like play to start as soon as mserv has loaded.
+-play=off
+-
+-# Set default random factor, 0.5 is completely random, 0.6 is less random
+-# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.
+-factor=0.60
+-
+-# Set default filter, leave blank for off.  Example: \"!classical\" to
+-# not play classical genre, or \"year>=1980&year<1990\" to only play
+-# 80's songs.
+-filter=
+-
+-# Set gap between songs, in seconds.  0 to start the next song as quick as
+-# possible.
+-gap=1
+-
++const char defconf_file[] = "# Mserv configuration file for 0.30 and later\n\
++\n\
++# File locations, / at start is absolute, otherwise relative to mserv root\n\
++path_acl=acl\n\
++path_webacl=webacl\n\
++path_logfile=log\n\
++path_tracks=tracks\n\
++path_trackinfo=trackinfo\n\
++path_playout=player.out\n\
++path_idea=idea\n\
++path_mixer=/dev/mixer\n\
++path_language=" SHAREDIR "/english.lang\n\
++\n\
++# Define player invokation methods\n\
++# mservplay is our special wrapper, the first parameter is a 'nice' level\n\
++mpg123=" PATH_MPG123 " -b 1024\n\
++freeamp=/usr/local/bin/freeamp -ui mpg123\n\
++mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024\n\
++\n\
++# Set default player from list above\n\
++player=mpg123\n\
++\n\
++# Set default random mode, either on or off.  You must still tell mserv to\n\
++# start playing (PLAY).\n\
++random=off\n\
++\n\
++# Set whether or not you would like play to start as soon as mserv has loaded.\n\
++play=off\n\
++\n\
++# Set default random factor, 0.5 is completely random, 0.6 is less random\n\
++# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.\n\
++factor=0.60\n\
++\n\
++# Set default filter, leave blank for off.  Example: \"!classical\" to\n\
++# not play classical genre, or \"year>=1980&year<1990\" to only play\n\
++# 80's songs.\n\
++filter=\n\
++\n\
++# Set gap between songs, in seconds.  0 to start the next song as quick as\n\
++# possible.\n\
++gap=1\n\
++\n\
+ ";
  
+ unsigned int defconf_size = sizeof(defconf_file)-1;
-- 
cgit v1.2.3