Redo this patch with less context to avoid a RCS keyword.

``This time for sure!''

2 files changed, 17 insertions, 28 deletions

diff --git a/databases/mysql-server/files/patch-sum b/databases/mysql-server/files/patch-sum
index 0b5b9944db9..7feb4848687 100644
--- a/databases/mysql-server/files/patch-sum
+++ b/databases/mysql-server/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.8 1999/12/29 16:06:51 bad Exp $
+$NetBSD: patch-sum,v 1.9 2000/01/17 17:15:31 bad Exp $
 
 MD5 (patch-aa) = f365bcd221de53ff6c21e25142e5c5e5
 MD5 (patch-ah) = b8aed564301f4cbea7c9677590917925
-MD5 (patch-ar) = 45c58c3d305ea438a6cbf910938a48b9
+MD5 (patch-ar) = 0b7cdad4dd69b6ca13ad0fbde37df8d6
 MD5 (patch-as) = 13776a945f3ed5a04fc1a3a4aa042dee
 MD5 (patch-au) = 6c45abe0f6c1600e0f2589f813047b1b
 MD5 (patch-av) = 0344b8c994c3ad198a20dadba3c2fe56
diff --git a/databases/mysql-server/patches/patch-ar b/databases/mysql-server/patches/patch-ar
index b4ae0422b88..9a73e1cf46d 100644
--- a/databases/mysql-server/patches/patch-ar
+++ b/databases/mysql-server/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
+$NetBSD: patch-ar,v 1.5 2000/01/17 17:15:30 bad Exp $
+# NOTE:  this one needs to be created with "diff -u2"
 
 --- mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S	Wed Dec 29 00:31:23 1999
-@@ -9,16 +9,17 @@
- 	.asciz "$Id: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $";
++++ mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S	Mon Jan 17 17:56:51 2000
+@@ -10,14 +10,15 @@
  #endif
   
 +#include <machine/asm.h>
@@ -26,9 +26,7 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +	bcs,a 2b;					\
  	sub %r0,%o0,%o0;				\
  	retl							
- 
-@@ -43,9 +44,9 @@
- /* ==========================================================================
+@@ -44,7 +45,7 @@
   * machdep_sys_pipe()
   */
 -    .globl _machdep_sys_pipe
@@ -38,9 +36,7 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +_C_LABEL(machdep_sys_pipe):
      mov  %o0, %o2
      mov  SYS_pipe, %g1
-     ta  0
-@@ -59,65 +60,65 @@
- /* ==========================================================================
+@@ -60,7 +61,7 @@
   * machdep_sys_fork()
   */
 -    .globl _machdep_sys_fork;
@@ -50,7 +46,7 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +_C_LABEL(machdep_sys_fork):;
  
      mov SYS_fork, %g1;
-     ta 0;
+@@ -68,7 +69,7 @@
      bcs 1b;
      nop;
 -	dec %o1;
@@ -60,7 +56,7 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +    and %o0, %o1, %o0;	! return 0 in child, pid in parent
  
  #ifndef SYS___sigprocmask14
- /* ==========================================================================
+@@ -76,9 +77,9 @@
   * machdep_sys_sigprocmask()
   */
 -    .globl _machdep_sys_sigprocmask;
@@ -73,15 +69,14 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +    ld [%o1], %o1; 
      mov SYS_sigprocmask, %g1;
      ta 0;
-     bcs 1b;
+@@ -86,5 +87,5 @@
      nop;
      retl
 -	nop
 +    nop
  #endif
  
- #ifndef SYS___sigsuspend14
- /* ==========================================================================
+@@ -93,9 +94,9 @@
   * machdep_sys_sigsuspend()
   */
 -    .globl _machdep_sys_sigsuspend;
@@ -94,14 +89,14 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +    ld [%o0], %o0; 
      mov SYS_sigsuspend, %g1;
      ta 0;
-     bcs 1b;
+@@ -103,5 +104,5 @@
      nop;
      retl
 -	nop
 +    nop
  #endif
  
- /* ==========================================================================
+@@ -109,7 +110,7 @@
   * machdep_sys_fstat()
   */
 -    .globl _machdep_sys_fstat;
@@ -111,17 +106,14 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +_C_LABEL(machdep_sys_fstat):;
  
      mov SYS___fstat13, %g1;
-     ta 0;
-     bcs 1b;
+@@ -118,5 +119,5 @@
      nop;
      retl
 -	nop
 +    nop
  
  /* ==========================================================================
-  * machdep_sys___syscall()
-@@ -129,14 +130,14 @@
-     bcs 1b;
+@@ -130,12 +131,12 @@
      nop;
      retl
 -	nop
@@ -137,9 +129,7 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +_C_LABEL(machdep_sys_lseek):
  	save %sp,-112,%sp
  	mov %i1,%o4
- 	mov %i2,%o5
-@@ -154,9 +155,9 @@
- /* ==========================================================================
+@@ -155,7 +156,7 @@
   * machdep_sys_ftruncate()
   */
 -	.global _machdep_sys_ftruncate
@@ -149,4 +139,3 @@ $NetBSD: patch-ar,v 1.4 1999/12/29 16:05:11 bad Exp $
 +_C_LABEL(machdep_sys_ftruncate):
  	save %sp,-104,%sp
  	mov %i1,%o4
- 	mov %i2,%o5