Update to 3.5.1

7 files changed, 79 insertions, 89 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index a1dff66d2834..6c46a051fab0 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	fmsx
-PORTVERSION=	3.0
-PORTREVISION=	2
+PORTVERSION=	3.5.1
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.mavetju.org/download/adopted/:code \
+MASTER_SITES=	ahttp://www.mavetju.org/download/adopted/:code \
 		http://fms.komkon.org/fMSX/:code \
 		http://fms.komkon.org/fMSX/src/:rom
-DISTFILES=	fMSX30.tar.Z:code \
+DISTFILES=	fMSX351.zip:code \
 		MSX.ROM:rom MSX2.ROM:rom MSX2EXT.ROM:rom MSX2P.ROM:rom \
 		MSX2PEXT.ROM:rom FMPAC.ROM:rom DISK.ROM:rom MSXDOS2.ROM:rom \
 		PAINTER.ROM:rom KANJI.ROM:rom
-DIST_SUBDIR=	fmsx30
-EXTRACT_ONLY=	fMSX30.tar.Z
+DIST_SUBDIR=	fmsx351
+EXTRACT_ONLY=	fMSX351.zip
 
 MAINTAINER=	dk@farm.org
 COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 
-REINPLACE_ARGS=	-i ""
-
 USE_XORG=	xi x11
+USE_ZIP=	yes
+USE_GMAKE=	yes
+USE_DOS2UNIX=	EMULib/NetUnix.c
 RESTRICTED=	Legal status of distributed ROM images unclear
-WRKSRC=		${WRKDIR}/MSX
+WRKSRC=		${WRKDIR}
 
 OPTIONS=	BPP8 "With BPP8" Off \
 		BPP16 "With BPP16" Off \
@@ -36,31 +36,36 @@ OPTIONS=	BPP8 "With BPP8" Off \
 .include <bsd.port.pre.mk>
 
 post-patch:
+	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
+		${WRKSRC}/fMSX/Unix/Makefile
+
+#post-patch:
 .ifdef(WITH_BPP32) || defined(PACKAGE_BUILDING) || defined(BATCH)
-	${REINPLACE_CMD} -e 's/%%BPP%%/BPP32/' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/BPP16/BPP32/' ${WRKSRC}/fMSX/Unix/Makefile
 .endif
 .ifdef(WITH_BPP24)
-	${REINPLACE_CMD} -e 's/%%BPP%%/BPP24/' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/BPP16/BPP24/' ${WRKSRC}/fMSX/Unix/Makefile
 .endif
 .ifdef(WITH_BPP16)
-	${REINPLACE_CMD} -e 's/%%BPP%%/BPP16/' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/BPP16/BPP16/' ${WRKSRC}/fMSX/Unix/Makefile
 .endif
 .ifdef(WITH_BPP8)
-	${REINPLACE_CMD} -e 's/%%BPP%%/BPP8/' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/BPP16/BPP8/' ${WRKSRC}/fMSX/Unix/Makefile
 .endif
 
