From 4d561e7fb217c0ac08bacaffcdaa82cced3ef14d Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Sun, 2 Aug 2009 18:27:55 +0300
Subject: [PATCH] bin86: switched to Dev86, xen-tools (there might be more
 programs in the future) needs bcc

---
 x86/bin86/bin86.conf    |  6 +++--
 x86/bin86/bin86.desc    | 10 ++++-----
 x86/bin86/no_elks.patch | 49 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 x86/bin86/no_elks.patch

diff --git a/x86/bin86/bin86.conf b/x86/bin86/bin86.conf
index 08130c615..44aef17ce 100644
--- a/x86/bin86/bin86.conf
+++ b/x86/bin86/bin86.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../bin86/bin86.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -12,4 +12,6 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
-var_append makeinstopt ' ' PREFIX=$root/$prefix
+
+var_append makeopt ' ' "PREFIX=$root/$prefix"
+var_append makeinstopt ' ' "PREFIX=$root/$prefix"
diff --git a/x86/bin86/bin86.desc b/x86/bin86/bin86.desc
index 6c8c62e1e..2da4c8fba 100644
--- a/x86/bin86/bin86.desc
+++ b/x86/bin86/bin86.desc
@@ -1,9 +1,8 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../bin86/bin86.desc
-[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -20,13 +19,13 @@
 [T] A real mode as/ld for x86. Needed to compile the kernel and other stuff
 [T] which contains i386 real mode code (like the lilo bootloader).
 
-[U] http://homepage.ntlworld.com/robert.debath/
+[U] http://www.debath.co.uk/dev86/
 
 [A] Bruce Evans <bde@runx.oz.au>
 [M] Miguel A. Bolaños <miguel@msdnetworks.com>
 
 [C] base/development
-[F] DIETLIBC
+[F] DIETLIBC NOPARALLEL
 [R] + x86 x86-64
 
 [L] GPL
@@ -34,5 +33,4 @@
 [V] 0.16.17
 [P] X -?-3-----9 102.700
 
-[D] 3074361317 bin86-0.16.17.tar.gz http://homepage.ntlworld.com/robert.debath/dev86/
-
+[D] 2547595252 Dev86src-0.16.17.tar.gz http://www.debath.co.uk/dev86/
diff --git a/x86/bin86/no_elks.patch b/x86/bin86/no_elks.patch
new file mode 100644
index 000000000..2a75b269f
--- /dev/null
+++ b/x86/bin86/no_elks.patch
@@ -0,0 +1,49 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../bin86/no_elks.patch
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur dev86-0.16.17-orig/Makefile dev86-0.16.17/Makefile
+--- dev86-0.16.17-orig/Makefile	2009-08-02 18:06:25.000000000 +0300
++++ dev86-0.16.17/Makefile	2009-08-02 18:07:10.000000000 +0300
+@@ -5,11 +5,11 @@
+ VERSION=0.16.17
+ 
+ TARGETS=install clean other \
+-    bcc86 unproto copt as86 ld86 elksemu \
++    bcc86 unproto copt as86 ld86 \
+     install-all install-bcc install-emu install-lib \
+     install-lib2 install-ln install-man install-other \
+     all-libs alt-libs library lib-386 lib-bsd lib-dos lib-fast lib-stand \
+-    config tests dis88 doselks bootblocks ld86r
++    config tests dis88 bootblocks ld86r
+ 
+ ELKSSRC= /usr/src/elks
+ PREFIX=  /usr
+diff -Nur dev86-0.16.17-orig/makefile.in dev86-0.16.17/makefile.in
+--- dev86-0.16.17-orig/makefile.in	2009-08-02 18:06:25.000000000 +0300
++++ dev86-0.16.17/makefile.in	2009-08-02 18:08:16.000000000 +0300
+@@ -89,10 +89,10 @@
+ 
+ #ifdef GNUMAKE
+ all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
+-     library lib-bsd alt-libs elksemu
++     library lib-bsd alt-libs 
+ 
+ install: check_config install-bcc install-man \
+-     install-lib install-emu
++     install-lib 
+ 
+ install-all: install install-other
+