malloc.h --> stdlib.h

5 files changed, 41 insertions, 20 deletions

diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo
index c4254f12bc5..fe6afb9e03c 100644
--- a/multimedia/mpeg_encode/distinfo
+++ b/multimedia/mpeg_encode/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/03 14:20:41 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/07/30 10:25:42 joerg Exp $
 
 SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed
 RMD160 (mpeg_encode-1.5b-src.tar.gz) = 24c0a1090076630c292936639c5fb275778f6470
@@ -8,12 +8,13 @@ SHA1 (patch-ab) = f2cdf02d49b726b4fb7fb210074e7ba53b9b380b
 SHA1 (patch-ac) = 152c0bd7737a307d1aa89ae820e219300c124085
 SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8
 SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474
-SHA1 (patch-ag) = 8cc4ffab9263f33e4a7da6779cdbbb59d010b475
-SHA1 (patch-ah) = 3df51a25ecc5abdb1821958183e087a9a9345e8a
-SHA1 (patch-ai) = 62f74749d2d4652222c1d0d96c1136af25ffae2e
+SHA1 (patch-ag) = 8014bf6347a3c95d279f989c027fb2c90e33aa6e
+SHA1 (patch-ah) = a266e0cde01bab10f83f7dba1996cefc700ea416
+SHA1 (patch-ai) = 209f802d46e84c30545629079e386374d110dbf5
 SHA1 (patch-aj) = 56031b467679ce4e2ae6bcddbdb129cd8cead479
 SHA1 (patch-ak) = f28929b16bb804c691565adbe3f4c1814154ced7
 SHA1 (patch-al) = be13795b7db10224974f222ce174fb1305d0e582
 SHA1 (patch-am) = 983546e7384fc96f0f182ae23bf5ddd19f7a0008
 SHA1 (patch-an) = 69e70b75b558637b3a2afb612871f7d4a8538c92
 SHA1 (patch-ao) = a771c6445fb792f0ea0fd41710302601d45d81fe
+SHA1 (patch-ap) = b5ff080731790d0478c0f285204aa010668f23c3
diff --git a/multimedia/mpeg_encode/patches/patch-ag b/multimedia/mpeg_encode/patches/patch-ag
index 0b15f5ef4ed..7df7f98275a 100644
--- a/multimedia/mpeg_encode/patches/patch-ag
+++ b/multimedia/mpeg_encode/patches/patch-ag
@@ -1,13 +1,14 @@
-$NetBSD: patch-ag,v 1.1 2005/04/06 16:30:18 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2007/07/30 10:25:42 joerg Exp $
 
---- opts.c.orig	1995-08-15 20:34:09.000000000 +0200
+--- opts.c.orig	1995-08-15 18:34:09.000000000 +0000
 +++ opts.c
 @@ -37,9 +37,9 @@
  
  #include <stdio.h>
  #include <string.h>
 -#include "opts.h"
- #include <malloc.h>
+-#include <malloc.h>
++#include <stdlib.h>
  #include <math.h>
 +#include "opts.h"
  
diff --git a/multimedia/mpeg_encode/patches/patch-ah b/multimedia/mpeg_encode/patches/patch-ah
index b187426010c..079b6605f5d 100644
--- a/multimedia/mpeg_encode/patches/patch-ah
+++ b/multimedia/mpeg_encode/patches/patch-ah
@@ -1,18 +1,17 @@
-$NetBSD: patch-ah,v 1.1 2005/10/05 11:45:46 salo Exp $
+$NetBSD: patch-ah,v 1.2 2007/07/30 10:25:42 joerg Exp $
 
-Fix for SA17008, from Gentoo.
-
---- ../convert/eyuvtojpeg.c.orig	1995-04-14 23:16:52.000000000 +0200
-+++ ../convert/eyuvtojpeg.c	2005-10-05 13:20:02.000000000 +0200
-@@ -24,6 +24,7 @@
+--- ../convert/eyuvtojpeg.c.orig	1995-04-14 21:16:52.000000000 +0000
++++ ../convert/eyuvtojpeg.c
+@@ -24,7 +24,7 @@
   *==============*/
  #include <stdio.h>
  #include <stdlib.h>
+-#include <malloc.h>
 +#include <unistd.h>
- #include <malloc.h>
  
  typedef unsigned char uint8;
-@@ -46,8 +47,9 @@
+ 
+@@ -46,8 +46,9 @@ void AllocYCC(void);
  void	main(int argc, char **argv)
  {
      FILE *fpointer;
@@ -24,7 +23,7 @@ Fix for SA17008, from Gentoo.
  
      if ((strcmp(argv[1],"-?") == 0) ||
  	(strcmp(argv[1],"-h") == 0) ||
-@@ -98,13 +100,16 @@
+@@ -98,13 +99,16 @@ void	main(int argc, char **argv)
      YUVtoPPM();
  
      fprintf(stdout, "Writing PPM\n");
diff --git a/multimedia/mpeg_encode/patches/patch-ai b/multimedia/mpeg_encode/patches/patch-ai
index 9a004a58f60..779809512e6 100644
--- a/multimedia/mpeg_encode/patches/patch-ai
+++ b/multimedia/mpeg_encode/patches/patch-ai
@@ -1,10 +1,18 @@
-$NetBSD: patch-ai,v 1.1 2005/10/05 11:45:46 salo Exp $
+$NetBSD: patch-ai,v 1.2 2007/07/30 10:25:42 joerg Exp $
 
 Fix for SA17008, from Gentoo.
 
---- ../convert/eyuvtoppm.c.orig	1995-04-14 23:16:52.000000000 +0200
-+++ ../convert/eyuvtoppm.c	2005-10-05 13:16:27.000000000 +0200
-@@ -99,13 +99,9 @@
+--- ../convert/eyuvtoppm.c.orig	1995-04-14 21:16:52.000000000 +0000
++++ ../convert/eyuvtoppm.c
+@@ -24,7 +24,6 @@
+  *==============*/
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ typedef unsigned char uint8;
+ 
+@@ -99,13 +98,9 @@ void	main(int argc, char **argv)
      fpointer = fopen(dest, "w");
      if (fpointer == NULL) {
        fprintf(stderr, "Problems opening %s!\n", dest);
diff --git a/multimedia/mpeg_encode/patches/patch-ap b/multimedia/mpeg_encode/patches/patch-ap
new file mode 100644
index 00000000000..783ea86b8be
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2007/07/30 10:25:42 joerg Exp $
+
+--- ../convert/mpeg_demux.c.orig	2007-07-30 10:08:47.000000000 +0000
++++ ../convert/mpeg_demux.c
+@@ -19,7 +19,6 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ 
+-#include <malloc.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>