emulators/openmsx: Upgrade from version 0.6.2 to 0.9.0

By request of the upstream developers, openMSX has been upgraded to the
12 Aug 2012 release (0.9.0).  The current version in pkgsrc is 0.6.2 was
released over 5 years ago on 15 April 2007.  The openMSX project has
added extensive features through eight newer releases since then, so the
project was "embarrassed" about the currency of the pkgsrc version.  The
changes of each release are way to long to list, so here are the links:

http://sourceforge.net/projects/openmsx/files/openmsx/0.9.0/README_release-notes.txt/view
http://sourceforge.net/projects/openmsx/files/openmsx/0.8.2/README_release-notes.txt/view
http://sourceforge.net/projects/openmsx/files/openmsx/0.8.1/README_release-notes.txt/view
http://sourceforge.net/projects/openmsx/files/openmsx/0.8.0/release-notes.txt/view
Consecutive release notes 0.7.2/0.7.1, 0.7.0, 0.6.3:
http://sourceforge.net/project/shownotes.php?group_id=38274&release_id=693184

Tested Zombie Incident on DragonFly.  It works nicely!

31 files changed, 306 insertions, 517 deletions

diff --git a/emulators/openmsx/DESCR b/emulators/openmsx/DESCR
index 28d8cd721cc..792e0a062d2 100644
--- a/emulators/openmsx/DESCR
+++ b/emulators/openmsx/DESCR
@@ -1,16 +1,7 @@
-openMSX, the open source MSX emulator that tries to achieve near-perfect
-emulation by using a novel emulation model.
+MSX emulator that aims for perfection
 
-Hardware emulated:
-
-	o almost all MSX systems, except for some details.
-	o Different CPU clock speeds, including those for the Panasonic
-	  MSX2+ machines.
-	o Almost all known cartridge mapper types via autodetection or the
-          included ROM database.
-	o Many MSX storage (disk/SRAM) systems.
-	o kanji JIS ROM 1 and 2.
-	o Mouse and joystick (with option to use the keyboard as joystick).
-	o rensha turbo auto fire support.
-
-And more!
+openMSX is an open source MSX emulator that uses a unique emulation model
+which tries to achieve the highest level of accuracy possible.  It allows
+emulating a large number of different MSX machines.  Using the included
+C-BIOS ROM files, you can run game ROMs without the need to acquire the
+non-free original MSX-BIOS ROM.
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 6430b94a73d..66f7393cd57 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,39 +1,49 @@
-# $NetBSD: Makefile,v 1.32 2012/08/21 23:49:21 marino Exp $
+# $NetBSD: Makefile,v 1.33 2012/08/26 09:07:21 marino Exp $
 #
 
-DISTNAME=		openmsx-0.6.2
-PKGREVISION=		10
+DISTNAME=		openmsx-0.9.0
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openmsx/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://openmsx.sourceforge.net/
 COMMENT=		MSX emulator that aims for perfection
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
+USE_LANGUAGES+=		c++
 HAS_CONFIGURE=		yes
 
 MAKE_FILE=		GNUmakefile
-CONFIGURE_ENV+=		OPENMSX_FLAVOUR=pkgsrc
-MAKE_ENV+=		OPENMSX_FLAVOUR=pkgsrc
+MAKE_ENV+=		OPENMSX_FLAVOUR=opt
+CONFIGURE_ENV+= 	OPENMSX_FLAVOUR=opt
+CONFIGURE_ENV+= 	LOCALBASE=${PREFIX}
+INSTALLATION_DIRS+=	bin
+INSTALL_MAKE_FLAGS+=	SYMLINK_FOR_BINARY=false
+INSTALL_MAKE_FLAGS+=	INSTALL_BASE=${PREFIX}/openmsx
+MAKE_ENV+=		OPENMSX_INSTALL=${PREFIX}/openmsx
 
-post-extract:
-	${CP} ${FILESDIR}/platform-netbsd.mk ${WRKSRC}/build
-	${LN} -s platform-netbsd.mk ${WRKSRC}/build/platform-dragonfly.mk
-	${ECHO_MSG} "OPENMSX_STRIP:=true" > \
-		${WRKSRC}/build/flavour-pkgsrc.mk
+.include "../../mk/bsd.prefs.mk"
 
-REPLACE_PYTHON+=	share/scripts/convert_hardwareconfig.py
-REPLACE_PYTHON+=	share/scripts/convert_hardwareconfig2.py
+.if "${PKGSRC_COMPILER}" == "clang"
+# As a result of predefining CXX, .wrapper/bin/clang++ is automatically
+# hardlinked to c++, g++, which is exactly what we what!
+CXX_OVERRIDE=clang++
+.elif "${PKGSRC_COMPILER}" == "gcc"
+CXX_OVERRIDE=g++
+.else
+CXX_OVERRIDE=${CXX}
+.endif
+CXX=${CXX_OVERRIDE}
 
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
-SUBST_FILES.prefix=	build/custom.mk
-SUBST_SED.prefix=	-e "s,/opt/openMSX,${PREFIX}/openmsx,"
-SUBST_MESSAGE.prefix=	Fixing installation directory.
+post-extract:
+	${CP} ${WRKSRC}/build/platform-freebsd.mk \
+	      ${WRKSRC}/build/platform-dragonfly.mk
+	# Fix permission problem specific to release 0.9.0 and below
+	${CHMOD} 644 ${WRKSRC}/share/extensions/debugdevice/hardwareconfig.xml
+	${CHMOD} 644 ${WRKSRC}/share/extensions/gfx9000/hardwareconfig.xml
 
 post-build:
 	(							\
@@ -41,19 +51,26 @@ post-build:
 	${ECHO} 'exec ${PREFIX}/openmsx/bin/openmsx $$@'	\
 	) > ${WRKSRC}/openmsx.sh
 
-INSTALLATION_DIRS+=	bin
-INSTALL_MAKE_FLAGS+=	OPENMSX_INSTALL=${DESTDIR}${PREFIX}/openmsx
-INSTALL_MAKE_FLAGS+=	SYMLINK_FOR_BINARY=false
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/openmsx.sh ${DESTDIR}${PREFIX}/bin/openmsx
+	@${ECHO_MSG} "======================================================================"
+	@${ECHO_MSG} "  Don't forget to have sound driver loaded before running openMSX."
+	@${ECHO_MSG} "  Otherwise, aRts will throw an exception when launching OpenMSX or"
+	@${ECHO_MSG} "  fail to create a directory called '.mcoprc' in the home directory."
+	@${ECHO_MSG} "  However, you may execute OpenMSX without sound support like this:"
+	@${ECHO_MSG} "  # env SDL_AUDIODRIVER=dummy openmsx <args>"
+	@${ECHO_MSG} "======================================================================"
 
-.include "../../lang/python/application.mk"
+.include "../../audio/libao/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/tcl/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/openmsx/PLIST b/emulators/openmsx/PLIST
index 231564bf116..2cafb5dc9d4 100644
--- a/emulators/openmsx/PLIST
+++ b/emulators/openmsx/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:51:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/08/26 09:07:21 marino Exp $
 bin/openmsx
 openmsx/bin/openmsx
-openmsx/doc/AUTHORS
-openmsx/doc/GPL
-openmsx/doc/README
+openmsx/doc/GPL.txt
+openmsx/doc/authors.txt
 openmsx/doc/cbios.txt
-openmsx/doc/exampleconfigs.xml
 openmsx/doc/manual/commands.html
 openmsx/doc/manual/compile.html
 openmsx/doc/manual/diskmanipulator.html
@@ -14,275 +12,307 @@ openmsx/doc/manual/index.html
 openmsx/doc/manual/manual-minty.css
 openmsx/doc/manual/manual-purple.css
 openmsx/doc/manual/manual.css
