Fix broken build by adding <cstring>. While here, deploy intptr_t, and

allow building this on LP64PLATFORMS again as I see no obvious further
reason it shouldn't work. If anyone knows how to test it properly,
please do so.

6 files changed, 80 insertions, 4 deletions

diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 19309da4780..6b465320ce3 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/03/07 05:58:35 obache Exp $
+# $NetBSD: Makefile,v 1.20 2012/06/28 03:16:06 dholland Exp $
 #
 
 DISTNAME=		tvision-0.8
@@ -13,10 +13,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.sigala.it/sergio/tvision/
 COMMENT=		Turbo Vision C++ CUI library for UNIX
 
-NOT_FOR_PLATFORM+=	${LP64PLATFORMS}
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+MAKE_JOBS_SAFE=		no
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
diff --git a/devel/tvision/distinfo b/devel/tvision/distinfo
index 6ca0bd1ba2f..febc4f4f054 100644
--- a/devel/tvision/distinfo
+++ b/devel/tvision/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/01/24 19:27:10 rillig Exp $
+$NetBSD: distinfo,v 1.6 2012/06/28 03:16:07 dholland Exp $
 
 SHA1 (tvision-0.8.tar.gz) = c3a9948052289f77534de7a05a5d90d3ce770fff
 RMD160 (tvision-0.8.tar.gz) = d6bc5b690d95eb50dea167d30de66daeb267baf3
@@ -11,3 +11,7 @@ SHA1 (patch-ab) = f446c55ca44d5fe96d93d608652a422adee18194
 SHA1 (patch-ac) = 9dc8d56ae0784b1a2faac07844f80a457e040ddc
 SHA1 (patch-ad) = 70136b49b41c34e21c3e58464d200f294071b658
 SHA1 (patch-ae) = b8fd0d96db80a20e78adaeb3e01368810bafbfd8
+SHA1 (patch-lib_tobjstrm_cc) = 382daeab1143331cfde394d5f72f0039b2edeb24
+SHA1 (patch-lib_tobjstrm_h) = 9deca03c757f7609516f28035269481cc5bd5677
+SHA1 (patch-tutorial_load_cc) = 60d761454182142cbf299e9511119d0c03fa627d
+SHA1 (patch-tutorial_nomenus_cc) = 7a608c925a5ff45f9693c63ea3bf6ceef1978029
diff --git a/devel/tvision/patches/patch-lib_tobjstrm_cc b/devel/tvision/patches/patch-lib_tobjstrm_cc
new file mode 100644
index 00000000000..feac891b11e
--- /dev/null
+++ b/devel/tvision/patches/patch-lib_tobjstrm_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_tobjstrm_cc,v 1.1 2012/06/28 03:16:07 dholland Exp $
+
+- Use intptr_t to deal with pointer-sized values.
+
+--- lib/tobjstrm.cc~	2012-06-28 02:28:23.000000000 +0000
++++ lib/tobjstrm.cc
+@@ -41,7 +41,7 @@ extern "C" {
+ 
+ const uchar nullStringLen = UCHAR_MAX;
+ 
+-TStreamableClass::TStreamableClass(const char *n, BUILDER b, int d ) :
++TStreamableClass::TStreamableClass(const char *n, BUILDER b, intptr_t d ) :
+     name( n ),
+     build( b ),
+     delta( d )
diff --git a/devel/tvision/patches/patch-lib_tobjstrm_h b/devel/tvision/patches/patch-lib_tobjstrm_h
new file mode 100644
index 00000000000..b223d2abbad
--- /dev/null
+++ b/devel/tvision/patches/patch-lib_tobjstrm_h
@@ -0,0 +1,29 @@
+$NetBSD: patch-lib_tobjstrm_h,v 1.1 2012/06/28 03:16:07 dholland Exp $
+
+- Use intptr_t to deal with pointer-sized values.
+
+--- lib/tobjstrm.h~	2012-06-28 02:28:23.000000000 +0000
++++ lib/tobjstrm.h
+@@ -139,7 +139,7 @@ const P_id_type P_id_notFound = UINT_MAX
+  */
+ typedef TStreamable *(*BUILDER)();
+ 
+-#define __DELTA( d ) ((int)(TStreamable*)(d*)1-1 )
++#define __DELTA( d ) ((intptr_t)(TStreamable*)(d*)1-1 )
+ 
+ /**
+  * TStreamableClass is used by @ref TStreamableTypes and @ref pstream in the
+@@ -179,11 +179,11 @@ public:
+      * typedef TStreamable *(*BUILDER)();
+      * </pre>
+      */
+-    TStreamableClass(const char *aName, BUILDER aBuild, int aDelta );
++    TStreamableClass(const char *aName, BUILDER aBuild, intptr_t aDelta );
+ private:
+     const char *name;
+     BUILDER build;
+-    int delta;
++    intptr_t delta;
+ };
+ 
+ #endif  // Uses_TStreamableClass
diff --git a/devel/tvision/patches/patch-tutorial_load_cc b/devel/tvision/patches/patch-tutorial_load_cc
new file mode 100644
index 00000000000..790aea208aa
--- /dev/null
+++ b/devel/tvision/patches/patch-tutorial_load_cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-tutorial_load_cc,v 1.1 2012/06/28 03:16:07 dholland Exp $
+
+- Use standard headers.
+
+--- tutorial/load.cc~	2012-06-28 02:28:23.000000000 +0000
++++ tutorial/load.cc
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <cstring>
+ 
+ #include <fstream>
+ 
diff --git a/devel/tvision/patches/patch-tutorial_nomenus_cc b/devel/tvision/patches/patch-tutorial_nomenus_cc
new file mode 100644
index 00000000000..3a040333375
--- /dev/null
+++ b/devel/tvision/patches/patch-tutorial_nomenus_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-tutorial_nomenus_cc,v 1.1 2012/06/28 03:16:07 dholland Exp $
+
+- Use standard headers.
+
+--- tutorial/nomenus.cc~	2012-06-28 02:28:23.000000000 +0000
++++ tutorial/nomenus.cc
+@@ -5,6 +5,8 @@
+  * Modified by Max Okumoto <okumoto@ucsd.edu>
+  */
+ 
++#include <cstring>
++
+ #define Uses_MsgBox
+ #define Uses_TApplication
+ #define Uses_TBackground