From 012402a100cf20d0ccdf6612c011b4706b8ffdc7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 4 Mar 2018 13:45:05 +0100
Subject: [PATCH] vasm: update to 1.8b

This fixes the regression in 1.8a, so 1.7c can be removed.
---
 dev-lang/vasm/vasm-1.7c.recipe                | 79 -------------------
 .../{vasm-1.8a.recipe => vasm-1.8b.recipe}    |  7 +-
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 dev-lang/vasm/vasm-1.7c.recipe
 rename dev-lang/vasm/{vasm-1.8a.recipe => vasm-1.8b.recipe} (91%)

diff --git a/dev-lang/vasm/vasm-1.7c.recipe b/dev-lang/vasm/vasm-1.7c.recipe
deleted file mode 100644
index 4bfc0c0bf..000000000
--- a/dev-lang/vasm/vasm-1.7c.recipe
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY="Portable and retargetable assembler"
-DESCRIPTION="vasm is a portable and retargetable assembler to create linkable \
-objects in various formats or absolute code. Multiple CPU-, syntax and \
-output-modules can be selected.
-
-Many common directives/pseudo-opcodes are supported (depending on the syntax \
-module) as well as CPU-specific extensions.
-
-The assembler supports optimizations (e.g. choosing the shortest possible \
-branch instruction or addressing mode) and relaxations (e.g. converting a \
-branch to an absolute jump when necessary).
-
-Most syntax modules support macros, include directives, repetitions, \
-conditional assembly and local symbols.
-
-Currently the following CPUs are officially supported by vasm:
-* M680x0 family (including M6888x, M68851 and CPU32)
-* ColdFire family (all models of V2, V3, V4, V4e)
-* 80x86 family (IA32 8/16/32 bit, using MIT-syntax)
-* PowerPC family (POWER, 40x, 6xx, 7xx, 7xxx, 860, e300)
-* ARM (architecture ARMv1 to ARMv4, including THUMB mode)
-* Jaguar RISC (GPU and DSP instruction sets)
-* TR3200 (virtual CPU from 0x10c)
-* Z80 family (Z80, 8080, GBZ80, 64180, RCM2/3/4k)
-* C16x/ST10
-* 6502 family
-* 6800 family (6800, 68HC11)
-
-These syntax flavours are supported:
-* Standard MIT (GNU-as style) syntax
-* Motorola/Freescale 68k syntax (Devpac compatible)
-* Atari MadMac syntax (6502, 68k, Jaguar)
-* Old 8-bit style syntax
-
-Supported output file formats:
-* ELF (M68k, PowerPC, i386, ARM and JRISC)
-* a.out (M68k and i386)
-* Amiga hunk format (M68k)
-* TOS executable format (M68k)
-* EHF extended hunk format (PowerPC)
-* Raw, binary output (all)
-* VOBJ proprietary versatile object format (all)
-* Test, debugging output (all)"
-HOMEPAGE="http://sun.hasenbraten.de/vasm/"
-COPYRIGHT="2002-2015 Volker Barthelmann"
-LICENSE="vasm"
-REVISION="1"
-SOURCE_URI="http://server.owl.de/~frank/tags/vasm1_7c.tar.gz"
-CHECKSUM_SHA256="28abaf48a035ed40903cc24ec864248f15e6610475b4cf17a5ec36c38c67456d"
-SOURCE_DIR="vasm"
-
-ARCHITECTURES="x86_gcc2"
-
-PROVIDES="
-	vasm = $portVersion
-	cmd:vasmz80_oldstyle
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:make
-	"
-
-BUILD()
-{
-	make -f Makefile.Haiku $jobArgs CPU=z80 SYNTAX=oldstyle
-}
-
-INSTALL()
-{
-	mkdir $binDir
-	cp vasmz80_oldstyle $binDir
-}
diff --git a/dev-lang/vasm/vasm-1.8a.recipe b/dev-lang/vasm/vasm-1.8b.recipe
similarity index 91%
rename from dev-lang/vasm/vasm-1.8a.recipe
rename to dev-lang/vasm/vasm-1.8b.recipe
index fc3c81160..51a249355 100644
--- a/dev-lang/vasm/vasm-1.8a.recipe
+++ b/dev-lang/vasm/vasm-1.8b.recipe
@@ -46,9 +46,10 @@ Supported output file formats:
 HOMEPAGE="http://sun.hasenbraten.de/vasm/"
 COPYRIGHT="2002-2017 Volker Barthelmann"
 LICENSE="vasm"
-REVISION="2"
-SOURCE_URI="http://server.owl.de/~frank/tags/vasm1_8a.tar.gz"
-CHECKSUM_SHA256="69981927a5e12f4befeb4b4b7b5eec8114f1470f7ec9131f9adf11034ab75c9f"
+REVISION="1"
+#SOURCE_URI="http://server.owl.de/~frank/tags/vasm1_8b.tar.gz"
+SOURCE_URI="http://sun.hasenbraten.de/vasm/release/vasm.tar.gz"
+CHECKSUM_SHA256="298e0c0e82ff1ec6f047b5c5c7694dca9fd6ef8b8c40b511818841e399a95991"
 SOURCE_DIR="vasm"
 
 ARCHITECTURES="x86_gcc2"