emulators/fmsx: Update to 5.4

- Reset maintainer; the port has been broken for over 5 months and
  there have been > 3 timeouts before (going as far back as 2004)
  so the current maintainer seems to not be interested anymore.

PR:		229848
Submitted by:	Kai <freebsd_ports@k-worx.org>

5 files changed, 51 insertions, 43 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index dd023cdb0dfa..9ea31a940278 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fmsx
-PORTVERSION=	4.2
+PORTVERSION=	5.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/fMSX/:code \
 		http://fms.komkon.org/fMSX/src/:rom
@@ -10,26 +10,29 @@ DISTFILES=	fMSX${PORTVERSION:C/\.//}.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=	fmsx4
+DIST_SUBDIR=	fmsx5
 EXTRACT_ONLY=	fMSX${PORTVERSION:C/\.//}.zip
 
-MAINTAINER=	dk@farm.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
+LICENSE=	UNKNOWN
+LICENSE_NAME=	unknown
+LICENSE_TEXT=	This program is NOT in public domain.\
+		It can be freely distributed for non-commercial purposes only. \
+		Legal status of distributed ROM images is unclear.
+LICENSE_PERMS=	none
 
-USE_XORG=	x11 xext
 USES=		dos2unix gmake zip
+USE_XORG=	x11 xext
 DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
-		EMULib/Rules.Unix
-RESTRICTED=	Legal status of distributed ROM images unclear
+		EMULib/Rules.Unix fMSX/fMSX.html
+
 NO_WRKSUBDIR=	yes
 SUB_FILES=	${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/fMSX/Unix
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS PULSEAUDIO
 OPTIONS_SINGLE=	BPP
 OPTIONS_SINGLE_BPP=	BPP8 BPP16 BPP24 BPP32
 OPTIONS_DEFAULT=	BPP32
@@ -41,12 +44,14 @@ BPP8_CFLAGS=	-DBPP8
 BPP16_CFLAGS=	-DBPP16
 BPP24_CFLAGS=	-DBPP24
 BPP32_CFLAGS=	-DBPP32
+PULSEAUDIO_CFLAGS=	-DPULSE_AUDIO
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
+PULSEAUDIO_LIBS=	-lpulse-simple
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/fmsx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${STAGEDIR}${PREFIX}/libexec/fmsx
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ROMs/*.FNT ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index 98f26017ed51..a04b4f439989 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1,22 +1,23 @@
-SHA256 (fmsx4/fMSX42.zip) = 7040bd61b309d4b514c20c7413d48f9b816e2f91e8bf7bb268d6143cbaa75e00
-SIZE (fmsx4/fMSX42.zip) = 580876
-SHA256 (fmsx4/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
-SIZE (fmsx4/MSX.ROM) = 32768
-SHA256 (fmsx4/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
-SIZE (fmsx4/MSX2.ROM) = 32768
-SHA256 (fmsx4/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
-SIZE (fmsx4/MSX2EXT.ROM) = 16384
-SHA256 (fmsx4/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
-SIZE (fmsx4/MSX2P.ROM) = 32768
-SHA256 (fmsx4/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
-SIZE (fmsx4/MSX2PEXT.ROM) = 16384
-SHA256 (fmsx4/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
-SIZE (fmsx4/FMPAC.ROM) = 65536
-SHA256 (fmsx4/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
-SIZE (fmsx4/DISK.ROM) = 16384
-SHA256 (fmsx4/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
-SIZE (fmsx4/MSXDOS2.ROM) = 65536
-SHA256 (fmsx4/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
-SIZE (fmsx4/PAINTER.ROM) = 65536
-SHA256 (fmsx4/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
-SIZE (fmsx4/KANJI.ROM) = 131072
+TIMESTAMP = 1531828409
+SHA256 (fmsx5/fMSX54.zip) = bd3ac4fd87586912bfe973c4e286ba9c30fee051a02afd5ea2b9fd6fec310825
+SIZE (fmsx5/fMSX54.zip) = 262278
+SHA256 (fmsx5/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
+SIZE (fmsx5/MSX.ROM) = 32768
+SHA256 (fmsx5/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
+SIZE (fmsx5/MSX2.ROM) = 32768
+SHA256 (fmsx5/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
+SIZE (fmsx5/MSX2EXT.ROM) = 16384
+SHA256 (fmsx5/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
+SIZE (fmsx5/MSX2P.ROM) = 32768
+SHA256 (fmsx5/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
+SIZE (fmsx5/MSX2PEXT.ROM) = 16384
+SHA256 (fmsx5/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
+SIZE (fmsx5/FMPAC.ROM) = 65536
+SHA256 (fmsx5/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
+SIZE (fmsx5/DISK.ROM) = 16384
+SHA256 (fmsx5/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
+SIZE (fmsx5/MSXDOS2.ROM) = 65536
+SHA256 (fmsx5/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
+SIZE (fmsx5/PAINTER.ROM) = 65536
+SHA256 (fmsx5/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
+SIZE (fmsx5/KANJI.ROM) = 131072
diff --git a/emulators/fmsx/files/patch-EMULib_Rules.Unix b/emulators/fmsx/files/patch-EMULib_Rules.Unix
index 4ad8ab8fcfd8..5c0d4bf8f543 100644
--- a/emulators/fmsx/files/patch-EMULib_Rules.Unix
+++ b/emulators/fmsx/files/patch-EMULib_Rules.Unix
@@ -1,12 +1,13 @@
---- EMULib/Rules.Unix.orig	2014-01-30 23:32:06.000000000 +0700
-+++ EMULib/Rules.Unix	2014-01-30 23:30:52.000000000 +0700
+--- EMULib/Rules.Unix.orig	2018-07-18 04:13:18 UTC
++++ EMULib/Rules.Unix
 @@ -6,7 +6,7 @@
  
  include ../../EMULib/Rules.gcc
  
 -CFLAGS += -I$(EMULIB)/Unix -I/usr/X11R6/include
+-DEFINES+= -DUNIX -DMITSHM -DBPS16 -DPULSE_AUDIO
+-LIBS   += -lX11 -lXext -lpulse-simple
 +CFLAGS += -I$(EMULIB)/Unix -I${LOCALBASE}/include $(DEBUG_FLAGS)
- DEFINES+= -DUNIX -DMITSHM -DBPS16
--LIBS   += -lX11 -lXext
++DEFINES+= -DUNIX -DMITSHM
 +LIBS   += -L${LOCALBASE}/lib -lX11 -lXext
  OBJECTS+= $(EMUUNIX)
diff --git a/emulators/fmsx/files/patch-EMULib_Rules.gcc b/emulators/fmsx/files/patch-EMULib_Rules.gcc
index 12d5963e63cc..02c2ff08e453 100644
--- a/emulators/fmsx/files/patch-EMULib_Rules.gcc
+++ b/emulators/fmsx/files/patch-EMULib_Rules.gcc
@@ -1,6 +1,6 @@
---- EMULib/Rules.gcc.orig	2014-01-31 00:39:34.000000000 +0700
-+++ EMULib/Rules.gcc	2014-01-31 00:40:38.000000000 +0700
-@@ -6,12 +6,12 @@
+--- EMULib/Rules.gcc.orig	2018-07-18 11:20:20 UTC
++++ EMULib/Rules.gcc
+@@ -7,14 +7,14 @@ LIB68K	= $(BASEDIR)/M68000
  LIBGBZ	= $(BASEDIR)/GBZ80
  PRIVATE	= $(BASEDIR)/Private
  
@@ -15,5 +15,8 @@
 -CFLAGS	= -O2 -pthread -I. -I.. -I$(EMULIB)
 +CFLAGS	+= -pthread -I. -I.. -I$(EMULIB)
  DEFINES = -DZLIB
- LIBS    = -lz -lpthread
+-LIBS    = -lz -lpthread
++LIBS    += -lz -lpthread
  
+ # EMULib sound, console, and other utility functions 
+ OBJECTS	= $(EMULIB)/EMULib.o $(EMULIB)/Sound.o   \
diff --git a/emulators/fmsx/pkg-plist b/emulators/fmsx/pkg-plist
index 4826d8d6ce51..ca46f6d4333c 100644
--- a/emulators/fmsx/pkg-plist
+++ b/emulators/fmsx/pkg-plist
@@ -1,9 +1,7 @@
 bin/fmsx
 libexec/fmsx
-%%DATADIR%%/CYRILLIC.FNT
 %%DATADIR%%/DISK.ROM
 %%DATADIR%%/FMPAC.ROM
-%%DATADIR%%/ITALIC.FNT
 %%DATADIR%%/KANJI.ROM
 %%DATADIR%%/MSX.ROM
 %%DATADIR%%/MSX2.ROM