git: a0cc88a42945 - main - emulators/uae: fix build on armv7

The branch main has been updated by fuz:

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

commit a0cc88a429459e903687509682e9f6a48ab07938
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-05-05 16:26:39 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-05-06 18:53:12 +0000

    emulators/uae: fix build on armv7
    
    Avoid USES=llvm:15 by manually disabling the offending warning cum
    error.  Refactor REINPLACE_CMD into proper patches.
    
    Approved by:    portmgr (build fix blanket)
    Discussed with: bofh
    MFH:            2025Q2
---
 emulators/uae/Makefile                            | 14 ++++----------
 emulators/uae/files/patch-src_Makefile.in         | 21 +++++++++++++++++++++
 emulators/uae/files/patch-src_include_bsdsocket.h | 11 +++++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 3b6d42bb3b9f..ff1b40c63c64 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uae
 PORTVERSION=	0.8.29
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/grembo
 
@@ -16,19 +16,13 @@ USES=		gmake gnome pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD
-USES+=	llvm:max=15
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|build68kc|build68k|' \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|struct socketbase {|extern &|' \
-		${WRKSRC}/src/include/bsdsocket.h
+pre-patch:
 	@${LN} -sf ../md-ppc/support.c ${WRKSRC}/src/md-ppc-gcc/support.c
 
 do-install:
diff --git a/emulators/uae/files/patch-src_Makefile.in b/emulators/uae/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..9fce0c548a90
--- /dev/null
+++ b/emulators/uae/files/patch-src_Makefile.in
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	2025-05-05 16:21:46 UTC
++++ src/Makefile.in
+@@ -9,7 +9,8 @@ CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \
+ LDFLAGS   = @LDFLAGS@
+ CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \
+ 		-DSYSTEM_ROMDIR=\"$(datadir)/uae/roms\" \
+-		-DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\"
++		-DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\" \
++		-Wno-error=incompatible-function-pointer-types
+ X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
+ TARGET    = @TARGET@
+ LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
+@@ -112,7 +113,7 @@ tools/build68k:
+ tools/genblitter:
+ 	$(MAKE) -C tools genblitter
+ tools/build68k:
+-	$(MAKE) -C tools build68kc
++	$(MAKE) -C tools build68k
+ tools/gencpu: 
+ 	$(MAKE) -C tools gencpu
+ 
diff --git a/emulators/uae/files/patch-src_include_bsdsocket.h b/emulators/uae/files/patch-src_include_bsdsocket.h
new file mode 100644
index 000000000000..02e8c1fc284d
--- /dev/null
+++ b/emulators/uae/files/patch-src_include_bsdsocket.h
@@ -0,0 +1,11 @@
+--- src/include/bsdsocket.h.orig	2025-05-05 16:22:22 UTC
++++ src/include/bsdsocket.h
+@@ -29,7 +29,7 @@ extern void deinit_socket_layer (void);
+ #define MAXADDRLEN 256
+ 
+ /* allocated and maintained on a per-task basis */
+-struct socketbase {
++extern struct socketbase {
+     struct socketbase *next;
+     struct socketbase *nextsig;	/* queue for tasks to signal */
+