From owner-svn-ports-head@freebsd.org Wed Sep 23 09:25:46 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B9653F3D96; Wed, 23 Sep 2020 09:25:46 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxCTQ37trz4XKF; Wed, 23 Sep 2020 09:25:46 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34E31E702; Wed, 23 Sep 2020 09:25:46 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08N9Pkwb062965; Wed, 23 Sep 2020 09:25:46 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08N9PjnP062964; Wed, 23 Sep 2020 09:25:45 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202009230925.08N9PjnP062964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Wed, 23 Sep 2020 09:25:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549674 - in head/emulators/qemu-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/emulators/qemu-utils: . files X-SVN-Commit-Revision: 549674 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 09:25:46 -0000 Author: dinoex Date: Wed Sep 23 09:25:45 2020 New Revision: 549674 URL: https://svnweb.freebsd.org/changeset/ports/549674 Log: - fix build PR: 248101 Approved by: ken Modified: head/emulators/qemu-utils/Makefile head/emulators/qemu-utils/files/patch-Makefile Modified: head/emulators/qemu-utils/Makefile ============================================================================== --- head/emulators/qemu-utils/Makefile Wed Sep 23 09:23:44 2020 (r549673) +++ head/emulators/qemu-utils/Makefile Wed Sep 23 09:25:45 2020 (r549674) @@ -5,8 +5,6 @@ PKGNAMESUFFIX= -utils MAINTAINER= ken@FreeBSD.org COMMENT= QEMU userland utilities -BROKEN= fails to configure - HAS_CONFIGURE= yes USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \ python:build tar:xz Modified: head/emulators/qemu-utils/files/patch-Makefile ============================================================================== --- head/emulators/qemu-utils/files/patch-Makefile Wed Sep 23 09:23:44 2020 (r549673) +++ head/emulators/qemu-utils/files/patch-Makefile Wed Sep 23 09:25:45 2020 (r549674) @@ -1,12 +1,13 @@ ---- Makefile.orig 2019-08-08 19:18:25.578250000 +0000 -+++ Makefile 2019-08-08 19:20:21.482341000 +0000 -@@ -355,14 +355,10 @@ +--- Makefile.orig 2020-09-18 12:03:57 UTC ++++ Makefile +@@ -344,14 +344,11 @@ endif ifdef BUILD_DOCS ifdef NOPORTDOCS - DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 + DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 -DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 ++DOCS+=docs/interop/qemu-ga-ref.7 else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 + DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 -DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 endif @@ -15,7 +16,7 @@ ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif -@@ -832,16 +828,10 @@ +@@ -828,16 +825,10 @@ ifndef NOPORTDOCS $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" @@ -29,12 +30,12 @@ - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" - ifneq ($(TOOLS),) + ifeq ($(CONFIG_TOOLS),y) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -895,11 +885,6 @@ - ifdef CONFIG_GTK - $(MAKE) -C po $@ +@@ -942,11 +933,6 @@ endif + ifeq ($(CONFIG_PLUGIN),y) + $(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h" endif - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" - set -e; for x in $(KEYMAPS); do \