Use valid C. Should improve clang build.

5 files changed, 78 insertions, 11 deletions

diff --git a/audio/tfmxplay/distinfo b/audio/tfmxplay/distinfo
index 8b3d1806636..c1b61fbac6e 100644
--- a/audio/tfmxplay/distinfo
+++ b/audio/tfmxplay/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/11/10 19:51:23 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/09/04 21:04:56 dholland Exp $
 
 SHA1 (tfmxplay-0.6.tgz) = 8028a03d4198da0733fa297e9e6ada864f0c782a
 RMD160 (tfmxplay-0.6.tgz) = 52c31309588b4a8073bf0987f0237ca9d6274b35
 Size (tfmxplay-0.6.tgz) = 24271 bytes
 SHA1 (patch-aa) = 38bf1771c8773e7e12dbd1a563fa30ec9ae43c0f
-SHA1 (patch-ab) = 0e18cc967b397e48857f47bc231ae5a5eeb0e8dc
-SHA1 (patch-ac) = 5796904e2b50e538973deec598ec69728e48e8d5
-SHA1 (patch-ad) = 1b3456f95f94b3a665899bbd84a97d44157e32cb
+SHA1 (patch-ab) = 298f7e457456911c3ea29e293adf5f6b70ac924d
+SHA1 (patch-ac) = a81e9f5dbbf8245d619546859d193ff93ee8ad95
+SHA1 (patch-ad) = 159c2810806edccbbc415ac230a2f9adeeba0622
+SHA1 (patch-player_h) = 059b0ee0735bb36e242dc3825643660f0cc3c9b2
diff --git a/audio/tfmxplay/patches/patch-ab b/audio/tfmxplay/patches/patch-ab
index 2e99a3414d6..13dc773e5ba 100644
--- a/audio/tfmxplay/patches/patch-ab
+++ b/audio/tfmxplay/patches/patch-ab
@@ -1,7 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2003/03/01 10:54:40 jmc Exp $
+$NetBSD: patch-ab,v 1.4 2011/09/04 21:04:57 dholland Exp $
 
---- player.c.orig	Sat Mar  1 10:51:04 2003
-+++ player.c	Sat Mar  1 10:51:31 2003
+- use valid C
+
+--- player.c.orig	2001-07-31 17:34:05.000000000 +0000
++++ player.c
 @@ -5,6 +5,7 @@
   */
  
@@ -10,3 +12,30 @@ $NetBSD: patch-ab,v 1.3 2003/03/01 10:54:40 jmc Exp $
  #include "player.h"
  #include "tfmxsong.h"
  
+@@ -384,7 +385,7 @@ void RunMacro(struct Cdb *c)
+ 	goto loop;
+ }
+ 
+-DoEffects(struct Cdb *c)
++static void DoEffects(struct Cdb *c)
+ {
+ 	register int a;
+ 	if (c->EfxRun<0) return;
+@@ -798,7 +799,7 @@ AllOff() {
+ 	}
+ }
+ 
+-TfmxInit()
++void TfmxInit(void)
+ {
+ 	int x;
+ 	AllOff();
+@@ -811,7 +812,7 @@ TfmxInit()
+ 	return;
+ }
+ 
+-StartSong(int song, int mode) {
++void StartSong(int song, int mode) {
+ 	int x;
+ 	mdb.PlayerEnable=0; /* sort of locking mechanism */
+ 	mdb.MasterVol=0x40;
diff --git a/audio/tfmxplay/patches/patch-ac b/audio/tfmxplay/patches/patch-ac
index 5f27c187b42..f7746e28a9a 100644
--- a/audio/tfmxplay/patches/patch-ac
+++ b/audio/tfmxplay/patches/patch-ac
@@ -1,8 +1,19 @@
-$NetBSD: patch-ac,v 1.3 2004/03/23 02:08:37 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2011/09/04 21:04:57 dholland Exp $
 
---- tfmx.c.orig	2001-08-02 13:49:40.000000000 -0500
+- needs stdlib.h
+- use valid C (string constants cannot span lines)
+
+--- tfmx.c.orig	2001-08-02 18:49:40.000000000 +0000
 +++ tfmx.c
-@@ -46,24 +46,22 @@ extern int blend,filt,over;
+@@ -9,6 +9,7 @@
+ #endif
+ #include <stdio.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "tfmxsong.h"
+ #include "player.h"
+@@ -46,24 +47,22 @@ extern int blend,filt,over;
  
  usage(char *x)
  {
diff --git a/audio/tfmxplay/patches/patch-ad b/audio/tfmxplay/patches/patch-ad
index d0c450a55c4..1dde0072d9b 100644
--- a/audio/tfmxplay/patches/patch-ad
+++ b/audio/tfmxplay/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/11/10 19:51:23 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2011/09/04 21:04:57 dholland Exp $
+
+- Support more OSes
+- use valid C
 
 --- audio.c.orig	2001-08-02 11:06:48.000000000 +0000
 +++ audio.c
@@ -14,3 +17,12 @@ $NetBSD: patch-ad,v 1.1 2005/11/10 19:51:23 joerg Exp $
  #else
  #include <linux/soundcard.h>
  #endif
+@@ -545,7 +547,7 @@ int play_it()
+ }
+ 
+ #if 0
+-play_it()
++void play_it(void)
+ {
+ 	char c=0;
+ 	int i,j=0;
diff --git a/audio/tfmxplay/patches/patch-player_h b/audio/tfmxplay/patches/patch-player_h
new file mode 100644
index 00000000000..ddb26a00cd5
--- /dev/null
+++ b/audio/tfmxplay/patches/patch-player_h
@@ -0,0 +1,14 @@
+$NetBSD: patch-player_h,v 1.1 2011/09/04 21:04:57 dholland Exp $
+
+- add prototypes for a couple of the external functions now that they
+  have a defined return type.
+
+--- player.h~	2001-06-24 14:10:51.000000000 +0000
++++ player.h
+@@ -92,3 +92,6 @@ struct Cdb
+ 
+ 	struct Hdb *hw;
+ };
++
++void TfmxInit(void);
++void Startsong(int song, int mode);