>Number:         21912
>Category:       pkg
>Synopsis:       pkgsrc/graphics/mpeg-lib doesn't build on !NetBSD systems + fix
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 17 01:49:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Juan RP
>Release:        NetBSD 1.6T
>Organization:
>Environment:
System: NetBSD Insomnio 1.6T NetBSD 1.6T (Insomnio) #6: Tue Jun 10 06:28:59 CEST 2003 juan@Nocturno:/home/juan/current/obj/sys/arch/i386/compile/Insomnio i386
Architecture: i386
Machine: i386
>Description:

I can't compile the package mpeg-lib in a !NetBSD system, the
fix seems easy ...

Without these patches there is problems with malloc.h, etc, we need
to include stdlib.h.

>How-To-Repeat:
>Fix:


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/distinfo,v
retrieving revision 1.5
diff -b -u -r1.5 distinfo
--- distinfo	2001/08/06 15:00:31	1.5
+++ distinfo	2003/06/17 01:41:25
@@ -2,19 +2,19 @@
 
 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-aa) = db8d6ede44c0c647eb67942ddef0800af7a51edc
 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-ac) = 7ba53181eb4ccd2cd6cb735ecd8b5892cbd0c9be
+SHA1 (patch-ad) = cb3a2b5bdee3f40b8605edafa03e7cacdccc736b
+SHA1 (patch-ae) = 1d774faea299447a3524946625bcfc60bb7e9911
+SHA1 (patch-af) = f1a9fe641779d9f6f2b3eb3b8f93927534cae1cd
+SHA1 (patch-ag) = 8e188f712f38e77b5d2d5985abbda177e86d3a06
+SHA1 (patch-ah) = 3a13a7b961d2396dd08be570bffd8c00d76352a1
+SHA1 (patch-ai) = 8e34bd6af11ad2e08f838187b9ffd826664a5a7a
+SHA1 (patch-aj) = ba475ce1c756ce7fc55aeb789279ad1cdd3e8efe
+SHA1 (patch-ak) = d8f57259c0aa807423cbd99820b27da74c654657
+SHA1 (patch-al) = f7e25c9b411de03a92dfba363b027ba91c8f9ec0
+SHA1 (patch-am) = 5a66835dd0bec555c2ad787faa157275e8c9bec2
+SHA1 (patch-an) = 07bbb7263c4201ddc4567d344f2f758e190601f4
 SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
 SHA1 (patch-ap) = 89ce52d7878966120638a1bce22666ee8b83fa7e
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-aa,v
retrieving revision 1.4
diff -b -u -r1.4 patch-aa
--- patches/patch-aa	2001/08/02 13:28:45	1.4
+++ patches/patch-aa	2003/06/17 01:41:25
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2001/08/02 13:28:45 jlam Exp $
+$NetBSD$
 
---- wrapper.c.orig	Sun Aug  8 20:22:14 1999
-+++ wrapper.c
-@@ -55,6 +55,11 @@
- #include "globals.h"
- #include "my_dmalloc.h"
+--- wrapper.c.orig	Tue Jun 17 03:13:55 2003
++++ wrapper.c	Tue Jun 17 03:15:07 2003
+@@ -44,7 +44,12 @@
+ ---------------------------------------------------------------------------- */
  
-+#ifdef __NetBSD__
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <stdlib.h>
 +#include <string.h>
++#else
+ #include <malloc.h>
 +#endif
-+
- #define BUF_LENGTH 80000
- 
- 
+ #include <memory.h>
+ #include <stdio.h>
+ #include <errno.h>
 @@ -341,7 +346,7 @@
  @CREATED    : 94/6/17, Greg Ward.
  @MODIFIED   : 95/3/18, GW: added MPEG_CMAP_INDEX option.
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ac,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ac
--- patches/patch-ac	2001/08/02 13:28:46	1.3
+++ patches/patch-ac	2003/06/17 01:41:25
@@ -1,15 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- 24bit.c.orig	Fri Jul 23 23:59:25 1999
-+++ 24bit.c
-@@ -30,6 +30,10 @@
+--- 24bit.c.orig	Tue Jun 17 03:15:21 2003
++++ 24bit.c	Tue Jun 17 03:16:00 2003
+@@ -30,7 +30,11 @@
  #include "dither.h"
  #include "proto.h"
  #include <time.h>
-+#ifdef __NetBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <stdlib.h>
-+#endif
-+
++#else
  #include <malloc.h>
++#endif
  #include "my_dmalloc.h"
  
