Replace multiline string printf's with several singleline string

printf's to appease gcc 3.2. Noticed in agc's bulk build.

3 files changed, 88 insertions, 1 deletions

diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
index 20dfb6c5935..8b79f7ff359 100644
--- a/audio/cmp3/distinfo
+++ b/audio/cmp3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/24 22:36:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/01/02 16:17:40 cjep Exp $
 
 SHA1 (cmp3-2.0pre5.tar.gz) = 9f8953fb34fdff8bafe198e1cd860d772e69cb7d
 Size (cmp3-2.0pre5.tar.gz) = 40207 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = 9bfd95a35696361effbfde89d55bcc9c47aaa260
 SHA1 (patch-ab) = dbe2565fe5388528b6a3b32af5cf50da8512bd51
 SHA1 (patch-ac) = f242ccaeed2b194938fad2978c24dc8619dcfaf4
 SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
+SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
+SHA1 (patch-af) = f15c60207248248f5cb7efa4c046cd246e247018
diff --git a/audio/cmp3/patches/patch-ae b/audio/cmp3/patches/patch-ae
new file mode 100644
index 00000000000..2b85b1ba6bb
--- /dev/null
+++ b/audio/cmp3/patches/patch-ae
@@ -0,0 +1,49 @@
+$NetBSD: patch-ae,v 1.1 2004/01/02 16:17:40 cjep Exp $
+--- rnmp3.c.orig	2000-01-14 13:55:56.000000000 +0000
++++ rnmp3.c	2004-01-02 16:06:58.000000000 +0000
+@@ -256,26 +256,25 @@
+ 
+ void usage()
+ {
+-    printf("rnmp3 %s:
+-    
+-Usage - pipe names into rnmp3. (\"find | rnmp3 args\")
+-    If first parameter starts with -, the following string will be removed
+-        from all names if they exist (enclose spaces with \"\")
+-    If any other commands are entered, commands will not be executed,
+-        just printed
+-
+-    rnmp3                       Rename
+-    rnmp3 test                  Don't rename, just show changes
+-    rnmp3 -\"string\"             Rename after removing \"string\"
+-    rnmp3 -\"string\" test        Don't rename after removing \"string\"
+-    rnmp3 --test test           Rename after removing \"-test\"
+-
+-    Before - \"1-This is my (file name) man.mp3\"
+-    After  - \"01-ThisIsMy-FileName-Man.mp3\"
+-
+-Suggested uses:
+-    find . | rnmp3
+-    find . -type f | rnmp3\n", VERSION);
++    printf("rnmp3 %s:\n\n", VERSION);
++    printf("Usage - pipe names into rnmp3. (\"find | rnmp3 args\")\n");
++    printf("    If first parameter starts with -, the following string will be removed\n");
++    printf("        from all names if they exist (enclose spaces with \"\")\n");
++    printf("    If any other commands are entered, commands will not be executed,\n");
++    printf("        just printed\n\n");
++
++    printf("    rnmp3                       Rename\n");
++    printf("    rnmp3 test                  Don't rename, just show changes\n");
++    printf("    rnmp3 -\"string\"             Rename after removing \"string\"\n");
++    printf("    rnmp3 -\"string\" test        Don't rename after removing \"string\"\n");
++    printf("    rnmp3 --test test           Rename after removing \"-test\"\n\n");
++
++    printf("    Before - \"1-This is my (file name) man.mp3\"\n");
++    printf("    After  - \"01-ThisIsMy-FileName-Man.mp3\"\n\n");
++
++    printf("Suggested uses:\n");
++    printf("   find . | rnmp3\n");
++    printf("   find . -type f | rnmp3\n");
+ 
+     exit(0);
+ }
diff --git a/audio/cmp3/patches/patch-af b/audio/cmp3/patches/patch-af
new file mode 100644
index 00000000000..fc6bbdd3df7
--- /dev/null
+++ b/audio/cmp3/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1 2004/01/02 16:17:40 cjep Exp $
+--- cmp3listfiles.c.orig	2000-03-17 00:06:25.000000000 +0000
++++ cmp3listfiles.c	2004-01-02 16:12:02.000000000 +0000
+@@ -7,7 +7,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include"cmp3funcs.h"
++#include "cmp3funcs.h"
+ 
+ typedef struct {
+     char dirLetter;
+@@ -269,15 +269,14 @@
+     if (outfile == NULL)
+ /*         XXX - alert person */
+         return;
+-    fprintf(outfile,
+-"##############################################################################
+-# Dumped Cmp3 playlist ass file
+-#
+-# Addable features (on individual lines):
+-# %%[command] - executes commands initially using system() call
+-# @ - randomizes this playlist at load time
+-# $ - turns on repeat mode at load time
+-#\n\n");
++fprintf(outfile, "##############################################################################\n");
++fprintf(outfile, "# Dumped Cmp3 playlist ass file\n");
++fprintf(outfile, "#\n");
++fprintf(outfile, "# Addable features (on individual lines):\n");
++fprintf(outfile, "# %%[command] - executes commands initially using system() call\n");
++fprintf(outfile, "# @ - randomizes this playlist at load time\n");
++fprintf(outfile, "# $ - turns on repeat mode at load time\n");
++fprintf(outfile, "#\n\n");
+ 
+     filename = shmptr->plhead;
+     for(i=0; i < shmptr->listlen; i++) {