Attachment 139292 Details for Bug 185518 – file.diff

[patch] file.diff

file.diff (text/plain), 2.47 KB, created by tkato432 on 2014-01-05 18:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-01-05 18:10:07 UTC

Size: 2.47 KB

patch

obsolete

>diff -urN /usr/ports/emulators/generator-cbiere/Makefile emulators/generator-cbiere/Makefile
>--- /usr/ports/emulators/generator-cbiere/Makefile	2013-11-06 22:06:26.000000000 +0900
>+++ emulators/generator-cbiere/Makefile	2014-01-06 00:00:00.000000000 +0900
>@@ -15,20 +15,20 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
>+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)
>+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}/
>-CONFIGURE_ARGS+=--with-gtk
>+CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/ \
>+		--with-gtk
> MAKE_JOBS_UNSAFE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -38,7 +38,6 @@
> 
> LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
>@@ -57,12 +56,7 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \
>-		${WRKSRC}/raze/raze.asm.in
>-
>-post-install:
>-	@${ECHO_CMD}
>-	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_CMD}
>+	@${REINPLACE_CMD} -e \
>+		'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h emulators/generator-cbiere/files/patch-hdr__registers.h
>--- /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h	1970-01-01 09:00:00.000000000 +0900
>+++ emulators/generator-cbiere/files/patch-hdr__registers.h	2014-01-06 00:00:00.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- 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 */

Actions: View | Diff

Attachments on bug 185518: 139292 | 139293 | 139294 | 139295