From 267c1e71a51846d80cf2cddc2285f71f28ed8ff9 Mon Sep 17 00:00:00 2001
From: Neel Chauhan <nc@FreeBSD.org>
Date: Mon, 29 Mar 2021 18:50:27 +0000
Subject: lang/mecrisp-stellaris: Update to 2.5.8

Also, statisfy portclippy where possible

PR:		254542
Submitted by:	Robert Clausecker <fuz AT fuz DOT su> (maintainer)
---
 lang/mecrisp-stellaris/Makefile | 21 +++++++++++++--------
 lang/mecrisp-stellaris/distinfo |  6 +++---
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'lang')

diff --git a/lang/mecrisp-stellaris/Makefile b/lang/mecrisp-stellaris/Makefile
index 85ff9b8cb471..e823ad29d616 100644
--- a/lang/mecrisp-stellaris/Makefile
+++ b/lang/mecrisp-stellaris/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mecrisp-stellaris
-DISTVERSION=	2.5.6
+DISTVERSION=	2.5.8
 CATEGORIES=	lang
 MASTER_SITES=	SF/mecrisp
 
@@ -11,16 +11,21 @@ COMMENT=	Native code Forth system for ARM
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	armv7
-ONLY_FOR_ARCHS_REASON=	written in ARM Thumb2 assembly
+ONLY_FOR_ARCHS=	armv6 armv7
+ONLY_FOR_ARCHS_REASON=	written in ARM assembly
+
+BUILD_DEPENDS=	binutils>2.33:devel/binutils
+
+AFLAGS.armv6=	-march=armv6 --defsym m0core=1
+MAKE_ENV+=	AFLAGS="${AFLAGS.${ARCH}}"
 
 # stripping eats our hand-crafted ELF binaries, so don't do that
 # the binaries are free of symbols or stuff like that anyway
 STRIP=
 # definitions assuming we build on ARM
-BINARY_ALIAS=	arm-none-eabi-as=${AS} \
-		arm-none-eabi-ld=${LD} \
-		arm-none-eabi-objcopy=${OBJCOPY}
+BINARY_ALIAS=	arm-none-eabi-as=${LOCALBASE}/bin/${AS} \
+		arm-none-eabi-ld=${LOCALBASE}/bin/${LD} \
+		arm-none-eabi-objcopy=${LOCALBASE}/bin/${OBJCOPY}
 
 OPTIONS_DEFINE=		EXTRAS
 OPTIONS_DEFAULT=	EXTRAS
@@ -33,9 +38,9 @@ EXTRAS_VARS_OFF=	PROGRAM=mecrisp-stellaris-freebsd
 # Can't use the release script as it tries to build a bunch of stuff
 # that won't build correctly.  This does the relevant parts manually.
 do-build:
-	cd ${WRKSRC}/mecrisp-stellaris-source/freebsd-ra && ${SETENV} ${MAKE_ENV} ${SH} assemble
+	cd ${WRKSRC}/mecrisp-stellaris-source/freebsd-ra && ${SETENV} ${MAKE_ENV} ${SH} -v assemble
 	${CP} ${WRKSRC}/mecrisp-stellaris-source/freebsd-ra/mecrisp-stellaris-freebsd ${WRKSRC}/freebsd-ra/
-	cd ${WRKSRC}/freebsd-ra && ${SETENV} ${MAKE_ENV} ${SH} buildcore-freebsd
+	cd ${WRKSRC}/freebsd-ra && ${SETENV} ${MAKE_ENV} ${SH} -v buildcore-freebsd
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/lang/mecrisp-stellaris/distinfo b/lang/mecrisp-stellaris/distinfo
index f3ff71faee6b..9d248bc91bfd 100644
--- a/lang/mecrisp-stellaris/distinfo
+++ b/lang/mecrisp-stellaris/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614603481
-SHA256 (mecrisp-stellaris-2.5.6.tar.gz) = 59459eb6d9b3a6bb02d6c9c09e48bafb6ba633938ff419c0bdc447315cae6e86
-SIZE (mecrisp-stellaris-2.5.6.tar.gz) = 5628263
+TIMESTAMP = 1616415161
+SHA256 (mecrisp-stellaris-2.5.8.tar.gz) = 52d82dc938b4b4b15bba6e77d20112525789e23ac982e464f9ae9274d404784e
+SIZE (mecrisp-stellaris-2.5.8.tar.gz) = 5809418
-- 
cgit v1.2.3