Merge branch '2.7' into 2.8

bin86/.md5sum

@@ -1 +1,2 @@
-914068fb649b93642d1cf21857b75699  bin86-0.16.18.tar.gz
+0a20d79765a6855ce7c8c2d02b23a0f0  bin86-0.16.19.tar.gz
+6ff720dfd80656026524ef8a683570ad  bin86-x86_64.patch

bin86/Pkgfile

@@ -3,13 +3,15 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=bin86
-version=0.16.18
+version=0.16.19
 release=1
-source=(http://rdebath.nfshost.com/dev86/$name-$version.tar.gz)
+source=(http://rdebath.nfshost.com/dev86/$name-$version.tar.gz \
+        $name-x86_64.patch)
 
 build() {
     cd $name-$version
-    make CFLAGS="$CFLAGS -D_POSIX_SOURCE" PREFIX=/usr
+    patch -p1 -i $SRC/$name-x86_64.patch
+    make -j1 CFLAGS="$CFLAGS -D_POSIX_SOURCE" PREFIX=/usr
     mkdir -p $PKG/usr/{bin,man/man1}
     make PREFIX=$PKG/usr install
 }

bin86/bin86-x86_64.patch

@@ -0,0 +1,14 @@
+diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
+--- bin86-0.16.14-orig/ld/x86_aout.h    2004-11-07 20:07:31.506442000 +0100
++++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
+