Index: emulators/fs-uae-devel/Makefile
===================================================================
--- /dev/null
+++ emulators/fs-uae-devel/Makefile
@@ -0,0 +1,26 @@
+# Created by: Johannes Lundberg <johalun0@gmail.com>
+# $FreeBSD$
+
+PORTVERSION=	2.9.7
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	johalun0@gmail.com
+COMMENT=	Amiga emulator (development branch)
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+CONFLICTS_INSTALL=	fs-uae-[0-9]*
+
+USES=		compiler:c11 desktop-file-utils gettext gl gmake autoreconf \
+		libtool gnome localbase pkgconfig shared-mime-info
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	FrodeSolheim
+GH_PROJECT=	fs-uae
+GH_TAGNAME=	7f4b992
+
+MASTERDIR=	${.CURDIR}/../fs-uae
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+.include	"${MASTERDIR}/Makefile"
Index: emulators/fs-uae-devel/distinfo
===================================================================
--- /dev/null
+++ emulators/fs-uae-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1544561226
+SHA256 (FrodeSolheim-fs-uae-2.9.7-7f4b992_GH0.tar.gz) = 18d3cd09478e88c06a6828d961c358da2747d2a2e800b3184c6e34e68080c664
+SIZE (FrodeSolheim-fs-uae-2.9.7-7f4b992_GH0.tar.gz) = 4755344
Index: emulators/fs-uae/Makefile
===================================================================
--- emulators/fs-uae/Makefile
+++ emulators/fs-uae/Makefile
@@ -2,22 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	fs-uae
-PORTVERSION=	2.8.4
+PORTVERSION?=	2.8.4
 CATEGORIES=	emulators
-MASTER_SITES=	http://fs-uae.net/stable/${PORTVERSION}/
+MASTER_SITES?=	http://fs-uae.net/stable/${PORTVERSION}/
 
-MAINTAINER=	tomse@oagd.net
-COMMENT=	Amiga emulator
+MAINTAINER?=	tomse@oagd.net
+COMMENT?=	Amiga emulator
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	zip:archivers/zip
-LIB_DEPENDS=	libpng.so:graphics/png \
+CONFLICTS_INSTALL?=	fs-uae-devel-[0-9]*
+BUILD_DEPENDS?=	zip:archivers/zip
+
+LIB_DEPENDS?=	libpng.so:graphics/png \
 		libopenal.so:audio/openal-soft \
 		libmpeg2.so:multimedia/libmpeg2
 
-USES=		compiler:c11 desktop-file-utils gettext gl gmake \
+USES?=		compiler:c11 desktop-file-utils gettext gl gmake \
 		gnome localbase pkgconfig shared-mime-info
 
 USE_SDL=	sdl2
@@ -29,7 +31,7 @@
 INSTALLS_ICONS=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-jit
+CONFIGURE_ARGS?=--disable-jit
 CFLAGS+=	-Wno-c++11-narrowing
 
 OPTIONS_DEFINE=	DOCS