ports/180817: emulators/kqemu-kmod-devel: simplify path for extra-patches

[Pedro Giffuni]

>Number:         180817
>Category:       ports
>Synopsis:       emulators/kqemu-kmod-devel: simplify path for extra-patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 24 23:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pedro Giffuni
>Release:        9.2-PRERELEASE
>Organization:
>Environment:
FreeBSD pcbsd-1465 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #2 r253398M: Tue Jul 16 16:26:12 COT 2013     pfg at pcbsd-1465:/usr/obj/usr/src/sys/DELL  amd64

>Description:
It appears that gnu patch doesn't need to specify -p1 on some occasions.
The BSD-licensed patch doesn't do this so the extra patches were causing
breakage on the exp-run.

>How-To-Repeat:

>Fix:
The attached patch fixes the diffs to apply against the base directory.
It works fine with both GNU and BSD-licensed patch.

Patch attached with submission follows:

Index: kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd
===================================================================
--- kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-ea-200711-netbsd	(working copy)
@@ -32,8 +32,8 @@
 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:
Index: kqemu-kmod-devel/files/extra-patch-jk-200905-01
===================================================================
--- kqemu-kmod-devel/files/extra-patch-jk-200905-01	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-jk-200905-01	(working copy)
@@ -18,11 +18,11 @@
  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 */
Index: kqemu-kmod-devel/files/extra-patch-jk-200905-02
===================================================================
--- kqemu-kmod-devel/files/extra-patch-jk-200905-02	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-jk-200905-02	(working copy)
@@ -18,11 +18,11 @@
  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 @@
          
  /* 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
Index: kqemu-kmod-devel/files/extra-patch-jk-200905-03
===================================================================
--- kqemu-kmod-devel/files/extra-patch-jk-200905-03	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-jk-200905-03	(working copy)
@@ -13,11 +13,11 @@
  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);
Index: kqemu-kmod-devel/files/extra-patch-jk-200905-04
===================================================================
--- kqemu-kmod-devel/files/extra-patch-jk-200905-04	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-jk-200905-04	(working copy)
@@ -16,8 +16,8 @@
 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;
  }
Index: kqemu-kmod-devel/files/extra-patch-jk-200905-05
===================================================================
--- kqemu-kmod-devel/files/extra-patch-jk-200905-05	(revision 323623)
+++ kqemu-kmod-devel/files/extra-patch-jk-200905-05	(working copy)
@@ -13,11 +13,11 @@
  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;
  }


>Release-Note:
>Audit-Trail:
>Unformatted: