[pkgsrc/trunk]: pkgsrc/graphics/mplex Make this build with gcc3 (use <assert....

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4759ecf3b865
branches:  trunk
changeset: 465027:4759ecf3b865
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Dec 19 18:25:57 2003 +0000

description:
Make this build with gcc3 (use <assert.h> explicitly, rather than relying
on implicit inclusion).

We might as well use pkgsrc's libtool.

diffstat:

 graphics/mplex/Makefile         |   3 ++-
 graphics/mplex/distinfo         |   5 ++++-
 graphics/mplex/patches/patch-aa |  12 ++++++++++++
 graphics/mplex/patches/patch-ab |  12 ++++++++++++
 graphics/mplex/patches/patch-ac |  12 ++++++++++++
 5 files changed, 42 insertions(+), 2 deletions(-)

diffs (77 lines):

diff -r a93484e7ba71 -r 4759ecf3b865 graphics/mplex/Makefile
--- a/graphics/mplex/Makefile   Fri Dec 19 18:21:03 2003 +0000
+++ b/graphics/mplex/Makefile   Fri Dec 19 18:25:57 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/13 20:14:27 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/19 18:25:57 agc Exp $
 
 DISTNAME=      mjpegtools-1.6.0
 PKGNAME=       mplex-1.6.0
@@ -15,6 +15,7 @@
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
 USE_GCC_SHLIB= yes
+LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
 do-build:
        cd ${WRKSRC}/utils && ${GMAKE}
diff -r a93484e7ba71 -r 4759ecf3b865 graphics/mplex/distinfo
--- a/graphics/mplex/distinfo   Fri Dec 19 18:21:03 2003 +0000
+++ b/graphics/mplex/distinfo   Fri Dec 19 18:25:57 2003 +0000
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/11/23 22:03:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/12/19 18:25:57 agc Exp $
 
 SHA1 (mjpegtools-1.6.0.tar.gz) = 07637802c94cff2363ca53529ba5e14d0786d6d6
 Size (mjpegtools-1.6.0.tar.gz) = 928991 bytes
+SHA1 (patch-aa) = 136c2e6068beec6676e328e213ddb9164d9e9489
+SHA1 (patch-ab) = e8207b661a8204b23ecc36e0b60844bfba4e1494
+SHA1 (patch-ac) = 47b2d73ae5d8d697cacc00fa7c5b05b39c2ff789
diff -r a93484e7ba71 -r 4759ecf3b865 graphics/mplex/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mplex/patches/patch-aa   Fri Dec 19 18:25:57 2003 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/multplex.cc  2003/12/19 18:16:29     1.1
++++ mplex/multplex.cc  2003/12/19 18:17:25
+@@ -3,6 +3,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <assert.h>
+ 
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
diff -r a93484e7ba71 -r 4759ecf3b865 graphics/mplex/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mplex/patches/patch-ab   Fri Dec 19 18:25:57 2003 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/systems.cc   2003/12/19 18:19:54     1.1
++++ mplex/systems.cc   2003/12/19 18:20:07
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <assert.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include "systems.hh"
diff -r a93484e7ba71 -r 4759ecf3b865 graphics/mplex/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mplex/patches/patch-ac   Fri Dec 19 18:25:57 2003 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/stillsstream.cc      2003/12/19 18:20:51     1.1
++++ mplex/stillsstream.cc      2003/12/19 18:21:08
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include <format_codes.h>
++#include <assert.h>
+ 
+ #include "stillsstream.hh"
+ #include "interact.hh"