svn commit: r461603 - in head/emulators/qemu-sbruno: . files

[Brooks Davis]

Author: brooks
Date: Mon Feb 12 16:55:28 2018
New Revision: 461603
URL: https://svnweb.freebsd.org/changeset/ports/461603

Log:
  Rename and regenerate the patch files so they have normal syntax and
  names and don't require -p1.
  
  No functional change.
  
  Approved by:	sbruno (maintainer)

Added:
  head/emulators/qemu-sbruno/files/patch-include_net_net.h
     - copied, changed from r461602, head/emulators/qemu-sbruno/files/patch-qemu-include-net-net.h
Deleted:
  head/emulators/qemu-sbruno/files/patch-qemu-include-net-net.h
Modified:
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu-sbruno/files/patch-Makefile
  head/emulators/qemu-sbruno/files/patch-configure
  head/emulators/qemu-sbruno/files/patch-qemu-doc.texi

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Mon Feb 12 16:16:38 2018	(r461602)
+++ head/emulators/qemu-sbruno/Makefile	Mon Feb 12 16:55:28 2018	(r461603)
@@ -18,7 +18,6 @@ GH_TUPLE=	seanbruno:qemu-bsd-user:2b84fbb94e9 \
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig bison perl5 python:2.7,build
 USE_PERL5=	build
-PATCH_STRIP=	-p1
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 
 ONLY_FOR_ARCHS=		amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?

Modified: head/emulators/qemu-sbruno/files/patch-Makefile
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-Makefile	Mon Feb 12 16:16:38 2018	(r461602)
+++ head/emulators/qemu-sbruno/files/patch-Makefile	Mon Feb 12 16:55:28 2018	(r461603)
@@ -1,6 +1,6 @@
---- Makefile.orig	2017-12-15 10:34:23.000000000 -0700
-+++ Makefile	2017-12-15 22:05:39.173965000 -0700
-@@ -263,9 +263,13 @@
+--- Makefile.orig	2018-02-08 19:22:54 UTC
++++ Makefile
+@@ -281,9 +281,13 @@ LIBS+=-lz $(LIBS_TOOLS)
  HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
  
  ifdef BUILD_DOCS
@@ -14,7 +14,7 @@
  DOCS+=docs/qemu-block-drivers.7
  ifdef CONFIG_VIRTFS
  DOCS+=fsdev/virtfs-proxy-helper.1
-@@ -647,16 +651,20 @@
+@@ -669,16 +673,20 @@ endif
  
  install-doc: $(DOCS)
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
@@ -35,7 +35,7 @@
  ifneq ($(TOOLS),)
  	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
-@@ -664,9 +672,11 @@
+@@ -686,11 +694,13 @@ ifneq ($(TOOLS),)
  endif
  ifneq (,$(findstring qemu-ga,$(TOOLS)))
  	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
@@ -43,7 +43,9 @@
  	$(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
  	$(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"
  	$(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
-+endif
  endif
  endif
++endif
  ifdef CONFIG_VIRTFS
+ 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
+ 	$(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"

Modified: head/emulators/qemu-sbruno/files/patch-configure
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-configure	Mon Feb 12 16:16:38 2018	(r461602)
+++ head/emulators/qemu-sbruno/files/patch-configure	Mon Feb 12 16:55:28 2018	(r461603)
@@ -1,6 +1,6 @@
---- configure.orig	2016-11-10 11:32:23.000000000 -0700
-+++ configure	2016-11-13 09:06:21.654976000 -0700
-@@ -2977,10 +2977,10 @@
+--- configure.orig	2018-02-08 19:22:54 UTC
++++ configure
+@@ -3248,10 +3248,10 @@ fi
  # curses probe
  if test "$curses" != "no" ; then
    if test "$mingw32" = "yes" ; then

Copied and modified: head/emulators/qemu-sbruno/files/patch-include_net_net.h (from r461602, head/emulators/qemu-sbruno/files/patch-qemu-include-net-net.h)
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-qemu-include-net-net.h	Mon Feb 12 16:16:38 2018	(r461602, copy source)
+++ head/emulators/qemu-sbruno/files/patch-include_net_net.h	Mon Feb 12 16:55:28 2018	(r461603)
@@ -1,7 +1,8 @@
-Index: qemu/include/net/net.h
-@@ -174,8 +174,8 @@ void net_host_device_remove(Monitor *mon
- int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
- int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
+--- include/net/net.h.orig	2018-02-08 19:22:54 UTC
++++ include/net/net.h
+@@ -220,8 +220,8 @@ void qmp_netdev_add(QDict *qdict, QObjec
+ int net_hub_id_for_client(NetClientState *nc, int *id);
+ NetClientState *net_hub_port_find(int hub_id);
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"

Modified: head/emulators/qemu-sbruno/files/patch-qemu-doc.texi
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-qemu-doc.texi	Mon Feb 12 16:16:38 2018	(r461602)
+++ head/emulators/qemu-sbruno/files/patch-qemu-doc.texi	Mon Feb 12 16:55:28 2018	(r461603)
@@ -1,5 +1,6 @@
-Index: qemu/qemu-doc.texi
-@@ -985,7 +985,8 @@
+--- qemu-doc.texi.orig	2018-02-08 19:22:54 UTC
++++ qemu-doc.texi
+@@ -556,7 +556,8 @@ Send the escape character to the fronten
  
  @c man begin SEEALSO
  The HTML documentation of QEMU for more precise information and Linux