Unbreak gcc 4.2 build.

Approved by:	portmgr

3 files changed, 22 insertions, 4 deletions

diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index e91f4db76cac..b0f21bd218ed 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -25,10 +25,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 .endif
diff --git a/devel/rhtvision/files/patch-include-compatlayer.h b/devel/rhtvision/files/patch-include-compatlayer.h
new file mode 100644
index 000000000000..9d7da5dd7aca
--- /dev/null
+++ b/devel/rhtvision/files/patch-include-compatlayer.h
@@ -0,0 +1,11 @@
+--- include/compatlayer.h.orig	2007-11-05 15:25:07.000000000 +0600
++++ include/compatlayer.h	2007-11-05 15:25:43.000000000 +0600
+@@ -324,7 +324,7 @@
+     library. GCC implemented it in version 3.0. BC++ implemented some
+     stuff in versions like BC++ 5.5. So that's a real mess. */
+  #if __GNUC__>=3
+-  #if __GNUC_MINOR__>=4
++  #if __GNUC__ >= 4 || __GNUC_MINOR__>=4
+    // gcc 3.4. It have __gnu_cxx::stdio_filebuf class.
+    #define CLY_filebuf       __gnu_cxx::stdio_filebuf<char>
+    #define CLY_int_filebuf   CLY_filebuf
diff --git a/devel/rhtvision/files/patch-include-tv-inputln.h b/devel/rhtvision/files/patch-include-tv-inputln.h
new file mode 100644
index 000000000000..5bf83e3e687f
--- /dev/null
+++ b/devel/rhtvision/files/patch-include-tv-inputln.h
@@ -0,0 +1,11 @@
+--- include/tv/inputln.h.orig	2007-11-05 15:06:18.000000000 +0600
++++ include/tv/inputln.h	2007-11-05 15:06:41.000000000 +0600
+@@ -196,7 +196,7 @@
+      { return name; }
+ 
+ protected:
+- TInputLine::TInputLine(StreamableInit) :
++ TInputLine(StreamableInit) :
+    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
+ 
+ public: