> http://build-failures.rhaalovely.net/sparc64/2019-07-11/emulators/xnp2.log > http://build-failures.rhaalovely.net/powerpc/2019-07-14/emulators/xnp2.log
There is a macro vs function clash here iiuc. Upstream [0] has already accepted a fix for it. It builds without issues on macppc [1] and amd64. Comments/feedback are welcome! Charlène. [0] https://github.com/nonakap/xnp2/issues/6 [1] https://bin.charlenew.xyz/xnp2.log Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/xnp2/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile 12 Jul 2019 20:46:10 -0000 1.14 +++ Makefile 27 Jul 2019 22:54:26 -0000 @@ -4,7 +4,7 @@ COMMENT = PC-9801 emulator DISTNAME = xnp2-0.86 EPOCH = 0 -REVISION = 3 +REVISION = 4 CATEGORIES = emulators HOMEPAGE = https://www.nonakap.org/np2/ Index: patches/patch-x11_compiler_h =================================================================== RCS file: patches/patch-x11_compiler_h diff -N patches/patch-x11_compiler_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-x11_compiler_h 27 Jul 2019 22:54:26 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +ports-gcc fix for: +error: macro "min" passed 3 arguments, but takes just 2 +From: +https://github.com/nonakap/xnp2/issues/6 + +Index: x11/compiler.h +--- x11/compiler.h.orig ++++ x11/compiler.h +@@ -117,12 +117,14 @@ typedef gboolean BOOL; + #define MAX_PATH MAXPATHLEN + #endif + ++#ifndef __cplusplus + #ifndef max + #define max(a,b) (((a) > (b)) ? (a) : (b)) + #endif + #ifndef min + #define min(a,b) (((a) < (b)) ? (a) : (b)) + #endif ++#endif /* __cplusplus */ + + #ifndef ZeroMemory + #define ZeroMemory(d,n) memset((d), 0, (n))
