Another day, another C++ dialect. Does not fix build, but advances it

substantially. Next problem is:

cc1: warnings being treated as errors
config.c: In function 'enter_chn':
config.c:636:21: error: array subscript is above array bounds
config.c:637:21: error: array subscript is above array bounds

24 files changed, 403 insertions, 1 deletions

diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index da69529d43b..6da47a2a393 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2010/12/13 21:32:14 chuck Exp $
+$NetBSD: distinfo,v 1.16 2011/12/22 14:44:42 dholland Exp $
 
 SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3
 RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a
@@ -16,3 +16,26 @@ SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7
 SHA1 (patch-ak) = 8a89f6eb4860b12479a062303c15a4f09416c964
 SHA1 (patch-al) = 5966b9c64a7d305b3e3b70717036ccebb5c3bdcd
 SHA1 (patch-am) = a0c9eb088b02d460925fb00e3f76b3fce186b187
+SHA1 (patch-common_video_iso-mpeg4_include_bitstrm_hpp) = 0706ccacbeefd9e416ad19e19a5db761166c3c18
+SHA1 (patch-common_video_iso-mpeg4_include_entropy_hpp) = b3fe3821186102a27ba70a6f7b2461909ecf7fb0
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp) = cdc0eeeef9faf97aa8a9e29ed107b40dcf179efd
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp) = 4452af67a3ac0352dcc78388b5f8cec7e17f1bbd
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp) = c59fe6335a9e04539cedb1ef69844983065af39e
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp) = 5fa1be1847fa776db1de70612757f362c6d7a4fd
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp) = 5210bbf90a9a1b07b29e96a7f5e93d83b6a3b121
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp) = 62fd59b3e40524ba4ad90f0d1538d4a3c7df4421
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp) = 1702cf094a8eeab45a1ceeb397bd86dd9c52ad8f
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp) = d47e8385c531dbe213929f70a5ffd1cf22d7f026
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp) = c4041cd35081a8419c0b81bf108b6cff93397d0b
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp) = ce53fee8cb41f9bad6e1bccf514107a14336a585
+SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp) = 2d7ba52bbe723ab30d8d243ed65727b77b757126
+SHA1 (patch-common_video_iso-mpeg4_src_sys__error_cpp) = e418ad95f222478e08d4e14a922a45063bac55c8
+SHA1 (patch-common_video_iso-mpeg4_src_sys__mode_cpp) = 9e51f0cb3c81fa1dbdc3fa5e4a7802eb8e1ae256
+SHA1 (patch-common_video_iso-mpeg4_src_sys__rrv_cpp) = 3a4a6b4b7caa63ecde5030376a86db28e04e1701
+SHA1 (patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp) = 3a400efaf50055cf8544a94d7b4fa05cb2d7ff58
+SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp) = 27ccb1d800b35c6f641a794389e9a9c8f22500f1
+SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp) = 2842a4c5c29be1d809c295d2484100706aeb1d9c
+SHA1 (patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp) = c1345fadb405a203542bb72df4bd0b47ecdb6ddd
+SHA1 (patch-common_video_iso-mpeg4_src_type__yuvac_cpp) = 5ff0d2a25b42832bd11a42043b264e36dff8f5ac
+SHA1 (patch-common_video_iso-mpeg4_src_type__yuvai_cpp) = ee62e50f089d9a198ac40045960b1e8c195641d9
+SHA1 (patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp) = 8e9b3ce134ebad001d942152d2e4b88a88bb4144
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp
new file mode 100644
index 00000000000..1cbb0dbeb9c
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-common_video_iso-mpeg4_include_bitstrm_hpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/include/bitstrm.hpp~	2005-09-08 22:02:55.000000000 +0000
++++ common/video/iso-mpeg4/include/bitstrm.hpp
+@@ -45,8 +45,9 @@ Revision History:
+ #ifndef _BITSTREAM_HPP_
+ #define _BITSTREAM_HPP_
+ #include "inbits.h"
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
++using namespace std;
+ 
+ class CIOBitStream
+ {
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp
new file mode 100644
index 00000000000..10d3a2f8726
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-common_video_iso-mpeg4_include_entropy_hpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/include/entropy.hpp~	2005-06-17 20:07:56.000000000 +0000
++++ common/video/iso-mpeg4/include/entropy.hpp
+@@ -39,8 +39,9 @@ Revision History:
+ #ifndef __ENTROPY_HPP_
+ #define __ENTROPY_HPP_
+ 
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
++using namespace std;
+ 
+ class CInBitStream;
+ class COutBitStream;
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp
new file mode 100644
index 00000000000..6255fcddcd6
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
+@@ -54,7 +54,7 @@ Revision History:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp
new file mode 100644
index 00000000000..4add6e1d0da
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
+@@ -46,7 +46,7 @@ Abstract:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <assert.h>
+ 
+ #include "typeapi.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp
new file mode 100644
index 00000000000..08c3a14d5a4
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
+@@ -75,7 +75,7 @@
+ 
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "typeapi.h"
+ #include "codehead.h"
+ #include "mode.hpp"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp
new file mode 100644
index 00000000000..ebbe8eb6bd4
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
+@@ -60,7 +60,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp
new file mode 100644
index 00000000000..56f131a7de9
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
+@@ -53,7 +53,7 @@ Revision History:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp
new file mode 100644
index 00000000000..c8d6ada1cca
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_motest.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp
+@@ -67,7 +67,7 @@ Revision History:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp
new file mode 100644
index 00000000000..aaa0b362134
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
+@@ -44,7 +44,7 @@ Revision History:
+ 
+ **************************************************************************/
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <math.h>
+ #include <stdlib.h>
+ 
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp
new file mode 100644
index 00000000000..1bfd8417bb4
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
+@@ -43,7 +43,7 @@ Revision History:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp
new file mode 100644
index 00000000000..1772a50f2f3
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
+@@ -40,7 +40,7 @@ Revision History:
+ *************************************************************************/
+ 
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include <stdlib.h>
+ 
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp
new file mode 100644
index 00000000000..25bfa2395c3
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
+@@ -52,7 +52,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include "header.h"
+ #include "typeapi.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp
new file mode 100644
index 00000000000..a753325ab81
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
+@@ -73,7 +73,7 @@ Revision History:
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp
new file mode 100644
index 00000000000..cf186cb4e3f
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__error_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_error.cpp~	2005-05-04 19:55:59.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_error.cpp
+@@ -35,7 +35,7 @@ This software module was originally deve
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp
new file mode 100644
index 00000000000..95416dba018
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__mode_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_mode.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_mode.cpp
+@@ -50,7 +50,7 @@ Revision History:
+ 
+ 
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include "typeapi.h"
+ #include "mode.hpp"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp
new file mode 100644
index 00000000000..26cf6f58e53
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__rrv_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_rrv.cpp~	2005-06-17 20:07:56.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_rrv.cpp
+@@ -53,7 +53,6 @@ Revision History:
+ #include "global.hpp"
+ #include "mode.hpp"
+ #include "bitstrm.hpp"
+-class ofstream;
+ #include "sesenc.hpp"
+ #include "vopses.hpp"
+ #include "vopseenc.hpp"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp
new file mode 100644
index 00000000000..2f3ec42fb40
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp
+@@ -36,7 +36,7 @@ Revision History:
+ *************************************************************************/
+ 
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <stdlib.h>
+ 
+ #include "typeapi.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp
new file mode 100644
index 00000000000..156f8418dee
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp~	2005-09-08 22:02:55.000000000 +0000
++++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp
+@@ -42,8 +42,8 @@ Revision History:
+ 
+ *************************************************************************/
+ 
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "typeapi.h"
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp
new file mode 100644
index 00000000000..0e54aa45ce9
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/tools_entropy_huffman.cpp~	2005-06-17 20:07:56.000000000 +0000
++++ common/video/iso-mpeg4/src/tools_entropy_huffman.cpp
+@@ -55,7 +55,7 @@ Revision History:
+ #include "bitstrm.hpp"
+ 
+ #include "vlc.hpp"
+-#include <iostream.h>
++#include <iostream>
+ #ifdef __MFC_
+ #ifdef _DEBUG
+ #undef THIS_FILE
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp
new file mode 100644
index 00000000000..939897f0596
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/tools_sadct_sadct.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/tools_sadct_sadct.cpp
+@@ -37,7 +37,7 @@ Revision History:
+ #include "dct.hpp"
+ #include <math.h>
+ #if defined(__DEBUG_SADCT_) && !defined(NDEBUG)
+-#include <iostream.h>
++#include <iostream>
+ #endif
+ #ifdef __MFC_
+ #ifdef _DEBUG
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp
new file mode 100644
index 00000000000..c6004733165
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_type__yuvac_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/type_yuvac.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/type_yuvac.cpp
+@@ -39,7 +39,7 @@ Revision History:
+ 
+ *************************************************************************/
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "typeapi.h"
+ 
+ #ifdef __MFC_
+@@ -540,7 +540,7 @@ const CU8Image* CVOPU8YUVBA::getPlaneA (
+ const CU8Image* CVOPU8YUVBA::getPlane (PlaneType plnType) const
+ {
+ 	if (plnType==A_PLANE) {
+-		cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n";
++		std::cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n";
+ 		assert( plnType!=A_PLANE );
+ 	}
+ 	
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp
new file mode 100644
index 00000000000..11f242e438a
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp
@@ -0,0 +1,33 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_type__yuvai_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/type_yuvai.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/type_yuvai.cpp
+@@ -37,7 +37,7 @@ Revision History:
+ *************************************************************************/
+ 
+ #include "typeapi.h"
+-#include <iostream.h>
++#include <iostream>
+ 
+ #ifdef __MFC_
+ #ifdef _DEBUG
+@@ -252,7 +252,7 @@ CVOPIntYUVBA::CVOPIntYUVBA (AlphaUsage f
+ const CIntImage* CVOPIntYUVBA::getPlane (PlaneType plnType) const
+ {
+   if (plnType==A_PLANE) {
+-    cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n";
++    std::cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n";
+     assert( plnType!=A_PLANE );
+   }
+ 
+@@ -309,7 +309,7 @@ Void CVOPIntYUVBA::setPlaneA (const CInt
+ Void CVOPIntYUVBA::setPlane (const CIntImage* pii, PlaneType plnType, Bool bBUV)
+ {
+   if (plnType==A_PLANE) {
+-    cerr << "For A-Planes please use CVOPIntYUVBA::setPlaneA()!\n";
++    std::cerr << "For A-Planes please use CVOPIntYUVBA::setPlaneA()!\n";
+     assert( plnType!=A_PLANE );
+   }
+ 
diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp
new file mode 100644
index 00000000000..a289089c0b6
--- /dev/null
+++ b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $
+
+Fix C++ headers.
+
+--- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp~	2005-05-04 19:56:00.000000000 +0000
++++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp
+@@ -57,7 +57,7 @@
+ #include <math.h>
+ #include <assert.h>
+ // begin: added by Sharp (99/2/16)
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/stat.h>
+ // end: added by Sharp (99/2/16)
+