-openmsx/doc/manual/nocartfound021.png
+openmsx/doc/manual/nocartfound.png
+openmsx/doc/manual/openmsx-control.html
 openmsx/doc/manual/setup.html
 openmsx/doc/manual/user.html
-openmsx/doc/openmsx-control-xml.txt
 openmsx/doc/release-history.txt
 openmsx/doc/release-notes.txt
+openmsx/share/extensions/ASCII_MSX-DOS2/hardwareconfig.xml
+openmsx/share/extensions/AVT_DPF-550/hardwareconfig.xml
+openmsx/share/extensions/Boosted_audio/hardwareconfig.xml
 openmsx/share/extensions/Checkmark_FM_Stereo_PAK/hardwareconfig.xml
-openmsx/share/extensions/Checkmark_FM_Stereo_PAK/roms/SHA1SUMS
 openmsx/share/extensions/DDX_3.0/hardwareconfig.xml
-openmsx/share/extensions/DDX_3.0/roms/SHA1SUMS
+openmsx/share/extensions/ESE_MEGA-SCSI/hardwareconfig.xml
+openmsx/share/extensions/ESE_Ramdisk/hardwareconfig.xml
+openmsx/share/extensions/ESE_SCC/hardwareconfig.xml
+openmsx/share/extensions/ESE_WAVE-SCSI/hardwareconfig.xml
+openmsx/share/extensions/Gouda_SCSI/hardwareconfig.xml
 openmsx/share/extensions/Konami_EC-702/hardwareconfig.xml
-openmsx/share/extensions/Konami_EC-702/roms/SHA1SUMS
 openmsx/share/extensions/Konami_SD-Snatcher_Sound_Cartridge/hardwareconfig.xml
 openmsx/share/extensions/Konami_Snatcher_Sound_Cartridge/hardwareconfig.xml
+openmsx/share/extensions/Lascom_Kanji/hardwareconfig.xml
 openmsx/share/extensions/MegaRAM_Disk/hardwareconfig.xml
-openmsx/share/extensions/MegaRAM_Disk/roms/SHA1SUMS
+openmsx/share/extensions/Mega_Flash_ROM_SCC/hardwareconfig.xml
+openmsx/share/extensions/Mega_Flash_ROM_SCC_Plus/hardwareconfig.xml
 openmsx/share/extensions/Microsol_CDX-2/hardwareconfig.xml
-openmsx/share/extensions/Microsol_CDX-2/roms/SHA1SUMS
+openmsx/share/extensions/Mitsubishi_ML-30DC_ML-30FD/hardwareconfig.xml
+openmsx/share/extensions/OPL3Cartridge/hardwareconfig.xml
 openmsx/share/extensions/Panasonic_FS-CA1/hardwareconfig.xml
-openmsx/share/extensions/Panasonic_FS-CA1/roms/SHA1SUMS
 openmsx/share/extensions/Panasonic_FS-FD1A/hardwareconfig.xml
-openmsx/share/extensions/Panasonic_FS-FD1A/roms/SHA1SUMS
+openmsx/share/extensions/Password_Cartridge/hardwareconfig.xml
+openmsx/share/extensions/Philips_NMS_1200/hardwareconfig.xml
 openmsx/share/extensions/Philips_NMS_1205/hardwareconfig.xml
-openmsx/share/extensions/Philips_NMS_1205/roms/SHA1SUMS
 openmsx/share/extensions/Philips_VY_0010/hardwareconfig.xml
-openmsx/share/extensions/Philips_VY_0010/roms/SHA1SUMS
+openmsx/share/extensions/README
+openmsx/share/extensions/Sanyo_MFD-001/hardwareconfig.xml
+openmsx/share/extensions/Sharp_HB-3600/hardwareconfig.xml
 openmsx/share/extensions/Sony_HBD-50/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBD-50/roms/SHA1SUMS
 openmsx/share/extensions/Sony_HBD-F1/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBD-F1/roms/SHA1SUMS
+openmsx/share/extensions/Sony_HBI-232/hardwareconfig.xml
 openmsx/share/extensions/Sony_HBI-55/hardwareconfig.xml
 openmsx/share/extensions/Sony_HBK-30/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBK-30/roms/SHA1SUMS
+openmsx/share/extensions/Talent_DPF-550/hardwareconfig.xml
 openmsx/share/extensions/Toshiba_HX-MU900/hardwareconfig.xml
-openmsx/share/extensions/Toshiba_HX-MU900/roms/SHA1SUMS
+openmsx/share/extensions/Yamaha_SFG-05/hardwareconfig.xml
 openmsx/share/extensions/advram/hardwareconfig.xml
 openmsx/share/extensions/audio/hardwareconfig.xml
 openmsx/share/extensions/audio2/hardwareconfig.xml
 openmsx/share/extensions/debugdevice/hardwareconfig.xml
 openmsx/share/extensions/fmpac/hardwareconfig.xml
-openmsx/share/extensions/fmpac/roms/SHA1SUMS
 openmsx/share/extensions/gfx9000/hardwareconfig.xml
 openmsx/share/extensions/ide/hardwareconfig.xml
-openmsx/share/extensions/ide/roms/SHA1SUMS
 openmsx/share/extensions/mbstereo/hardwareconfig.xml
-openmsx/share/extensions/mbstereo/roms/SHA1SUMS
 openmsx/share/extensions/megaram/hardwareconfig.xml
 openmsx/share/extensions/moonsound/hardwareconfig.xml
-openmsx/share/extensions/moonsound/roms/SHA1SUMS
 openmsx/share/extensions/msxdos2/hardwareconfig.xml
-openmsx/share/extensions/msxdos2/roms/SHA1SUMS
+openmsx/share/extensions/nowind/hardwareconfig.xml
 openmsx/share/extensions/pac/hardwareconfig.xml
 openmsx/share/extensions/ram1mb/hardwareconfig.xml
 openmsx/share/extensions/ram2mb/hardwareconfig.xml
 openmsx/share/extensions/ram4mb/hardwareconfig.xml
 openmsx/share/extensions/ram512k/hardwareconfig.xml
 openmsx/share/extensions/rs232/hardwareconfig.xml
-openmsx/share/extensions/rs232/roms/SHA1SUMS
 openmsx/share/extensions/scc+/hardwareconfig.xml
 openmsx/share/extensions/scc/hardwareconfig.xml
 openmsx/share/extensions/slotexpander/hardwareconfig.xml
+openmsx/share/extensions/video9000/hardwareconfig.xml
 openmsx/share/icons/openMSX-logo-128.png
 openmsx/share/icons/openMSX-logo-16.png
 openmsx/share/icons/openMSX-logo-32.png
 openmsx/share/icons/openMSX-logo-48.png
 openmsx/share/icons/openMSX-logo-64.png
 openmsx/share/init.tcl
-openmsx/share/keymaps/keymap.default
-openmsx/share/keymaps/keymap.rus2eng
 openmsx/share/machines/Al_Alamiah_AX170/hardwareconfig.xml
-openmsx/share/machines/Al_Alamiah_AX170/roms/SHA1SUMS
+openmsx/share/machines/Boosted_MSX2+_JP/README
+openmsx/share/machines/Boosted_MSX2+_JP/hardwareconfig.xml
 openmsx/share/machines/Boosted_MSX2_EN/README
 openmsx/share/machines/Boosted_MSX2_EN/hardwareconfig.xml
-openmsx/share/machines/Boosted_MSX2_EN/roms/README
 openmsx/share/machines/C-BIOS_MSX1/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX1/roms/cbios_logo_msx1.rom
 openmsx/share/machines/C-BIOS_MSX1/roms/cbios_main_msx1.rom
