Remove incorrect patch hunks that make perfectly good static variables

into globals.

5 files changed, 7 insertions, 41 deletions

diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index e62cf1a4573..c2d322dc4b4 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/01/20 20:01:23 sketch Exp $
+# $NetBSD: Makefile,v 1.19 2011/09/04 21:20:06 dholland Exp $
 #
 
 DISTNAME=	toolame-02l
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=toolame/}
 EXTRACT_SUFX=	.tgz
diff --git a/audio/toolame/distinfo b/audio/toolame/distinfo
index de0d418fdb0..d76600967e6 100644
--- a/audio/toolame/distinfo
+++ b/audio/toolame/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/09/04 21:17:13 dholland Exp $
+$NetBSD: distinfo,v 1.6 2011/09/04 21:20:06 dholland Exp $
 
 SHA1 (toolame-02l.tgz) = 9f58345ec5d552f49a9ad598e6eb2dc126cb10b4
 RMD160 (toolame-02l.tgz) = 65ff0757f48080093df9e1932b5952199d03f5c6
 Size (toolame-02l.tgz) = 127493 bytes
-SHA1 (patch-aa) = 44633513f0ad2768ad1531ab41e059659d661630
-SHA1 (patch-ab) = 3dae25436a931eea5fe33aa0dcca16c46e529ed7
+SHA1 (patch-aa) = 873031612d0f8bb7f41d49be647f24d73dc15384
+SHA1 (patch-ab) = 97c2c56083f89ef0b999e692db4f38eb405cd3fb
 SHA1 (patch-ac) = 35901599b52f09e6b50db7fde81d3332271eb0ef
-SHA1 (patch-ad) = 9b3f8fc15012714da8b1c701103b5aa2ed77ac87
diff --git a/audio/toolame/patches/patch-aa b/audio/toolame/patches/patch-aa
index e5099f35ad9..9e8e43484eb 100644
--- a/audio/toolame/patches/patch-aa
+++ b/audio/toolame/patches/patch-aa
@@ -1,18 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2005/07/30 11:30:03 grant Exp $
+$NetBSD: patch-aa,v 1.3 2011/09/04 21:20:06 dholland Exp $
 
 these patches correct invalid C code that declares variables after statements.
 
 --- psycho_3.c.orig	2003-03-01 20:35:14.000000000 +1100
 +++ psycho_3.c
-@@ -22,7 +22,7 @@
- 
- /* Keep a table to fudge the adding of dB */
- #define DBTAB 1000
--static double dbtable[DBTAB];
-+double dbtable[DBTAB];
- 
- #define CRITBANDMAX 32 /* this is much higher than it needs to be. really only about 24 */
- int cbands=0; /* How many critical bands there really are */
 @@ -133,8 +133,8 @@ void psycho_3_fft(FLOAT sample[BLKSIZE],
    static FLOAT *window;
  
diff --git a/audio/toolame/patches/patch-ab b/audio/toolame/patches/patch-ab
index 3dbe44b8288..0282cc5975a 100644
--- a/audio/toolame/patches/patch-ab
+++ b/audio/toolame/patches/patch-ab
@@ -1,20 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2005/07/30 11:30:03 grant Exp $
+$NetBSD: patch-ab,v 1.3 2011/09/04 21:20:06 dholland Exp $
 
 these patches correct invalid C code that declares variables after statements.
 
 --- psycho_4.c.orig	2003-03-02 11:50:48.000000000 +1100
 +++ psycho_4.c
-@@ -83,8 +83,8 @@ static F2HBLK *r, *phi_sav;
- 
- #define TRIGTABLESIZE 3142
- #define TRIGTABLESCALE 1000.0
--static FLOAT cos_table[TRIGTABLESIZE];
--static FLOAT sin_table[TRIGTABLESIZE];
-+FLOAT cos_table[TRIGTABLESIZE];
-+FLOAT sin_table[TRIGTABLESIZE];
- void psycho_4_trigtable_init(void) {
- 
-   int i;
 @@ -361,6 +361,7 @@ void psycho_4_init (double sfreq, option
    }  
   
diff --git a/audio/toolame/patches/patch-ad b/audio/toolame/patches/patch-ad
deleted file mode 100644
index a5f16215ccd..00000000000
--- a/audio/toolame/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/24 02:28:22 grant Exp $
-
---- fft.c.orig	2003-03-02 18:14:45.000000000 +1100
-+++ fft.c
-@@ -1187,7 +1187,7 @@ static void fht (FLOAT * fz)
- #ifdef NEWATAN
- #define ATANSIZE 2000
- #define ATANSCALE 50.0
--  static FLOAT atan_t[ATANSIZE];
-+  FLOAT atan_t[ATANSIZE];
- 
- INLINE FLOAT atan_table(FLOAT y, FLOAT x) {
-   int index;