1. delete pkg-message: this file slipped in by mistake.

2. fix pkg-plist for version 0.96
3. move message for WITH_OPTIMIZED_FLAGS to correct place
4. delete -mcpu=i686 -march=i686:
	Not all i386 is i686.
	cpu dependent optimize is done by CPUTYPE.
5. change fix for non-i386 arch

PR:		54686
Submitted by:	HIYAMA Takeshi <gibbon@cocoa.freemail.ne.jp> (maintainer)

5 files changed, 23 insertions, 28 deletions

diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index faa2f1dbae92..d3904e630623 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.96
 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,17 +22,17 @@ USE_GMAKE=	yes
 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
 
@@ -46,7 +45,7 @@ pre-everything::
 	@${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 @@ PLIST_SUB=	TECHDOCS="@comment "
 
 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 @@ do-install:
 .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 --git a/emulators/fceux/files/patch-Makefile.base b/emulators/fceux/files/patch-Makefile.base
index 1a83dee26f69..1f7a86bda34d 100644
--- a/emulators/fceux/files/patch-Makefile.base
+++ b/emulators/fceux/files/patch-Makefile.base
@@ -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 --git a/emulators/fceux/files/patch-Makefile.unixsdl b/emulators/fceux/files/patch-Makefile.unixsdl
index 3667c18b3be4..6fabf2caba4b 100644
--- a/emulators/fceux/files/patch-Makefile.unixsdl
+++ b/emulators/fceux/files/patch-Makefile.unixsdl
@@ -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 --git a/emulators/fceux/pkg-message b/emulators/fceux/pkg-message
deleted file mode 100644
index b51dca12b132..000000000000
--- a/emulators/fceux/pkg-message
+++ /dev/null
@@ -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 --git a/emulators/fceux/pkg-plist b/emulators/fceux/pkg-plist
index cc6e8dd354aa..c7f1553f8f38 100644
--- a/emulators/fceux/pkg-plist
+++ b/emulators/fceux/pkg-plist
@@ -15,13 +15,14 @@ bin/fceu
 %%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