Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10623,3 +10623,4 @@
 science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs
 x11-wm/cde|x11/cde|2018-11-03|Recategorise
 misc/rumprun||2018-11-06|Has expired: "fails with current compilers"
+emulators/qemu-ppcnv|emulators/qemu-powernv|2018-11-09|Use accurate naming for qemu PowerNV support
Index: emulators/qemu-powernv/Makefile
===================================================================
--- emulators/qemu-powernv/Makefile
+++ emulators/qemu-powernv/Makefile
@@ -1,34 +1,23 @@
 # $FreeBSD$
 
-PORTNAME=	qemu
-PORTVERSION=	2.10.0
+PORTNAME=	qemu-powernv
+PORTVERSION=	3.0.50
 CATEGORIES=	emulators
-MASTER_SITES=	GH \
-		LOCAL/nox:dtc \
-		http://people.freebsd.org/~nox/tmp/distfiles/:dtc
-PKGNAMESUFFIX?=	-ppcnv
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		dtc-v1.4.0${EXTRACT_SUFX}:dtc
+MASTER_SITES=	http://people.freebsd.org/~kbowling/distfiles/
 
-MAINTAINER=	linimon@FreeBSD.org
-COMMENT=	Fork of QEMU with experimental PowerPCNV emulation support
+MAINTAINER=	kbowling@FreeBSD.org
+COMMENT=	Fork of QEMU with experimental PowerNV emulation support
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libfdt.so:sysutils/dtc
+BUILD_DEPENDS=		${LOCALBASE}/lib/libfdt.so:sysutils/dtc
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	dgibson
-GH_PROJECT=	qemu
-GH_TAGNAME=	8d5981c
-
-HAS_CONFIGURE=	yes
-USES=		gmake libtool makeinfo pkgconfig python:2.7,build
+USES=		bison:build gmake libtool makeinfo pkgconfig python:2.7,build
 USE_XORG=	pixman
-USE_GNOME+=	glib20
-ONLY_FOR_ARCHS=	amd64
+USE_GNOME=	glib20
 
-CONFIGURE_ARGS+=--target-list=ppc-softmmu,ppcemb-softmmu,ppc64-softmmu \
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--target-list=ppc64-softmmu \
 		--cc=${CC} \
 		--disable-curl \
 		--disable-docs \
@@ -47,20 +36,20 @@
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \
 		--extra-ldflags=-L\"${LOCALBASE}/lib\" \
 		--localstatedir=/var \
+		--datadir=${DATADIR} \
 		--python=${PYTHON_CMD}
 
-PLIST_FILES=	bin/qemu-system-ppcnv \
-		bin/qemu-system-ppc64nv \
-		bin/qemu-system-ppcembnv
+PLIST_FILES=	bin/qemu-system-powernv \
+		${DATADIR}/qemu/skiboot.lid \
+		${DATADIR}/qemu/slof.bin \
+		${DATADIR}/qemu/spapr-rtas.bin
 
-# XXX this magic should not be necessary, but seems to be:
-post-patch:
-	@${MV} ${WRKDIR}/dtc ${WRKSRC}
-
 # remap names to avoid conflicts with mainline port
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ppc-softmmu/qemu-system-ppc ${STAGEDIR}${PREFIX}/bin/qemu-system-ppcnv
-	${INSTALL_PROGRAM} ${WRKSRC}/ppc64-softmmu/qemu-system-ppc64 ${STAGEDIR}${PREFIX}/bin/qemu-system-ppc64nv
-	${INSTALL_PROGRAM} ${WRKSRC}/ppcemb-softmmu/qemu-system-ppcemb ${STAGEDIR}${PREFIX}/bin/qemu-system-ppcembnv
+	${INSTALL_PROGRAM} ${WRKSRC}/ppc64-softmmu/qemu-system-ppc64 ${STAGEDIR}${PREFIX}/bin/qemu-system-powernv
+	${MKDIR} ${STAGEDIR}${DATADIR}/qemu
+	${INSTALL_DATA} ${WRKSRC}/pc-bios/skiboot.lid ${STAGEDIR}${DATADIR}/qemu/skiboot.lid
+	${INSTALL_DATA} ${WRKSRC}/pc-bios/slof.bin ${STAGEDIR}${DATADIR}/qemu/slof.bin
+	${INSTALL_DATA} ${WRKSRC}/pc-bios/spapr-rtas.bin ${STAGEDIR}${DATADIR}/qemu/spapr-rtas.bin
 
 .include <bsd.port.mk>
Index: emulators/qemu-powernv/distinfo
===================================================================
--- emulators/qemu-powernv/distinfo
+++ emulators/qemu-powernv/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1501102325
-SHA256 (dgibson-qemu-2.10.0-8d5981c_GH0.tar.gz) = 1a0a19167259d1b4598d73f765b069643d4e8628c099be6c425644e33aa82deb
-SIZE (dgibson-qemu-2.10.0-8d5981c_GH0.tar.gz) = 14435599
-SHA256 (dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (dtc-v1.4.0.tar.gz) = 131893
+TIMESTAMP = 1541490377
+SHA256 (qemu-powernv-3.0.50.tar.gz) = 6935e4b4b5def6c5b1cc1ac1717bae56323e673193ab587978929db9f8849b52
+SIZE (qemu-powernv-3.0.50.tar.gz) = 17249849
Index: emulators/qemu-powernv/pkg-descr
===================================================================
--- emulators/qemu-powernv/pkg-descr
+++ emulators/qemu-powernv/pkg-descr
@@ -1,3 +1,3 @@
-Fork of QEMU with experimental PowerPC NV emulation support.
+Fork of QEMU with experimental PowerNV emulation support.
 
-WWW: https://github.com/dgibson/qemu/tree/powernv/target-ppc
+WWW: https://github.com/ozbenh/qemu/tree/power9