Index: head/emulators/catapult/Makefile
===================================================================
--- head/emulators/catapult/Makefile	(revision 397516)
+++ head/emulators/catapult/Makefile	(revision 397517)
@@ -1,84 +1,82 @@
 # Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
 # $FreeBSD$
 
 PORTNAME=	catapult
-PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	emulators
-MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
+MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GUI for openMSX
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 USES=		gmake pkgconfig python:build
 USE_GCC=	yes
 USE_CXXSTD=	gnu++0x
 USE_GNOME=	gtk20 libxml2
 USE_WX=		2.8
-WX_UNICODE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
 		INSTALL_SHARE_DIR="${DATADIR}" \
 		INSTALL_DOC_DIR="${DOCSDIR}" \
 		CATAPULT_FLAVOUR="portbld" \
 		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
 		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
 		CATAPULT_NO_DESKTOP_HOOKS="true" \
 		SYMLINK_FOR_BINARY="false" \
 		PYTHON="${PYTHON_CMD}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-DDEBUG
 CATAPULT_STRIP=	false
 .else
 CFLAGS+=	-DNDEBUG
 CATAPULT_STRIP=	true
 .endif
 
 post-extract:
 	${CP} ${WRKSRC}/build/platform-freebsd.mk \
 		${WRKSRC}/build/platform-dragonfly.mk
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL_BASE)|${DATADIR}|' \
 		${WRKSRC}/build/info2code.mk
 	@${REINPLACE_CMD} '/-Wno-literal/s|^CXXFLAGS|#CXXFLAGS| ; \
 		 /--cxx/s|^CXX|#CXX| ; \
 		 /COMPILE=/s|g++|$$(CXX)| ; \
 		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
 	@${REINPLACE_CMD} 's|wx-config --|${WX_CONFIG:T} --|g' \
 		${WRKSRC}/build/probe.mk
 	@${REINPLACE_CMD} '/^Exec/s|%INSTALL_BASE%|${PREFIX}| ; \
 		 /^Icon/s|%INSTALL_BASE%|${DATADIR}| ; \
 		 /^DocPath/s|%INSTALL_BASE%/doc|${DOCSDIR}|' \
 		${WRKSRC}/desktop/openMSX-Catapult.desktop
 	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'LINK_FLAGS+=${LDFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CATAPULT_STRIP:=${CATAPULT_STRIP}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/resources/icons
-	@${INSTALL_DATA} ${WRKSRC}/src/catapult.xpm \
+	${MKDIR} ${STAGEDIR}${DATADIR}/resources/icons
+	${INSTALL_DATA} ${WRKSRC}/src/catapult.xpm \
 		${STAGEDIR}${DATADIR}/resources/icons
-	@cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
+	cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.post.mk>
Index: head/emulators/catapult/distinfo
===================================================================
--- head/emulators/catapult/distinfo	(revision 397516)
+++ head/emulators/catapult/distinfo	(revision 397517)
@@ -1,2 +1,2 @@
-SHA256 (openmsx-catapult-0.11.0.tar.gz) = a76d9ab9e2000679d8cbc69622232c3d6647493d402bffc19f469749ead15ad2
-SIZE (openmsx-catapult-0.11.0.tar.gz) = 1404388
+SHA256 (openmsx-catapult-0.12.0.tar.gz) = 2dff844016e62e46e395b8094b1e985d4acf4b86c2670c102f77e5a86eb389c2
+SIZE (openmsx-catapult-0.12.0.tar.gz) = 1394993
Index: head/emulators/openmsx/Makefile
===================================================================
--- head/emulators/openmsx/Makefile	(revision 397516)
+++ head/emulators/openmsx/Makefile	(revision 397517)
@@ -1,47 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	openmsx
-PORTVERSION=	0.11.0
-PORTREVISION=	2
+PORTVERSION=	0.12.0
 CATEGORIES=	emulators
-MASTER_SITES=	SF
+MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Open source MSX emulator
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora \
 		libao.so:${PORTSDIR}/audio/libao
 
 MAKEFILE=	GNUmakefile
 USES=		gmake python tcl
 USE_GCC=	yes
 USE_GL=		glew
 USE_SDL=	sdl ttf
 
 MAKE_ARGS=	INSTALL_BINARY_DIR=${PREFIX}/bin \
 		INSTALL_SHARE_DIR=${DATADIR} \
 		INSTALL_DOC_DIR=${DOCSDIR} \
 		OPENMSX_CXX=${CXX} \
 		CXXFLAGS="${CXXFLAGS}"
 
 PLIST_FILES=	bin/openmsx
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 # Use dummy target rather than rewriting makefile
 DOCS_MAKE_ARGS_OFF=	INSTALL_DOC_DIR=${WRKSRC}/dummy
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/{TCL_LIB_SPEC}/& $${TCL_LD_FLAGS}/' \
 		${WRKSRC}/build/libraries.py
 	@${REINPLACE_CMD} -e '/^SYMLINK_FOR_BINARY/s/true/false/' \
 		${WRKSRC}/build/custom.mk
 
 .include <bsd.port.mk>
Index: head/emulators/openmsx/distinfo
===================================================================
--- head/emulators/openmsx/distinfo	(revision 397516)
+++ head/emulators/openmsx/distinfo	(revision 397517)
@@ -1,2 +1,2 @@
-SHA256 (openmsx-0.11.0.tar.gz) = 93611a12b3860f31ef081d625e9e7f68a48c81c564d629801def868a87b75a77
-SIZE (openmsx-0.11.0.tar.gz) = 3249448
+SHA256 (openmsx-0.12.0.tar.gz) = 1d96a466badd625e7b6860a65afb10a7b5283a15721faa4186546693fec06a92
+SIZE (openmsx-0.12.0.tar.gz) = 3277303