From owner-svn-ports-all@FreeBSD.ORG  Fri Jul 26 19:40:03 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5D9729FA;
 Fri, 26 Jul 2013 19:40:03 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B2FC2D46;
 Fri, 26 Jul 2013 19:40:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QJe3Vk087276;
 Fri, 26 Jul 2013 19:40:03 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QJe2bt086930;
 Fri, 26 Jul 2013 19:40:02 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201307261940.r6QJe2bt086930@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Fri, 26 Jul 2013 19:40:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323750 - head/emulators/kqemu-kmod-devel/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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 19:40:03 -0000

Author: nox
Date: Fri Jul 26 19:40:01 2013
New Revision: 323750
URL: http://svnweb.freebsd.org/changeset/ports/323750

Log:
  Simplify path for extra-patches.
  
  PR:		ports/180817
  Submitted by:	pfg

Modified:
  head/emulators/kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd   (contents, props changed)
  head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-01   (contents, props changed)
  head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-02   (contents, props changed)
  head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-03   (contents, props changed)
  head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-04   (contents, props changed)
  head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-05   (contents, props changed)

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd	Fri Jul 26 19:40:01 2013	(r323750)
@@ -32,8 +32,8 @@ Regards,
 Adi
 
 Index: common/monitor.c
---- xx/kqemu-1.3.0pre11/common/monitor.c	Tue Feb  6 23:02:00 2007
-+++ kqemu-1.3.0pre11/common/monitor.c	Mon Nov  5 18:59:58 2007
+--- common/monitor.c	Tue Feb  6 23:02:00 2007
++++ common/monitor.c	Mon Nov  5 18:59:58 2007
 @@ -990,7 +990,8 @@ static void *map_vaddr(struct kqemu_state *s, unsigned
      e = &s->soft_tlb[(addr >> PAGE_SHIFT) & (SOFT_TLB_SIZE - 1)];
   redo:

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-01
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-01	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-01	Fri Jul 26 19:40:01 2013	(r323750)
@@ -18,11 +18,11 @@ Signed-off-by: Jan Kiszka <jan.kiszka@si
  common/kernel.c |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/common/kernel.c b/common/kernel.c
+diff --git common/kernel.c common/kernel.c
 index 6a88452..1d7a69e 100644
 Index: common/kernel.c
---- a/common/kernel.c
-+++ b/common/kernel.c
+--- common/kernel.c
++++ common/kernel.c
 @@ -422,8 +422,8 @@ struct kqemu_state *kqemu_init(struct kqemu_init *d,
  #ifdef __x86_64__
      s->monitor_ds_sel = 0; /* no need for a specific data segment */

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-02
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-02	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-02	Fri Jul 26 19:40:01 2013	(r323750)
@@ -18,11 +18,11 @@ Signed-off-by: Jan Kiszka <jan.kiszka@si
  common/kqemu_int.h        |    6 +++---
  2 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/common/i386/monitor_asm.S b/common/i386/monitor_asm.S
+diff --git common/i386/monitor_asm.S b/common/i386/monitor_asm.S
 index 04f4258..e996553 100644
 Index: common/i386/monitor_asm.S
---- a/common/i386/monitor_asm.S
-+++ b/common/i386/monitor_asm.S
+--- common/i386/monitor_asm.S
++++ common/i386/monitor_asm.S
 @@ -214,8 +214,8 @@ __monitor_exception:
          pushl %edx
          pushl %ecx
@@ -78,11 +78,11 @@ Index: common/i386/monitor_asm.S
          
  /* compute the address of the monitor context */
          call 1f
-diff --git a/common/kqemu_int.h b/common/kqemu_int.h
+diff --git common/kqemu_int.h common/kqemu_int.h
 index f19f7ca..4b59cb3 100644
 Index: common/kqemu_int.h
---- a/common/kqemu_int.h
-+++ b/common/kqemu_int.h
+--- common/kqemu_int.h
++++ common/kqemu_int.h
 @@ -367,10 +367,10 @@ struct kqemu_exception_regs {
  };
  #else

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-03
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-03	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-03	Fri Jul 26 19:40:01 2013	(r323750)
@@ -13,11 +13,11 @@ Signed-off-by: Jan Kiszka <jan.kiszka@si
  common/interp.c |    7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/common/interp.c b/common/interp.c
+diff --git common/interp.c b/common/interp.c
 index 088d2b2..4c042e9 100644
 Index: common/interp.c
---- a/common/interp.c
-+++ b/common/interp.c
+--- common/interp.c
++++ common/interp.c
 @@ -775,9 +775,12 @@ static void load_seg_desc(struct kqemu_state *s,
  #ifdef DEBUG_SEG
      monitor_log(s, "load_seg_desc: reg=%d sel=0x%04x\n", seg_reg, selector);

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-04
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-04	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-04	Fri Jul 26 19:40:01 2013	(r323750)
@@ -16,8 +16,8 @@ Signed-off-by: Jan Kiszka <jan.kiszka@si
 diff --git a/common/interp.c b/common/interp.c
 index 4c042e9..4f93bc3 100644
 Index: common/interp.c
---- a/common/interp.c
-+++ b/common/interp.c
+--- common/interp.c
++++ common/interp.c
 @@ -1720,6 +1720,65 @@ void helper_lldt(struct kqemu_state *s, int selector)
      env->ldt.selector = selector;
  }

Modified: head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-05
==============================================================================
--- head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-05	Fri Jul 26 19:21:10 2013	(r323749)
+++ head/emulators/kqemu-kmod-devel/files/extra-patch-jk-200905-05	Fri Jul 26 19:40:01 2013	(r323750)
@@ -13,11 +13,11 @@ Signed-off-by: Jan Kiszka <jan.kiszka@si
  common/interp.c |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 files changed, 109 insertions(+), 2 deletions(-)
 
-diff --git a/common/interp.c b/common/interp.c
+diff --git common/interp.c b/common/interp.c
 index 4f93bc3..577d666 100644
 Index: common/interp.c
---- a/common/interp.c
-+++ b/common/interp.c
+--- common/interp.c
++++ common/interp.c
 @@ -1720,6 +1720,93 @@ void helper_lldt(struct kqemu_state *s, int selector)
      env->ldt.selector = selector;
  }