[pkgsrc/pkgsrc-2015Q1]: pkgsrc/games/ivan Pullup ticket #4673 - requested by ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6db87059d1ec
branches:  pkgsrc-2015Q1
changeset: 649174:6db87059d1ec
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Apr 18 22:50:31 2015 +0000

description:
Pullup ticket #4673 - requested by joerg
games/ivan: build fix

Revisions pulled up:
- games/ivan/distinfo                                           1.10
- games/ivan/patches/patch-ae                                   1.2

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sat Apr 18 20:42:39 UTC 2015

   Modified Files:
        pkgsrc/games/ivan: distinfo
        pkgsrc/games/ivan/patches: patch-ae

   Log Message:
   Add long long overloads to help ILP32 targets.

diffstat:

 games/ivan/distinfo         |   4 ++--
 games/ivan/patches/patch-ae |  41 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 4f620721a49e -r 6db87059d1ec games/ivan/distinfo
--- a/games/ivan/distinfo       Sat Apr 18 22:30:04 2015 +0000
+++ b/games/ivan/distinfo       Sat Apr 18 22:50:31 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2014/02/09 17:09:03 wiedi Exp $
+$NetBSD: distinfo,v 1.9.10.1 2015/04/18 22:50:31 tron Exp $
 
 SHA1 (ivan-0.50.tar.gz) = e4c5ae2b9bdfd59a0ed3c87a504043df12b0f1a4
 RMD160 (ivan-0.50.tar.gz) = 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91
@@ -19,7 +19,7 @@
 SHA1 (patch-ab) = 63f215564ee0922d1daa5240b5a3b3b4afc5db24
 SHA1 (patch-ac) = 42150fb33cbc0136bd702ab5cb26dcbc9d7c717c
 SHA1 (patch-ad) = 0cf6d0d9dff4482f091bff502b0ebd180734c631
-SHA1 (patch-ae) = 2b55ebd81f5136f5be8081f5dadf953a6370d199
+SHA1 (patch-ae) = 51325e0ac17af769b85891a3a8439d9daca8476a
 SHA1 (patch-af) = af3d8e16b1ee3e3e0d5efe2f301b7a5380880b14
 SHA1 (patch-ag) = 58c92ccf5cad81c8030bb0e7f885e95b1ca4d555
 SHA1 (patch-ah) = 56fa7992634cd699eeccbb6702f2ec499d149a21
diff -r 4f620721a49e -r 6db87059d1ec games/ivan/patches/patch-ae
--- a/games/ivan/patches/patch-ae       Sat Apr 18 22:30:04 2015 +0000
+++ b/games/ivan/patches/patch-ae       Sat Apr 18 22:50:31 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2008/07/27 21:44:47 dholland Exp $
+$NetBSD: patch-ae,v 1.1.56.1 2015/04/18 22:50:31 tron Exp $
 
---- FeLib/Include/save.h~      2004-10-26 15:35:45.000000000 -0400
-+++ FeLib/Include/save.h       2008-07-27 16:24:25.000000000 -0400
-@@ -36,7 +36,7 @@
+--- FeLib/Include/save.h.orig  2004-10-26 19:35:45.000000000 +0000
++++ FeLib/Include/save.h
+@@ -36,7 +36,7 @@ class outputfile
    void Put(char What) { fputc(What, Buffer); }
    void Write(const char* Offset, long Size)
    { fwrite(Offset, 1, Size, Buffer); }
@@ -11,7 +11,7 @@
    void Close() { fclose(Buffer); }
    void Flush() { fflush(Buffer); }
    void ReOpen();
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ class inputfile
    rect ReadRect();
    int Get() { return fgetc(Buffer); }
    void Read(char* Offset, long Size) { fread(Offset, 1, Size, Buffer); }
@@ -20,3 +20,34 @@
    truth Eof() { return feof(Buffer); }
    void ClearFlags() { clearerr(Buffer); }
    void SeekPosBegin(long Offset) { fseek(Buffer, Offset, SEEK_SET); }
+@@ -220,6 +220,30 @@ inline inputfile& operator>>(inputfile& 
+   return SaveFile;
+ }
+ 
++inline outputfile& operator<<(outputfile& SaveFile, long long Value)
++{
++  SaveFile.Write(reinterpret_cast<char*>(&Value), sizeof(Value));
++  return SaveFile;
++}
++
++inline inputfile& operator>>(inputfile& SaveFile, long long& Value)
++{
++  SaveFile.Read(reinterpret_cast<char*>(&Value), sizeof(Value));
++  return SaveFile;
++}
++
++inline outputfile& operator<<(outputfile& SaveFile, unsigned long long Value)
++{
++  SaveFile.Write(reinterpret_cast<char*>(&Value), sizeof(Value));
++  return SaveFile;
++}
++
++inline inputfile& operator>>(inputfile& SaveFile, unsigned long long& Value)
++{
++  SaveFile.Read(reinterpret_cast<char*>(&Value), sizeof(Value));
++  return SaveFile;
++}
++
+ inline outputfile& operator<<(outputfile& SaveFile, unsigned Value)
+ {
+   SaveFile.Write(reinterpret_cast<char*>(&Value), sizeof(Value));