From ba6c2d982eac0cce38947cc220425acedcb06f93 Mon Sep 17 00:00:00 2001
From: danw <danw>
Date: Sat, 4 Oct 2003 15:54:39 +0000
Subject: Remove malloc.h includes and use stdlib.h everywhere. (Fixes Darwin
 build)

---
 graphics/mpeg-lib/distinfo         | 30 +++++++++++++++---------------
 graphics/mpeg-lib/patches/patch-aa | 18 ++++++++++++------
 graphics/mpeg-lib/patches/patch-ab |  6 ++----
 graphics/mpeg-lib/patches/patch-ac | 11 +++++------
 graphics/mpeg-lib/patches/patch-ad | 12 ++++++------
 graphics/mpeg-lib/patches/patch-ae | 12 +++++++-----
 graphics/mpeg-lib/patches/patch-af | 13 +++++++------
 graphics/mpeg-lib/patches/patch-ag | 12 +++++++-----
 graphics/mpeg-lib/patches/patch-ah | 13 +++++++------
 graphics/mpeg-lib/patches/patch-ai | 12 ++++++------
 graphics/mpeg-lib/patches/patch-aj | 12 ++++++------
 graphics/mpeg-lib/patches/patch-ak | 13 +++++++------
 graphics/mpeg-lib/patches/patch-al | 13 +++++++------
 graphics/mpeg-lib/patches/patch-am | 13 +++++++------
 graphics/mpeg-lib/patches/patch-an | 13 +++++++------
 15 files changed, 108 insertions(+), 95 deletions(-)

diff --git a/graphics/mpeg-lib/distinfo b/graphics/mpeg-lib/distinfo
index f81f0930d27..031bbba3b27 100644
--- a/graphics/mpeg-lib/distinfo
+++ b/graphics/mpeg-lib/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.5 2001/08/06 15:00:31 tron Exp $
+$NetBSD: distinfo,v 1.6 2003/10/04 15:54:39 danw Exp $
 
 SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
 Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
-SHA1 (patch-aa) = 1dc0008ccba4ea2db49b5d42ffde588b19e376c2
-SHA1 (patch-ab) = f81f1e71ae709f98663470a61cbe05e9fb1f387f
-SHA1 (patch-ac) = 520581e27188602d833ff6b379a9a6cbbff84bb2
-SHA1 (patch-ad) = eebb31fcb51c20eee42078ea361e907030948c87
-SHA1 (patch-ae) = af6a9886fa0b6152831ccb34419ebe049332d688
-SHA1 (patch-af) = 3c79a7425fa62372530ea129f0e1f782c1ab4614
-SHA1 (patch-ag) = 5d3fa43eb1fff3d0b9178bf5e00dad22e139739a
-SHA1 (patch-ah) = 80436c19f6e097c853f4926a65779058dbbe5c36
-SHA1 (patch-ai) = 91cc6cfc73d6938a187c02aa606248ea81007fab
-SHA1 (patch-aj) = d89264c70cae7debf08cceb38e19ada642391a11
-SHA1 (patch-ak) = 213af68860c8dd8901555cb04aa9359a77666cf3
-SHA1 (patch-al) = 5d5c793a18d34327fce2edf544c10a3fd94c9e80
-SHA1 (patch-am) = 67b3bbe3bab8354b853bdf99535a2e11501500f9
-SHA1 (patch-an) = 59149da95dc7a6c85b4e219714fd8e0bfa5de1c2
+SHA1 (patch-aa) = 6f43a8a94c8efa3f241891fe479a1b93406d2266
+SHA1 (patch-ab) = a97c3c8b411975ee51ef25cd6a0a66aa967ac064
+SHA1 (patch-ac) = 20b8e16bcbcd183441855a9277b9042d2ec7bcf0
+SHA1 (patch-ad) = 822fcd6a1908b4b0c31b9a565929bbd0f37f31af
+SHA1 (patch-ae) = 79ff90b04dc9e9b1a55bb5800263f29d193d0abe
+SHA1 (patch-af) = b4cbba0e6e08ee5b9e72f7ff8ede0fc3f615aab0
+SHA1 (patch-ag) = fbc47b594a0c7184d46a72f748109b3114e94234
+SHA1 (patch-ah) = 9c9460a86c6384955016c42e58b0f4e66743650e
+SHA1 (patch-ai) = 9573d9b58fa55ead4d51ede01f4f3fe24121408a
+SHA1 (patch-aj) = 5fbff44803b11344fde25f94f3466f4af3e40633
+SHA1 (patch-ak) = e6dd6f3e902ee774d06aa93cfa6ac5ead9df7aa9
+SHA1 (patch-al) = f63df4035b3f33ac778e7bde1e478434826c34ba
+SHA1 (patch-am) = b2f7afdd74c28bd6345f1ac291577103bf8196f3
+SHA1 (patch-an) = 3b23f238fcdc1321d17d19be74c7e670b249c5fc
 SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
 SHA1 (patch-ap) = 89ce52d7878966120638a1bce22666ee8b83fa7e
