Fix build on -CURRENT (gcc-3.3)

Also use ${DOCSDIR} for Makefile and %%DOCSDIR%% for pkg-plist

Submitted by:	Simon Barner <barner@in.tum.de>

4 files changed, 72 insertions, 6 deletions

diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 794738549f5c..bdbd5a133463 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -25,9 +25,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/cmp3
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
-	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${DOCSDIR}/sample.cmp3rc
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/cmp3/files/patch-cmp3listfiles.c b/audio/cmp3/files/patch-cmp3listfiles.c
new file mode 100644
index 000000000000..332b51152e1c
--- /dev/null
+++ b/audio/cmp3/files/patch-cmp3listfiles.c
@@ -0,0 +1,23 @@
+--- cmp3listfiles.c.orig	Fri Jul 18 17:55:33 2003
++++ cmp3listfiles.c	Fri Jul 18 17:56:23 2003
+@@ -270,13 +270,13 @@
+ /*         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\
++# Dumped Cmp3 playlist ass file\n\
++#\n\
++# Addable features (on individual lines):\n\
++# %%[command] - executes commands initially using system() call\n\
++# @ - randomizes this playlist at load time\n\
++# $ - turns on repeat mode at load time\n\
+ #\n\n");
+ 
+     filename = shmptr->plhead;
diff --git a/audio/cmp3/files/patch-rnmp3.c b/audio/cmp3/files/patch-rnmp3.c
new file mode 100644
index 000000000000..4c5d0805f25d
--- /dev/null
+++ b/audio/cmp3/files/patch-rnmp3.c
@@ -0,0 +1,43 @@
+--- rnmp3.c.orig	Fri Jul 18 18:00:43 2003
++++ rnmp3.c	Fri Jul 18 18:02:36 2003
+@@ -256,25 +256,21 @@
+ 
+ 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
++    printf("rnmp3 %s:\n\n\
++Usage - pipe names into rnmp3. (\"find | rnmp3 args\")\n\
++    If first parameter starts with -, the following string will be removed\n\
++        from all names if they exist (enclose spaces with \"\")\n\
++    If any other commands are entered, commands will not be executed,\n\
++        just printed\n\n\
++    rnmp3                       Rename\n\
++    rnmp3 test                  Don't rename, just show changes\n\
++    rnmp3 -\"string\"             Rename after removing \"string\"\n\
++    rnmp3 -\"string\" test        Don't rename after removing \"string\"\n\
++    rnmp3 --test test           Rename after removing \"-test\"\n\n\
++    Before - \"1-This is my (file name) man.mp3\"\n\
++    After  - \"01-ThisIsMy-FileName-Man.mp3\"\n\n\
++Suggested uses:\n\
++    find . | rnmp3\n\
+     find . -type f | rnmp3\n", VERSION);
+ 
+     exit(0);
diff --git a/audio/cmp3/pkg-plist b/audio/cmp3/pkg-plist
index 6cd281102f4d..923cbdc24d4c 100644
--- a/audio/cmp3/pkg-plist
+++ b/audio/cmp3/pkg-plist
@@ -1,5 +1,5 @@
 bin/cmp3
 bin/rnmp3
-%%PORTDOCS%%share/doc/cmp3/README
-%%PORTDOCS%%share/doc/cmp3/sample.cmp3rc
-%%PORTDOCS%%@dirrm share/doc/cmp3
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/sample.cmp3rc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%