From 9976e365d746926f434263bc5e8ffadeba81bdf3 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Fri, 22 Feb 2013 17:52:52 +0100
Subject: [PATCH] dev86: updated to 0.16.9

---
 dev86/.footprint          |  1 -
 dev86/.md5sum             |  3 +-
 dev86/Pkgfile             | 10 +++--
 dev86/dev86-0.16.18.patch | 89 ---------------------------------------
 4 files changed, 7 insertions(+), 96 deletions(-)
 delete mode 100644 dev86/dev86-0.16.18.patch

diff --git a/dev86/.footprint b/dev86/.footprint
index 058f790ff..1e144a3c6 100644
--- a/dev86/.footprint
+++ b/dev86/.footprint
@@ -3,7 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ar86
 -rwxr-xr-x	root/root	usr/bin/bcc
 -rwxr-xr-x	root/root	usr/bin/dis86
--rwxr-xr-x	root/root	usr/bin/elksemu
 -rwxr-xr-x	root/root	usr/bin/makeboot
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/bcc/
diff --git a/dev86/.md5sum b/dev86/.md5sum
index f3ed0de3e..49da2fae6 100644
--- a/dev86/.md5sum
+++ b/dev86/.md5sum
@@ -1,2 +1 @@
-f2e06b547397383b2b2650b9c4fd9bab  Dev86src-0.16.18.tar.gz
-4b5cc0a5b85bbf79130a11a641ad6ba9  dev86-0.16.18.patch
+442e98e1afa23fe00d40c5a996385942  Dev86src-0.16.19.tar.gz
diff --git a/dev86/Pkgfile b/dev86/Pkgfile
index f30458e4c..7acdf36cf 100644
--- a/dev86/Pkgfile
+++ b/dev86/Pkgfile
@@ -5,16 +5,18 @@
 # Depends on:
 
 name=dev86
-version=0.16.18
+version=0.16.19
 release=1
-source=(http://www.debath.co.uk/$name/Dev86src-$version.tar.gz \
-        $name-$version.patch)
+source=(http://www.debath.co.uk/$name/Dev86src-$version.tar.gz)
+
+# \       $name-$version.patch)
 
 build() {
   cd $name-$version
-  patch -p1 -i $SRC/$name-$version.patch
+  
   echo quit | make -j1 PREFIX=/usr GCCFLAG="$CFLAGS"
   make -j1 install-all DIST=$PKG
+  
   rm -f $PKG/usr/bin/{as,ld,nm,objdump,size}86
   rm -f $PKG/usr/man/man1/{as,ld}86.1
 }
diff --git a/dev86/dev86-0.16.18.patch b/dev86/dev86-0.16.18.patch
deleted file mode 100644
index b682b2b34..000000000
--- a/dev86/dev86-0.16.18.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -purN dev86-0.16.17.orig/bootblocks/Makefile dev86-0.16.17/bootblocks/Makefile
---- dev86-0.16.17.orig/bootblocks/Makefile	2009-10-26 08:51:58.502794823 +0100
-+++ dev86-0.16.17/bootblocks/Makefile	2009-10-26 08:55:41.134794770 +0100
-@@ -1,6 +1,6 @@
- 
- HOSTCC=cc
--HOSTCCFLAGS=-O
-+HOSTCCFLAGS=
- BCC=bcc
- AS86=as86
- 
-diff -purN dev86-0.16.17.orig/elksemu/elks.c dev86-0.16.17/elksemu/elks.c
---- dev86-0.16.17.orig/elksemu/elks.c	2009-10-26 08:51:58.518794797 +0100
-+++ dev86-0.16.17/elksemu/elks.c	2009-10-26 08:58:26.186795371 +0100
-@@ -15,7 +15,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/stat.h>
--#include <sys/vm86.h>
-+#include <asm/vm86.h>
- #include <sys/mman.h>
- #include "elks.h" 
- 
-@@ -129,8 +129,17 @@ static int load_elks(int fd)
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- 	int __res;
-+#ifndef __PIC__
- 	__asm__ __volatile__("int $0x80\n"
- 	:"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+	__asm__ __volatile__(
-+		"movl	%%ebx,%%ecx\n\t"
-+		"movl	%2,%%ebx\n\t"
-+		"int	$0x80\n\t"
-+		"movl	%%ecx,%%ebx\n\t"
-+		:"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- 	return __res;
- } 
- #endif
-diff -purN dev86-0.16.17.orig/elksemu/elks_signal.c dev86-0.16.17/elksemu/elks_signal.c
---- dev86-0.16.17.orig/elksemu/elks_signal.c	2009-10-26 08:51:58.518794797 +0100
-+++ dev86-0.16.17/elksemu/elks_signal.c	2009-10-26 08:58:26.182795456 +0100
-@@ -7,7 +7,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/stat.h>
--#include <sys/vm86.h>
-+#include <asm/vm86.h>
- #include "elks.h" 
- 
- static int elks_sigtrap= -1;
-diff -purN dev86-0.16.17.orig/elksemu/elks_sys.c dev86-0.16.17/elksemu/elks_sys.c
---- dev86-0.16.17.orig/elksemu/elks_sys.c	2009-10-26 08:51:58.518794797 +0100
-+++ dev86-0.16.17/elksemu/elks_sys.c	2009-10-26 08:58:26.182795456 +0100
-@@ -9,7 +9,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
--#include <sys/vm86.h>
-+#include <asm/vm86.h>
- #include <sys/times.h>
- #include <utime.h>
- #include <termios.h>
-diff -purN dev86-0.16.17.orig/elksemu/minix.c dev86-0.16.17/elksemu/minix.c
---- dev86-0.16.17.orig/elksemu/minix.c	2009-10-26 08:51:58.518794797 +0100
-+++ dev86-0.16.17/elksemu/minix.c	2009-10-26 08:58:26.186795371 +0100
-@@ -4,7 +4,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
--#include <sys/vm86.h>
-+#include <asm/vm86.h>
- #include <sys/times.h>
- #include <utime.h>
- #include <termios.h>
-diff -purN dev86-0.16.17.orig/makefile.in dev86-0.16.17/makefile.in
---- dev86-0.16.17.orig/makefile.in	2009-10-26 08:51:58.598795590 +0100
-+++ dev86-0.16.17/makefile.in	2009-10-26 08:55:41.134794770 +0100
-@@ -42,7 +42,7 @@ WALL  =-Wall -Wtraditional -Wshadow -Wid
- WALL  =-Wall -Wstrict-prototypes
- 
- CC	=%CC%
--CFLAGS	=$(GCCFLAG) $(WALL) -O2 -g
-+CFLAGS	=$(GCCFLAG) $(WALL) -fno-strict-aliasing
- #endif
- 
- #ifndef GNUMAKE