Attachment #139292 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
SDL_DESC=	Use SDL for audio

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

CPPFLAGS+=	-I${LOCALBASE}/include


LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)

.endif

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

post-install:
	@${ECHO_CMD}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD}

.include <bsd.port.mk>




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

Return to bug 185518

Lines 15-34 Link Here

(-)emulators/generator-cbiere/Makefile (-13 / +7 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		19
20	OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL	20	OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL
21	OPTIONS_DEFINE_i386= RAZE	21	OPTIONS_DEFINE_i386= RAZE
22	RAZE_DESC= Use RAZE z80 emulation (only for i386)	22	RAZE_DESC= Use RAZE z80 emulation
23	SDL_DESC= Use SDL for audio	23	SDL_DESC= Use SDL for audio
24		24
25	USE_BZIP2= yes	25	USE_BZIP2= yes
		26	USES= gmake
26	USE_GNOME= gtk12	27	USE_GNOME= gtk12
27	USE_SDL= sdl	28	USE_SDL= sdl
28	USE_GMAKE= yes
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/	30	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/ \
31	CONFIGURE_ARGS+=--with-gtk	31	--with-gtk
32	MAKE_JOBS_UNSAFE= yes	32	MAKE_JOBS_UNSAFE= yes
33		33
34	CPPFLAGS+= -I${LOCALBASE}/include	34	CPPFLAGS+= -I${LOCALBASE}/include
Lines 38-44 Link Here
38		38
39	LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}	39	LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
40		40
41	NO_STAGE= yes
42	.include <bsd.port.options.mk>	41	.include <bsd.port.options.mk>
43		42
44	.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)	43	.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
Lines 57-68 Link Here
57	.endif	56	.endif
58		57
59	post-patch:	58	post-patch:
60	@${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \	59	@${REINPLACE_CMD} -e \
61	${WRKSRC}/raze/raze.asm.in	60	'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in
62
63	post-install:
64	@${ECHO_CMD}
65	@${CAT} ${PKGMESSAGE}
66	@${ECHO_CMD}
67		61
68	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-hdr__registers.h (+26 lines)
	1	--- hdr/registers.h.orig
	2	+++ hdr/registers.h
	3	@@ -6,6 +6,7 @@
	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	+#if defined(__GNUC__) && !defined(__clang__)
	8	#ifdef PROCESSOR_ARM
	9	register uint32 reg68k_pc asm ("r7");
	10	register uint32 *reg68k_regs asm ("r8");
	11	@@ -20,12 +21,13 @@
	12	register uint32 reg68k_pc asm ("%ebx");
	13	register uint32 *reg68k_regs asm ("%edi");
	14	register t_sr reg68k_sr asm ("%esi");
	15	+# endif
	16	+# endif
	17	+#endif
	18	# else
	19	extern uint32 reg68k_pc;
	20	extern uint32 *reg68k_regs;
	21	extern t_sr reg68k_sr;
	22	-# endif
	23	-# endif
	24	#endif
	25
	26	#endif /* REGISTERS_HEADER_FILE */