Pullup ticket #5023 - requested by joerg

devel/tvision: build fix

Revisions pulled up:
- devel/tvision/distinfo                                        1.9
- devel/tvision/patches/patch-lib_TWindow_cc                    1.2
- devel/tvision/patches/patch-lib_colorsel_cc                   1.2
- devel/tvision/patches/patch-lib_tobjstrm_h                    1.2

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Wed May 18 20:19:46 UTC 2016

   Modified Files:
   	pkgsrc/devel/tvision: distinfo
   	pkgsrc/devel/tvision/patches: patch-lib_TWindow_cc
   	    patch-lib_colorsel_cc patch-lib_tobjstrm_h

   Log Message:
   Don't assume intptr_t is magically defined, but request it when
   necessary.

4 files changed, 42 insertions, 18 deletions

diff --git a/devel/tvision/distinfo b/devel/tvision/distinfo
index 2af51b1fa84..7c120541b6b 100644
--- a/devel/tvision/distinfo
+++ b/devel/tvision/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 03:29:37 agc Exp $
+$NetBSD: distinfo,v 1.8.4.1 2016/05/23 05:14:35 bsiegert Exp $
 
 SHA1 (tvision-0.8.tar.gz) = c3a9948052289f77534de7a05a5d90d3ce770fff
 RMD160 (tvision-0.8.tar.gz) = d6bc5b690d95eb50dea167d30de66daeb267baf3
@@ -14,9 +14,9 @@ SHA1 (patch-ac) = 9dc8d56ae0784b1a2faac07844f80a457e040ddc
 SHA1 (patch-ad) = 70136b49b41c34e21c3e58464d200f294071b658
 SHA1 (patch-ae) = b8fd0d96db80a20e78adaeb3e01368810bafbfd8
 SHA1 (patch-lib_TChDirDialog_cc) = 1893e7239e87053febfe4cd4258e8f64e4d0ec47
-SHA1 (patch-lib_TWindow_cc) = 6bae6b81c22f9c4d434248a1a03d8ba2d5e4d71c
-SHA1 (patch-lib_colorsel_cc) = 8f6c6544cb53c0cfe6dce4d9e7a7d5a66e7bd232
+SHA1 (patch-lib_TWindow_cc) = f42f1611d1298b211721b7c4a90a0f64d016ecbe
+SHA1 (patch-lib_colorsel_cc) = 01bb47c10e30f57d4c09b901252918d9f3dcd24c
 SHA1 (patch-lib_tobjstrm_cc) = 382daeab1143331cfde394d5f72f0039b2edeb24
-SHA1 (patch-lib_tobjstrm_h) = 9deca03c757f7609516f28035269481cc5bd5677
+SHA1 (patch-lib_tobjstrm_h) = 1547d431cd4d2c1b01d5242ce85cc48db57e5d67
 SHA1 (patch-tutorial_load_cc) = 60d761454182142cbf299e9511119d0c03fa627d
 SHA1 (patch-tutorial_nomenus_cc) = 7a608c925a5ff45f9693c63ea3bf6ceef1978029
diff --git a/devel/tvision/patches/patch-lib_TWindow_cc b/devel/tvision/patches/patch-lib_TWindow_cc
index d797b55c5bc..73b09bc0a16 100644
--- a/devel/tvision/patches/patch-lib_TWindow_cc
+++ b/devel/tvision/patches/patch-lib_TWindow_cc
@@ -1,11 +1,19 @@
-$NetBSD: patch-lib_TWindow_cc,v 1.1 2012/06/28 05:35:33 dholland Exp $
+$NetBSD: patch-lib_TWindow_cc,v 1.1.32.1 2016/05/23 05:14:35 bsiegert Exp $
 
 Silence gcc pointer cast warnings. These have been checked to be
 harmless.
 
---- lib/TWindow.cc~	2001-07-26 07:59:22.000000000 +0000
+--- lib/TWindow.cc.orig	2001-07-26 07:59:22.000000000 +0000
 +++ lib/TWindow.cc
