Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Apr 2017 23:47:28 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
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
Message-ID:  <201704212347.v3LNlSHX065826@repo.freebsd.org>

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



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