+openmsx/share/machines/C-BIOS_MSX1_BR/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX1_BR/roms/cbios_logo_msx1.rom
+openmsx/share/machines/C-BIOS_MSX1_BR/roms/cbios_main_msx1_br.rom
+openmsx/share/machines/C-BIOS_MSX1_JP/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX1_JP/roms/cbios_logo_msx1.rom
+openmsx/share/machines/C-BIOS_MSX1_JP/roms/cbios_main_msx1_jp.rom
 openmsx/share/machines/C-BIOS_MSX2+/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_logo_msx2+.rom
 openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_main_msx2+.rom
 openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_music.rom
 openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_sub.rom
+openmsx/share/machines/C-BIOS_MSX2+_BR/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2+_BR/roms/cbios_main_msx2+_br.rom
+openmsx/share/machines/C-BIOS_MSX2+_BR/roms/cbios_music.rom
+openmsx/share/machines/C-BIOS_MSX2+_BR/roms/cbios_sub.rom
+openmsx/share/machines/C-BIOS_MSX2+_JP/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2+_JP/roms/cbios_logo_msx2+.rom
+openmsx/share/machines/C-BIOS_MSX2+_JP/roms/cbios_main_msx2+_jp.rom
+openmsx/share/machines/C-BIOS_MSX2+_JP/roms/cbios_music.rom
+openmsx/share/machines/C-BIOS_MSX2+_JP/roms/cbios_sub.rom
 openmsx/share/machines/C-BIOS_MSX2/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2/roms/cbios_logo_msx2.rom
 openmsx/share/machines/C-BIOS_MSX2/roms/cbios_main_msx2.rom
 openmsx/share/machines/C-BIOS_MSX2/roms/cbios_sub.rom
+openmsx/share/machines/C-BIOS_MSX2_BR/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2_BR/roms/cbios_logo_msx2.rom
+openmsx/share/machines/C-BIOS_MSX2_BR/roms/cbios_main_msx2_br.rom
+openmsx/share/machines/C-BIOS_MSX2_BR/roms/cbios_sub.rom
+openmsx/share/machines/C-BIOS_MSX2_JP/hardwareconfig.xml
+openmsx/share/machines/C-BIOS_MSX2_JP/roms/cbios_logo_msx2.rom
+openmsx/share/machines/C-BIOS_MSX2_JP/roms/cbios_main_msx2_jp.rom
+openmsx/share/machines/C-BIOS_MSX2_JP/roms/cbios_sub.rom
+openmsx/share/machines/CIEL_Expert-Turbo/hardwareconfig.xml
 openmsx/share/machines/Canon_V-20/hardwareconfig.xml
-openmsx/share/machines/Canon_V-20/roms/SHA1SUMS
 openmsx/share/machines/Daewoo_CPC-300/hardwareconfig.xml
-openmsx/share/machines/Daewoo_CPC-300/roms/SHA1SUMS
 openmsx/share/machines/Daewoo_CPC-400S/hardwareconfig.xml
-openmsx/share/machines/Daewoo_CPC-400S/roms/SHA1SUMS
 openmsx/share/machines/Daewoo_DPC-100/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-100/roms/SHA1SUMS
 openmsx/share/machines/Daewoo_DPC-180/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-180/roms/SHA1SUMS
 openmsx/share/machines/Daewoo_DPC-200/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-200/roms/SHA1SUMS
 openmsx/share/machines/Goldstar_FC-200/hardwareconfig.xml
-openmsx/share/machines/Goldstar_FC-200/roms/SHA1SUMS
 openmsx/share/machines/Gradiente_Expert_1.0/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_1.0/roms/SHA1SUMS
 openmsx/share/machines/Gradiente_Expert_1.1/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_1.1/roms/SHA1SUMS
 openmsx/share/machines/Gradiente_Expert_DDPlus/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_DDPlus/roms/SHA1SUMS
 openmsx/share/machines/Gradiente_Expert_Plus/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_Plus/roms/SHA1SUMS
 openmsx/share/machines/JVC_HC-7GB/hardwareconfig.xml
-openmsx/share/machines/JVC_HC-7GB/roms/SHA1SUMS
 openmsx/share/machines/Mitsubishi_ML-F80/hardwareconfig.xml
-openmsx/share/machines/Mitsubishi_ML-F80/roms/SHA1SUMS
 openmsx/share/machines/Mitsubishi_ML-FX1/hardwareconfig.xml
-openmsx/share/machines/Mitsubishi_ML-FX1/roms/SHA1SUMS
+openmsx/share/machines/Mitsubishi_ML-G1_ES/hardwareconfig.xml
+openmsx/share/machines/Mitsubishi_ML-G3_ES/hardwareconfig.xml
 openmsx/share/machines/National_CF-1200/hardwareconfig.xml
-openmsx/share/machines/National_CF-1200/roms/SHA1SUMS
 openmsx/share/machines/National_CF-2000/hardwareconfig.xml
-openmsx/share/machines/National_CF-2000/roms/SHA1SUMS
 openmsx/share/machines/National_CF-2700/hardwareconfig.xml
-openmsx/share/machines/National_CF-2700/roms/SHA1SUMS
 openmsx/share/machines/National_CF-3000/hardwareconfig.xml
-openmsx/share/machines/National_CF-3000/roms/SHA1SUMS
 openmsx/share/machines/National_CF-3300/hardwareconfig.xml
-openmsx/share/machines/National_CF-3300/roms/SHA1SUMS
 openmsx/share/machines/National_FS-1300/hardwareconfig.xml
-openmsx/share/machines/National_FS-1300/roms/SHA1SUMS
 openmsx/share/machines/National_FS-4000/hardwareconfig.xml
-openmsx/share/machines/National_FS-4000/roms/SHA1SUMS
 openmsx/share/machines/National_FS-4500/hardwareconfig.xml
-openmsx/share/machines/National_FS-4500/roms/SHA1SUMS
 openmsx/share/machines/National_FS-4600/hardwareconfig.xml
-openmsx/share/machines/National_FS-4600/roms/SHA1SUMS
 openmsx/share/machines/National_FS-4700/hardwareconfig.xml
-openmsx/share/machines/National_FS-4700/roms/SHA1SUMS
 openmsx/share/machines/National_FS-5000/hardwareconfig.xml
-openmsx/share/machines/National_FS-5000/roms/SHA1SUMS
 openmsx/share/machines/National_FS-5500F1/hardwareconfig.xml
-openmsx/share/machines/National_FS-5500F1/roms/SHA1SUMS
 openmsx/share/machines/National_FS-5500F2/hardwareconfig.xml
-openmsx/share/machines/National_FS-5500F2/roms/SHA1SUMS
+openmsx/share/machines/Panasonic_CF-2700_DE/hardwareconfig.xml
 openmsx/share/machines/Panasonic_FS-A1/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1F/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1F/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1FM/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1FM/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1FX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1FX/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1GT/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1GT/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1MK2/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1MK2/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1ST/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1ST/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1WSX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1WSX/roms/SHA1SUMS
 openmsx/share/machines/Panasonic_FS-A1WX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1WX/roms/SHA1SUMS
 openmsx/share/machines/Philips_NMS_801/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_801/roms/SHA1SUMS
 openmsx/share/machines/Philips_NMS_8220/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8220/roms/SHA1SUMS
 openmsx/share/machines/Philips_NMS_8245/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8245/roms/SHA1SUMS
 openmsx/share/machines/Philips_NMS_8250/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8250/roms/SHA1SUMS
 openmsx/share/machines/Philips_NMS_8255/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8255/roms/SHA1SUMS
+openmsx/share/machines/Philips_VG_8000/hardwareconfig.xml
+openmsx/share/machines/Philips_VG_8010/hardwareconfig.xml
+openmsx/share/machines/Philips_VG_8010F/hardwareconfig.xml
 openmsx/share/machines/Philips_VG_8020-20/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8020-20/roms/SHA1SUMS
 openmsx/share/machines/Philips_VG_8020/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8020/roms/SHA1SUMS