diff --git a/graphics/mpeg-lib/patches/patch-aa b/graphics/mpeg-lib/patches/patch-aa
index fbd9d43e402..e22e87ef3ab 100644
--- a/graphics/mpeg-lib/patches/patch-aa
+++ b/graphics/mpeg-lib/patches/patch-aa
@@ -1,20 +1,26 @@
-$NetBSD: patch-aa,v 1.4 2001/08/02 13:28:45 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2003/10/04 15:54:39 danw Exp $
 
 --- wrapper.c.orig	Sun Aug  8 20:22:14 1999
-+++ wrapper.c
-@@ -55,6 +55,11 @@
++++ wrapper.c	Mon Sep 15 22:50:34 2003
+@@ -44,7 +44,6 @@
+ ---------------------------------------------------------------------------- */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -55,6 +54,9 @@
  #include "globals.h"
  #include "my_dmalloc.h"
  
-+#ifdef __NetBSD__
 +#include <stdlib.h>
 +#include <string.h>
-+#endif
 +
  #define BUF_LENGTH 80000
  
  
-@@ -341,7 +346,7 @@
+@@ -341,7 +343,7 @@
  @CREATED    : 94/6/17, Greg Ward.
  @MODIFIED   : 95/3/18, GW: added MPEG_CMAP_INDEX option.
  ---------------------------------------------------------------------------- */
diff --git a/graphics/mpeg-lib/patches/patch-ab b/graphics/mpeg-lib/patches/patch-ab
index 4827ac42512..4188c44ea62 100644
--- a/graphics/mpeg-lib/patches/patch-ab
+++ b/graphics/mpeg-lib/patches/patch-ab
@@ -1,14 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2001/08/02 13:28:45 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- globals.c.orig	Sat Jul 31 20:17:20 1999
 +++ globals.c
-@@ -63,6 +63,9 @@
+@@ -63,6 +63,7 @@
  #include "globals.h"
  #include "my_dmalloc.h"
  
-+#ifdef __NetBSD__
 +#include <string.h>
-+#endif
  
  /* Universal global variables -- those needed by the decoding engine: */
  
diff --git a/graphics/mpeg-lib/patches/patch-ac b/graphics/mpeg-lib/patches/patch-ac
index c97c9add1f0..b96c56423e7 100644
--- a/graphics/mpeg-lib/patches/patch-ac
+++ b/graphics/mpeg-lib/patches/patch-ac
@@ -1,15 +1,14 @@
-$NetBSD: patch-ac,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- 24bit.c.orig	Fri Jul 23 23:59:25 1999
-+++ 24bit.c
-@@ -30,6 +30,10 @@
++++ 24bit.c	Mon Sep 15 22:49:14 2003
+@@ -30,7 +30,8 @@
  #include "dither.h"
  #include "proto.h"
  #include <time.h>
-+#ifdef __NetBSD__
+-#include <malloc.h>
 +#include <stdlib.h>
-+#endif
 +
- #include <malloc.h>
  #include "my_dmalloc.h"
  
+ /*
diff --git a/graphics/mpeg-lib/patches/patch-ad b/graphics/mpeg-lib/patches/patch-ad
index 89639069552..09e4794d532 100644
--- a/graphics/mpeg-lib/patches/patch-ad
+++ b/graphics/mpeg-lib/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- gdith.c.orig	Sat Jul 24 00:04:42 1999
-+++ gdith.c
-@@ -23,6 +23,9 @@
++++ gdith.c	Mon Sep 15 22:49:55 2003
+@@ -21,8 +21,8 @@
+ 
+ 
  #include <config.h>
- #include <malloc.h>
+-#include <malloc.h>
  #include <memory.h>
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "mpeg.h"
  #include "dither.h"
  #include "video.h"
diff --git a/graphics/mpeg-lib/patches/patch-ae b/graphics/mpeg-lib/patches/patch-ae
index c555b178150..21a13d980e6 100644
--- a/graphics/mpeg-lib/patches/patch-ae
+++ b/graphics/mpeg-lib/patches/patch-ae
@@ -1,14 +1,16 @@
-$NetBSD: patch-ae,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- fs2.c.orig	Fri Jul 23 23:40:17 1999
-+++ fs2.c
-@@ -23,6 +23,9 @@
++++ fs2.c	Mon Sep 15 22:49:38 2003
+@@ -19,10 +19,10 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
  #include "dither.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "fs2.h"
  #include "proto.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-af b/graphics/mpeg-lib/patches/patch-af
index 25b528064ce..dd0fe8276e0 100644
--- a/graphics/mpeg-lib/patches/patch-af
+++ b/graphics/mpeg-lib/patches/patch-af
@@ -1,14 +1,15 @@
-$NetBSD: patch-af,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-af,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs2fast.c
-@@ -22,6 +22,9 @@
- #include <malloc.h>
++++ fs2fast.c	Mon Sep 15 22:49:44 2003
+@@ -19,9 +19,9 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ag b/graphics/mpeg-lib/patches/patch-ag
index f4a48913fd3..b272edf2188 100644
--- a/graphics/mpeg-lib/patches/patch-ag
+++ b/graphics/mpeg-lib/patches/patch-ag
@@ -1,14 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- fs4.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs4.c
-@@ -25,6 +25,9 @@
++++ fs4.c	Mon Sep 15 22:49:49 2003
+@@ -21,10 +21,10 @@
+ /* This file contains C code to do YCrCb -> colormap space. */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "fs4.h"
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ah b/graphics/mpeg-lib/patches/patch-ah
index b7f06b98699..ec475c7bfce 100644
--- a/graphics/mpeg-lib/patches/patch-ah
+++ b/graphics/mpeg-lib/patches/patch-ah
@@ -1,14 +1,15 @@
-$NetBSD: patch-ah,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- hybrid.c.orig	Fri Jul 23 23:50:51 1999
-+++ hybrid.c
-@@ -24,6 +24,9 @@
- #include <malloc.h>
++++ hybrid.c	Mon Sep 15 22:50:01 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ai b/graphics/mpeg-lib/patches/patch-ai
index e0147496ccb..0bbeae2cfbb 100644
--- a/graphics/mpeg-lib/patches/patch-ai
+++ b/graphics/mpeg-lib/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
-+++ hybriderr.c
-@@ -26,6 +26,9 @@
++++ hybriderr.c	Mon Sep 15 22:50:05 2003
+@@ -24,8 +24,8 @@
+ 
+ #include <config.h>
  #include <memory.h>
