6 files changed, 48 insertions, 29 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 6c66f74e3a34..0ae6b5816603 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	fmsx
-PORTVERSION=	2.7
+PORTVERSION=	3.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.mavetju.org/download/adopted/ \
-		http://fms.komkon.org/fMSX/
-DISTNAME=	fMSX27
-EXTRACT_SUFX=	.tar.Z
-
+MASTER_SITES=	http://www.mavetju.org/download/adopted/:code \
+		http://fms.komkon.org/fMSX/:code \
+		http://fms.komkon.org/fMSX/src/:rom
+DIST_SUBDIR=	fmsx30
+DISTFILES=	fMSX30.tar.Z: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
 MAINTAINER=	dk@farm.org
 COMMENT=	The Portable MSX/MSX2/MSX2+ Emulator
 
@@ -51,7 +54,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin/fmsx-rddsk
 	${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin/fmsx-wrdsk
 	${MKDIR} ${PREFIX}/share/fmsx
-	${INSTALL_DATA} ${WRKSRC}/*.ROM ${WRKSRC}/*.FNT ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.FNT ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index 0b370c8f644f..eceffd268759 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1,2 +1,22 @@
-MD5 (fMSX27.tar.Z) = 419b3b637067f83465d61b32b0b09ab7
-SIZE (fMSX27.tar.Z) = 516213
+MD5 (fmsx30/fMSX30.tar.Z) = 6a6e7a4966adc3253701896a86adfcde
+SIZE (fmsx30/fMSX30.tar.Z) = 218299
+MD5 (fmsx30/MSX.ROM) = aa95aea2563cd5ec0a0919b44cc17d47
+SIZE (fmsx30/MSX.ROM) = 32768
+MD5 (fmsx30/MSX2.ROM) = ec3a01c91f24fbddcbcab0ad301bc9ef
+SIZE (fmsx30/MSX2.ROM) = 32768
+MD5 (fmsx30/MSX2EXT.ROM) = 2183c2aff17cf4297bdb496de78c2e8a
+SIZE (fmsx30/MSX2EXT.ROM) = 16384
+MD5 (fmsx30/MSX2P.ROM) = 6d8c0ca64e726c82a4b726e9b01cdf1e
+SIZE (fmsx30/MSX2P.ROM) = 32768
+MD5 (fmsx30/MSX2PEXT.ROM) = 7c8243c71d8f143b2531f01afa6a05dc
+SIZE (fmsx30/MSX2PEXT.ROM) = 16384
+MD5 (fmsx30/FMPAC.ROM) = 6f69cc8b5ed761b03afd78000dfb0e19
+SIZE (fmsx30/FMPAC.ROM) = 65536
+MD5 (fmsx30/DISK.ROM) = 80dcd1ad1a4cf65d64b7ba10504e8190
+SIZE (fmsx30/DISK.ROM) = 16384
+MD5 (fmsx30/MSXDOS2.ROM) = 6418d091cd6907bbcf940324339e43bb
+SIZE (fmsx30/MSXDOS2.ROM) = 65536
+MD5 (fmsx30/PAINTER.ROM) = 403cdea1cbd2bb24fae506941f8f655e
+SIZE (fmsx30/PAINTER.ROM) = 65536
+MD5 (fmsx30/KANJI.ROM) = febe8782b466d7c3b16de6d104826b34
+SIZE (fmsx30/KANJI.ROM) = 131072
diff --git a/emulators/fmsx/files/patch-aa b/emulators/fmsx/files/patch-aa
index a5b9719bddfd..b17d2497ee34 100644
--- a/emulators/fmsx/files/patch-aa
+++ b/emulators/fmsx/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Dec 31 20:01:16 2001
-+++ Makefile	Sat Feb 28 11:20:12 2004
+--- 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
@@ -12,15 +12,6 @@
 +DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
 +          -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB
 +CFLAGS  = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
- OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Sound.o \
+ 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 
-@@ -71,7 +71,7 @@
- # fMSX Unix/X requires X11 libraries. See note above if you are
- # experiencing any problems.
- fmsx:	${OBJECTS}
--	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -lz
-+	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib -lz
- 
- # Clean up.
- clean:
diff --git a/emulators/fmsx/pkg-descr b/emulators/fmsx/pkg-descr
index abaebedf3219..e2e1a36e3c44 100644
--- a/emulators/fmsx/pkg-descr
+++ b/emulators/fmsx/pkg-descr
@@ -1,6 +1,7 @@
-                        ******* fMSX *******
-                 The Portable MSX/MSX2/MSX2+ Emulator
-                             version 2.7
-                  by Marat Fayzullin <fms@cs.umd.edu>
+******* fMSX *******
+The Portable MSX/MSX2/MSX2+ Emulator
+by Marat Fayzullin <fms@cs.umd.edu>
+
+For Cartridges see: ftp://ftp.komkon.org/pub/EMUL8/MSX/Carts/
 
 WWW: http://fms.komkon.org/fMSX/
diff --git a/emulators/fmsx/pkg-message b/emulators/fmsx/pkg-message
index 3aae9b77ace9..e9cbb1ac6633 100644
--- a/emulators/fmsx/pkg-message
+++ b/emulators/fmsx/pkg-message
@@ -8,3 +8,6 @@ when starting fMSX and you're using -DBPP32, try compiling with
 For FreeBSD users: run "make clean config" and unselect BPP32 and
 select BPP16 or BPP24 as options.
 *******************************************************************
+
+See ftp://ftp.komkon.org//pub/EMUL8/MSX/Carts for cartridge ROMs
+
diff --git a/emulators/fmsx/pkg-plist b/emulators/fmsx/pkg-plist
index 0ca32b1995dc..a9dd29427d4b 100644
--- a/emulators/fmsx/pkg-plist
+++ b/emulators/fmsx/pkg-plist
@@ -2,18 +2,18 @@ bin/fmsx
 bin/fmsx.bin
 bin/fmsx-rddsk
 bin/fmsx-wrdsk
-%%DATADIR%%/CMOS.ROM
 %%DATADIR%%/CYRILLIC.FNT
-%%DATADIR%%/DISK.ROM
-%%DATADIR%%/FMPAC.ROM
 %%DATADIR%%/ITALIC.FNT
-%%DATADIR%%/KANJI.ROM
 %%DATADIR%%/MSX.ROM
 %%DATADIR%%/MSX2.ROM
 %%DATADIR%%/MSX2EXT.ROM
 %%DATADIR%%/MSX2P.ROM
 %%DATADIR%%/MSX2PEXT.ROM
+%%DATADIR%%/FMPAC.ROM
+%%DATADIR%%/DISK.ROM
+%%DATADIR%%/MSXDOS2.ROM
 %%DATADIR%%/PAINTER.ROM
+%%DATADIR%%/KANJI.ROM
 %%PORTDOCS%%%%DOCSDIR%%/fMSX.html
 %%PORTDOCS%%@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%