+do-build:
+	cd ${WRKSRC}/fMSX/Unix && ${GMAKE}
+
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${PREFIX}/bin
-	${REINPLACE_CMD} "s,PREFIX,${PREFIX},g" ${PREFIX}/bin/fmsx
-	${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin/fmsx.bin
-	${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin/fmsx-rddsk
-	${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin/fmsx-wrdsk
+	${REINPLACE_CMD} -i "" -e "s,PREFIX,${PREFIX},g" ${PREFIX}/bin/fmsx
+	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${PREFIX}/bin/fmsx.bin
 	${MKDIR} ${PREFIX}/share/fmsx
-	${INSTALL_DATA} ${WRKSRC}/*.FNT ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index 88753b8c7c44..831d099b5d4e 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1,33 +1,33 @@
-MD5 (fmsx30/fMSX30.tar.Z) = 6a6e7a4966adc3253701896a86adfcde
-SHA256 (fmsx30/fMSX30.tar.Z) = ab2501d58234fad7f7d29d3beff554101e76ce42d1e7fbe3f3b53a498a1149fd
-SIZE (fmsx30/fMSX30.tar.Z) = 218299
-MD5 (fmsx30/MSX.ROM) = aa95aea2563cd5ec0a0919b44cc17d47
-SHA256 (fmsx30/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
-SIZE (fmsx30/MSX.ROM) = 32768
-MD5 (fmsx30/MSX2.ROM) = ec3a01c91f24fbddcbcab0ad301bc9ef
-SHA256 (fmsx30/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
-SIZE (fmsx30/MSX2.ROM) = 32768
-MD5 (fmsx30/MSX2EXT.ROM) = 2183c2aff17cf4297bdb496de78c2e8a
-SHA256 (fmsx30/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
-SIZE (fmsx30/MSX2EXT.ROM) = 16384
-MD5 (fmsx30/MSX2P.ROM) = 6d8c0ca64e726c82a4b726e9b01cdf1e
-SHA256 (fmsx30/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
-SIZE (fmsx30/MSX2P.ROM) = 32768
-MD5 (fmsx30/MSX2PEXT.ROM) = 7c8243c71d8f143b2531f01afa6a05dc
-SHA256 (fmsx30/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
-SIZE (fmsx30/MSX2PEXT.ROM) = 16384
-MD5 (fmsx30/FMPAC.ROM) = 6f69cc8b5ed761b03afd78000dfb0e19
-SHA256 (fmsx30/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
-SIZE (fmsx30/FMPAC.ROM) = 65536
-MD5 (fmsx30/DISK.ROM) = 80dcd1ad1a4cf65d64b7ba10504e8190
-SHA256 (fmsx30/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
-SIZE (fmsx30/DISK.ROM) = 16384
-MD5 (fmsx30/MSXDOS2.ROM) = 6418d091cd6907bbcf940324339e43bb
-SHA256 (fmsx30/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
-SIZE (fmsx30/MSXDOS2.ROM) = 65536
-MD5 (fmsx30/PAINTER.ROM) = 403cdea1cbd2bb24fae506941f8f655e
-SHA256 (fmsx30/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
-SIZE (fmsx30/PAINTER.ROM) = 65536
-MD5 (fmsx30/KANJI.ROM) = febe8782b466d7c3b16de6d104826b34
-SHA256 (fmsx30/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
-SIZE (fmsx30/KANJI.ROM) = 131072
+MD5 (fmsx351/fMSX351.zip) = 270df07fccb0dac7bbe4e4e09cfc27d0
+SHA256 (fmsx351/fMSX351.zip) = e7eb643c88693fed1315f640ec7aea14f0ea6f1fec560fc85bccdc412afddc60
+SIZE (fmsx351/fMSX351.zip) = 515112
+MD5 (fmsx351/MSX.ROM) = aa95aea2563cd5ec0a0919b44cc17d47
+SHA256 (fmsx351/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
+SIZE (fmsx351/MSX.ROM) = 32768
+MD5 (fmsx351/MSX2.ROM) = ec3a01c91f24fbddcbcab0ad301bc9ef
+SHA256 (fmsx351/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
+SIZE (fmsx351/MSX2.ROM) = 32768
+MD5 (fmsx351/MSX2EXT.ROM) = 2183c2aff17cf4297bdb496de78c2e8a
+SHA256 (fmsx351/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
+SIZE (fmsx351/MSX2EXT.ROM) = 16384
+MD5 (fmsx351/MSX2P.ROM) = 6d8c0ca64e726c82a4b726e9b01cdf1e
+SHA256 (fmsx351/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
+SIZE (fmsx351/MSX2P.ROM) = 32768
+MD5 (fmsx351/MSX2PEXT.ROM) = 7c8243c71d8f143b2531f01afa6a05dc
+SHA256 (fmsx351/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
+SIZE (fmsx351/MSX2PEXT.ROM) = 16384
+MD5 (fmsx351/FMPAC.ROM) = 6f69cc8b5ed761b03afd78000dfb0e19
+SHA256 (fmsx351/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
+SIZE (fmsx351/FMPAC.ROM) = 65536
+MD5 (fmsx351/DISK.ROM) = 80dcd1ad1a4cf65d64b7ba10504e8190
+SHA256 (fmsx351/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
+SIZE (fmsx351/DISK.ROM) = 16384
+MD5 (fmsx351/MSXDOS2.ROM) = 6418d091cd6907bbcf940324339e43bb
+SHA256 (fmsx351/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
+SIZE (fmsx351/MSXDOS2.ROM) = 65536
+MD5 (fmsx351/PAINTER.ROM) = 403cdea1cbd2bb24fae506941f8f655e
+SHA256 (fmsx351/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
+SIZE (fmsx351/PAINTER.ROM) = 65536
+MD5 (fmsx351/KANJI.ROM) = febe8782b466d7c3b16de6d104826b34
+SHA256 (fmsx351/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
+SIZE (fmsx351/KANJI.ROM) = 131072
diff --git a/emulators/fmsx/files/patch-EMULib_NetUnix.c b/emulators/fmsx/files/patch-EMULib_NetUnix.c
new file mode 100644
index 000000000000..21c7bce5eab4
--- /dev/null
+++ b/emulators/fmsx/files/patch-EMULib_NetUnix.c
@@ -0,0 +1,11 @@
+--- EMULib/NetUnix.c.orig	2008-05-26 05:26:55.000000000 +0000
++++ EMULib/NetUnix.c	2008-05-26 05:28:16.000000000 +0000
+@@ -17,6 +17,8 @@
+ #include <stdio.h>
+ #include <netdb.h>
+ #include <errno.h>
++#include <netinet/in.h>
++#include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ 
diff --git a/emulators/fmsx/files/patch-Patch.c b/emulators/fmsx/files/patch-Patch.c
deleted file mode 100644
index 4283dd96e961..000000000000
--- a/emulators/fmsx/files/patch-Patch.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- Patch.c.orig	2007-11-16 02:31:51.000000000 +0600
-+++ Patch.c	2007-11-16 02:35:41.000000000 +0600
-@@ -24,15 +24,6 @@
- 
- void SSlot(byte Value); /* Used to switch secondary slots */
- 
--#ifdef FMSX
--extern byte *RAM[],PSL[],SSLReg;
--static byte RdZ80(word A)
--{
--  if(A!=0xFFFF) return(RAM[A>>13][A&0x1FFF]);
--  else return((PSL[3]==3)? ~SSLReg:RAM[7][0x1FFF]);
--}
--#endif
--
- /** PatchZ80() ***********************************************/
- /** Emulate BIOS calls. This function is called on an ED FE **/
- /** instruction to emulate disk/tape access, etc.           **/
diff --git a/emulators/fmsx/files/patch-aa b/emulators/fmsx/files/patch-aa
deleted file mode 100644
index 9c9611768148..000000000000
--- a/emulators/fmsx/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	Sun Aug 21 13:35:41 2005
-+++ Makefile	Sun Aug 21 13:36:51 2005
-@@ -51,10 +51,10 @@
- # If you are getting linker errors about not found X11 functions,
- # change the -L/usr/X11R6/lib to the directory where X11
- # libraries libX11.* and libXext.* are located on your system.
--CC      = gcc
--DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
--          -DDISK -DNARROW -DSOUND -DBPP16 -DZLIB
--CFLAGS  = -O3 -Wall -I/usr/X11R6/include -L/usr/X11R6/lib ${DEFINES}
-+CC      ?= gcc
-+DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
-+          -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB
-+CFLAGS  = -O3 -Wall -I${LOCALBASE}/include -L${LOCALBASE}/lib ${DEFINES}
- OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Floppy.o Sound.o \
- 	  Z80.o I8255.o AY8910.o YM2413.o SCC.o V9938.o I8251.o \
- 	  Unix.o LibUnix.o SndUnix.o 
diff --git a/emulators/fmsx/files/patch-fMSX_Unix_Makefile b/emulators/fmsx/files/patch-fMSX_Unix_Makefile
new file mode 100644
index 000000000000..553a2a65e892
--- /dev/null
+++ b/emulators/fmsx/files/patch-fMSX_Unix_Makefile
@@ -0,0 +1,11 @@
+--- fMSX/Unix/Makefile.orig	2008-01-28 19:29:59.000000000 +0000
++++ fMSX/Unix/Makefile	2008-05-26 05:52:08.000000000 +0000
+@@ -10,7 +10,7 @@
+ all:    fmsx
+ 
+ fmsx:	Makefile $(OBJECTS)
+-	$(CC) -o $@ $(CFLAGS) $(OBJECTS) $(LIBS)
++	$(CC) -L%%LOCALBASE%%/lib -o $@ $(CFLAGS) $(OBJECTS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJECTS)
diff --git a/emulators/fmsx/pkg-plist b/emulators/fmsx/pkg-plist
index a9dd29427d4b..53648495b163 100644
--- a/emulators/fmsx/pkg-plist
+++ b/emulators/fmsx/pkg-plist
@@ -1,7 +1,5 @@
 bin/fmsx
 bin/fmsx.bin
-bin/fmsx-rddsk
-bin/fmsx-wrdsk
 %%DATADIR%%/CYRILLIC.FNT
 %%DATADIR%%/ITALIC.FNT
 %%DATADIR%%/MSX.ROM