Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2017 01:13:18 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
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
Message-ID:  <201704300113.v3U1DILs065313@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704300113.v3U1DILs065313>