Index: head/emulators/qemu-devel/Makefile
===================================================================
--- head/emulators/qemu-devel/Makefile	(revision 406120)
+++ head/emulators/qemu-devel/Makefile	(revision 406121)
@@ -1,202 +1,158 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	qemu
 DISTVERSION=	2.5.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	QEMU CPU Emulator - development version
 
 LICENSE=	GPLv2
 
 HAS_CONFIGURE=	yes
 USES=		cpe gmake pkgconfig bison perl5 python:2,build tar:bzip2
 USE_PERL5=	build
 USE_XORG=	pixman
 USE_GNOME+=	glib20
 MAKE_ENV+=	BSD_MAKE="${MAKE}"
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
 
 OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
 		STATIC_LINK DOCS BSD_USER
 SAMBA_DESC=		samba dependency (for -smb)
 GNUTLS_DESC=		gnutls dependency (vnc encryption)
 SASL_DESC=		cyrus-sasl dependency (vnc encryption)
 JPEG_DESC=		jpeg dependency (vnc lossy compression)
 PNG_DESC=		png dependency (vnc compression)
 CDROM_DMA_DESC=		IDE CDROM DMA
 PCAP_DESC=		pcap dependency (networking with bpf)
 USBREDIR_DESC=		usb device network redirection (experimental!)
 GNS3_DESC=		gns3 patches (promiscuous multicast)
 X86_TARGETS_DESC=	Don't build non-x86 system targets
 BSD_USER_DESC=		Also build bsd-user targets (for testing)
 STATIC_LINK_DESC=	Statically link the executables
 OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3
 OPTIONS_SUB=	yes
 X11_USE=	SDL=sdl
 X11_CONFIGURE_ON=	--enable-sdl
 X11_CONFIGURE_OFF=	--disable-sdl
 GTK2_USE=	GNOME=gtk20,vte
 GTK2_USES=	gettext
 GTK2_CONFIGURE_OFF=	--disable-gtk --disable-vte
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-vnc-tls
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 SASL_CONFIGURE_OFF=	--disable-vnc-sasl
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-vnc-jpeg
 PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 PNG_CONFIGURE_OFF=	--disable-vnc-png
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
 OPENGL_USE=	GL=yes
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
 USBREDIR_RUN_DEPENDS=	usbredir>=0.6:${PORTSDIR}/net/usbredir
 USBREDIR_CONFIGURE_OFF=	--disable-usb-redir
 PCAP_CONFIGURE_ON=	--enable-pcap
 PCAP_CONFIGURE_OFF=	--disable-pcap
 
 STATIC_LINK_CONFIGURE_ON=	--static
 STATIC_LINK_PREVENTS=		GTK2 X11
 STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
 SAMBA_RUN_DEPENDS=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36
 DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
 DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 
 .if !defined(QEMU_USER_STATIC)
 CONFLICTS_INSTALL=	qemu--devel-[0-9]* qemu-sbruno-[0-9]*
 .endif
 
 PORTDOCS=	docs qemu-doc.html qemu-tech.html qmp-commands.txt
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
 		--disable-libssh2 --enable-debug \
 		--prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 .include <bsd.port.options.mk>
 
