[Lunar-commits] <moonbase> dev86: remove conflicts with bin86

[Paul Bredbury]

commit 1d4383c21fc36c98323fb34f77f523e7cef2950b
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Jan 13 19:14:52 2011 +0700

    dev86: remove conflicts with bin86
---
 compilers/dev86/BUILD   |   11 +++++++++++
 compilers/dev86/DEPENDS |    2 ++
 compilers/dev86/DETAILS |    4 +++-
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/compilers/dev86/BUILD b/compilers/dev86/BUILD
new file mode 100644
index 0000000..0ad8132
--- /dev/null
+++ b/compilers/dev86/BUILD
@@ -0,0 +1,11 @@
+(
+
+  # Prevent installation of files conflicting with bin86
+  patch_it $SOURCE2 0  &&
+
+  sedit "s/CFLAGS=  -O/CFLAGS=  $CFLAGS/1" Makefile  &&
+  sedit "s:(PREFIX)/man:(PREFIX)/share/man:1" Makefile  &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/compilers/dev86/DEPENDS b/compilers/dev86/DEPENDS
new file mode 100644
index 0000000..49723db
--- /dev/null
+++ b/compilers/dev86/DEPENDS
@@ -0,0 +1,2 @@
+# There is file overlap between bin86 and dev86
+depends bin86
diff --git a/compilers/dev86/DETAILS b/compilers/dev86/DETAILS
index c48245b..8249026 100644
--- a/compilers/dev86/DETAILS
+++ b/compilers/dev86/DETAILS
@@ -1,12 +1,14 @@
         MODULE=dev86
        VERSION=0.16.18
         SOURCE=Dev86src-$VERSION.tar.gz
+       SOURCE2=dev86-0.16.18-remove-bin86-conflicts.patch.bz2
  SOURCE_URL[0]=$MIRROR_URL
  SOURCE_URL[1]=http://www.debath.co.uk/$MODULE
     SOURCE_VFY=sha1:da665d855963419cac5578736417cae8d1f8b5b0
+   SOURCE2_VFY=sha1:f46dff9266ef355fccbfd4e1e51afd3fdc0a1167
       WEB_SITE=http://www.debath.co.uk
        ENTERED=20071004
-       UPDATED=20110110
+       UPDATED=20110111
          SHORT="Bruce Evan's C compiler, related assembler and linker"
          PSAFE=no