Fixup qemu-devel as the bsd-user code from my branch does not exist in

upstream qemu.

2 files changed, 95 insertions, 148 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 6469cbe199a1..f1769aa4af38 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -86,50 +86,6 @@ CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
 
 .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
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 2d9f6b89fb65..ea86585c3570 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -1,14 +1,14 @@
-%%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
@@ -29,105 +29,96 @@
 %%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