-.if defined(QEMU_USER_STATIC)
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user
-.else
-CONFIGURE_ARGS+=	--target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user
-.endif
-.else
-.if ${PORT_OPTIONS:MX86_TARGETS}
-.if ${PORT_OPTIONS:MBSD_USER}
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user
-.else
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user
-.endif
-.else
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu
-.endif
-.else
-.if empty(PORT_OPTIONS:MBSD_USER)
-CONFIGURE_ARGS+=	--disable-bsd-user
-.else
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user
-.endif
-.endif
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MBSD_USER} && ${ARCH} == "sparc64"
-IGNORE=	bsd-user targets not tested on sparc64
-.endif
-
-.if empty(PORT_OPTIONS:MBSD_USER) || ${ARCH} != "amd64"
-PLIST_SUB+=	BSD_USER64="@comment "
-.else
-PLIST_SUB+=	BSD_USER64=""
-.endif
-
-.if defined(QEMU_USER_STATIC)
-PLIST_SUB+=	SOFTMMU="@comment " STATIC="-static"
-.else
-PLIST_SUB+=	SOFTMMU="" STATIC=""
-.endif
-
 .if !defined(STRIP) || ${STRIP} == ""
 CONFIGURE_ARGS+=--disable-strip
 .endif
 
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	ARCH=x86_64
 .endif
 
 .if ${ARCH} == "powerpc"
 MAKE_ARGS+=	ARCH=ppc
 .endif
 
 .if ${ARCH} == "powerpc64"
 MAKE_ARGS+=	ARCH=ppc64
 .endif
 
 .if ${ARCH} == "sparc64"
 CONFIGURE_ARGS+=	--sparc_cpu=v9
 .endif
 
 # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
 # but it shouldn't matter much
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -E \
 		-e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \
 		${WRKSRC}/qemu-doc.texi
 	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile.target
 	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E \
 		-e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \
 		${WRKSRC}/scripts/texi2pod.pl
 
 post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/internal.h
 
 post-patch-GNS3-on:
 	@${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \
 		${WRKSRC}/hw/net/e1000.c
 
 post-patch-PCAP-on:
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
 
 # XXX need to disable usb host code on head while it's not ported to the
 # new usb stack yet
 post-configure:
 	@${REINPLACE_CMD} -E \
 		-e "s|^(HOST_USB=)bsd|\1stub|" \
 		${WRKSRC}/config-host.mak
 
 .if !target(post-install)
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-*
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .include <bsd.port.mk>
Index: head/emulators/qemu-devel/pkg-plist
===================================================================
--- head/emulators/qemu-devel/pkg-plist	(revision 406120)
+++ head/emulators/qemu-devel/pkg-plist	(revision 406121)
@@ -1,136 +1,127 @@
-%%SOFTMMU%%bin/ivshmem-server
-%%SOFTMMU%%bin/ivshmem-client
-%%SOFTMMU%%bin/qemu-ga
-%%SOFTMMU%%bin/qemu-img
-%%SOFTMMU%%bin/qemu-io
-%%SOFTMMU%%bin/qemu-nbd
+bin/ivshmem-server
+bin/ivshmem-client
+bin/qemu-ga
+bin/qemu-img
+bin/qemu-io
+bin/qemu-nbd
 %%X86_TARGETS%%bin/qemu-system-aarch64
 %%X86_TARGETS%%bin/qemu-system-alpha
 %%X86_TARGETS%%bin/qemu-system-arm
 %%X86_TARGETS%%bin/qemu-system-cris
-%%SOFTMMU%%bin/qemu-system-i386
+bin/qemu-system-i386
 %%X86_TARGETS%%bin/qemu-system-lm32
 %%X86_TARGETS%%bin/qemu-system-m68k
 %%X86_TARGETS%%bin/qemu-system-microblaze
 %%X86_TARGETS%%bin/qemu-system-microblazeel
 %%X86_TARGETS%%bin/qemu-system-mips
 %%X86_TARGETS%%bin/qemu-system-mips64
 %%X86_TARGETS%%bin/qemu-system-mips64el
 %%X86_TARGETS%%bin/qemu-system-mipsel
 %%X86_TARGETS%%bin/qemu-system-moxie
 %%X86_TARGETS%%bin/qemu-system-or32
 %%X86_TARGETS%%bin/qemu-system-ppc
 %%X86_TARGETS%%bin/qemu-system-ppc64
 %%X86_TARGETS%%bin/qemu-system-ppcemb
 %%X86_TARGETS%%bin/qemu-system-s390x
 %%X86_TARGETS%%bin/qemu-system-sh4
 %%X86_TARGETS%%bin/qemu-system-sh4eb
 %%X86_TARGETS%%bin/qemu-system-sparc
 %%X86_TARGETS%%bin/qemu-system-sparc64
 %%X86_TARGETS%%bin/qemu-system-tricore
 %%X86_TARGETS%%bin/qemu-system-unicore32
-%%BSD_USER%%bin/qemu-arm%%STATIC%%
-%%BSD_USER%%bin/qemu-i386%%STATIC%%
-%%BSD_USER%%bin/qemu-mips%%STATIC%%
-%%BSD_USER64%%bin/qemu-mips64%%STATIC%%
-%%BSD_USER64%%bin/qemu-mips64el%%STATIC%%
-%%BSD_USER%%bin/qemu-mipsel%%STATIC%%
-%%BSD_USER%%bin/qemu-sparc%%STATIC%%
-%%BSD_USER64%%bin/qemu-sparc64%%STATIC%%
-%%BSD_USER64%%bin/qemu-x86_64%%STATIC%%
-%%SOFTMMU%%bin/qemu-system-x86_64
+bin/qemu-system-x86_64
 %%X86_TARGETS%%bin/qemu-system-xtensa
 %%X86_TARGETS%%bin/qemu-system-xtensaeb
-%%SOFTMMU%%man/man1/qemu.1.gz
-%%SOFTMMU%%man/man1/qemu-img.1.gz
-%%SOFTMMU%%man/man8/qemu-ga.8.gz
-%%SOFTMMU%%man/man8/qemu-nbd.8.gz
-%%SOFTMMU%%@sample etc/qemu-ifup.sample
-%%SOFTMMU%%@sample etc/qemu-ifdown.sample
-%%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin
-%%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin
-%%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml
-%%SOFTMMU%%%%DATADIR%%/q35-acpi-dsdt.aml
-%%SOFTMMU%%%%DATADIR%%/bios-256k.bin
-%%SOFTMMU%%%%DATADIR%%/bios.bin
-%%SOFTMMU%%%%DATADIR%%/efi-e1000.rom
-%%SOFTMMU%%%%DATADIR%%/efi-eepro100.rom
-%%SOFTMMU%%%%DATADIR%%/efi-ne2k_pci.rom
-%%SOFTMMU%%%%DATADIR%%/efi-pcnet.rom
-%%SOFTMMU%%%%DATADIR%%/efi-rtl8139.rom
-%%SOFTMMU%%%%DATADIR%%/efi-virtio.rom
-%%SOFTMMU%%%%DATADIR%%/s390-ccw.img
-%%SOFTMMU%%%%DATADIR%%/vgabios.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-cirrus.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-qxl.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-stdvga.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin
-%%SOFTMMU%%%%DATADIR%%/palcode-clipper
-%%SOFTMMU%%%%DATADIR%%/ppc_rom.bin
-%%SOFTMMU%%%%DATADIR%%/openbios-ppc
-%%SOFTMMU%%%%DATADIR%%/openbios-sparc32
-%%SOFTMMU%%%%DATADIR%%/openbios-sparc64
-%%SOFTMMU%%%%DATADIR%%/pxe-e1000.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-eepro100.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-ne2k_pci.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-rtl8139.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-pcnet.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-virtio.rom
-%%SOFTMMU%%%%DATADIR%%/petalogix-ml605.dtb
-%%SOFTMMU%%%%DATADIR%%/spapr-rtas.bin
-%%SOFTMMU%%%%DATADIR%%/slof.bin
-%%SOFTMMU%%%%DATADIR%%/s390-zipl.rom
-%%SOFTMMU%%%%DATADIR%%/linuxboot.bin
-%%SOFTMMU%%%%DATADIR%%/multiboot.bin
-%%SOFTMMU%%%%DATADIR%%/sgabios.bin
-%%SOFTMMU%%%%DATADIR%%/petalogix-s3adsp1800.dtb
-%%SOFTMMU%%%%DATADIR%%/bamboo.dtb
-%%SOFTMMU%%%%DATADIR%%/kvmvapic.bin
-%%SOFTMMU%%%%DATADIR%%/qemu-icon.bmp
-%%SOFTMMU%%%%DATADIR%%/qemu_logo_no_text.svg
-%%SOFTMMU%%%%DATADIR%%/trace-events
-%%SOFTMMU%%%%DATADIR%%/u-boot.e500
-%%SOFTMMU%%%%DATADIR%%/keymaps/ar
-%%SOFTMMU%%%%DATADIR%%/keymaps/bepo
-%%SOFTMMU%%%%DATADIR%%/keymaps/common
-%%SOFTMMU%%%%DATADIR%%/keymaps/cz
-%%SOFTMMU%%%%DATADIR%%/keymaps/da
-%%SOFTMMU%%%%DATADIR%%/keymaps/de
-%%SOFTMMU%%%%DATADIR%%/keymaps/de-ch
-%%SOFTMMU%%%%DATADIR%%/keymaps/en-gb
-%%SOFTMMU%%%%DATADIR%%/keymaps/en-us
-%%SOFTMMU%%%%DATADIR%%/keymaps/es
-%%SOFTMMU%%%%DATADIR%%/keymaps/et
-%%SOFTMMU%%%%DATADIR%%/keymaps/fi
-%%SOFTMMU%%%%DATADIR%%/keymaps/fo
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-be
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-ca
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-ch
-%%SOFTMMU%%%%DATADIR%%/keymaps/hr
-%%SOFTMMU%%%%DATADIR%%/keymaps/hu
-%%SOFTMMU%%%%DATADIR%%/keymaps/is
-%%SOFTMMU%%%%DATADIR%%/keymaps/it
-%%SOFTMMU%%%%DATADIR%%/keymaps/ja
-%%SOFTMMU%%%%DATADIR%%/keymaps/lt
-%%SOFTMMU%%%%DATADIR%%/keymaps/lv
-%%SOFTMMU%%%%DATADIR%%/keymaps/mk
-%%SOFTMMU%%%%DATADIR%%/keymaps/modifiers
-%%SOFTMMU%%%%DATADIR%%/keymaps/nl
-%%SOFTMMU%%%%DATADIR%%/keymaps/nl-be
-%%SOFTMMU%%%%DATADIR%%/keymaps/no
-%%SOFTMMU%%%%DATADIR%%/keymaps/pl
-%%SOFTMMU%%%%DATADIR%%/keymaps/pt
-%%SOFTMMU%%%%DATADIR%%/keymaps/pt-br
-%%SOFTMMU%%%%DATADIR%%/keymaps/ru
-%%SOFTMMU%%%%DATADIR%%/keymaps/sl
-%%SOFTMMU%%%%DATADIR%%/keymaps/sv
-%%SOFTMMU%%%%DATADIR%%/keymaps/th
-%%SOFTMMU%%%%DATADIR%%/keymaps/tr
+man/man1/qemu.1.gz
+man/man1/qemu-img.1.gz
+man/man8/qemu-ga.8.gz
+man/man8/qemu-nbd.8.gz
+@sample etc/qemu-ifup.sample
+@sample etc/qemu-ifdown.sample
+%%DATADIR%%/QEMU,tcx.bin
+%%DATADIR%%/QEMU,cgthree.bin
+%%DATADIR%%/acpi-dsdt.aml
+%%DATADIR%%/q35-acpi-dsdt.aml
+%%DATADIR%%/bios-256k.bin
+%%DATADIR%%/bios.bin
+%%DATADIR%%/efi-e1000.rom
+%%DATADIR%%/efi-eepro100.rom
+%%DATADIR%%/efi-ne2k_pci.rom
+%%DATADIR%%/efi-pcnet.rom
+%%DATADIR%%/efi-rtl8139.rom
+%%DATADIR%%/efi-virtio.rom
+%%DATADIR%%/s390-ccw.img
+%%DATADIR%%/vgabios.bin
+%%DATADIR%%/vgabios-cirrus.bin
+%%DATADIR%%/vgabios-qxl.bin
+%%DATADIR%%/vgabios-stdvga.bin
+%%DATADIR%%/vgabios-virtio.bin
+%%DATADIR%%/vgabios-vmware.bin
+%%DATADIR%%/palcode-clipper
+%%DATADIR%%/ppc_rom.bin
+%%DATADIR%%/openbios-ppc
+%%DATADIR%%/openbios-sparc32
+%%DATADIR%%/openbios-sparc64
+%%DATADIR%%/pxe-e1000.rom
+%%DATADIR%%/pxe-eepro100.rom
+%%DATADIR%%/pxe-ne2k_pci.rom
+%%DATADIR%%/pxe-rtl8139.rom
+%%DATADIR%%/pxe-pcnet.rom
+%%DATADIR%%/pxe-virtio.rom
+%%DATADIR%%/petalogix-ml605.dtb
+%%DATADIR%%/spapr-rtas.bin
+%%DATADIR%%/slof.bin
+%%DATADIR%%/s390-zipl.rom
+%%DATADIR%%/linuxboot.bin
+%%DATADIR%%/multiboot.bin
+%%DATADIR%%/sgabios.bin
+%%DATADIR%%/petalogix-s3adsp1800.dtb
+%%DATADIR%%/bamboo.dtb
+%%DATADIR%%/kvmvapic.bin
+%%DATADIR%%/qemu-icon.bmp
+%%DATADIR%%/qemu_logo_no_text.svg
+%%DATADIR%%/trace-events
+%%DATADIR%%/u-boot.e500
+%%DATADIR%%/keymaps/ar
+%%DATADIR%%/keymaps/bepo
+%%DATADIR%%/keymaps/common
+%%DATADIR%%/keymaps/cz
+%%DATADIR%%/keymaps/da
+%%DATADIR%%/keymaps/de
+%%DATADIR%%/keymaps/de-ch
+%%DATADIR%%/keymaps/en-gb
+%%DATADIR%%/keymaps/en-us
+%%DATADIR%%/keymaps/es
+%%DATADIR%%/keymaps/et
+%%DATADIR%%/keymaps/fi
+%%DATADIR%%/keymaps/fo
+%%DATADIR%%/keymaps/fr
+%%DATADIR%%/keymaps/fr-be
+%%DATADIR%%/keymaps/fr-ca
+%%DATADIR%%/keymaps/fr-ch
+%%DATADIR%%/keymaps/hr
+%%DATADIR%%/keymaps/hu
+%%DATADIR%%/keymaps/is
+%%DATADIR%%/keymaps/it
+%%DATADIR%%/keymaps/ja
+%%DATADIR%%/keymaps/lt
+%%DATADIR%%/keymaps/lv
+%%DATADIR%%/keymaps/mk
+%%DATADIR%%/keymaps/modifiers
+%%DATADIR%%/keymaps/nl
+%%DATADIR%%/keymaps/nl-be
+%%DATADIR%%/keymaps/no
+%%DATADIR%%/keymaps/pl
+%%DATADIR%%/keymaps/pt
+%%DATADIR%%/keymaps/pt-br
+%%DATADIR%%/keymaps/ru
+%%DATADIR%%/keymaps/sl
+%%DATADIR%%/keymaps/sv
+%%DATADIR%%/keymaps/th
+%%DATADIR%%/keymaps/tr
 %%GTK2%%share/locale/de_DE/LC_MESSAGES/qemu.mo
 %%GTK2%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
 %%GTK2%%share/locale/it/LC_MESSAGES/qemu.mo
 %%GTK2%%share/locale/hu/LC_MESSAGES/qemu.mo
 %%GTK2%%share/locale/tr/LC_MESSAGES/qemu.mo
 %%GTK2%%share/locale/zh_CN/LC_MESSAGES/qemu.mo