Make this build on amd64. Probably doesn't have that good odds of working,

but it's a step.

3 files changed, 70 insertions, 1 deletions

diff --git a/devel/bin86/distinfo b/devel/bin86/distinfo
index ade385e0bef..6b48c7e14a6 100644
--- a/devel/bin86/distinfo
+++ b/devel/bin86/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/08 00:39:23 reed Exp $
+$NetBSD: distinfo,v 1.2 2008/08/02 21:46:33 dholland Exp $
 
 SHA1 (bin86-0.16.17.tar.gz) = 656f06b4b26d08412132e338baa25e42d713eeec
 RMD160 (bin86-0.16.17.tar.gz) = b0ae5aff632a3528214749e256f5ab498f1a7fa4
 Size (bin86-0.16.17.tar.gz) = 152400 bytes
 SHA1 (patch-aa) = f4a4fcc5cb51fb428a660d0fc70579f73e2de719
+SHA1 (patch-ab) = b5876c050630d5acec5b8bf1b3079125f112b6be
+SHA1 (patch-ac) = 2f6e342013396561278bb78571148ec7ce3d32d2
diff --git a/devel/bin86/patches/patch-ab b/devel/bin86/patches/patch-ab
new file mode 100644
index 00000000000..abbc5925f2d
--- /dev/null
+++ b/devel/bin86/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1 2008/08/02 21:46:33 dholland Exp $
+
+--- ld/catimage.c~	1997-07-22 17:38:12.000000000 -0400
++++ ld/catimage.c	2008-08-02 17:43:47.000000000 -0400
+@@ -39,7 +39,7 @@ main(argc, argv)
+ int argc;
+ char ** argv;
+ {
+-   long image_offset, text_off;
++   Long image_offset, text_off;
+    int  image_id;
+ 
+    if( argc < 3 || argc > 11 )
+@@ -59,8 +59,10 @@ char ** argv;
+       open_obj(argv[image_id+2]);
+ 
+       printf("File %-14s seg=0x%04lx text=0x%04lx data=0x%04lx\n",
+-              input_file, (image_offset>>4),
+-	      (header.a_text>>4), (header.a_total>>4));
++              input_file,
++              (unsigned long)(image_offset>>4),
++              (unsigned long)(header.a_text>>4),
++              (unsigned long)(header.a_total>>4));
+ 
+       text_off = image_offset;
+       if( header.a_flags & A_SEP )
+@@ -90,7 +92,7 @@ char ** argv;
+    fputc('\0', ofd);
+    fclose(ofd);
+ 
+-   printf("Output file size %ldKb\n", ((image_offset+0x3FF)>>10));
++   printf("Output file size %ldKb\n", (long)((image_offset+0x3FF)>>10));
+ 
+    if( ifd ) fclose(ifd);
+    exit(0);
+@@ -162,7 +164,7 @@ read_symtable()
+ {
+    struct nlist item;
+    int nitems;
+-   long base_off = 0;
++   Long base_off = 0;
+ 
+    if( header.a_syms == 0 )
+       fatal("Input file has been stripped!");
diff --git a/devel/bin86/patches/patch-ac b/devel/bin86/patches/patch-ac
new file mode 100644
index 00000000000..c3bd0e3b5da
--- /dev/null
+++ b/devel/bin86/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2008/08/02 21:46:33 dholland Exp $
+
+--- ld/x86_aout.h~	2003-01-28 17:17:14.000000000 -0500
++++ ld/x86_aout.h	2008-08-02 17:40:03.000000000 -0400
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(_LP64)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
+@@ -77,7 +80,7 @@ struct	exec {			/* a.out header */
+ #endif
+ 
+ struct reloc {
+-  long r_vaddr;			/* virtual address of reference */
++  Long r_vaddr;			/* virtual address of reference */
+   unsigned short r_symndx;	/* internal segnum or extern symbol num */
+   unsigned short r_type;	/* relocation type */
+ };