-@@ -153,7 +153,7 @@ void TWindow::handleEvent( TEvent& event
+@@ -20,6 +20,7 @@
+ #define Uses_ipstream
+ #include <tvision/tv.h>
+ 
++#include <inttypes.h>
+ #include <string.h>
+ 
+ const TPoint minWinSize = {16, 6};
+@@ -153,7 +154,7 @@ void TWindow::handleEvent( TEvent& event
  		/*
  		 * Some non-portable code changed.  See `TProgram.cc'.
  		 */
diff --git a/devel/tvision/patches/patch-lib_colorsel_cc b/devel/tvision/patches/patch-lib_colorsel_cc
index 55f4e45c69d..d3e432da812 100644
--- a/devel/tvision/patches/patch-lib_colorsel_cc
+++ b/devel/tvision/patches/patch-lib_colorsel_cc
@@ -1,11 +1,19 @@
-$NetBSD: patch-lib_colorsel_cc,v 1.1 2012/06/28 05:35:33 dholland Exp $
+$NetBSD: patch-lib_colorsel_cc,v 1.1.32.1 2016/05/23 05:14:35 bsiegert Exp $
 
 Silence gcc pointer cast warnings. These have been checked to be
 harmless.
 
---- lib/colorsel.cc~	2001-07-26 07:59:18.000000000 +0000
+--- lib/colorsel.cc.orig	2001-07-26 07:59:18.000000000 +0000
 +++ lib/colorsel.cc
-@@ -210,9 +210,9 @@ void TColorSelector::handleEvent( TEvent
+@@ -30,6 +30,7 @@
+ #define Uses_ipstream
+ #include <tvision/tv.h>
+ 
++#include <inttypes.h>
+ #include <string.h>
+ 
+ static TColorIndex* colorIndexes = 0;
+@@ -210,9 +211,9 @@ void TColorSelector::handleEvent( TEvent
  		 * SS: some non-portable code changed.
  		 */
                  if( selType == csBackground )
@@ -17,7 +25,7 @@ harmless.
                  drawView();
                  return ;
                  }
-@@ -278,7 +278,7 @@ void TMonoSelector::handleEvent( TEvent&
+@@ -278,7 +279,7 @@ void TMonoSelector::handleEvent( TEvent&
  	/*
  	 * SS: some non-portable code changed.
  	 */
@@ -26,7 +34,7 @@ harmless.
          drawView();
          }
  }
-@@ -357,12 +357,12 @@ void TColorDisplay::handleEvent( TEvent&
+@@ -357,12 +358,12 @@ void TColorDisplay::handleEvent( TEvent&
  		/*
  		 * SS: some non-portable code changed.
  		 */
@@ -41,7 +49,7 @@ harmless.
                  drawView();
              }
  }
-@@ -507,7 +507,7 @@ void TColorGroupList::handleEvent(TEvent
+@@ -507,7 +508,7 @@ void TColorGroupList::handleEvent(TEvent
  	/*
  	 * SS: some non-portable code changed.
  	 */
@@ -50,7 +58,7 @@ harmless.
  }
  
  void TColorGroupList::setGroupIndex(uchar groupNum, uchar itemNum)
-@@ -810,7 +810,7 @@ void TColorDialog::handleEvent( TEvent& 
+@@ -810,7 +811,7 @@ void TColorDialog::handleEvent( TEvent& 
  	/*
  	 * SS: some non-portable code changed.
  	 */
diff --git a/devel/tvision/patches/patch-lib_tobjstrm_h b/devel/tvision/patches/patch-lib_tobjstrm_h
index b223d2abbad..102d64fea07 100644
--- a/devel/tvision/patches/patch-lib_tobjstrm_h
+++ b/devel/tvision/patches/patch-lib_tobjstrm_h
@@ -1,10 +1,18 @@
-$NetBSD: patch-lib_tobjstrm_h,v 1.1 2012/06/28 03:16:07 dholland Exp $
+$NetBSD: patch-lib_tobjstrm_h,v 1.1.32.1 2016/05/23 05:14:35 bsiegert Exp $
 
 - Use intptr_t to deal with pointer-sized values.
 
---- lib/tobjstrm.h~	2012-06-28 02:28:23.000000000 +0000
+--- lib/tobjstrm.h.orig	2016-05-18 10:49:59.000000000 +0000
 +++ lib/tobjstrm.h
-@@ -139,7 +139,7 @@ const P_id_type P_id_notFound = UINT_MAX
+@@ -14,6 +14,7 @@
+ #include <iostream>
+ #include <fstream>
+ 
++#include <inttypes.h>
+ #include <limits.h>
+ 
+ /**
+@@ -139,7 +140,7 @@ const P_id_type P_id_notFound = UINT_MAX
   */
  typedef TStreamable *(*BUILDER)();
  
@@ -13,7 +21,7 @@ $NetBSD: patch-lib_tobjstrm_h,v 1.1 2012/06/28 03:16:07 dholland Exp $
  
  /**
   * TStreamableClass is used by @ref TStreamableTypes and @ref pstream in the
-@@ -179,11 +179,11 @@ public:
+@@ -179,11 +180,11 @@ public:
       * typedef TStreamable *(*BUILDER)();
       * </pre>
       */