+openmsx/share/machines/Philips_VG_8020F/hardwareconfig.xml
 openmsx/share/machines/Philips_VG_8230/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8230/roms/SHA1SUMS
 openmsx/share/machines/Philips_VG_8235/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8235/roms/SHA1SUMS
-openmsx/share/machines/SHA1SUMS
+openmsx/share/machines/Pioneer_PX-7/hardwareconfig.xml
+openmsx/share/machines/Pioneer_PX-7UK/hardwareconfig.xml
+openmsx/share/machines/Pioneer_PX-V60/hardwareconfig.xml
+openmsx/share/machines/README
 openmsx/share/machines/Sanyo_MPC-100/hardwareconfig.xml
-openmsx/share/machines/Sanyo_MPC-100/roms/SHA1SUMS
+openmsx/share/machines/Sanyo_MPC-25FD/hardwareconfig.xml
+openmsx/share/machines/Sanyo_PHC-23JB/hardwareconfig.xml
+openmsx/share/machines/Sanyo_PHC-28L/hardwareconfig.xml
+openmsx/share/machines/Sanyo_PHC-28S/hardwareconfig.xml
 openmsx/share/machines/Sanyo_PHC-35J/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-35J/roms/SHA1SUMS
 openmsx/share/machines/Sanyo_PHC-70FD/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-70FD/roms/SHA1SUMS
 openmsx/share/machines/Sanyo_PHC-70FD2/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-70FD2/roms/SHA1SUMS
 openmsx/share/machines/Sharp_Epcom_HotBit_1.1/hardwareconfig.xml
-openmsx/share/machines/Sharp_Epcom_HotBit_1.1/roms/SHA1SUMS
 openmsx/share/machines/Sharp_Epcom_HotBit_1.2/hardwareconfig.xml
-openmsx/share/machines/Sharp_Epcom_HotBit_1.2/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-10/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-101P/hardwareconfig.xml
+openmsx/share/machines/Sony_HB-10P/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-201P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-201P/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-20P/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-501P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-501P/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-55P/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-75P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-75P/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F1/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F1II/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1II/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F1XD/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1XD/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-F1XDJ/hardwareconfig.xml
+openmsx/share/machines/Sony_HB-F5/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-F500P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F500P/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F700D/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F700D/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-F700P/hardwareconfig.xml
 openmsx/share/machines/Sony_HB-F900/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F900/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F9P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F9P/roms/SHA1SUMS
 openmsx/share/machines/Sony_HB-F9P_Russian/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F9P_Russian/roms/SHA1SUMS
+openmsx/share/machines/Sony_HB-F9S/hardwareconfig.xml
+openmsx/share/machines/Sony_HB-G900P/hardwareconfig.xml
 openmsx/share/machines/Spectravideo_SVI-728/hardwareconfig.xml
-openmsx/share/machines/Spectravideo_SVI-728/roms/SHA1SUMS
 openmsx/share/machines/Spectravideo_SVI-738/hardwareconfig.xml
-openmsx/share/machines/Spectravideo_SVI-738/roms/SHA1SUMS
+openmsx/share/machines/Talent_DPC-200/hardwareconfig.xml
+openmsx/share/machines/Talent_TPC-310/hardwareconfig.xml
 openmsx/share/machines/Toshiba_HX-10/hardwareconfig.xml
-openmsx/share/machines/Toshiba_HX-10/roms/SHA1SUMS
+openmsx/share/machines/Victor_HC-95A/hardwareconfig.xml
 openmsx/share/machines/Yamaha_AX350II/hardwareconfig.xml
-openmsx/share/machines/Yamaha_AX350II/roms/SHA1SUMS
+openmsx/share/machines/Yamaha_CX5M/hardwareconfig.xml
+openmsx/share/machines/Yamaha_CX5MII-128/hardwareconfig.xml
+openmsx/share/machines/Yamaha_YIS-503F/hardwareconfig.xml
+openmsx/share/machines/Yamaha_YIS-503IIIR/hardwareconfig.xml
+openmsx/share/machines/Yamaha_YIS-805-128R2/hardwareconfig.xml
 openmsx/share/machines/Yashica_YC-64/hardwareconfig.xml
-openmsx/share/machines/Yashica_YC-64/roms/SHA1SUMS
 openmsx/share/machines/msx1
 openmsx/share/machines/msx2
 openmsx/share/machines/msx2plus
 openmsx/share/machines/turbor
+openmsx/share/nettou_yakyuu/README
 openmsx/share/playball/README
 openmsx/share/scripts/about.tcl
 openmsx/share/scripts/autoplug.tcl
 openmsx/share/scripts/backwards_compatibility.tcl
 openmsx/share/scripts/cheat.tcl
-openmsx/share/scripts/convert_hardwareconfig.py
-openmsx/share/scripts/convert_hardwareconfig2.py
 openmsx/share/scripts/cpuregs.tcl
+openmsx/share/scripts/create_user_dirs.tcl
 openmsx/share/scripts/cycle.tcl
+openmsx/share/scripts/cycle_machine.tcl
 openmsx/share/scripts/disasm.tcl
+openmsx/share/scripts/example_tools.tcl
+openmsx/share/scripts/filepool.tcl
 openmsx/share/scripts/guess_title.tcl
+openmsx/share/scripts/info_panel.tcl
+openmsx/share/scripts/keybindings.tcl
 openmsx/share/scripts/load_icons.tcl
+openmsx/share/scripts/mode.tcl
+openmsx/share/scripts/mog-overlay.tcl
 openmsx/share/scripts/monitor.tcl
 openmsx/share/scripts/multi_screenshot.tcl
+openmsx/share/scripts/music_keyboard.tcl
+openmsx/share/scripts/osd.tcl
+openmsx/share/scripts/osd_keyboard.tcl
+openmsx/share/scripts/osd_menu.tcl
+openmsx/share/scripts/osd_nemesis.tcl
+openmsx/share/scripts/osd_widgets.tcl
 openmsx/share/scripts/psg_log.tcl
+openmsx/share/scripts/psg_profile.tcl
+openmsx/share/scripts/record_channels.tcl
+openmsx/share/scripts/record_chunks.tcl
 openmsx/share/scripts/reg_log.tcl
+openmsx/share/scripts/reverse.tcl
+openmsx/share/scripts/rom_info.tcl
 openmsx/share/scripts/save_debuggable.tcl
+openmsx/share/scripts/savestate.tcl
+openmsx/share/scripts/scc_toys.tcl
+openmsx/share/scripts/screenshot.tcl
+openmsx/share/scripts/session_management.tcl
+openmsx/share/scripts/shield.png
 openmsx/share/scripts/showdebuggable.tcl
 openmsx/share/scripts/slot.tcl
+openmsx/share/scripts/soundchip_utils.tcl
 openmsx/share/scripts/soundlog.tcl
+openmsx/share/scripts/sprites.tcl
 openmsx/share/scripts/stack.tcl
+openmsx/share/scripts/tabbed_machine_view.tcl
+openmsx/share/scripts/tas_tools.tcl
 openmsx/share/scripts/text_echo.tcl
+openmsx/share/scripts/tileviewer.tcl
 openmsx/share/scripts/toggle_freq.tcl
 openmsx/share/scripts/trainer.tcl
 openmsx/share/scripts/trainerdefs.tclinclude
+openmsx/share/scripts/type_from_file.tcl
 openmsx/share/scripts/umrcallback.tcl
+openmsx/share/scripts/utils.tcl
 openmsx/share/scripts/vdp.tcl
+openmsx/share/scripts/vdp_access_test.tcl
 openmsx/share/scripts/vdrive.tcl
+openmsx/share/scripts/vu-meters.tcl
+openmsx/share/scripts/widgets.tcl
 openmsx/share/settings.xml
