Fix build on 64bit platforms.

Patches provided by Martijn van Buul in PR 35585.
Bump PKGREVISION to be on the safe side,
in case this changes anything on 32bit platforms.

5 files changed, 57 insertions, 3 deletions

diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 3b235603a20..568dea8ad89 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2006/06/12 16:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/16 01:52:20 wiz Exp $
 
 DISTNAME=		VisualBoyAdvance-src-1.7.2
 PKGNAME=		vba-1.7.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vba/}
 
diff --git a/emulators/vba/distinfo b/emulators/vba/distinfo
index bb97ebee3b0..dfba334d9d5 100644
--- a/emulators/vba/distinfo
+++ b/emulators/vba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/04/17 14:50:47 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/02/16 01:52:20 wiz Exp $
 
 SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = 04d82406079563fd17cda07f72488185e9152f51
 RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = 44f94a4f270f2cda25879681c52892f6978caf99
@@ -6,3 +6,6 @@ Size (VisualBoyAdvance-src-1.7.2.tar.gz) = 1410762 bytes
 SHA1 (patch-aa) = 2871ea4cf2451d489d1afe72af4abb86f1a58ca0
 SHA1 (patch-ab) = 55e1084d1cc48cff28b98a7fa68213d97f1f3d7e
 SHA1 (patch-ac) = 33158335dc12f335471d10962b4552082b589d25
+SHA1 (patch-ad) = b61c4053bbed582db5df2039c20b436e1d9e1ff1
+SHA1 (patch-ae) = b7e08365abd77b5c0f3473b4ce091b747298dfc8
+SHA1 (patch-af) = 0b194e624acb083942bd8f9f1a56c34bdd97d9e4
diff --git a/emulators/vba/patches/patch-ad b/emulators/vba/patches/patch-ad
new file mode 100644
index 00000000000..c7cf6603d88
--- /dev/null
+++ b/emulators/vba/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/02/16 01:52:20 wiz Exp $
+
+--- src/prof/gmon.h.orig	2002-11-20 14:29:08.000000000 +0100
++++ src/prof/gmon.h
+@@ -119,7 +119,7 @@
+ 
+ struct tostruct
+   {
+-    char *selfpc;
++    uint32_t selfpc;
+     int count;
+     unsigned short link;
+   };
diff --git a/emulators/vba/patches/patch-ae b/emulators/vba/patches/patch-ae
new file mode 100644
index 00000000000..68520bdd5cb
--- /dev/null
+++ b/emulators/vba/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2007/02/16 01:52:20 wiz Exp $
+
+--- src/prof/prof.cpp.orig	2004-05-13 16:31:58.000000000 +0200
++++ src/prof/prof.cpp
+@@ -279,7 +279,7 @@ void profCleanup()
+ 
+ void profCount()
+ {
+-  register char *selfpc;
++  register u32 selfpc;
+   register unsigned short *frompcindex;
+   register struct tostruct *top;
+   register struct tostruct *prevtop;
+@@ -292,7 +292,7 @@ void profCount()
+   
+   /* selfpc = pc pushed by mcount call.
+      This identifies the function that was just entered.  */
+-  selfpc = (char *) reg[14].I;
++  selfpc = (u32) reg[14].I;
+   /* frompcindex = pc in preceding frame.
+      This identifies the caller of the function just entered.  */
+   frompcindex = (unsigned short *) reg[12].I;
diff --git a/emulators/vba/patches/patch-af b/emulators/vba/patches/patch-af
new file mode 100644
index 00000000000..d7fb1598a04
--- /dev/null
+++ b/emulators/vba/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2007/02/16 01:52:20 wiz Exp $
+
+--- src/sdl/debugger.cpp.orig	2004-05-13 16:13:14.000000000 +0200
++++ src/sdl/debugger.cpp
+@@ -950,9 +950,9 @@ void debuggerBreakOnWrite(u32 *mem, u32 
+ {
+   u32 address = 0;
+   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
+-    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
++    address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
+   else
+-    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
++    address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
+ 
+   if(size == 2)
+     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",