From owner-svn-ports-all@freebsd.org Mon Aug 7 18:26:54 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95F31DC0346; Mon, 7 Aug 2017 18:26:54 +0000 (UTC) (envelope-from asomers@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 mx1.freebsd.org (Postfix) with ESMTPS id 6EF877C78E; Mon, 7 Aug 2017 18:26:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v77IQr4h030699; Mon, 7 Aug 2017 18:26:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v77IQrLi030697; Mon, 7 Aug 2017 18:26:53 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708071826.v77IQrLi030697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 7 Aug 2017 18:26:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447503 - in head/emulators/qemu-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head/emulators/qemu-utils: . files X-SVN-Commit-Revision: 447503 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Aug 2017 18:26:54 -0000 Author: asomers (src committer) Date: Mon Aug 7 18:26:53 2017 New Revision: 447503 URL: https://svnweb.freebsd.org/changeset/ports/447503 Log: emulators/qemu-utils: Update to 2.9.0 Update emulators/qemu-utils to build at version 2.9.0. Its master port made the update in r447330. Reported by: pkg-fallout Reviewed by: sbruno Approved by: sbruno (ports) Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D11915 Modified: head/emulators/qemu-utils/Makefile head/emulators/qemu-utils/files/patch-Makefile Modified: head/emulators/qemu-utils/Makefile ============================================================================== --- head/emulators/qemu-utils/Makefile Mon Aug 7 18:23:02 2017 (r447502) +++ head/emulators/qemu-utils/Makefile Mon Aug 7 18:26:53 2017 (r447503) @@ -15,14 +15,15 @@ CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* qemu-sbrun OPTIONS_SLAVE= DOCS OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ - STATIC_LINK NCURSES + STATIC_LINK NCURSES VDE MASTERDIR= ${.CURDIR}/../qemu PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr -EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure +EXTRA_PATCHES= ${.CURDIR}/files/patch-configure PKGMESSAGE= -PORTDOCS= qemu-doc.html qmp-commands.txt +PORTDOCS= qemu-doc.html qemu-doc.txt + CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 \ @@ -52,7 +53,6 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=- --disable-bluez \ --disable-kvm \ --disable-rdma \ - --disable-uuid \ --disable-vde \ --disable-netmap \ --disable-cap-ng \ @@ -71,13 +71,19 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=- --disable-seccomp \ --disable-coroutine-pool \ --disable-glusterfs \ - --disable-archipelago \ --disable-tpm \ --disable-numa \ --disable-blobs \ --without-pixman 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-* Modified: head/emulators/qemu-utils/files/patch-Makefile ============================================================================== --- head/emulators/qemu-utils/files/patch-Makefile Mon Aug 7 18:23:02 2017 (r447502) +++ head/emulators/qemu-utils/files/patch-Makefile Mon Aug 7 18:26:53 2017 (r447503) @@ -1,6 +1,21 @@ ---- Makefile.orig 2017-03-31 14:07:03 UTC -+++ Makefile -@@ -484,11 +490,6 @@ endif +--- Makefile.orig 2017-08-07 11:28:12.728245720 -0600 ++++ Makefile 2017-08-07 11:28:49.098244913 -0600 +@@ -566,14 +566,10 @@ + $(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)" + 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" + ifneq ($(TOOLS),) + $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" +@@ -625,11 +621,6 @@ ifeq ($(CONFIG_GTK),y) $(MAKE) -C po $@ endif