git: 5e2e6a2f8e5d - main - emulators/ares: unbreak i386 build

The branch main has been updated by vvd:

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

commit 5e2e6a2f8e5d14fd4322863cbae3a779c83c3278
Author:     Stefan Schlosser <bsdcode@disroot.org>
AuthorDate: 2024-08-15 17:31:25 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-15 17:35:42 +0000

    emulators/ares: unbreak i386 build
    
    - recognize i386 architecture in upstream GNUmakefile
      (upstream pool request:
      https://github.com/ares-emulator/ares/pull/1600)
    - use LLD_UNSAFE with OPENAL option
    - change WWW to homepage
    - fix typo in pkg-descr
    
    PR:     280826
---
 emulators/ares/Makefile                     | 9 ++++++++-
 emulators/ares/files/patch-nall_GNUmakefile | 9 +++++++++
 emulators/ares/pkg-descr                    | 2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile
index cd82a846f62d..a3c37e28d0a8 100644
--- a/emulators/ares/Makefile
+++ b/emulators/ares/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	ares
 DISTVERSION=	139.20240809
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Multi-system emulator
-WWW=		https://github.com/ares-emulator/ares
+WWW=		https://ares-emu.net
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -174,6 +175,12 @@ XVIDEO_MAKE_ARGS=	ruby+=video.xvideo
 
 _SHADERS=		share/libretro/shaders/shaders_slang
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENAL} && ${ARCH} == "i386"
+LLD_UNSAFE=	yes
+.endif
+
 post-patch-SHADER-on:
 	${REINPLACE_CMD} 's|@@SHADERS@@|${LOCALBASE}/${_SHADERS}/|g' \
 		${WRKSRC}/desktop-ui/desktop-ui.cpp
diff --git a/emulators/ares/files/patch-nall_GNUmakefile b/emulators/ares/files/patch-nall_GNUmakefile
index 2f3d96d9db09..1d1551df60f3 100644
--- a/emulators/ares/files/patch-nall_GNUmakefile
+++ b/emulators/ares/files/patch-nall_GNUmakefile
@@ -1,5 +1,14 @@
 --- nall/GNUmakefile.orig	2024-08-14 12:07:36 UTC
 +++ nall/GNUmakefile
+@@ -102,7 +102,7 @@ else
+ else
+   machine_opt := $(if $(findstring clang,$(compiler)),-print-target-triple,-dumpmachine)
+   machine_str := $(shell $(compiler) $(machine_opt))
+-  ifneq ($(filter i686-%,$(machine_str)),)
++  ifneq ($(filter i386-% i486-% i586-% i686-%,$(machine_str)),)
+     machine := x86
+   else ifneq ($(filter amd64-% x86_64-%,$(machine_str)),)
+     machine := amd64
 @@ -169,8 +169,6 @@ ifeq ($(build),debug)
    lto = false
    ifeq ($(cl),true)
diff --git a/emulators/ares/pkg-descr b/emulators/ares/pkg-descr
index b01a978f7b90..1d1df5876394 100644
--- a/emulators/ares/pkg-descr
+++ b/emulators/ares/pkg-descr
@@ -16,5 +16,5 @@ ares has all the features one would expect from a great emulator system: native
 multi-platform UI, dynamic rate control, save states, run-ahead, rewind and
 fast-forward, pixel shaders, color correction, input multi-mapping, debugger
 
-ares uses librashader for it's pixel shader engine. This means it is highly
+ares uses librashader for its pixel shader engine. This means it is highly
 compatible with existing slang shaders, e.g. the slang-shaders from libretro.