Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -10642,4 +10642,5 @@
 net/rubygem-gitaly-proto094|net/rubygem-gitaly-proto|2018-11-24|Use net/rubygem-gitaly-proto instead
 www/rubygem-toml-rb03|www/rubygem-toml-rb|2018-11-25|Has expired: Obsoleted by update of www/gitlab. Please use www/rubygem-tom-rb instead.
 dns/dnscheck||2018-11-27|Unmaintained upstream over a decade
-www/mod_security3|security/modsecurity3|2018-11-27|Not an Apache module, use correct upstream name 
+www/mod_security3|security/modsecurity3|2018-11-27|Not an Apache module, use correct upstream name
+emulators/qemu-ppcnv|emulators/qemu-powernv|2018-11-28|Use more accurate naming for qemu PowerNV port
Index: head/emulators/Makefile
===================================================================
--- head/emulators/Makefile
+++ head/emulators/Makefile
@@ -117,7 +117,7 @@
     SUBDIR += qemu
     SUBDIR += qemu-cheri
     SUBDIR += qemu-devel
-    SUBDIR += qemu-ppcnv
+    SUBDIR += qemu-powernv
     SUBDIR += qemu-riscv
     SUBDIR += qemu-sbruno
     SUBDIR += qemu-user-static
Index: head/emulators/qemu-powernv/Makefile
===================================================================
--- head/emulators/qemu-powernv/Makefile
+++ head/emulators/qemu-powernv/Makefile
@@ -0,0 +1,55 @@
+# $FreeBSD$
+
+PORTNAME=	qemu-powernv
+PORTVERSION=	3.0.50
+CATEGORIES=	emulators
+MASTER_SITES=	http://people.freebsd.org/~kbowling/distfiles/
+
+MAINTAINER=	kbowling@FreeBSD.org
+COMMENT=	Fork of QEMU with experimental PowerNV emulation support
+
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=		${LOCALBASE}/lib/libfdt.so:sysutils/dtc
+
+USES=		bison:build gmake libtool makeinfo pkgconfig python:2.7,build
+USE_XORG=	pixman
+USE_GNOME=	glib20
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--target-list=ppc64-softmmu \
+		--cc=${CC} \
+		--disable-curl \
+		--disable-docs \
+		--disable-gtk \
+		--disable-gcrypt \
+		--disable-kvm \
+		--disable-libssh2 \
+		--disable-linux-aio \
+		--disable-linux-user \
+		--disable-vnc \
+		--disable-sdl \
+		--disable-nettle \
+		--disable-gnutls \
+		--disable-vte \
+		--disable-xen \
+		--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-powernv \
+		${DATADIR}/qemu/skiboot.lid \
+		${DATADIR}/qemu/slof.bin \
+		${DATADIR}/qemu/spapr-rtas.bin
+
+# remap names to avoid conflicts with mainline port
+do-install:
+	${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: head/emulators/qemu-powernv/distinfo
===================================================================
--- head/emulators/qemu-powernv/distinfo
+++ head/emulators/qemu-powernv/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1541490377
+SHA256 (qemu-powernv-3.0.50.tar.gz) = 6935e4b4b5def6c5b1cc1ac1717bae56323e673193ab587978929db9f8849b52
+SIZE (qemu-powernv-3.0.50.tar.gz) = 17249849
Index: head/emulators/qemu-powernv/pkg-descr
===================================================================
--- head/emulators/qemu-powernv/pkg-descr
+++ head/emulators/qemu-powernv/pkg-descr
@@ -0,0 +1,3 @@
+Fork of QEMU with experimental PowerNV emulation support.
+
+WWW: https://github.com/ozbenh/qemu/tree/power9
Index: head/emulators/qemu-ppcnv/Makefile
===================================================================
--- head/emulators/qemu-ppcnv/Makefile
+++ head/emulators/qemu-ppcnv/Makefile
@@ -1,66 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	qemu
-PORTVERSION=	2.10.0
-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
-
-MAINTAINER=	linimon@FreeBSD.org
-COMMENT=	Fork of QEMU with experimental PowerPCNV emulation support
-
-LICENSE=	GPLv2
-
-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
-USE_XORG=	pixman
-USE_GNOME+=	glib20
-ONLY_FOR_ARCHS=	amd64
-
-CONFIGURE_ARGS+=--target-list=ppc-softmmu,ppcemb-softmmu,ppc64-softmmu \
-		--cc=${CC} \
-		--disable-curl \
-		--disable-docs \
-		--disable-gtk \
-		--disable-gcrypt \
-		--disable-kvm \
-		--disable-libssh2 \
-		--disable-linux-aio \
-		--disable-linux-user \
-		--disable-vnc \
-		--disable-sdl \
-		--disable-nettle \
-		--disable-gnutls \
-		--disable-vte \
-		--disable-xen \
-		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \
-		--extra-ldflags=-L\"${LOCALBASE}/lib\" \
-		--localstatedir=/var \
-		--python=${PYTHON_CMD}
-
-PLIST_FILES=	bin/qemu-system-ppcnv \
-		bin/qemu-system-ppc64nv \
-		bin/qemu-system-ppcembnv
-
-# 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
-
-.include <bsd.port.mk>
Index: head/emulators/qemu-ppcnv/distinfo
===================================================================
--- head/emulators/qemu-ppcnv/distinfo
+++ head/emulators/qemu-ppcnv/distinfo
@@ -1,5 +0,0 @@
-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
Index: head/emulators/qemu-ppcnv/pkg-descr
===================================================================
--- head/emulators/qemu-ppcnv/pkg-descr
+++ head/emulators/qemu-ppcnv/pkg-descr
@@ -1,3 +0,0 @@
-Fork of QEMU with experimental PowerPC NV emulation support.
-
-WWW: https://github.com/dgibson/qemu/tree/powernv/target-ppc