From a8b1453bc49a9de9c9edc913e4f18b64e9251f45 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Tue, 27 Jul 2004 22:25:31 +0000
Subject: Consolidate patch-ac and -ad into one patch file, as they patch the
 same file (patch-ad with a weird path). Fixes problem seen in bulk build.

---
 audio/tracker/distinfo         |  5 ++--
 audio/tracker/patches/patch-ac | 55 +++++++++++++++++++++++-------------------
 audio/tracker/patches/patch-ad | 13 ----------
 3 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 audio/tracker/patches/patch-ad

diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
index a478eed7ee2..71964d36951 100644
--- a/audio/tracker/distinfo
+++ b/audio/tracker/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/07/10 16:33:01 minskim Exp $
+$NetBSD: distinfo,v 1.6 2004/07/27 22:25:31 agc Exp $
 
 SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
 Size (tracker-5.3.tgz) = 454803 bytes
 SHA1 (patch-aa) = 9274dcc7d394638325da08b85fa57974f9d13577
 SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e
-SHA1 (patch-ac) = 8627c4b530957e056d791a94f935f818970f1dc0
-SHA1 (patch-ad) = 98bc1802a888159ea9e4d779ac781ce9865b4311
+SHA1 (patch-ac) = 965c5e4c7eee7cbf73de4056055ff4fac1fe2db5
 SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
 SHA1 (patch-af) = e159f31d04f3e1ced666197d303ff0aa39a474b6
diff --git a/audio/tracker/patches/patch-ac b/audio/tracker/patches/patch-ac
index aa0b851653a..d933008bdf0 100644
--- a/audio/tracker/patches/patch-ac
+++ b/audio/tracker/patches/patch-ac
@@ -1,26 +1,31 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:18 agc Exp $
+$NetBSD: patch-ac,v 1.3 2004/07/27 22:25:31 agc Exp $
 
-*** Arch/PCux/audio.c.bak	Fri Apr 12 20:30:37 1996
---- Arch/PCux/audio.c	Tue Nov 12 08:40:29 1996
-***************
-*** 9,14 ****
---- 9,17 ----
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include "extern.h"
-+ #include "prefs.h"
-+ #include "autoinit.h"
-+ #include "watched_var.h"
-  
-  struct options_set *port_options=0;
-  
-***************
-*** 116,121 ****
---- 119,125 ----
-  		}
-  	samples_max = buf_max / dsize;
-  	current_freq = f;
-+ 	set_watched_scalar(FREQUENCY, f);
-  	total = 0;
-  	return f;
-     }
+--- Arch/PCux/audio.c	2004/07/27 22:20:32	1.1
++++ Arch/PCux/audio.c	2004/07/27 22:21:39
+@@ -9,6 +9,9 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include "extern.h"
++#include "prefs.h"
++#include "autoinit.h"
++#include "watched_var.h"
+ 
+ struct options_set *port_options=0;
+ 
+@@ -50,7 +53,7 @@
+ 	int buf_max;
+ 	unsigned long possible, current;
+ 
+-   audio = open("/dev/dsp", O_WRONLY, 0);
++   audio = open(DEVOSSAUDIO, O_WRONLY, 0);
+    if (audio == -1)
+ 		end_all("Error opening audio device");
+ 
+@@ -116,6 +119,7 @@
+ 		}
+ 	samples_max = buf_max / dsize;
+ 	current_freq = f;
++	set_watched_scalar(FREQUENCY, f);
+ 	total = 0;
+ 	return f;
+    }
diff --git a/audio/tracker/patches/patch-ad b/audio/tracker/patches/patch-ad
deleted file mode 100644
index aea6e6dd452..00000000000
--- a/audio/tracker/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2004/07/10 16:33:01 minskim Exp $
-
---- ../../work/tracker/Arch/PCux/audio.c.orig	2004-07-10 11:05:07.000000000 -0500
-+++ ../../work/tracker/Arch/PCux/audio.c
-@@ -53,7 +61,7 @@ unsigned long open_audio(unsigned long f
- 	int buf_max;
- 	unsigned long possible, current;
- 
--   audio = open("/dev/dsp", O_WRONLY, 0);
-+   audio = open(DEVOSSAUDIO, O_WRONLY, 0);
-    if (audio == -1)
- 		end_all("Error opening audio device");
- 
-- 
cgit v1.2.3