From 3405aaf7b139bce1f155a7b5c73d6a7286f8c96c Mon Sep 17 00:00:00 2001
From: polluks <polluks@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Thu, 19 Feb 2015 13:06:04 +0000
Subject: [PATCH] Backport and version tag

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50094 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/c/Install.c              | 8 +++++++-
 workbench/c/Unpack/bzip2_private.h | 2 ++
 workbench/c/Unpack/file.h          | 3 ++-
 workbench/c/Unpack/package.c       | 2 ++
 workbench/c/Unpack/unpack.c        | 9 ++++++++-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/workbench/c/Install.c b/workbench/c/Install.c
index 32b495acda..910d0d5889 100644
--- a/workbench/c/Install.c
+++ b/workbench/c/Install.c
@@ -2,7 +2,7 @@
     Copyright © 1995-2001, The AROS Development Team. All rights reserved.
     $Id$
 
-    Desc: 
+    Desc: Install CLI command
     Lang: English
 */
 /******************************************************************************
@@ -72,6 +72,12 @@
 #include <exec/types.h>
 #include <exec/ports.h>
 #include <aros/macros.h>
+#ifndef ERROR_UNKNOWN
+#define ERROR_UNKNOWN 100
+#define AROS_BSTR_ADDR(s) (((STRPTR)BADDR(s))+1)
+#endif
+
+const TEXT version[] = "$VER: Install 42.1 (19.2.2015)\n";
 
 struct Volume {
 	STRPTR drivename;
diff --git a/workbench/c/Unpack/bzip2_private.h b/workbench/c/Unpack/bzip2_private.h
index 348a753617..b66dcef44b 100644
--- a/workbench/c/Unpack/bzip2_private.h
+++ b/workbench/c/Unpack/bzip2_private.h
@@ -7,7 +7,9 @@
 */
 
 #include <exec/types.h>
+#ifdef __AROS__
 #include <dos/bptr.h>
+#endif
 
 #include <bzlib.h>
 
diff --git a/workbench/c/Unpack/file.h b/workbench/c/Unpack/file.h
index 9469327d4c..5424763088 100644
--- a/workbench/c/Unpack/file.h
+++ b/workbench/c/Unpack/file.h
@@ -7,7 +7,9 @@
 */
 
 #include <exec/types.h>
+#ifdef __AROS__
 #include <dos/bptr.h>
+#endif
 
 /****************************************************************************/
 /*** Prototypes *************************************************************/
@@ -17,4 +19,3 @@ LONG FILE_Read( BPTR file, APTR buffer, LONG length );
 LONG FILE_Write( BPTR file, CONST_APTR buffer, LONG length );
 
 #endif /* PKG_FILE_H */
-
diff --git a/workbench/c/Unpack/package.c b/workbench/c/Unpack/package.c
index 585123cad6..3fb07a5e8b 100644
--- a/workbench/c/Unpack/package.c
+++ b/workbench/c/Unpack/package.c
@@ -8,7 +8,9 @@
 
 #include <proto/exec.h>
 #include <proto/dos.h>
+#ifdef __AROS__
 #include <aros/macros.h>
+#endif
 
 #include "support.h"
 #include "modes.h"
diff --git a/workbench/c/Unpack/unpack.c b/workbench/c/Unpack/unpack.c
index cb72455fc7..e6c95cd935 100644
--- a/workbench/c/Unpack/unpack.c
+++ b/workbench/c/Unpack/unpack.c
@@ -58,7 +58,15 @@
 #define SH_GLOBAL_DOSBASE 1
 #define SH_GLOBAL_SYSBASE 1
 
+#ifdef __AROS__
 #include <aros/shcommands.h>
+#else
+#define AROS_SH2(a,b,c,d) main()
+#define AROS_SHCOMMAND_INIT
+#define AROS_SHCOMMAND_EXIT
+#define FILE 0
+#define TO 0
+#endif
 
 #include "modes.h"
 #include "package.h"
@@ -116,4 +124,3 @@ cleanup:
 
     AROS_SHCOMMAND_EXIT
 }
-
-- 
2.11.4.GIT