From 00ac2f8d8bbf78c2a2c82c4f3c6d000661b65fb2 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Wed, 29 Sep 2021 00:25:33 -0700
Subject: [PATCH] bin86: dev86: make bin86 a subpackage of dev86.

---
 srcpkgs/bin86                         |  1 +
 srcpkgs/bin86/patches/fix_x86_64.diff | 12 -----------
 srcpkgs/bin86/template                | 20 ------------------
 srcpkgs/dev86/template                | 30 ++++++++++++++++-----------
 4 files changed, 19 insertions(+), 44 deletions(-)
 create mode 120000 srcpkgs/bin86
 delete mode 100644 srcpkgs/bin86/patches/fix_x86_64.diff
 delete mode 100644 srcpkgs/bin86/template

diff --git a/srcpkgs/bin86 b/srcpkgs/bin86
new file mode 120000
index 000000000000..6c075505a031
--- /dev/null
+++ b/srcpkgs/bin86
@@ -0,0 +1 @@
+dev86
\ No newline at end of file
diff --git a/srcpkgs/bin86/patches/fix_x86_64.diff b/srcpkgs/bin86/patches/fix_x86_64.diff
deleted file mode 100644
index 05c374aeb6f2..000000000000
--- a/srcpkgs/bin86/patches/fix_x86_64.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ld/x86_aout.h    2005-11-07 20:07:31.506442000 +0100
-+++ b/ld/x86_aout.h 2020-02-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
diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template
deleted file mode 100644
index 8d711210193e..000000000000
--- a/srcpkgs/bin86/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'bin86'
-pkgname=bin86
-version=0.16.21
-revision=4
-short_desc="A complete 8086 assembler and loader"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://v3.sk/~lkundrak/dev86/"
-license="GPL-2"
-distfiles="http://v3.sk/~lkundrak/dev86/bin86-${version}.tar.gz"
-checksum=021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738
-archs="i686* x86_64*"
-
-do_build() {
-	make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" PREFIX=/usr
-}
-do_install() {
-	vmkdir usr/bin
-	vmkdir usr/share/man/man1
-	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install
-}
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index 174e6d9602a8..137e4f461f81 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -1,31 +1,37 @@
 # Template file for 'dev86'
 pkgname=dev86
 version=0.16.21
-revision=4
-archs="i686* x86_64*"
-makedepends="bin86"
-depends="${makedepends}"
+revision=5
 short_desc="8086 cross development compiler, assembler and linker"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-1.0-or-later, GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://v3.sk/~lkundrak/dev86/"
-distfiles="${homepage}/Dev86src-$version.tar.gz"
-checksum=234b110e6df9b7f6843e2ee53473127c2211243a16748f229fc0127845f68d94
+homepage="https://github.com/lkundrak/dev86/"
+distfiles="https://github.com/lkundrak/dev86/archive/v${version}.tar.gz"
+checksum=49c7ee9102d45c2eef072bfb8a49ba3821c9fe3ef31ccd3290f658b667b579a8
+nocross=yes
 nostrip=yes
 nopie=yes
 
-do_build() {
+pre_build() {
 	for f in libc/bcc libc/misc libc/msdos libc/string libc/syscall \
 		libc/bios; do
 		sed -i -e "s|\$(CCFLAGS) ||g" ${wrksrc}/${f}/Makefile
 	done
-	make DIST=${DESTDIR}
 }
 
 do_install() {
 	make DIST=${DESTDIR} MANDIR=/usr/share/man install install-man
+}
 
-	# Remove stuff supplied by bin86
-	rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86
-	rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1
+bin86_package() {
+	short_desc="Complete 8086 assembler and loader"
+	pkg_install() {
+		vmove /usr/bin/as86
+		vmove /usr/bin/ld86
+		vmove /usr/bin/nm86
+		vmove /usr/bin/objdump86
+		vmove /usr/bin/size86
+		vmove /usr/share/man/man1/as86.1
+		vmove /usr/share/man/man1/ld86.1
+	}
 }