From owner-svn-ports-all@freebsd.org Fri Apr 21 23:47:29 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 77613D4831D; Fri, 21 Apr 2017 23:47:29 +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 20198BDB; Fri, 21 Apr 2017 23:47:29 +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 v3LNlSje065828; Fri, 21 Apr 2017 23:47:28 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3LNlSHX065826; Fri, 21 Apr 2017 23:47:28 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201704212347.v3LNlSHX065826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 21 Apr 2017 23:47:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439132 - in head/emulators/qemu-utils: . files X-SVN-Group: ports-head 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: Fri, 21 Apr 2017 23:47:29 -0000 Author: asomers (src committer) Date: Fri Apr 21 23:47:27 2017 New Revision: 439132 URL: https://svnweb.freebsd.org/changeset/ports/439132 Log: Add missing file from r438925 Apparently when you run "make makepatch" in a slave port, the patchfiles get put into the master port's directory Pointy-hat to: asomers Reported by: pkg-fallout Approved by: brd (implicit) MFH: 2017Q2 Sponsored by: Spectra Logic Corp Added: head/emulators/qemu-utils/files/patch-Makefile (contents, props changed) Modified: head/emulators/qemu-utils/Makefile Modified: head/emulators/qemu-utils/Makefile ============================================================================== --- head/emulators/qemu-utils/Makefile Fri Apr 21 22:59:11 2017 (r439131) +++ head/emulators/qemu-utils/Makefile Fri Apr 21 23:47:27 2017 (r439132) @@ -19,7 +19,7 @@ OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL G MASTERDIR= ${.CURDIR}/../qemu PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr -EXTRA_PATCHES= ${.CURDIR}/files/patch-configure +EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure PKGMESSAGE= PORTDOCS= qemu-doc.html qmp-commands.txt Added: head/emulators/qemu-utils/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-utils/files/patch-Makefile Fri Apr 21 23:47:27 2017 (r439132) @@ -0,0 +1,14 @@ +--- Makefile.orig 2017-03-31 14:07:03 UTC ++++ Makefile +@@ -484,11 +490,6 @@ endif + ifeq ($(CONFIG_GTK),y) + $(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