-openmsx/share/shaders/HQ2xLiteOffset.dat
+openmsx/share/shaders/HQ2xLiteOffsets.dat
 openmsx/share/shaders/HQ2xOffsets.dat
 openmsx/share/shaders/HQ2xWeights.dat
-openmsx/share/shaders/HQ3xLiteOffset.dat
+openmsx/share/shaders/HQ3xLiteOffsets.dat
 openmsx/share/shaders/HQ3xOffsets.dat
 openmsx/share/shaders/HQ3xWeights.dat
-openmsx/share/shaders/HQ4xLiteOffset.dat
+openmsx/share/shaders/HQ4xLiteOffsets.dat
 openmsx/share/shaders/HQ4xOffsets.dat
 openmsx/share/shaders/HQ4xWeights.dat
 openmsx/share/shaders/hq.frag
 openmsx/share/shaders/hq.vert
 openmsx/share/shaders/hqlite.frag
 openmsx/share/shaders/hqlite.vert
+openmsx/share/shaders/rgb.frag
+openmsx/share/shaders/rgb.vert
+openmsx/share/shaders/sai.frag
+openmsx/share/shaders/sai.vert
 openmsx/share/shaders/scale2x.frag
 openmsx/share/shaders/scale2x.vert
 openmsx/share/shaders/simple.frag
 openmsx/share/shaders/simple.vert
+openmsx/share/shaders/superImpose.frag
+openmsx/share/shaders/superImpose.vert
 openmsx/share/shaders/tv.frag
 openmsx/share/shaders/tv.vert
 openmsx/share/skins/ConsoleBackground.png
@@ -294,16 +324,38 @@ openmsx/share/skins/ConsoleBackground5.png
 openmsx/share/skins/ConsoleBackground6.png
 openmsx/share/skins/ConsoleBackgroundBlue.png
 openmsx/share/skins/ConsoleBackgroundGrey.png
-openmsx/share/skins/ConsoleFont.png
-openmsx/share/skins/ConsoleFont1.png
-openmsx/share/skins/ConsoleFontRave.png
-openmsx/share/skins/ConsoleFontRaveL.png
-openmsx/share/skins/ConsoleFontRaveLShaded.png
-openmsx/share/skins/ConsoleFontRaveShaded.png
-openmsx/share/skins/ConsoleFontShaded.png
+openmsx/share/skins/Vera.ttf.gz
+openmsx/share/skins/VeraMono.ttf.gz
+openmsx/share/skins/breaked.png
+openmsx/share/skins/fancy/frame.png
+openmsx/share/skins/fancy/led-off.png
+openmsx/share/skins/fancy/led-on.png
+openmsx/share/skins/fancy/skin.tcl
+openmsx/share/skins/handheld/breaked.png
+openmsx/share/skins/handheld/caps-off.png
+openmsx/share/skins/handheld/caps-on.png
+openmsx/share/skins/handheld/code-off.png
+openmsx/share/skins/handheld/code-on.png
+openmsx/share/skins/handheld/fdd-off.png
+openmsx/share/skins/handheld/fdd-on.png
+openmsx/share/skins/handheld/kana-off.png
+openmsx/share/skins/handheld/kana-on.png
+openmsx/share/skins/handheld/mute.png
+openmsx/share/skins/handheld/pause-off.png
+openmsx/share/skins/handheld/pause-on.png
+openmsx/share/skins/handheld/pause.png
+openmsx/share/skins/handheld/power-off.png
+openmsx/share/skins/handheld/power-on.png
+openmsx/share/skins/handheld/skin.tcl
+openmsx/share/skins/handheld/throttle.png
+openmsx/share/skins/handheld/turbo-off.png
+openmsx/share/skins/handheld/turbo-on.png
 openmsx/share/skins/led-off.png
 openmsx/share/skins/led.png
+openmsx/share/skins/mute.png
 openmsx/share/skins/none/skin.tcl
+openmsx/share/skins/pause.png
+openmsx/share/skins/set1/breaked.png
 openmsx/share/skins/set1/caps-off.png
 openmsx/share/skins/set1/caps-on.png
 openmsx/share/skins/set1/code-off.png
@@ -312,11 +364,14 @@ openmsx/share/skins/set1/fdd-off.png
 openmsx/share/skins/set1/fdd-on.png
 openmsx/share/skins/set1/kana-off.png
 openmsx/share/skins/set1/kana-on.png
+openmsx/share/skins/set1/mute.png
 openmsx/share/skins/set1/pause-off.png
 openmsx/share/skins/set1/pause-on.png
+openmsx/share/skins/set1/pause.png
 openmsx/share/skins/set1/power-off.png
 openmsx/share/skins/set1/power-on.png
 openmsx/share/skins/set1/skin.tcl
+openmsx/share/skins/set1/throttle.png
 openmsx/share/skins/set1/turbo-off.png
 openmsx/share/skins/set1/turbo-on.png
 openmsx/share/skins/set2/caps-off.png
@@ -345,5 +400,43 @@ openmsx/share/skins/set4/power-on.png
 openmsx/share/skins/set4/skin.tcl
 openmsx/share/skins/set4/turbo-off.png
 openmsx/share/skins/set4/turbo-on.png
+openmsx/share/skins/set5/breaked.png
+openmsx/share/skins/set5/caps-off.png
+openmsx/share/skins/set5/caps-on.png
+openmsx/share/skins/set5/fdd-off.png
+openmsx/share/skins/set5/fdd-on.png
+openmsx/share/skins/set5/kana-off.png
+openmsx/share/skins/set5/kana-on.png
+openmsx/share/skins/set5/mute.png
+openmsx/share/skins/set5/mute_off.png
+openmsx/share/skins/set5/pause-off.png
+openmsx/share/skins/set5/pause-on.png
+openmsx/share/skins/set5/pause.png
+openmsx/share/skins/set5/power-off.png
+openmsx/share/skins/set5/power-on.png
+openmsx/share/skins/set5/reverse.png
+openmsx/share/skins/set5/skin.tcl
+openmsx/share/skins/set5/throttle.png
+openmsx/share/skins/set5/throttle_off.png
+openmsx/share/skins/set5/turbo-off.png
+openmsx/share/skins/set5/turbo-on.png
+openmsx/share/skins/throttle.png
+openmsx/share/software/README
 openmsx/share/softwaredb.xml
+openmsx/share/softwaredb1.dtd
 openmsx/share/systemroms/README
+openmsx/share/unicodemaps/unicodemap.br_gradiente_1_0
+openmsx/share/unicodemaps/unicodemap.br_gradiente_1_1
+openmsx/share/unicodemaps/unicodemap.br_hotbit_1_1
+openmsx/share/unicodemaps/unicodemap.br_hotbit_1_2
+openmsx/share/unicodemaps/unicodemap.de
+openmsx/share/unicodemaps/unicodemap.es
+openmsx/share/unicodemaps/unicodemap.fr
+openmsx/share/unicodemaps/unicodemap.gb
+openmsx/share/unicodemaps/unicodemap.int
+openmsx/share/unicodemaps/unicodemap.jp_ansi
+openmsx/share/unicodemaps/unicodemap.jp_jis
+openmsx/share/unicodemaps/unicodemap.kr
+openmsx/share/unicodemaps/unicodemap.proto_fr
+openmsx/share/unicodemaps/unicodemap.proto_int
+openmsx/share/unicodemaps/unicodemap.ru
diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo
index b68d4fb66a6..8951f406f31 100644
--- a/emulators/openmsx/distinfo
+++ b/emulators/openmsx/distinfo
@@ -1,28 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/08/12 01:15:00 marino Exp $
+$NetBSD: distinfo,v 1.10 2012/08/26 09:07:21 marino Exp $
 
