Add DragonFly. Fix compilation with GCC 3.4+.

3 files changed, 31 insertions, 14 deletions

diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
index be80b00219a..3534aaf01a1 100644
--- a/audio/tracker/distinfo
+++ b/audio/tracker/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:52 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/11/10 20:07:17 joerg Exp $
 
 SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
 RMD160 (tracker-5.3.tgz) = d089f514ace6f64dcb90866542121b51ab5f154c
 Size (tracker-5.3.tgz) = 454803 bytes
-SHA1 (patch-aa) = 9274dcc7d394638325da08b85fa57974f9d13577
+SHA1 (patch-aa) = da8fa5ecf7ec2a1981e642963d147c8e293d4ad8
 SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e
-SHA1 (patch-ac) = 965c5e4c7eee7cbf73de4056055ff4fac1fe2db5
+SHA1 (patch-ac) = 76ec86b6132e4f954acefa71be30b2c702114a5c
 SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
 SHA1 (patch-af) = e159f31d04f3e1ced666197d303ff0aa39a474b6
diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa
index 7693399d532..c9f1ee394e5 100644
--- a/audio/tracker/patches/patch-aa
+++ b/audio/tracker/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2005/11/10 20:07:17 joerg Exp $
 
---- Makefile.orig	1996-05-07 10:20:50.000000000 -0500
+--- Makefile.orig	1996-05-07 15:20:50.000000000 +0000
 +++ Makefile
 @@ -20,7 +20,7 @@ CC = gcc
  
@@ -20,10 +20,19 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
  LIBS_freebsd = -lm
  AUDIODIR_freebsd=PCux/
  CONFIG_freebsd = PCux/freebsd_
-@@ -175,6 +175,15 @@ EXE_freebsd = 
+@@ -175,6 +175,24 @@ EXE_freebsd = 
  UI_freebsd = Unix/
  SHELL_freebsd = /bin/sh
  
++CFLAGS_dragonfly = -O2 -funroll-loops -finline-functions
++LIBS_dragonfly = -lm
++AUDIODIR_dragonfly = PCux/
++CONFIG_dragonfly = PCux/freebsd_
++O_dragonfly = .o
++EXE_dragonfly =
++UI_dragonfly = Unix/
++SHELL_dragonfly = /bin/sh
++
 +CFLAGS_netbsd = -O2 -funroll-loops -finline-functions
 +LIBS_netbsd = -lm
 +AUDIODIR_netbsd=PCux/
@@ -36,7 +45,7 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
  CFLAGS_aix = -O
  LIBS_aix = -lm
  AUDIODIR_aix = Aix/
-@@ -220,9 +229,9 @@ EXE_sbos2 = .exe
+@@ -220,9 +238,9 @@ EXE_sbos2 = .exe
  UI_sbos2 = OS2/./
  SHELL_sbos2 = /bin/sh
  
@@ -48,7 +57,7 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
  CONFIG = Arch/$(CONFIG_${MACHINE})
  AUDIODIR = Arch/$(AUDIODIR_${MACHINE})
  AUDIONAME = $(AUDIONAME_${MACHINE})
-@@ -250,7 +259,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O 
+@@ -250,7 +268,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O 
  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
  st_virt$O automaton$O
  
@@ -57,7 +66,7 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
  
  config.h: $(CONFIG)config.h 
  	rm -f config.h
-@@ -272,9 +281,8 @@ version.c: Makefile
+@@ -272,9 +290,8 @@ version.c: Makefile
  install: 
  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
diff --git a/audio/tracker/patches/patch-ac b/audio/tracker/patches/patch-ac
index d933008bdf0..d8b85310ab5 100644
--- a/audio/tracker/patches/patch-ac
+++ b/audio/tracker/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2004/07/27 22:25:31 agc Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/10 20:07:17 joerg Exp $
 
---- Arch/PCux/audio.c	2004/07/27 22:20:32	1.1
-+++ Arch/PCux/audio.c	2004/07/27 22:21:39
+--- Arch/PCux/audio.c.orig	1996-04-12 16:30:37.000000000 +0000
++++ Arch/PCux/audio.c
 @@ -9,6 +9,9 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.3 2004/07/27 22:25:31 agc Exp $
  
  struct options_set *port_options=0;
  
-@@ -50,7 +53,7 @@
+@@ -50,7 +53,7 @@ unsigned long open_audio(unsigned long f
  	int buf_max;
  	unsigned long possible, current;
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.3 2004/07/27 22:25:31 agc Exp $
     if (audio == -1)
  		end_all("Error opening audio device");
  
-@@ -116,6 +119,7 @@
+@@ -116,6 +119,7 @@ unsigned long open_audio(unsigned long f
  		}
  	samples_max = buf_max / dsize;
  	current_freq = f;
@@ -29,3 +29,11 @@ $NetBSD: patch-ac,v 1.3 2004/07/27 22:25:31 agc Exp $
  	total = 0;
  	return f;
     }
+@@ -145,6 +149,7 @@ void output_samples(long left, long righ
+ 		add_samples8(left, right, n);
+ 		break;
+ 	default:	/* should not happen */
++		break;
+ 	   }
+    }
+