Each of patch-* should patch only one file.

3 files changed, 29 insertions, 44 deletions

diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
index 36a30859426..c9c497eed56 100644
--- a/audio/tracker/distinfo
+++ b/audio/tracker/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/12/22 12:22:05 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/07/10 16:11:59 minskim Exp $
 
 SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
 Size (tracker-5.3.tgz) = 454803 bytes
-SHA1 (patch-aa) = 0b0f951a3da8fc0d4eaf563c23ebf8876ba25203
+SHA1 (patch-aa) = 40ecc42387e858b9e43262f642d3abfa2caf3976
 SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e
 SHA1 (patch-ac) = 8627c4b530957e056d791a94f935f818970f1dc0
-SHA1 (patch-ad) = fd72f95993f62fe44dc21d2e2addc074915b216a
+SHA1 (patch-ad) = a65c37143113c5eef8dae67c55f9fcdb58a31db2
 SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
 SHA1 (patch-af) = e159f31d04f3e1ced666197d303ff0aa39a474b6
diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa
index d74ef2d0885..5e9311c9b1a 100644
--- a/audio/tracker/patches/patch-aa
+++ b/audio/tracker/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2002/12/22 12:22:06 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2004/07/10 16:11:59 minskim Exp $
 
---- Makefile.orig	Tue May  7 17:20:50 1996
+--- Makefile.orig	2004-07-10 11:05:04.000000000 -0500
 +++ Makefile
 @@ -20,7 +20,7 @@ CC = gcc
  
@@ -20,7 +20,23 @@ $NetBSD: patch-aa,v 1.3 2002/12/22 12:22:06 jmmv Exp $
  LIBS_freebsd = -lm
  AUDIODIR_freebsd=PCux/
  CONFIG_freebsd = PCux/freebsd_
-@@ -250,7 +250,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O 
+@@ -175,6 +175,15 @@ EXE_freebsd = 
+ UI_freebsd = Unix/
+ SHELL_freebsd = /bin/sh
+ 
++CFLAGS_netbsd = -O2 -funroll-loops -finline-functions
++LIBS_netbsd = -lm -lossaudio
++AUDIODIR_netbsd=PCux/
++CONFIG_netbsd = PCux/netbsd_
++O_netbsd = .o
++EXE_netbsd = 
++UI_netbsd = Unix/
++SHELL_netbsd = /bin/sh
++
+ CFLAGS_aix = -O
+ LIBS_aix = -lm
+ AUDIODIR_aix = Aix/
+@@ -250,7 +259,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
  
@@ -29,7 +45,7 @@ $NetBSD: patch-aa,v 1.3 2002/12/22 12:22:06 jmmv Exp $
  
  config.h: $(CONFIG)config.h 
  	rm -f config.h
-@@ -272,9 +272,8 @@ version.c: Makefile
+@@ -272,9 +281,8 @@ version.c: Makefile
  install: 
  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
@@ -41,3 +57,4 @@ $NetBSD: patch-aa,v 1.3 2002/12/22 12:22:06 jmmv Exp $
  
  # no manpage available, use the texinfo manual.
  install.man:
+-
diff --git a/audio/tracker/patches/patch-ad b/audio/tracker/patches/patch-ad
index c605d60e064..64239bb9758 100644
--- a/audio/tracker/patches/patch-ad
+++ b/audio/tracker/patches/patch-ad
@@ -1,9 +1,8 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:18 agc Exp $
+$NetBSD: patch-ad,v 1.3 2004/07/10 16:11:59 minskim Exp $
 
-diff -u -r ../../work/tracker/Arch/PCux/audio.c ./Arch/PCux/audio.c
---- ../../work/tracker/Arch/PCux/audio.c	Thu Oct 30 00:58:14 1997
-+++ ./Arch/PCux/audio.c	Thu Oct 30 00:46:12 1997
-@@ -28,10 +28,18 @@
+--- ../../work/tracker/Arch/PCux/audio.c.orig	2004-07-10 11:05:07.000000000 -0500
++++ ../../work/tracker/Arch/PCux/audio.c
+@@ -28,10 +28,18 @@ struct options_set *port_options=0;
  #include "/usr/src/linux/drivers/sound/soundcard.h"
  #else
  #ifndef __FreeBSD__
@@ -22,7 +21,7 @@ diff -u -r ../../work/tracker/Arch/PCux/audio.c ./Arch/PCux/audio.c
  #endif
  #endif
  
-@@ -53,7 +61,7 @@
+@@ -53,7 +61,7 @@ unsigned long open_audio(unsigned long f
  	int buf_max;
  	unsigned long possible, current;
  
@@ -31,34 +30,3 @@ diff -u -r ../../work/tracker/Arch/PCux/audio.c ./Arch/PCux/audio.c
     if (audio == -1)
  		end_all("Error opening audio device");
  
-diff -u -r ../../work/tracker/Makefile ./Makefile
---- ../../work/tracker/Makefile	Thu Oct 30 00:58:14 1997
-+++ ./Makefile	Thu Oct 30 01:01:52 1997
-@@ -175,6 +175,15 @@
- UI_freebsd = Unix/
- SHELL_freebsd = /bin/sh
- 
-+CFLAGS_netbsd = -O2 -funroll-loops -finline-functions
-+LIBS_netbsd = -lm -lossaudio
-+AUDIODIR_netbsd=PCux/
-+CONFIG_netbsd = PCux/netbsd_
-+O_netbsd = .o
-+EXE_netbsd = 
-+UI_netbsd = Unix/
-+SHELL_netbsd = /bin/sh
-+
- CFLAGS_aix = -O
- LIBS_aix = -lm
- AUDIODIR_aix = Aix/
-@@ -344,11 +353,7 @@
- bug2:
- 	lclint -skipansiheaders bug.c
- 
--	
--	
--	
- 
- export: Docs/tracker.doc
- 	-rm tracker*.tgz
- 	cd ..; tar cvozf tracker/tracker-$(VERSION).tgz -T tracker/arc.list
--