Consolidate two patches that patched the same file.

3 files changed, 34 insertions, 53 deletions

diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
index 3534aaf01a1..ae21ac5ee5d 100644
--- a/audio/tracker/distinfo
+++ b/audio/tracker/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/11/10 20:07:17 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/03/17 08:04:15 jlam Exp $
 
 SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
 RMD160 (tracker-5.3.tgz) = d089f514ace6f64dcb90866542121b51ab5f154c
 Size (tracker-5.3.tgz) = 454803 bytes
 SHA1 (patch-aa) = da8fa5ecf7ec2a1981e642963d147c8e293d4ad8
-SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e
+SHA1 (patch-ab) = 4acd7c74548754b4d640be784aa904e24066568d
 SHA1 (patch-ac) = 76ec86b6132e4f954acefa71be30b2c702114a5c
 SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
-SHA1 (patch-af) = e159f31d04f3e1ced666197d303ff0aa39a474b6
diff --git a/audio/tracker/patches/patch-ab b/audio/tracker/patches/patch-ab
index 436e1a2f8ba..335a698bf66 100644
--- a/audio/tracker/patches/patch-ab
+++ b/audio/tracker/patches/patch-ab
@@ -1,35 +1,33 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:18 agc Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/17 08:04:15 jlam Exp $
 
-*** Docs/tracker.texinfo.orig	Thu Apr 11 21:21:05 1996
---- Docs/tracker.texinfo	Tue Nov 12 07:08:17 1996
-***************
-*** 979,992 ****
-  * Other Architectures: Porting tracker.
-  @end menu
-  
-! @node Aix, Amiga, Architecture dependent problems, Architecture Dependent problems
-  @subsection Aix
-  
-  The Aix port is slightly outdated and won't run with most recent versions of
-  Aix. There is nothing I can do about it until somebody sends me an up-to-date
-  version as I don't have access to Aix machines.
-  
-! @node Amiga, DECstation, Architecture dependent problems, Architecture dependent problems
-  @subsection Amiga
-  
-  There is currently one Amiga version running under AmigaDos. 
---- 979,992 ----
-  * Other Architectures: Porting tracker.
-  @end menu
-  
-! @node Aix, Amiga, Architecture dependent problems, Architecture dependent problems
-  @subsection Aix
-  
-  The Aix port is slightly outdated and won't run with most recent versions of
-  Aix. There is nothing I can do about it until somebody sends me an up-to-date
-  version as I don't have access to Aix machines.
-  
-! @node Amiga, DECstation, Aix, Architecture dependent problems
-  @subsection Amiga
-  
-  There is currently one Amiga version running under AmigaDos. 
+--- Docs/tracker.texinfo.orig	1996-04-11 13:21:05.000000000 -0400
++++ Docs/tracker.texinfo
+@@ -3,6 +3,11 @@
+ @setfilename tracker.info
+ @set VERSION 4.44
+ @settitle Tracker @value{VERSION} 
++@dircategory Miscellaneous
++@direntry
++* tracker: (tracker).          MOD player.
++@end direntry
++
+ @c End of header
+ @set EMAIL Marc.Espie@@ens.fr
+ @set POSTAL Marc Espie@*60 rue du 4 septembre@*87100 Limoges@*France
+@@ -979,14 +984,14 @@ filter for obvious reasons.
+ * Other Architectures: Porting tracker.
+ @end menu
+ 
+-@node Aix, Amiga, Architecture dependent problems, Architecture Dependent problems
++@node Aix, Amiga, Architecture dependent problems, Architecture dependent problems
+ @subsection Aix
+ 
+ The Aix port is slightly outdated and won't run with most recent versions of
+ Aix. There is nothing I can do about it until somebody sends me an up-to-date
+ version as I don't have access to Aix machines.
+ 
+-@node Amiga, DECstation, Architecture dependent problems, Architecture dependent problems
++@node Amiga, DECstation, Aix, Architecture dependent problems
+ @subsection Amiga
+ 
+ There is currently one Amiga version running under AmigaDos. 
diff --git a/audio/tracker/patches/patch-af b/audio/tracker/patches/patch-af
deleted file mode 100644
index 96961ff3b26..00000000000
--- a/audio/tracker/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:36:19 agc Exp $
-
---- Docs/tracker.texinfo.orig	Sun Jan 18 22:18:22 1998
-+++ Docs/tracker.texinfo	Sun Jan 18 22:19:30 1998
-@@ -3,6 +3,11 @@
- @setfilename tracker.info
- @set VERSION 4.44
- @settitle Tracker @value{VERSION} 
-+@dircategory Miscellaneous
-+@direntry
-+* tracker: (tracker).          MOD player.
-+@end direntry
-+
- @c End of header
- @set EMAIL Marc.Espie@@ens.fr
- @set POSTAL Marc Espie@*60 rue du 4 septembre@*87100 Limoges@*France