-SHA1 (openmsx-0.6.2.tar.gz) = b9e2f1bf13f193618f35c0fd6820c2bd44088870
-RMD160 (openmsx-0.6.2.tar.gz) = b800499248ee43de8007042d4dd0a4523f464833
-Size (openmsx-0.6.2.tar.gz) = 1934469 bytes
-SHA1 (patch-aa) = aadad14af76af2dc97dbb3f0ab4b1b5bda4be8c1
-SHA1 (patch-src_MSXDevice.cc) = 92de13d9cc66c3367a475585d4883581074d65a2
-SHA1 (patch-src_commands_Completer.cc) = b5ef6c2d59aef5d927691a638d01512fffc4a44f
-SHA1 (patch-src_cpu_MSXCPUInterface.cc) = de0bf2c8a35eb2e3c862804ac224523155623132
-SHA1 (patch-src_events_Socket.cc) = b64d9620bf88a0515612e5a60a87e26442b85752
-SHA1 (patch-src_fdc_MSXtar.cc) = 944893194d15e0d802986860c85286eeaca4c0af
-SHA1 (patch-src_fdc_TC8566AF.cc) = 418121aff79791fc4b3b8f4062014ebb6529d5ad
-SHA1 (patch-src_file_Date.cc) = 885ae3934fc9ab0d15c99c620a8b94703f3383eb
-SHA1 (patch-src_file_FileBase.cc) = 606ca7ed75dc8ac55e02b1c89e97a39480cb2044
-SHA1 (patch-src_file_GZFileAdapter.cc) = 6b3c691684d7d95a78f9247be0661a4b4b07af36
-SHA1 (patch-src_file_ZipFileAdapter.cc) = 1534647f8c40a44aa80cc41949609f9a855680ce
-SHA1 (patch-src_input_RecordedCommand.hh) = 700ccad99b5b8e23ec54ca5bc0d98081b049d9ee
-SHA1 (patch-src_memory_Ram.cc) = d87340931ad048417fa791c9830b95197593f326
-SHA1 (patch-src_sound_AY8910.cc) = 61c009e403945bd55f9f61d242c01ae204677021
-SHA1 (patch-src_sound_MSXMixer.cc) = d4dd0b4ba1b344ff50a465b7583303122241d5dc
-SHA1 (patch-src_sound_Y8950Adpcm.cc) = 564c0ea4f3783ff6873b45a7bc0b0405f5cc6160
-SHA1 (patch-src_sound_YMF262.cc) = b07afcbe7dd2ced71a7e914283a9580529d8f54e
-SHA1 (patch-src_video_MemoryOps.cc) = 145cf13cbeb8148d0e22eea202c9085a4b501419
-SHA1 (patch-src_video_ScreenShotSaver.cc) = 84175620949c2f781565bdc5e2e864b24afd4549
-SHA1 (patch-src_video_VDP.cc) = 464bb75e38d02dda36b05febf6060f79347f36b0
-SHA1 (patch-src_video_VDPVRAM.cc) = 6fd50b6d977317ca08fe6957d8f91b67381e1a6e
-SHA1 (patch-src_video_v9990_V9990.cc) = 0b6f80332b5c1f64c9812c54f1e4d1864fdde612
-SHA1 (patch-src_video_v9990_V9990VRAM.cc) = 124a0cd55f3d9e763ac8a4775f7dd8859cfe6bbb
+SHA1 (openmsx-0.9.0.tar.gz) = a8e396d5feb60bd7df8fbef0b5e6d41e5b0e5826
+RMD160 (openmsx-0.9.0.tar.gz) = 9b7f01ba3dcedf5ebba920983938a25db561c26d
+Size (openmsx-0.9.0.tar.gz) = 2963005 bytes
+SHA1 (patch-build_detectsys.py) = 9d88783a8c00a074e5dc149fce2dbeb20d12cb9e
+SHA1 (patch-build_probe.py) = c083d5950dae95f12d4c0b5c7d1a2cac89ad786e
+SHA1 (patch-build_version.py) = 2b3e53a0499befb8c18760e80fdbc279cc6aefc8
diff --git a/emulators/openmsx/files/platform-netbsd.mk b/emulators/openmsx/files/platform-netbsd.mk
deleted file mode 100644
index b39f282c0af..00000000000
--- a/emulators/openmsx/files/platform-netbsd.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration file for NetBSD.
-
-# Does platform support symlinks?
-USE_SYMLINK:=true
-
-# Default compiler.
-OPENMSX_CXX?=$(CXX)
-
-# File name extension of executables.
-EXEEXT:=
-
-CXXFLAGS+=	-D_REENTRANT -D_THREAD_SAFE
-LINK_FLAGS+=	-pthread
-
-# Probe Overrides
-# ===============
-
-MMAP_PREHEADER:=<sys/types.h>
-SYS_MMAN_PREHEADER:=<sys/types.h>
-SYS_SOCKET_PREHEADER:=<sys/types.h>
-
-SDL_CFLAGS:=`sdl-config --cflags 2>> $(LOG)`
-
-SDL_LDFLAGS:=`sdl-config --libs 2>> $(LOG)`
-SDL_RESULT:=`sdl-config --version`
-
-PNG_CFLAGS:=
-
-PNG_LDFLAGS:=-lpng
-PNG_RESULT:=yes
diff --git a/emulators/openmsx/patches/patch-aa b/emulators/openmsx/patches/patch-aa
deleted file mode 100644
index ad9470f440d..00000000000
--- a/emulators/openmsx/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/06/20 09:27:46 wiz Exp $
-
-Add DragonFly to recognized platforms.
-
---- build/detectsys.sh.orig	2007-05-19 03:12:27.000000000 +0200
-+++ build/detectsys.sh	2007-05-19 03:12:48.000000000 +0200
-@@ -77,6 +77,8 @@
- 		OPENMSX_TARGET_OS=freebsd;;
- 	*netbsd*)
- 		OPENMSX_TARGET_OS=netbsd;;
-+	*dragonfly*)
-+		OPENMSX_TARGET_OS=dragonfly;;
- 	*openbsd*)
- 		OPENMSX_TARGET_OS=openbsd;;
- 	*mingw*)
diff --git a/emulators/openmsx/patches/patch-build_detectsys.py b/emulators/openmsx/patches/patch-build_detectsys.py
new file mode 100644
index 00000000000..ae99d9805f3
--- /dev/null
+++ b/emulators/openmsx/patches/patch-build_detectsys.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_detectsys.py,v 1.1 2012/08/26 09:07:23 marino Exp $
+
+Set os to "dragonfly" when built on "DragonFly"
+
+--- build/detectsys.py.orig	2012-08-12 12:29:37.000000000 +0000
++++ build/detectsys.py
+@@ -58,7 +58,7 @@ def detectOS():
+ 	Raises ValueError if no known OS is detected.
+ 	'''
+ 	os = system().lower()
+-	if os in ('linux', 'darwin', 'freebsd', 'netbsd', 'openbsd', 'gnu'):
++	if os in ('linux', 'darwin', 'dragonfly', 'freebsd', 'netbsd', 'openbsd', 'gnu'):
+ 		return os
+ 	elif os.startswith('gnu/'):
+ 		# GNU userland on non-Hurd kernel, for example Debian GNU/kFreeBSD.
diff --git a/emulators/openmsx/patches/patch-build_probe.py b/emulators/openmsx/patches/patch-build_probe.py
new file mode 100644
index 00000000000..222b7d87ca1
--- /dev/null
+++ b/emulators/openmsx/patches/patch-build_probe.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-build_probe.py,v 1.1 2012/08/26 09:07:23 marino Exp $
+
+DragonFly is a BSD whose platform name does not end in "BSD"
+Just look for it specifically.
+
+--- build/probe.py.orig	2012-08-12 12:29:37.000000000 +0000
++++ build/probe.py
+@@ -396,7 +396,7 @@ def main(compileCommandStr, outDir, plat
+ 						break
+ 				else:
+ 					distroRoot = '/usr/local'
+-			elif platform.endswith('bsd'):
++			elif platform == 'dragonfly' or platform.endswith('bsd'):
+ 				distroRoot = environ.get('LOCALBASE', '/usr/local')
+ 				print 'Using libraries from ports directory %s.' % distroRoot
+ 			elif platform == 'pandora':
diff --git a/emulators/openmsx/patches/patch-build_version.py b/emulators/openmsx/patches/patch-build_version.py
new file mode 100644
index 00000000000..91eecb7f4d5
--- /dev/null
+++ b/emulators/openmsx/patches/patch-build_version.py
@@ -0,0 +1,18 @@
+$NetBSD: patch-build_version.py,v 1.1 2012/08/26 09:07:23 marino Exp $
+
+Bug caused subversion to run during the make process.  This patch is
+proposed by upstream.
+
+--- build/version.py.orig	2012-08-12 12:29:37.000000000 +0000
++++ build/version.py
+@@ -50,6 +50,10 @@ def extractRevision():
+ 	global _cachedRevision
+ 	if _cachedRevision is not False:
+ 		return _cachedRevision
++	if releaseFlag:
++		# Running "svn info" creates a ~/.subversion directory, which is
++		# undesired on automated build machines and pkgsrc complains about it.
++		return None
+ 	if not isdir('derived'):
+ 		makedirs('derived')
+ 	log = open('derived/version.log', 'w')
diff --git a/emulators/openmsx/patches/patch-src_MSXDevice.cc b/emulators/openmsx/patches/patch-src_MSXDevice.cc
deleted file mode 100644
index 587ef84eb78..00000000000
--- a/emulators/openmsx/patches/patch-src_MSXDevice.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_MSXDevice.cc,v 1.1 2012/08/12 01:15:00 marino Exp $
-
---- src/MSXDevice.cc.orig	2007-04-14 21:25:22.000000000 +0000
-+++ src/MSXDevice.cc
-@@ -11,6 +11,7 @@
- #include <set>
- #include <algorithm>
- #include <cassert>
-+#include <cstring>
- 
- using std::string;
- using std::vector;
diff --git a/emulators/openmsx/patches/patch-src_commands_Completer.cc b/emulators/openmsx/patches/patch-src_commands_Completer.cc
deleted file mode 100644
index b974d9db868..00000000000
--- a/emulators/openmsx/patches/patch-src_commands_Completer.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_commands_Completer.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/commands/Completer.cc.orig	2011-11-24 02:40:18.000000000 +0000
-+++ src/commands/Completer.cc
-@@ -6,6 +6,7 @@
- #include "FileOperations.hh"
- #include "ReadDir.hh"
- #include <algorithm>
-+#include <strings.h>
- 
- using std::vector;
- using std::string;
diff --git a/emulators/openmsx/patches/patch-src_cpu_MSXCPUInterface.cc b/emulators/openmsx/patches/patch-src_cpu_MSXCPUInterface.cc
deleted file mode 100644
index 143554a1840..00000000000
--- a/emulators/openmsx/patches/patch-src_cpu_MSXCPUInterface.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_cpu_MSXCPUInterface.cc,v 1.1 2012/08/12 01:15:00 marino Exp $
-
---- src/cpu/MSXCPUInterface.cc.orig	2007-04-14 21:25:23.000000000 +0000
-+++ src/cpu/MSXCPUInterface.cc
-@@ -27,6 +27,7 @@
- #include <iomanip>
- #include <algorithm>
- #include <iostream>
-+#include <cstring>
- 
- using std::auto_ptr;
- using std::ostringstream;
diff --git a/emulators/openmsx/patches/patch-src_events_Socket.cc b/emulators/openmsx/patches/patch-src_events_Socket.cc
deleted file mode 100644
index 2040a6229ef..00000000000
--- a/emulators/openmsx/patches/patch-src_events_Socket.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_events_Socket.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/events/Socket.cc.orig	2011-11-24 02:41:51.000000000 +0000
-+++ src/events/Socket.cc
-@@ -3,6 +3,7 @@
- #include "Socket.hh"
- #include "MSXException.hh"
- #include <map>
-+#include <string.h>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_fdc_MSXtar.cc b/emulators/openmsx/patches/patch-src_fdc_MSXtar.cc
deleted file mode 100644
index cccaec40680..00000000000
--- a/emulators/openmsx/patches/patch-src_fdc_MSXtar.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_fdc_MSXtar.cc,v 1.1 2012/08/12 01:15:00 marino Exp $
-
---- src/fdc/MSXtar.cc.orig	2007-04-14 21:25:24.000000000 +0000
-+++ src/fdc/MSXtar.cc
-@@ -14,6 +14,7 @@
- #include <cstdlib>
- #include <algorithm>
- #include <cassert>
-+#include <cstring>
- 
- using std::string;
- 
diff --git a/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc b/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc
deleted file mode 100644
index 092211b3c38..00000000000
--- a/emulators/openmsx/patches/patch-src_fdc_TC8566AF.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_fdc_TC8566AF.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/fdc/TC8566AF.cc.orig	2011-11-24 02:42:35.000000000 +0000
-+++ src/fdc/TC8566AF.cc
-@@ -8,6 +8,7 @@
- #include "TC8566AF.hh"
- #include "DiskDrive.hh"
- #include "MSXException.hh"
-+#include <string.h>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_file_Date.cc b/emulators/openmsx/patches/patch-src_file_Date.cc
deleted file mode 100644
index b47692bb194..00000000000
--- a/emulators/openmsx/patches/patch-src_file_Date.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_file_Date.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/file/Date.cc.orig	2011-11-24 02:42:56.000000000 +0000
-+++ src/file/Date.cc
-@@ -4,6 +4,7 @@
- #include <sstream>
- #include <iomanip>
- #include <cstdio>
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_file_FileBase.cc b/emulators/openmsx/patches/patch-src_file_FileBase.cc
deleted file mode 100644
index 44884277ed2..00000000000
--- a/emulators/openmsx/patches/patch-src_file_FileBase.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_file_FileBase.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/file/FileBase.cc.orig	2011-11-24 02:43:13.000000000 +0000
-+++ src/file/FileBase.cc
-@@ -2,6 +2,7 @@
- 
- #include "FileBase.hh"
- #include <algorithm>
-+#include <cstring>
- 
- using std::string;
- 
diff --git a/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc b/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc
deleted file mode 100644
index 4952c376eae..00000000000
--- a/emulators/openmsx/patches/patch-src_file_GZFileAdapter.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_file_GZFileAdapter.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/file/GZFileAdapter.cc.orig	2011-11-24 02:43:36.000000000 +0000
-+++ src/file/GZFileAdapter.cc
-@@ -3,6 +3,7 @@
- #include "GZFileAdapter.hh"
- #include "FileException.hh"
- #include <cassert>
-+#include <cstdlib>
- #include <zlib.h>
- 
- namespace openmsx {
diff --git a/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc b/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc
deleted file mode 100644
index 2d104766f67..00000000000
--- a/emulators/openmsx/patches/patch-src_file_ZipFileAdapter.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_file_ZipFileAdapter.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/file/ZipFileAdapter.cc.orig	2011-11-24 02:43:55.000000000 +0000
-+++ src/file/ZipFileAdapter.cc
-@@ -3,6 +3,7 @@
- #include <zlib.h>
- #include "ZipFileAdapter.hh"
- #include "FileException.hh"
-+#include <cstdlib>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh b/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh
deleted file mode 100644
index 6c9a66ffbfe..00000000000
--- a/emulators/openmsx/patches/patch-src_input_RecordedCommand.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_input_RecordedCommand.hh,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/input/RecordedCommand.hh.orig	2011-11-24 02:44:43.000000000 +0000
-+++ src/input/RecordedCommand.hh
-@@ -6,6 +6,8 @@
- #include "Command.hh"
- #include "MSXEventListener.hh"
- 
-+#include <memory>
-+
- namespace openmsx {
- 
- class MSXCommandController;
diff --git a/emulators/openmsx/patches/patch-src_memory_Ram.cc b/emulators/openmsx/patches/patch-src_memory_Ram.cc
deleted file mode 100644
index 97d0e333f91..00000000000
--- a/emulators/openmsx/patches/patch-src_memory_Ram.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_memory_Ram.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/memory/Ram.cc.orig	2011-11-24 02:45:09.000000000 +0000
-+++ src/memory/Ram.cc
-@@ -2,6 +2,7 @@
- 
- #include "Ram.hh"
- #include "SimpleDebuggable.hh"
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_sound_AY8910.cc b/emulators/openmsx/patches/patch-src_sound_AY8910.cc
deleted file mode 100644
index 724758d2e6e..00000000000
--- a/emulators/openmsx/patches/patch-src_sound_AY8910.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_sound_AY8910.cc,v 1.1 2012/08/12 01:15:00 marino Exp $
-
---- src/sound/AY8910.cc.orig	2007-04-14 21:25:28.000000000 +0000
-+++ src/sound/AY8910.cc
-@@ -19,6 +19,7 @@
- #include "MSXException.hh"
- #include "StringOp.hh"
- #include <cassert>
-+#include <cstring>
- 
- using std::string;
- 
diff --git a/emulators/openmsx/patches/patch-src_sound_MSXMixer.cc b/emulators/openmsx/patches/patch-src_sound_MSXMixer.cc
deleted file mode 100644
index b05eef3a65b..00000000000
--- a/emulators/openmsx/patches/patch-src_sound_MSXMixer.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_sound_MSXMixer.cc,v 1.1 2012/08/12 01:15:00 marino Exp $
-
---- src/sound/MSXMixer.cc.orig	2007-04-14 21:25:28.000000000 +0000
-+++ src/sound/MSXMixer.cc
-@@ -14,6 +14,7 @@
- #include "AviRecorder.hh"
- #include <algorithm>
- #include <cassert>
-+#include <cstring>
- 
- using std::remove;
- using std::set;
diff --git a/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc b/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc
deleted file mode 100644
index 91b726cb328..00000000000
--- a/emulators/openmsx/patches/patch-src_sound_Y8950Adpcm.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_sound_Y8950Adpcm.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/sound/Y8950Adpcm.cc.orig	2011-11-24 02:46:13.000000000 +0000
-+++ src/sound/Y8950Adpcm.cc
-@@ -5,6 +5,7 @@
- #include "Clock.hh"
- #include "Ram.hh"
- #include "MSXMotherBoard.hh"
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_sound_YMF262.cc b/emulators/openmsx/patches/patch-src_sound_YMF262.cc
deleted file mode 100644
index 7449b1f3929..00000000000
--- a/emulators/openmsx/patches/patch-src_sound_YMF262.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_sound_YMF262.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/sound/YMF262.cc.orig	2011-11-24 02:46:36.000000000 +0000
-+++ src/sound/YMF262.cc
-@@ -43,6 +43,7 @@
- #include "SimpleDebuggable.hh"
- #include "MSXMotherBoard.hh"
- #include <cmath>
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_video_MemoryOps.cc b/emulators/openmsx/patches/patch-src_video_MemoryOps.cc
deleted file mode 100644
index 2b66dba157d..00000000000
--- a/emulators/openmsx/patches/patch-src_video_MemoryOps.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_video_MemoryOps.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/video/MemoryOps.cc.orig	2011-11-24 02:47:07.000000000 +0000
-+++ src/video/MemoryOps.cc
-@@ -10,6 +10,7 @@
- #include <map>
- #include <cassert>
- #include <cstdlib>
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_video_ScreenShotSaver.cc b/emulators/openmsx/patches/patch-src_video_ScreenShotSaver.cc
deleted file mode 100644
index a1468c8ff3a..00000000000
--- a/emulators/openmsx/patches/patch-src_video_ScreenShotSaver.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-src_video_ScreenShotSaver.cc,v 1.1 2011/06/20 09:28:06 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/video/ScreenShotSaver.cc.orig	2007-04-14 21:25:30.000000000 +0000
-+++ src/video/ScreenShotSaver.cc
-@@ -31,7 +31,7 @@ static bool IMG_SavePNG_RW(int width, in
- 		// Couldn't allocate memory for PNG file
- 		goto error;
- 	}
--	png_ptr->io_ptr = fp;
-+	png_init_io(png_ptr, fp);
- 
- 	// Allocate/initialize the image information data.  REQUIRED
- 	info_ptr = png_create_info_struct(png_ptr);
-@@ -41,7 +41,7 @@ static bool IMG_SavePNG_RW(int width, in
- 	}
- 
- 	// Set error handling.
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		// Error writing the PNG file
- 		goto error;
- 	}
-@@ -78,18 +78,12 @@ static bool IMG_SavePNG_RW(int width, in
- 	png_write_image(png_ptr, row_pointers);
- 	png_write_end(png_ptr, info_ptr);
- 
--	if (info_ptr->palette) {
--		free(info_ptr->palette);
--	}
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 
- 	fclose(fp);
- 	return true;
- 
- error:
--	if (info_ptr->palette) {
--		free(info_ptr->palette);
--	}
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 
- 	fclose(fp);
diff --git a/emulators/openmsx/patches/patch-src_video_VDP.cc b/emulators/openmsx/patches/patch-src_video_VDP.cc
deleted file mode 100644
index 3785da11e86..00000000000
--- a/emulators/openmsx/patches/patch-src_video_VDP.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_video_VDP.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/video/VDP.cc.orig	2011-11-24 02:47:33.000000000 +0000
-+++ src/video/VDP.cc
-@@ -33,6 +33,7 @@ TODO:
- #include "MSXCliComm.hh"
- #include <sstream>
- #include <cassert>
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc b/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc
deleted file mode 100644
index 8da4e244363..00000000000
--- a/emulators/openmsx/patches/patch-src_video_VDPVRAM.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_video_VDPVRAM.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/video/VDPVRAM.cc.orig	2011-11-24 02:47:51.000000000 +0000
-+++ src/video/VDPVRAM.cc
-@@ -4,6 +4,7 @@
- #include "SpriteChecker.hh"
- #include "Renderer.hh"
- #include "Math.hh"
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc b/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc
deleted file mode 100644
index 7032d464ba7..00000000000
--- a/emulators/openmsx/patches/patch-src_video_v9990_V9990.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_video_v9990_V9990.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/video/v9990/V9990.cc.orig	2011-11-24 02:48:14.000000000 +0000
-+++ src/video/v9990/V9990.cc
-@@ -10,6 +10,7 @@
- #include "SimpleDebuggable.hh"
- #include "MSXMotherBoard.hh"
- #include <cassert>
-+#include <cstring>
- 
- namespace openmsx {
- 
diff --git a/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc b/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc
deleted file mode 100644
index 3b2efa0499d..00000000000
--- a/emulators/openmsx/patches/patch-src_video_v9990_V9990VRAM.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_video_v9990_V9990VRAM.cc,v 1.1 2011/11/24 14:12:21 joerg Exp $
-
---- src/video/v9990/V9990VRAM.cc.orig	2011-11-24 02:48:37.000000000 +0000
-+++ src/video/v9990/V9990VRAM.cc
-@@ -2,6 +2,7 @@
- 
- #include "V9990.hh"
- #include "V9990VRAM.hh"
-+#include <cstring>
- 
- namespace openmsx {
-