7 files changed, 45 insertions, 38 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 9861ac79bb25..f3bc5c400dab 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	fmsx
-PORTVERSION=	1.5
+PORTVERSION=	2.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/fms/fMSX/
-DISTNAME=       fMSX
+DISTNAME=       fMSX22
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	dk@farm.org
@@ -22,14 +22,13 @@ WRKSRC=         ${WRKDIR}/MSX
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin/fmsx.bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dasm ${PREFIX}/bin/fmsx-dasm
 	${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 ${PREFIX}/share/fmsx
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/fmsx
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/fmsx
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/fmsx
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index e490758f0bf4..5c43dd4e8150 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1 +1 @@
-MD5 (fMSX.tar.Z) = 484f2a25f2c9c1b7a87d76e6a1ab9e4c
+MD5 (fMSX22.tar.Z) = 15f9e0d4cd28f16d9de81f75cfd63ce4
diff --git a/emulators/fmsx/files/fmsx b/emulators/fmsx/files/fmsx
index 4b29b4dedbcc..d48efecc5fff 100644
--- a/emulators/fmsx/files/fmsx
+++ b/emulators/fmsx/files/fmsx
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-cd /usr/local/share/fmsx || { echo "cannot cd to /usr/local/share/fmsx" ; exit 1; }
-exec /usr/local/bin/fmsx.bin $@
+exec /usr/local/bin/fmsx.bin -home /usr/local/share/fmsx "$@"
diff --git a/emulators/fmsx/files/patch-aa b/emulators/fmsx/files/patch-aa
index 77474bb7b7d0..90b0bf24d5a8 100644
--- a/emulators/fmsx/files/patch-aa
+++ b/emulators/fmsx/files/patch-aa
@@ -1,13 +1,15 @@
---- Makefile.orig	Wed Jul  3 00:49:39 1996
-+++ Makefile	Mon Feb 24 14:20:26 1997
-@@ -34,8 +34,8 @@
+--- Makefile.orig	Thu Aug  3 20:23:33 2000
++++ Makefile	Wed Aug 16 17:24:53 2000
+@@ -44,10 +44,10 @@
  # change the -L/usr/X11R6/lib to the directory where X11
  # libraries libX11.* and libXext.* are located on your system.
  CC      = gcc
--DEFINES = -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM -DSOUND
--CFLAGS  = -O2 -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
-+DEFINES = -DUNIX -DLSB_FIRST -DMITSHM -DSOUND #-DBEBUG
-+CFLAGS  = -O2 -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
- OBJECTS = fMSX.o MSX.o Z80.o Debug.o Unix.o Sound.o
+-DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
++DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
+           -DDISK -DNARROW -DSOUND -DBPP16
+ CFLAGS  = -O3 -fomit-frame-pointer \
+-          -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
++          -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
+ OBJECTS = fMSX.o MSX.o Z80.o AY8910.o SCC.o V9938.o Patch.o Debug.o \
+           Disk.o Unix.o LibUnix.o SndUnix.o MIDI.o
  
- # Make the standard distribution: fMSX and DASM.
diff --git a/emulators/fmsx/files/patch-ab b/emulators/fmsx/files/patch-ab
new file mode 100644
index 000000000000..57562636345d
--- /dev/null
+++ b/emulators/fmsx/files/patch-ab
@@ -0,0 +1,21 @@
+--- Unix.c.orig	Thu Aug  3 20:10:32 2000
++++ Unix.c	Wed Aug 16 16:14:50 2000
+@@ -309,12 +309,16 @@
+           }
+           break;
+ 
+-        case XK_F9:
++        case XK_F6:
+           if(Control) AutoFire=!AutoFire;
+           break;
+ 
+-        case XK_F10:   
++        case XK_F9:   
+           if(Control) UseFont=UseFont? 0:FontBuf? 1:0;
++          break;
++
++        case XK_F10:
++          if(Control) LogSnd=!LogSnd;
+           break;
+ 
+         case XK_F12:   ExitNow=1;break;
diff --git a/emulators/fmsx/pkg-descr b/emulators/fmsx/pkg-descr
index 8fa70538da3d..7137b98a00a1 100644
--- a/emulators/fmsx/pkg-descr
+++ b/emulators/fmsx/pkg-descr
@@ -1,23 +1,6 @@
                         ******* fMSX *******
                  The Portable MSX/MSX2/MSX2+ Emulator
-                             version 1.5
-
-by Marat Fayzullin
-                      
-email:  fms@freeflight.com
-IRC:    RST38h
-WWW:    http://www.freeflight.com/fms/
-
-
-
-                       * NEW IN THIS VERSION *
-
-o More stable split screen (Zanac-Ex no longer blinks)
-o RAM mapper fixed *again* (Designer+ works now)
-o V9938 SRCH command fixed
-o MSXDOS2.ROM support
-o PAINTER.ROM support
-o FMPAC.ROM support
-o .PSG file format is updated
-o Serial port support is *not* yet implemented.
+                             version 2.2
+                  by Marat Fayzullin <fms@cs.umd.edu>
 
+WWW: http://www.komkon.org/fms/fMSX/
diff --git a/emulators/fmsx/pkg-plist b/emulators/fmsx/pkg-plist
index e13544780f75..aee2eb8d11d8 100644
--- a/emulators/fmsx/pkg-plist
+++ b/emulators/fmsx/pkg-plist
@@ -1,15 +1,18 @@
 bin/fmsx
 bin/fmsx.bin
-bin/fmsx-dasm
 bin/fmsx-rddsk
 bin/fmsx-wrdsk
 share/fmsx/CMOS.ROM
 share/fmsx/CYRILLIC.FNT
 share/fmsx/DISK.ROM
 share/fmsx/ITALIC.FNT
+share/fmsx/KANJI.ROM
 share/fmsx/MSX.ROM
 share/fmsx/MSX2.ROM
 share/fmsx/MSX2EXT.ROM
 share/fmsx/MSX2P.ROM
 share/fmsx/MSX2PEXT.ROM
-share/doc/fmsx/fMSX.doc
+share/fmsx/PAINTER.ROM
+@dirrm share/fmsx
+share/doc/fmsx/fMSX.html
+@dirrm share/doc/fmsx