From owner-svn-ports-branches@freebsd.org Sun Apr 30 01:13:19 2017 Return-Path: Delivered-To: svn-ports-branches@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 6B68AD4BB5D; Sun, 30 Apr 2017 01:13:19 +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 2182AB3F; Sun, 30 Apr 2017 01:13:19 +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 v3U1DIXF065315; Sun, 30 Apr 2017 01:13:18 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3U1DILs065313; Sun, 30 Apr 2017 01:13:18 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201704300113.v3U1DILs065313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 30 Apr 2017 01:13:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r439780 - in branches/2017Q2/emulators/qemu-utils: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Apr 2017 01:13:19 -0000 Author: asomers (src committer) Date: Sun Apr 30 01:13:17 2017 New Revision: 439780 URL: https://svnweb.freebsd.org/changeset/ports/439780 Log: MFH: r439132 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) Sponsored by: Spectra Logic Corp Approved by: ports-secteam (junovitch) Added: branches/2017Q2/emulators/qemu-utils/files/patch-Makefile - copied unchanged from r439132, head/emulators/qemu-utils/files/patch-Makefile Modified: branches/2017Q2/emulators/qemu-utils/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/emulators/qemu-utils/Makefile ============================================================================== --- branches/2017Q2/emulators/qemu-utils/Makefile Sun Apr 30 01:12:10 2017 (r439779) +++ branches/2017Q2/emulators/qemu-utils/Makefile Sun Apr 30 01:13:17 2017 (r439780) @@ -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 Copied: branches/2017Q2/emulators/qemu-utils/files/patch-Makefile (from r439132, head/emulators/qemu-utils/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/qemu-utils/files/patch-Makefile Sun Apr 30 01:13:17 2017 (r439780, copy of r439132, head/emulators/qemu-utils/files/patch-Makefile) @@ -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