+ /*
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ad,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ad
--- patches/patch-ad	2001/08/02 13:28:46	1.3
+++ patches/patch-ad	2003/06/17 01:41:25
@@ -1,14 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- gdith.c.orig	Sat Jul 24 00:04:42 1999
-+++ gdith.c
-@@ -23,6 +23,9 @@
+--- gdith.c.orig	Tue Jun 17 03:21:01 2003
++++ gdith.c	Tue Jun 17 03:21:39 2003
+@@ -21,7 +21,11 @@
+ 
+ 
  #include <config.h>
- #include <malloc.h>
- #include <memory.h>
-+#ifdef __NetBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <stdlib.h>
++#else
+ #include <malloc.h>
 +#endif
+ #include <memory.h>
  #include "mpeg.h"
  #include "dither.h"
- #include "video.h"
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ae,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ae
--- patches/patch-ae	2001/08/02 13:28:46	1.3
+++ patches/patch-ae	2003/06/17 01:41:25
@@ -1,14 +1,16 @@
-$NetBSD: patch-ae,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- fs2.c.orig	Fri Jul 23 23:40:17 1999
-+++ fs2.c
-@@ -23,6 +23,9 @@
+--- fs2.c.orig	Tue Jun 17 03:27:49 2003
++++ fs2.c	Tue Jun 17 03:28:29 2003
+@@ -19,7 +19,11 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
  #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"
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-af,v
retrieving revision 1.3
diff -b -u -r1.3 patch-af
--- patches/patch-af	2001/08/02 13:28:46	1.3
+++ patches/patch-af	2003/06/17 01:41:25
@@ -1,14 +1,16 @@
-$NetBSD: patch-af,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs2fast.c
-@@ -22,6 +22,9 @@
+--- fs2fast.c.orig	Tue Jun 17 03:32:53 2003
++++ fs2fast.c	Tue Jun 17 03:33:47 2003
+@@ -19,7 +19,11 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ag,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ag
--- patches/patch-ag	2001/08/02 13:28:46	1.3
+++ patches/patch-ag	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- fs4.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs4.c
-@@ -25,6 +25,9 @@
+--- fs4.c.orig	Tue Jun 17 03:34:17 2003
++++ fs4.c	Tue Jun 17 03:34:31 2003
+@@ -21,7 +21,11 @@
+ /* This file contains C code to do YCrCb -> colormap space. */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
  #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"
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ah,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ah
--- patches/patch-ah	2001/08/02 13:28:46	1.3
+++ patches/patch-ah	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-ah,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- hybrid.c.orig	Fri Jul 23 23:50:51 1999
-+++ hybrid.c
-@@ -24,6 +24,9 @@
+--- hybrid.c.orig	Tue Jun 17 03:35:06 2003
++++ hybrid.c	Tue Jun 17 03:35:19 2003
+@@ -21,7 +21,11 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ai,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ai
--- patches/patch-ai	2001/08/02 13:28:46	1.3
+++ patches/patch-ai	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-ai,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
-+++ hybriderr.c
-@@ -26,6 +26,9 @@
+--- hybriderr.c.orig	Tue Jun 17 03:36:08 2003
++++ hybriderr.c	Tue Jun 17 03:36:23 2003
+@@ -24,7 +24,11 @@
+ 
+ #include <config.h>
  #include <memory.h>
- #include <malloc.h>
- #include "video.h"
-+#ifdef __NetBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <stdlib.h>
++#else
+ #include <malloc.h>
 +#endif
+ #include "video.h"
  #include "proto.h"
  #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-aj,v
retrieving revision 1.3
diff -b -u -r1.3 patch-aj
--- patches/patch-aj	2001/08/02 13:28:46	1.3
+++ patches/patch-aj	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-aj,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- 2x2.c.orig	Sat Jul 24 00:06:22 1999
-+++ 2x2.c
-@@ -23,6 +23,9 @@
+--- 2x2.c.orig	Tue Jun 17 03:36:52 2003
++++ 2x2.c	Tue Jun 17 03:37:23 2003
+@@ -21,7 +21,11 @@
+ 
+ #include <config.h>
  #include <stdlib.h>
- #include <malloc.h>
- #include "video.h"
-+#ifdef __NetBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <stdlib.h>
++#else
+ #include <malloc.h>
 +#endif
+ #include "video.h"
  #include "dither.h"
  #include "proto.h"
- #include "my_dmalloc.h"
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-ak,v
retrieving revision 1.3
diff -b -u -r1.3 patch-ak
--- patches/patch-ak	2001/08/02 13:28:46	1.3
+++ patches/patch-ak	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-ak,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- mono.c.orig	Fri Jul 23 23:59:22 1999
-+++ mono.c
-@@ -27,6 +27,9 @@
+--- mono.c.orig	Tue Jun 17 03:38:06 2003
++++ mono.c	Tue Jun 17 03:38:20 2003
+@@ -24,7 +24,11 @@
+  */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-al,v
retrieving revision 1.3
diff -b -u -r1.3 patch-al
--- patches/patch-al	2001/08/02 13:28:46	1.3
+++ patches/patch-al	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-al,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- ordered.c.orig	Fri Jul 23 23:53:40 1999
-+++ ordered.c
-@@ -24,6 +24,9 @@
+--- ordered.c.orig	Tue Jun 17 03:39:16 2003
++++ ordered.c	Tue Jun 17 03:39:29 2003
+@@ -21,7 +21,11 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-am,v
retrieving revision 1.3
diff -b -u -r1.3 patch-am
--- patches/patch-am	2001/08/02 13:28:46	1.3
+++ patches/patch-am	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-am,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- ordered2.c.orig	Fri Jul 23 23:54:01 1999
-+++ ordered2.c
-@@ -24,6 +24,9 @@
+--- ordered2.c.orig	Tue Jun 17 03:39:57 2003
++++ ordered2.c	Tue Jun 17 03:40:10 2003
+@@ -21,7 +21,11 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
Index: patches/patch-an
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mpeg-lib/patches/patch-an,v
retrieving revision 1.3
diff -b -u -r1.3 patch-an
--- patches/patch-an	2001/08/02 13:28:46	1.3
+++ patches/patch-an	2003/06/17 01:41:26
@@ -1,14 +1,16 @@
-$NetBSD: patch-an,v 1.3 2001/08/02 13:28:46 jlam Exp $
+$NetBSD$
 
---- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
-+++ mb_ordered.c
-@@ -24,6 +24,9 @@
+--- mb_ordered.c.orig	Tue Jun 17 03:40:41 2003
++++ mb_ordered.c	Tue Jun 17 03:40:53 2003
+@@ -21,7 +21,11 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#else
  #include <malloc.h>
++#endif
  #include <memory.h>
  #include "video.h"
-+#ifdef __NetBSD__
-+#include <stdlib.h>
-+#endif
  #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
>Release-Note:
>Audit-Trail:
>Unformatted: