git: fbb6fe4a914b - main - sysutils/javaservicewrapper: Fix build on arm

[Mikael Urankar]

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fbb6fe4a914bbf3d07cd407018c200bbe2a006ff

commit fbb6fe4a914bbf3d07cd407018c200bbe2a006ff
Author:     Mikael Urankar <mikael at FreeBSD.org>
AuthorDate: 2021-04-29 15:26:34 +0000
Commit:     Mikael Urankar <mikael at FreeBSD.org>
CommitDate: 2021-04-29 15:26:34 +0000

    sysutils/javaservicewrapper: Fix build on arm
    
    PR:             255470
    Reported by:    Mark Dixon
    Approved by:    portmgr (tier-2 blanket)
---
 sysutils/javaservicewrapper/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile
index e98050a8ff86..d6b47e8390ea 100644
--- a/sysutils/javaservicewrapper/Makefile
+++ b/sysutils/javaservicewrapper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JSW enables a Java application to be run as a Unix daemon
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 USES=		gmake iconv
 USE_JAVA=	yes
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
 MAKE_ARGS+=	-Dbits=64
 .else
 MAKE_ARGS+=	-Dbits=32
@@ -50,6 +50,10 @@ post-patch:
 		${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake
 	@${REINPLACE_CMD} -e 's|\(javac\.target\.version\)=.*|\1=1.8|' \
 		${WRKSRC}/default.properties
+	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-32.gmake \
+		${WRKSRC}/src/c/Makefile-freebsd-arm-32.gmake
+	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake \
+		${WRKSRC}/src/c/Makefile-freebsd-armhf-64.gmake
 	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake \
 		${WRKSRC}/src/c/Makefile-freebsd-ppcbe-64.gmake
 	@${CP} ${WRKSRC}/src/c/Makefile-freebsd-x86-64.gmake \