Index: head/emulators/qemu-utils/Makefile =================================================================== --- head/emulators/qemu-utils/Makefile (revision 475341) +++ head/emulators/qemu-utils/Makefile (revision 475342) @@ -1,92 +1,90 @@ # $FreeBSD$ PKGNAMESUFFIX= -utils MAINTAINER= asomers@FreeBSD.org COMMENT= QEMU userland utilities HAS_CONFIGURE= yes USES= cpe gmake pkgconfig perl5 python:2.7,build tar:bzip2 USES+= gettext-runtime USE_GNOME+= glib20 MAKE_ENV+= BSD_MAKE="${MAKE}" PREFIX=${PREFIX} CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* qemu-sbruno-* OPTIONS_SLAVE= DOCS OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK NCURSES VDE MASTERDIR= ${.CURDIR}/../qemu PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES= ${.CURDIR}/files/patch-configure PKGMESSAGE= PORTDOCS= qemu-doc.html qemu-doc.txt - CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 \ --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} --cc=${CC} --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \ --disable-curl \ --disable-gnutls \ --disable-gtk \ --disable-vte \ --disable-vnc-jpeg \ --disable-opengl \ --disable-usb-redir \ --disable-sdl \ --disable-system \ --disable-user \ --disable-guest-agent \ --disable-nettle \ --disable-gcrypt \ --disable-curses \ --disable-vnc \ --disable-virtfs \ --disable-brlapi \ --disable-fdt \ --disable-bluez \ --disable-kvm \ --disable-rdma \ --disable-vde \ --disable-netmap \ --disable-cap-ng \ --disable-attr \ --disable-vhost-net \ --disable-spice \ --disable-rbd \ --disable-libiscsi \ --disable-libnfs \ --disable-smartcard \ --disable-libusb \ --disable-usb-redir \ --disable-lzo \ --disable-snappy \ --disable-bzip2 \ --disable-seccomp \ --disable-coroutine-pool \ --disable-glusterfs \ --disable-tpm \ --disable-numa \ - --disable-blobs \ - --without-pixman + --disable-blobs LIB_DEPENDS= # qemu-utils must patch Makefile during pre-configure, because the master port # also patches Makefile. We can't use EXTRA_PATCHES, because that happens # before do-patch, and causes a conflict with the master port's patch. And we # can't use post-patch, because the master port also defines that target. pre-configure: ${PATCH} ${WRKSRC}/Makefile ${.CURDIR}/files/patch-Makefile post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${RMDIR} ${STAGEDIR}${DATADIR} .include "${MASTERDIR}/Makefile" Index: head/emulators/qemu-utils/files/patch-Makefile =================================================================== --- head/emulators/qemu-utils/files/patch-Makefile (revision 475341) +++ head/emulators/qemu-utils/files/patch-Makefile (revision 475342) @@ -1,29 +1,30 @@ ---- Makefile.orig 2017-08-07 11:28:12.728245720 -0600 -+++ Makefile 2017-08-07 11:28:49.098244913 -0600 -@@ -566,14 +566,10 @@ +--- Makefile.orig 2018-07-26 01:18:43 UTC ++++ Makefile +@@ -806,15 +806,10 @@ ifndef NOPORTDOCS $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" -- $(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" -- $(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" endif ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" -- $(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" +- $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" ifneq ($(TOOLS),) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -625,11 +621,6 @@ - ifeq ($(CONFIG_GTK),y) +@@ -868,11 +863,6 @@ endif + ifdef CONFIG_GTK $(MAKE) -C po $@ endif - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" - set -e; for x in $(KEYMAPS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ - done - $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" for d in $(TARGET_DIRS); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done Index: head/emulators/qemu-utils/files/patch-configure =================================================================== --- head/emulators/qemu-utils/files/patch-configure (revision 475341) +++ head/emulators/qemu-utils/files/patch-configure (revision 475342) @@ -1,19 +1,21 @@ ---- configure.orig 2016-08-17 15:26:51 UTC +--- configure.orig 2018-04-24 16:30:46 UTC +++ configure -@@ -3021,7 +3021,7 @@ if test "$pixman" = ""; then - fi - fi - if test "$pixman" = "none"; then -- if test "$want_tools" != "no" -o "$softmmu" != "no"; then -+ if test "$softmmu" != "no"; then - error_exit "pixman disabled but system emulation or tools build" \ - "enabled. You can turn off pixman only if you also" \ - "disable all system emulation targets and the tools" \ -@@ -4584,7 +4584,6 @@ if test "$want_tools" = "yes" ; then +@@ -3452,7 +3452,7 @@ fi + ########################################## + # pixman support probe + +-if test "$want_tools" = "no" -a "$softmmu" = "no"; then ++if test "$softmmu" = "no"; then + pixman_cflags= + pixman_libs= + elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then +@@ -5498,9 +5498,6 @@ if test "$want_tools" = "yes" ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" +- fi +- if [ "$ivshmem" = "yes" ]; then - tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" fi fi if test "$softmmu" = yes ; then