[arch-commits] Commit in bin86/repos (6 files)
Dave Reisner
dreisner at archlinux.org
Wed Nov 2 15:44:38 UTC 2011
Date: Wednesday, November 2, 2011 @ 11:44:38
Author: dreisner
Revision: 141728
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
bin86/repos/testing-i686/
bin86/repos/testing-i686/PKGBUILD
(from rev 141727, bin86/trunk/PKGBUILD)
bin86/repos/testing-i686/bin86-0.16.17-x86_64-1.patch
(from rev 141727, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
bin86/repos/testing-x86_64/
bin86/repos/testing-x86_64/PKGBUILD
(from rev 141727, bin86/trunk/PKGBUILD)
bin86/repos/testing-x86_64/bin86-0.16.17-x86_64-1.patch
(from rev 141727, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
---------------------------------------------+
testing-i686/PKGBUILD | 33 +++++++++++++++++++
testing-i686/bin86-0.16.17-x86_64-1.patch | 44 ++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 33 +++++++++++++++++++
testing-x86_64/bin86-0.16.17-x86_64-1.patch | 44 ++++++++++++++++++++++++++
4 files changed, 154 insertions(+)
Copied: bin86/repos/testing-i686/PKGBUILD (from rev 141727, bin86/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-02 15:44:38 UTC (rev 141728)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=bin86
+pkgver=0.16.18
+pkgrel=2
+pkgdesc="A complete 8086 assembler and loader"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.debath.co.uk/"
+depends=('glibc')
+source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
+ bin86-0.16.17-x86_64-1.patch)
+md5sums=('914068fb649b93642d1cf21857b75699'
+ '92bdce7b0655cd2e9f83c83fc56d128e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ if [[ $CARCH = x86_64 ]]; then
+ patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
+ fi
+
+ make PREFIX=/usr
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
+ make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install
+}
Copied: bin86/repos/testing-i686/bin86-0.16.17-x86_64-1.patch (from rev 141727, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
===================================================================
--- testing-i686/bin86-0.16.17-x86_64-1.patch (rev 0)
+++ testing-i686/bin86-0.16.17-x86_64-1.patch 2011-11-02 15:44:38 UTC (rev 141728)
@@ -0,0 +1,44 @@
+Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
+Date: 2005-06-28
+Initial Package Version: 0.16.14
+Upstream Status: Submitted Upstream
+Origin: from ROCK Linux
+Description: Allows bin86 to compile on x86_64, which permits lilo to
+ be used in a 64-bit system. I'm dubious about ROCK's attempts to
+ automatically add dual-licensing to all their patches, but bin86 is
+ already GPL'd. I've heard from the maintainer that this will be
+ included in the next upload.
+
+
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+#
+# 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.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+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
Copied: bin86/repos/testing-x86_64/PKGBUILD (from rev 141727, bin86/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-02 15:44:38 UTC (rev 141728)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=bin86
+pkgver=0.16.18
+pkgrel=2
+pkgdesc="A complete 8086 assembler and loader"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.debath.co.uk/"
+depends=('glibc')
+source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
+ bin86-0.16.17-x86_64-1.patch)
+md5sums=('914068fb649b93642d1cf21857b75699'
+ '92bdce7b0655cd2e9f83c83fc56d128e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ if [[ $CARCH = x86_64 ]]; then
+ patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
+ fi
+
+ make PREFIX=/usr
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
+ make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install
+}
Copied: bin86/repos/testing-x86_64/bin86-0.16.17-x86_64-1.patch (from rev 141727, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
===================================================================
--- testing-x86_64/bin86-0.16.17-x86_64-1.patch (rev 0)
+++ testing-x86_64/bin86-0.16.17-x86_64-1.patch 2011-11-02 15:44:38 UTC (rev 141728)
@@ -0,0 +1,44 @@
+Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
+Date: 2005-06-28
+Initial Package Version: 0.16.14
+Upstream Status: Submitted Upstream
+Origin: from ROCK Linux
+Description: Allows bin86 to compile on x86_64, which permits lilo to
+ be used in a 64-bit system. I'm dubious about ROCK's attempts to
+ automatically add dual-licensing to all their patches, but bin86 is
+ already GPL'd. I've heard from the maintainer that this will be
+ included in the next upload.
+
+
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+#
+# 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.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+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
More information about the arch-commits
mailing list