Attachment #139295 for bug #185518





LICENSE=	GPLv2

LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg

OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
OPTIONS_DEFINE_i386=	RAZE
RAZE_DESC=	Use RAZE z80 emulation (only for i386)
SDL_DESC=	Use SDL for audio

USE_BZIP2=	yes
USES=		gmake
USE_GNOME=	gtk12
USE_SDL=	sdl
USES=		gmake
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \
		--with-gtk
MAKE_JOBS_UNSAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PLIST_FILES=	bin/${UNIQUENAME}-gtk

OPTIONS_DEFINE=		OPTIMIZED_CFLAGS SDL
OPTIONS_DEFINE_i386=	RAZE

OPTIMIZED_CFLAGS_CONFIGURE_OFF=	--without-gcc
RAZE_DESC=		Use RAZE z80 emulation
RAZE_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
RAZE_CONFIGURE_ON=	--with-raze
SDL_DESC=		Use SDL for audio
SDL_CONFIGURE_ON=	--with-sdl-audio

.include <bsd.port.options.mk>

.if empty(PORT_OPTIONS:MRAZE)
CONFIGURE_ARGS+=	--without-gcc
.endif

.if ${PORT_OPTIONS:MRAZE}
BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
CONFIGURE_ARGS+=--with-raze
.else
CONFIGURE_ARGS+=--with-cmz80
.endif

.if ${PORT_OPTIONS:MSDL}
CONFIGURE_ARGS+=--with-sdl-audio
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in

.include <bsd.port.mk>




--- hdr/registers.h.orig
+++ hdr/registers.h
@@ -6,17 +6,17 @@
    call a C function, then when that C function returns these registers are
    still what they were before we made the call. */
 
-#ifdef PROCESSOR_ARM
+#if defined(PROCESSOR_ARM) && !defined(__clang__)
      register uint32 reg68k_pc asm ("r7");
      register uint32 *reg68k_regs asm ("r8");
      register t_sr reg68k_sr asm ("r9");
 #else
-#  ifdef PROCESSOR_SPARC
+#  if defined(PROCESSOR_SPARC) && !defined(__clang__)
        register uint32 reg68k_pc asm ("5");
        register uint32 *reg68k_regs asm ("6");
        register t_sr reg68k_sr asm ("7");
 #  else
-#    ifdef PROCESSOR_INTEL
+#    if defined(PROCESSOR_INTEL) && !defined(__clang__)
          register uint32 reg68k_pc asm ("%ebx");
          register uint32 *reg68k_regs asm ("%edi");
          register t_sr reg68k_sr asm ("%esi");




--- main/reg68k.c.orig
+++ main/reg68k.c
@@ -18,8 +18,8 @@
 
 /*** global variables ***/
 
-#if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
-       || defined(PROCESSOR_INTEL)))
+#if ((!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
+       || defined(PROCESSOR_INTEL))) || defined(__clang__))
 uint32 reg68k_pc;
 uint32 *reg68k_regs;
 t_sr reg68k_sr;

Return to bug 185518

Lines 15-62 Link Here

(-)emulators/generator-cbiere/Makefile (-25 / +17 lines)
15		15
16	LICENSE= GPLv2	16	LICENSE= GPLv2
17		17
18	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg	18	LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
19
20	OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL
21	OPTIONS_DEFINE_i386= RAZE
22	RAZE_DESC= Use RAZE z80 emulation (only for i386)
23	SDL_DESC= Use SDL for audio
24		19
25	USE_BZIP2= yes	20	USE_BZIP2= yes
		21	USES= gmake
26	USE_GNOME= gtk12	22	USE_GNOME= gtk12
27	USE_SDL= sdl	23	USE_SDL= sdl
28	USES= gmake
29	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/	25	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \
31	CONFIGURE_ARGS+=--with-gtk	26	--with-gtk
32	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
33		28
34	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include
35	LDFLAGS+= -L${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib
36		31
37	PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX}-gtk	32	PLIST_FILES= bin/${UNIQUENAME}-gtk
		33
		34	OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL
		35	OPTIONS_DEFINE_i386= RAZE
38		36
39	LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}	37	OPTIMIZED_CFLAGS_CONFIGURE_OFF= --without-gcc
		38	RAZE_DESC= Use RAZE z80 emulation
		39	RAZE_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
		40	RAZE_CONFIGURE_ON= --with-raze
		41	SDL_DESC= Use SDL for audio
		42	SDL_CONFIGURE_ON= --with-sdl-audio
40		43
41	.include <bsd.port.options.mk>	44	.include <bsd.port.options.mk>
42		45
43	.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)	46	.if empty(PORT_OPTIONS:MRAZE)
44	CONFIGURE_ARGS+= --without-gcc
45	.endif
46
47	.if ${PORT_OPTIONS:MRAZE}
48	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
49	CONFIGURE_ARGS+=--with-raze
50	.else
51	CONFIGURE_ARGS+=--with-cmz80	47	CONFIGURE_ARGS+=--with-cmz80
52	.endif	48	.endif
53		49
54	.if ${PORT_OPTIONS:MSDL}
55	CONFIGURE_ARGS+=--with-sdl-audio
56	.endif
57
58	post-patch:	50	post-patch:
59	@${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \	51	@${REINPLACE_CMD} -e \
60	${WRKSRC}/raze/raze.asm.in	52	'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in
61		53
62	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-hdr__registers.h (+23 lines)
	1	--- hdr/registers.h.orig
	2	+++ hdr/registers.h
	3	@@ -6,17 +6,17 @@
	4	call a C function, then when that C function returns these registers are
	5	still what they were before we made the call. */
	6
	7	-#ifdef PROCESSOR_ARM
	8	+#if defined(PROCESSOR_ARM) && !defined(__clang__)
	9	register uint32 reg68k_pc asm ("r7");
	10	register uint32 *reg68k_regs asm ("r8");
	11	register t_sr reg68k_sr asm ("r9");
	12	#else
	13	-# ifdef PROCESSOR_SPARC
	14	+# if defined(PROCESSOR_SPARC) && !defined(__clang__)
	15	register uint32 reg68k_pc asm ("5");
	16	register uint32 *reg68k_regs asm ("6");
	17	register t_sr reg68k_sr asm ("7");
	18	# else
	19	-# ifdef PROCESSOR_INTEL
	20	+# if defined(PROCESSOR_INTEL) && !defined(__clang__)
	21	register uint32 reg68k_pc asm ("%ebx");
	22	register uint32 *reg68k_regs asm ("%edi");
	23	register t_sr reg68k_sr asm ("%esi");

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-main__reg68k.c (+13 lines)
	1	--- main/reg68k.c.orig
	2	+++ main/reg68k.c
	3	@@ -18,8 +18,8 @@
	4
	5	/* global variables */
	6
	7	-#if (!(defined(PROCESSOR_ARM) \|\| defined(PROCESSOR_SPARC) \
	8	- \|\| defined(PROCESSOR_INTEL)))
	9	+#if ((!(defined(PROCESSOR_ARM) \|\| defined(PROCESSOR_SPARC) \
	10	+ \|\| defined(PROCESSOR_INTEL))) \|\| defined(__clang__))
	11	uint32 reg68k_pc;
	12	uint32 *reg68k_regs;
	13	t_sr reg68k_sr;