- #include <malloc.h>
+-#include <malloc.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-aj b/graphics/mpeg-lib/patches/patch-aj
index 5b1ddf446b5..4b5cf7e1cd9 100644
--- a/graphics/mpeg-lib/patches/patch-aj
+++ b/graphics/mpeg-lib/patches/patch-aj
@@ -1,14 +1,14 @@
-$NetBSD: patch-aj,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-aj,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- 2x2.c.orig	Sat Jul 24 00:06:22 1999
-+++ 2x2.c
-@@ -23,6 +23,9 @@
++++ 2x2.c	Mon Sep 15 22:49:32 2003
+@@ -21,8 +21,8 @@
+ 
+ #include <config.h>
  #include <stdlib.h>
- #include <malloc.h>
+-#include <malloc.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "dither.h"
  #include "proto.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ak b/graphics/mpeg-lib/patches/patch-ak
index b8d04454454..c527a996629 100644
--- a/graphics/mpeg-lib/patches/patch-ak
+++ b/graphics/mpeg-lib/patches/patch-ak
@@ -1,14 +1,15 @@
-$NetBSD: patch-ak,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-ak,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- mono.c.orig	Fri Jul 23 23:59:22 1999
-+++ mono.c
-@@ -27,6 +27,9 @@
- #include <malloc.h>
++++ mono.c	Mon Sep 15 22:50:16 2003
+@@ -24,9 +24,9 @@
+  */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-al b/graphics/mpeg-lib/patches/patch-al
index 00d2c1a6860..a1da9c1fd7e 100644
--- a/graphics/mpeg-lib/patches/patch-al
+++ b/graphics/mpeg-lib/patches/patch-al
@@ -1,14 +1,15 @@
-$NetBSD: patch-al,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-al,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- ordered.c.orig	Fri Jul 23 23:53:40 1999
-+++ ordered.c
-@@ -24,6 +24,9 @@
- #include <malloc.h>
++++ ordered.c	Mon Sep 15 22:50:21 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-am b/graphics/mpeg-lib/patches/patch-am
index 70df3427880..f83d7980826 100644
--- a/graphics/mpeg-lib/patches/patch-am
+++ b/graphics/mpeg-lib/patches/patch-am
@@ -1,14 +1,15 @@
-$NetBSD: patch-am,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-am,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- ordered2.c.orig	Fri Jul 23 23:54:01 1999
-+++ ordered2.c
-@@ -24,6 +24,9 @@
- #include <malloc.h>
++++ ordered2.c	Mon Sep 15 22:50:25 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-an b/graphics/mpeg-lib/patches/patch-an
index c0e57181e50..fab06e9e3e9 100644
--- a/graphics/mpeg-lib/patches/patch-an
+++ b/graphics/mpeg-lib/patches/patch-an
@@ -1,14 +1,15 @@
-$NetBSD: patch-an,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD: patch-an,v 1.4 2003/10/04 15:54:39 danw Exp $
 
 --- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
-+++ mb_ordered.c
-@@ -24,6 +24,9 @@
- #include <malloc.h>
++++ mb_ordered.c	Mon Sep 15 22:50:11 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
 +#include <stdlib.h>
-+#endif
  #include "proto.h"
  #include "dither.h"
  #include "my_dmalloc.h"
-- 
cgit v1.2.3