Attachment 33359 Details for Bug 54686 – file.diff

[patch] file.diff

file.diff (text/plain), 6.48 KB, created by HIYAMA Takeshi on 2003-07-21 03:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: HIYAMA Takeshi

Created: 2003-07-21 03:20:17 UTC

Size: 6.48 KB

patch

obsolete

>diff -urN fceu.orig/Makefile fceu/Makefile
>--- fceu.orig/Makefile	Mon Jul 21 07:01:06 2003
>+++ fceu/Makefile	Mon Jul 21 10:32:30 2003
>@@ -10,7 +10,6 @@
> CATEGORIES=	emulators
> MASTER_SITES=	http://fceultra.sourceforge.net/files/
> DISTNAME=	fceu${PORTVERSION:S/.//}src
>-#DISTFILES=	${DISTNAME}${PORTVERSION:S/.//}src${EXTRACT_SUFX}
> 
> MAINTAINER=	gibbon@cocoa.freemail.ne.jp
> COMMENT=	A portable NES/Famicom emulator based on Bero's original FCE
>@@ -23,30 +22,30 @@
> MAKEFILE=	Makefile.unixsdl
> USE_REINPLACE=	yes
> 
>-DOCS=		AUTHORS COPYING ChangeLog FAQ README \
>-		TODO cheat.txt fcs.txt porting.txt rel/readme-linux.txt
>+DOCS=		AUTHORS COPYING ChangeLog FAQ README TODO \
>+		cheat.txt fcs.txt porting.txt rel/readme-linux.txt
> TECHDOCS=	README.now README.sound UNIF_current.txt nsfspec.txt
>-TECHCPUDOC=	4017.txt 6502_cpu.txt NESSOUND.txt dmc.txt
>+TECHCPUDOC=	4017.txt 6502_cpu.txt NESSOUND-4th.txt NESSOUND.txt dmc.txt
> TECHEXPDOCS=	mmc5-e.txt mmc5_bank_switch.txt
>-TECHPPUDOCS=	loopy1.txt loopy2.txt timing.txt
>+TECHPPUDOCS=	"2C02\technical\operation.TXT" loopy1.txt loopy2.txt
> 
> .if defined(WITH_OPTIMIZED_FLAGS)
>-CFLAGS+=        -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
>+CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
> .if (${MACHINE_ARCH} == "i386")
>-CFLAGS+=        -mcpu=i686 -march=i686 -mfancy-math-387
>+CFLAGS+=	-mfancy-math-387
> .endif # i386
> .endif
>+
>+pre-everything::
> .if !defined(WITH_OPTIMIZED_FLAGS)
> 	@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
> .endif
>-
>-pre-everything::
> .if !defined(NOPORTDOCS) && !defined(TECH_DOC_INSTALL)
> 	@${ECHO_MSG} "You can install technical documents"
> 	@${ECHO_MSG} "by defining TECH_DOC_INSTALL"
> .endif
> 
>-.if defined(TECH_DOC_INSTALL)
>+.if !defined(NOPORTDOCS) && defined(TECH_DOC_INSTALL)
> PLIST_SUB=	TECHDOCS=""
> .else
> PLIST_SUB=	TECHDOCS="@comment "
>@@ -56,18 +55,23 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' ${WRKSRC}/Makefile.unixsdl
>-	@${REINPLACE_CMD} -e 's+%%CFLAGS%%+${CFLAGS}+g;' ${WRKSRC}/Makefile.unixsdl
>-.if (${ARCH} == "alpha")
>-	@${REINPLACE_CMD} -e 's|-DC80x86||g' ${WRKSRC}/Makefile.unixsdl
>+.if (${MACHINE_ARCH} != "i386")
>+# do I have to do this for ia64 and amd64 too?
>+	@${REINPLACE_CMD} -e 's|-DC80x86||g;' ${WRKSRC}/Makefile.unixsdl
>+.if (${MACHINE_ARCH} == "sparc64")
>+	@${REINPLACE_CMD} -e 's|-DLSB_FIRST||g;' ${WRKSRC}/Makefile.unixsdl
>+.endif
> .endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/fceu ${PREFIX}/bin
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>+.if !defined(NOPORTDOCS)
> .for docs in ${DOCS}
> 	${INSTALL_DATA} ${WRKSRC}/Documentation/${docs} ${DOCSDIR}
> .endfor
>+.endif
> .if defined(TECH_DOC_INSTALL)
> 	@${MKDIR} ${DOCSDIR}/tech
> .for docs in ${TECHDOCS}
>@@ -85,7 +89,7 @@
> .endfor
> 	@${MKDIR} ${DOCSDIR}/tech/ppu
> .for docs in ${TECHPPUDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/Documentation/tech/ppu/${docs} \
>+	${INSTALL_DATA} ${WRKSRC}/Documentation/tech/ppu/${docs:S/\\/ /g} \
> 			${DOCSDIR}/tech/ppu
> .endfor
> .endif
>diff -urN fceu.orig/files/patch-Makefile.base fceu/files/patch-Makefile.base
>--- fceu.orig/files/patch-Makefile.base	Mon Jul 21 07:01:06 2003
>+++ fceu/files/patch-Makefile.base	Mon Jul 21 06:31:50 2003
>@@ -1,8 +1,8 @@
>---- Makefile.base.orig	Sun Nov 10 02:13:55 2002
>-+++ Makefile.base	Sun Nov 10 02:14:00 2002
>+--- Makefile.base.orig	Mon Jul 21 06:27:19 2003
>++++ Makefile.base	Mon Jul 21 06:27:28 2003
> @@ -1,4 +1,4 @@
> -CFLAGS  = -Wall -Winline ${TFLAGS}
> +CFLAGS  += -Wall -Winline ${TFLAGS}
>- OBJECTS = fce.o x6502.o video.o general.o endian.o svga.o sound.o nsf.o fds.o netplay.o ines.o state.o unif.o input.o file.o cart.o crc32.o memory.o cheat.o debug.o
>+ OBJECTS = fce.o x6502.o video.o general.o endian.o svga.o sound.o nsf.o fds.o netplay.o ines.o state.o unif.o input.o file.o cart.o crc32.o memory.o cheat.o debug.o filter.o palette.o
>  
>  fceu: 		fceu2
>diff -urN fceu.orig/files/patch-Makefile.unixsdl fceu/files/patch-Makefile.unixsdl
>--- fceu.orig/files/patch-Makefile.unixsdl	Mon Jul 21 07:01:06 2003
>+++ fceu/files/patch-Makefile.unixsdl	Mon Jul 21 07:59:25 2003
>@@ -1,9 +1,9 @@
> --- Makefile.unixsdl.orig	Fri Jun 20 12:50:03 2003
>-+++ Makefile.unixsdl	Sun Jul 20 20:43:22 2003
>++++ Makefile.unixsdl	Mon Jul 21 07:53:48 2003
> @@ -1,5 +1,5 @@
>  CC	= gcc 
> -TFLAGS  = -DFRAMESKIP -DSTDIOIFACE -DUNIXDSP -DNETWORK -DFPS `sdl-config --cflags` -mcpu=i686 -O2 -Izlib -fomit-frame-pointer -DC80x86 -DLSB_FIRST -DSDL -DUNIX -DPSS_STYLE=1 -DZLIB
>-+TFLAGS  = -DFRAMESKIP -DSTDIOIFACE -DUNIXDSP -DNETWORK -DFPS `%%LOCALBASE%%/bin/sdl11-config --cflags` -Izlib -DC80x86 -DLSB_FIRST -DSDL -DUNIX -DPSS_STYLE=1 -DZLIB %%CFLAGS%%
>++TFLAGS  = -DFRAMESKIP -DSTDIOIFACE -DUNIXDSP -DNETWORK -DFPS `%%LOCALBASE%%/bin/sdl11-config --cflags` -Izlib -fomit-frame-pointer -DC80x86 -DLSB_FIRST -DSDL -DUNIX -DPSS_STYLE=1 -DZLIB
>  
>  RM	= rm -f
>  B	= drivers/cli/
>diff -urN fceu.orig/pkg-message fceu/pkg-message
>--- fceu.orig/pkg-message	Mon Jul 21 07:01:06 2003
>+++ fceu/pkg-message	Thu Jan  1 09:00:00 1970
>@@ -1,10 +0,0 @@
>-	To enable start/stop seti@home client,
>-	please run "setiathome" as your login name.
>-	If you installed "setiathome" by ports or package,
>-	change the line 9 of %%LOCALBASE%%/etc/rc.d/setiathome.sh
>-		seti_user=nobody
>-			  ^^^^^^
>-	to your login name before setting up working directory.
>-	If you already done this as nobody, do
>-		%%LOCALBASE%%/etc/rc.d/setiathome.sh stop
>-		chown -R "YOUR LOGIN NAME" /var/db/setiathome
>diff -urN fceu.orig/pkg-plist fceu/pkg-plist
>--- fceu.orig/pkg-plist	Mon Jul 21 07:01:06 2003
>+++ fceu/pkg-plist	Mon Jul 21 06:56:59 2003
>@@ -15,13 +15,14 @@
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/nsfspec.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/cpu/4017.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/cpu/6502_cpu.txt
>+%%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/cpu/NESSOUND-4th.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/cpu/NESSOUND.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/cpu/dmc.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/exp/mmc5-e.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/exp/mmc5_bank_switch.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/ppu/loopy1.txt
> %%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/ppu/loopy2.txt
>-%%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/ppu/timing.txt
>+%%PORTDOCS%%%%TECHDOCS%%share/doc/fceu/tech/ppu/2C02 technical operation.TXT
> %%PORTDOCS%%%%TECHDOCS%%@dirrm share/doc/fceu/tech/ppu
> %%PORTDOCS%%%%TECHDOCS%%@dirrm share/doc/fceu/tech/exp
> %%PORTDOCS%%%%TECHDOCS%%@dirrm share/doc/fceu/tech/cpu

Actions: View | Diff

Attachments on bug 54686: 33359