From b560461006fd3b1f41e71c34826fa3a173499b25 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 3 Jan 2006 09:45:57 +0000
Subject: Add DragonFly support. Fix ambigious conversions for GCC 3.4+ by
 explicitly casting positions to long, since that is what the code expects.

---
 devel/tvision/distinfo         |  6 ++++--
 devel/tvision/patches/patch-aa |  6 +++---
 devel/tvision/patches/patch-ab | 40 ++++++++++++++++++++++++++++++++++++++++
 devel/tvision/patches/patch-ac | 13 +++++++++++++
 4 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 devel/tvision/patches/patch-ab
 create mode 100644 devel/tvision/patches/patch-ac

diff --git a/devel/tvision/distinfo b/devel/tvision/distinfo
index 5160afbdc8a..d6258ed9468 100644
--- a/devel/tvision/distinfo
+++ b/devel/tvision/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:35 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/03 09:45:57 joerg Exp $
 
 SHA1 (tvision-0.8.tar.gz) = c3a9948052289f77534de7a05a5d90d3ce770fff
 RMD160 (tvision-0.8.tar.gz) = d6bc5b690d95eb50dea167d30de66daeb267baf3
@@ -6,4 +6,6 @@ Size (tvision-0.8.tar.gz) = 1296058 bytes
 SHA1 (tvision-0.8-freebsd-patches-20040910.diff.bz2) = 74b8a0a4fd0cecc28e40b1f9844b7361d31d5519
 RMD160 (tvision-0.8-freebsd-patches-20040910.diff.bz2) = 85bcee3e5bfc64ab8744818783a1732f94909896
 Size (tvision-0.8-freebsd-patches-20040910.diff.bz2) = 22368 bytes
-SHA1 (patch-aa) = 949a270f748c4b5f20a7a0fe555cfff19da978ed
+SHA1 (patch-aa) = 318be94b3dc3ba4fabc08e1cd156d0008761cd3f
+SHA1 (patch-ab) = f446c55ca44d5fe96d93d608652a422adee18194
+SHA1 (patch-ac) = 9dc8d56ae0784b1a2faac07844f80a457e040ddc
diff --git a/devel/tvision/patches/patch-aa b/devel/tvision/patches/patch-aa
index 4140faae528..1dababa11ba 100644
--- a/devel/tvision/patches/patch-aa
+++ b/devel/tvision/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2004/09/10 19:32:44 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/03 09:45:57 joerg Exp $
 
---- myendian.h.orig	2001-07-25 16:09:37.000000000 +0200
+--- myendian.h.orig	2001-07-25 14:09:37.000000000 +0000
 +++ myendian.h
 @@ -32,6 +32,10 @@
  
  #include <machine/endian.h>
  
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
 +
 +#include <sys/endian.h>
 +
diff --git a/devel/tvision/patches/patch-ab b/devel/tvision/patches/patch-ab
new file mode 100644
index 00000000000..200ef75b4b3
--- /dev/null
+++ b/devel/tvision/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.3 2006/01/03 09:45:57 joerg Exp $
+
+--- lib/TResourceFile.cc.orig	2006-01-03 09:18:35.000000000 +0000
++++ lib/TResourceFile.cc
+@@ -62,7 +62,7 @@ TResourceFile::TResourceFile( fpstream *
+     int repeat;
+     do {
+        repeat = 0;
+-       if (basePos <= (streamSize - (long)sizeof(THeader)))
++       if (basePos <= ((long)streamSize - sizeof(THeader)))
+            {
+            stream->seekg(basePos, ios::beg);
+            stream->readBytes(&header, sizeof(THeader));
+@@ -172,7 +172,7 @@ void TResourceFile::put(TStreamable *ite
+     p->pos =  indexPos;
+     stream->seekp(basePos + indexPos, ios::beg);
+     *stream << item;
+-    indexPos = stream->tellp() - basePos;
++    indexPos = (long)stream->tellp() - basePos;
+     p->size  = indexPos - p->pos;
+ 
+     modified = True;
+@@ -213,7 +213,7 @@ void doCopyResource(void* item, void* ar
+   SwitchInfo* si = (SwitchInfo*)arg;
+ 
+   si->sourceStream->seekg(si->oldBasePos + ((TResourceItem*)item)->pos);
+-  ((TResourceItem*)item)->pos = si->destStream->tellp() - si->newBasePos;
++  ((TResourceItem*)item)->pos = (long)si->destStream->tellp() - si->newBasePos;
+ 
+   copyStream( si->destStream, si->sourceStream, ((TResourceItem*)item)->size);
+ }
+@@ -231,7 +231,7 @@ fpstream* TResourceFile::switchTo( fpstr
+ 	 args.destStream = aStream;
+     aStream->seekp( args.newBasePos + sizeof(long)*3);
+     index->forEach(doCopyResource, &args);
+-    indexPos = aStream->tellp() - args.newBasePos;
++    indexPos = (long)aStream->tellp() - args.newBasePos;
+   }
+   else
+   {
diff --git a/devel/tvision/patches/patch-ac b/devel/tvision/patches/patch-ac
new file mode 100644
index 00000000000..31ba102842c
--- /dev/null
+++ b/devel/tvision/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/01/03 09:45:57 joerg Exp $
+
+--- lib/helpbase.cc.orig	2006-01-03 09:23:26.000000000 +0000
++++ lib/helpbase.cc
+@@ -588,7 +588,7 @@ THelpFile::~THelpFile(void)
+         streampos size = filelength(*stream);
+ 	size =- 8;
+         *stream << magic;
+-        *stream << size;
++        *stream << (long)size;
+         *stream << indexPos;
+         }
+     delete stream;
-- 
cgit v1.2.3