Split up patch-ab into one patch per file and converted it from context

diff to unified diff.

8 files changed, 212 insertions, 222 deletions

diff --git a/math/grpn/distinfo b/math/grpn/distinfo
index 017e909f57e..2ba776a285b 100644
--- a/math/grpn/distinfo
+++ b/math/grpn/distinfo
@@ -1,12 +1,17 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 12:06:55 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/10/07 12:31:25 rillig Exp $
 
 SHA1 (grpn-1.1.2.tar.gz) = c7a6b89d9d9316f89d02b000b77e35a48ec3343b
 RMD160 (grpn-1.1.2.tar.gz) = 28a432ec8e4d2095a59440c4e401f12f85d75249
 Size (grpn-1.1.2.tar.gz) = 46153 bytes
 SHA1 (patch-aa) = 633c81b1bbe2537a61425b0e070cdc47eebb8a43
-SHA1 (patch-ab) = 2aea4f5283d42491ef500ba637dc47228dc33f03
 SHA1 (patch-ag) = c7e24d2786203b9eff6d1921bd82885ad412db09
 SHA1 (patch-ah) = eaa503abd7ae9ee08efe63462eb9aae6591aad3a
 SHA1 (patch-ai) = 01ae0b6476d5280f2420aec9f0bc878bfdb87c12
 SHA1 (patch-aj) = cfc11e0ec11e188351fbaa64783bedca02b927e9
 SHA1 (patch-ak) = e77349f7f81253064dfd60cdb2f0f148b765e70b
+SHA1 (patch-al) = e9fdbefd046221e1210b45974205a604543934d3
+SHA1 (patch-am) = dd32bc6dfe5560e6fb65cacd65455ab52093b49a
+SHA1 (patch-an) = d752dc3232a08542d6e40a908c476b22096e56dd
+SHA1 (patch-ao) = f0d609dd12b040e4b49042309b75ee3aeff291ab
+SHA1 (patch-ap) = 121f85c9e25832f2309f490c056e6fde9d4e7a43
+SHA1 (patch-aq) = e34e4b2b3e31133bb741c7f9d870e1f6c6c6d26d
diff --git a/math/grpn/patches/patch-ab b/math/grpn/patches/patch-ab
deleted file mode 100644
index 656f53df8c5..00000000000
--- a/math/grpn/patches/patch-ab
+++ /dev/null
@@ -1,220 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/05/12 23:21:54 dmcmahill Exp $
-
-adds physical constants:  k,q,e0,mu0,c.  
-
-*** button_def.c.orig	Wed Apr  3 22:46:10 2002
---- button_def.c	Fri Apr 26 10:56:28 2002
-***************
-*** 34,39 ****
---- 34,49 ----
-  extern void baseCmdCB(GtkWidget *, gpointer);
-  
-  FuncInfo invisible1[] = {
-+    { "k", "k", "Boltzmann's constant (Joules/Kelvin).",
-+       genericButtonCB, (void *)BoltzmannStack },
-+    { "q", "q", "Electron Charge (coulomb).",
-+       genericButtonCB, (void *)ChargeStack },
-+    { "e0", "e0", "Free space permitivitty (Farads/meter).",
-+       genericButtonCB, (void *)E0Stack },
-+    { "mu0", "mu0", "Free space permeability (Henries/meter).",
-+       genericButtonCB, (void *)Mu0Stack },
-+    { "c", "c", "Free space speed of light (meters/second).",
-+       genericButtonCB, (void *)LightSpeedStack },
-     { "Hex", "hex", "Hexidecimal display mode.",
-        baseCmdCB, (void *)HEXIDECIMAL },
-     { "Dec", "dec", "Decimal display mode.",
-***************
-*** 137,143 ****
-     { 8, 8, num456 },
-     { 8, 8, num123 },
-     { 8, 8, num0 },
-!    { 14, 0, invisible1 }
-  };
-  
-  
---- 147,153 ----
-     { 8, 8, num456 },
-     { 8, 8, num123 },
-     { 8, 8, num0 },
-!    { 19, 0, invisible1 }
-  };
-  
-  
-*** constant.c.orig	Wed Apr  3 22:46:11 2002
---- constant.c	Fri Apr 26 10:51:06 2002
-***************
-*** 24,29 ****
---- 24,34 ----
-  #include "real.h"
-  #include "complex.h"
-  
-+ Real *realBoltzmann;
-+ Real *realCharge;
-+ Real *realE0;
-+ Real *realMu0;
-+ Real *realLightSpeed;
-  Real *realPi;
-  Real *realPi2;
-  Real *realZero;
-***************
-*** 35,43 ****
---- 40,56 ----
-  Real *real180Pi;
-  Cmplx *cmplxI;
-  
-+ #define LIGHTSPEED	2.997923e8
-+ #define MU0				(4*M_PI*1.0e-7)
-+ 
-  void setup_constant(){
-     Real *tmp;
-  
-+    realBoltzmann = setRealDouble(newReal(), 1.380622e-23);
-+    realCharge = setRealDouble(newReal(), 1.6021917e-19);
-+    realE0 = setRealDouble(newReal(), 1.0/(LIGHTSPEED*LIGHTSPEED*MU0));
-+    realMu0 = setRealDouble(newReal(), MU0);
-+    realLightSpeed = setRealDouble(newReal(), LIGHTSPEED);
-     realPi = setRealDouble(newReal(), M_PI);
-     realPi2 = setRealDouble(newReal(), M_PI/2.0);
-     realZero = setRealDouble(newReal(), 0.0);
-*** constant.h.orig	Wed Apr  3 22:46:11 2002
---- constant.h	Fri Apr 26 10:55:24 2002
-***************
-*** 22,27 ****
---- 22,32 ----
-  #ifndef __CONSTANT_H
-  #define __CONSTANT_H
-  
-+ extern Real *realBoltzmann;
-+ extern Real *realCharge;
-+ extern Real *realE0;
-+ extern Real *realMu0;
-+ extern Real *realLightSpeed;
-  extern Real *realPi;
-  extern Real *realPi2;
-  extern Real *realZero;
-*** funcs.c.orig	Wed Apr  3 22:46:11 2002
---- funcs.c	Fri Apr 26 10:39:46 2002
-***************
-*** 95,100 ****
---- 95,165 ----
-  
-  }
-  
-+ void BoltzmannStack(){
-+    Number *n1;
-+ 
-+    finishEditor();
-+ 
-+    SaveStackState(0);
-+ 
-+    n1 = setNumberReal(newNumber(), realBoltzmann);
-+    Push(n1);
-+ 
-+    UndoStackState(1);
-+ }
-+ 
-+ void ChargeStack(){
-+    Number *n1;
-+ 
-+    finishEditor();
-+ 
-+    SaveStackState(0);
-+ 
-+    n1 = setNumberReal(newNumber(), realCharge);
-+    Push(n1);
-+ 
-+    UndoStackState(1);
-+ }
-+ 
-+ void E0Stack(){
-+    Number *n1;
-+ 
-+    finishEditor();
-+ 
-+    SaveStackState(0);
-+ 
-+    n1 = setNumberReal(newNumber(), realE0);
-+    Push(n1);
-+ 
-+    UndoStackState(1);
-+ }
-+ 
-+ void Mu0Stack(){
-+    Number *n1;
-+ 
-+    finishEditor();
-+ 
-+    SaveStackState(0);
-+ 
-+    n1 = setNumberReal(newNumber(), realMu0);
-+    Push(n1);
-+ 
-+    UndoStackState(1);
-+ }
-+ 
-+ void LightSpeedStack(){
-+    Number *n1;
-+ 
-+    finishEditor();
-+ 
-+    SaveStackState(0);
-+ 
-+    n1 = setNumberReal(newNumber(), realLightSpeed);
-+    Push(n1);
-+ 
-+    UndoStackState(1);
-+ }
-+ 
-  void PiStack(){
-     Number *n1;
-  
-*** funcs.h.orig	Wed Apr  3 22:46:11 2002
---- funcs.h	Fri Apr 26 10:40:27 2002
-***************
-*** 41,46 ****
---- 41,51 ----
-  void PopStack();
-  void PushStack();
-  
-+ void BoltzmannStack();
-+ void ChargeStack();
-+ void E0Stack();
-+ void Mu0Stack();
-+ void LightSpeedStack();
-  void PiStack();
-  
-  void NegStack();
-*** CHANGES.orig	Wed Apr  3 22:37:30 2002
---- CHANGES	Fri Apr 26 16:46:35 2002
-***************
-*** 29,31 ****
---- 29,38 ----
-  
-  v1.1.2
-     Add db10 and db20 commands.
-+ 
-+ v1.1.2nb1
-+    Add k,q,e0,mu0, and c commands for Boltzmann's constant
-+    (Joules/Kelvin), electron charge (coulomb), free space
-+    permitivitty (Farads/meter), free space permeability
-+ 	(Henries/meter), and the speed of light in a vacuum 
-+ 	(meters/second).
-*** help.c.orig	Wed Apr  3 22:46:11 2002
---- help.c	Fri Apr 26 16:47:46 2002
-***************
-*** 28,34 ****
-  
-  #define HELP_TXT \
-  "\n\
-! GRPN  v1.1.2\n\
-  \n\
-  By: Paul Wilkins\n\
-      paul.wilkins@analog.com\n\
---- 28,34 ----
-  
-  #define HELP_TXT \
-  "\n\
-! GRPN  v1.1.2nb1\n\
-  \n\
-  By: Paul Wilkins\n\
-      paul.wilkins@analog.com\n\
diff --git a/math/grpn/patches/patch-al b/math/grpn/patches/patch-al
new file mode 100644
index 00000000000..fd56087dc6e
--- /dev/null
+++ b/math/grpn/patches/patch-al
@@ -0,0 +1,33 @@
+$NetBSD: patch-al,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- button_def.c.orig	Thu Apr  4 05:46:10 2002
++++ button_def.c	Fri Oct  7 14:24:25 2005
+@@ -34,6 +34,16 @@ Foundation, Inc., 59 Temple Place - Suit
+ extern void baseCmdCB(GtkWidget *, gpointer);
+ 
+ FuncInfo invisible1[] = {
++   { "k", "k", "Boltzmann's constant (Joules/Kelvin).",
++      genericButtonCB, (void *)BoltzmannStack },
++   { "q", "q", "Electron Charge (coulomb).",
++      genericButtonCB, (void *)ChargeStack },
++   { "e0", "e0", "Free space permitivitty (Farads/meter).",
++      genericButtonCB, (void *)E0Stack },
++   { "mu0", "mu0", "Free space permeability (Henries/meter).",
++      genericButtonCB, (void *)Mu0Stack },
++   { "c", "c", "Free space speed of light (meters/second).",
++      genericButtonCB, (void *)LightSpeedStack },
+    { "Hex", "hex", "Hexidecimal display mode.",
+       baseCmdCB, (void *)HEXIDECIMAL },
+    { "Dec", "dec", "Decimal display mode.",
+@@ -137,7 +147,7 @@ struct RowInfo rowinf[] = {
+    { 8, 8, num456 },
+    { 8, 8, num123 },
+    { 8, 8, num0 },
+-   { 14, 0, invisible1 }
++   { 19, 0, invisible1 }
+ };
+ 
+ 
diff --git a/math/grpn/patches/patch-am b/math/grpn/patches/patch-am
new file mode 100644
index 00000000000..b23841325ea
--- /dev/null
+++ b/math/grpn/patches/patch-am
@@ -0,0 +1,37 @@
+$NetBSD: patch-am,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- constant.c.orig	Thu Apr  4 05:46:11 2002
++++ constant.c	Fri Oct  7 14:24:25 2005
+@@ -24,6 +24,11 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include "real.h"
+ #include "complex.h"
+ 
++Real *realBoltzmann;
++Real *realCharge;
++Real *realE0;
++Real *realMu0;
++Real *realLightSpeed;
+ Real *realPi;
+ Real *realPi2;
+ Real *realZero;
+@@ -35,9 +40,17 @@ Real *realMOne;
+ Real *real180Pi;
+ Cmplx *cmplxI;
+ 
++#define LIGHTSPEED	2.997923e8
++#define MU0				(4*M_PI*1.0e-7)
++
+ void setup_constant(){
+    Real *tmp;
+ 
++   realBoltzmann = setRealDouble(newReal(), 1.380622e-23);
++   realCharge = setRealDouble(newReal(), 1.6021917e-19);
++   realE0 = setRealDouble(newReal(), 1.0/(LIGHTSPEED*LIGHTSPEED*MU0));
++   realMu0 = setRealDouble(newReal(), MU0);
++   realLightSpeed = setRealDouble(newReal(), LIGHTSPEED);
+    realPi = setRealDouble(newReal(), M_PI);
+    realPi2 = setRealDouble(newReal(), M_PI/2.0);
+    realZero = setRealDouble(newReal(), 0.0);
diff --git a/math/grpn/patches/patch-an b/math/grpn/patches/patch-an
new file mode 100644
index 00000000000..37fd644f546
--- /dev/null
+++ b/math/grpn/patches/patch-an
@@ -0,0 +1,19 @@
+$NetBSD: patch-an,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- constant.h.orig	Thu Apr  4 05:46:11 2002
++++ constant.h	Fri Oct  7 14:24:25 2005
+@@ -22,6 +22,11 @@ Foundation, Inc., 59 Temple Place - Suit
+ #ifndef __CONSTANT_H
+ #define __CONSTANT_H
+ 
++extern Real *realBoltzmann;
++extern Real *realCharge;
++extern Real *realE0;
++extern Real *realMu0;
++extern Real *realLightSpeed;
+ extern Real *realPi;
+ extern Real *realPi2;
+ extern Real *realZero;
diff --git a/math/grpn/patches/patch-ao b/math/grpn/patches/patch-ao
new file mode 100644
index 00000000000..4184679b249
--- /dev/null
+++ b/math/grpn/patches/patch-ao
@@ -0,0 +1,79 @@
+$NetBSD: patch-ao,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- funcs.c.orig	Thu Apr  4 05:46:11 2002
++++ funcs.c	Fri Oct  7 14:24:25 2005
+@@ -95,6 +95,71 @@ void PushStack(){
+ 
+ }
+ 
++void BoltzmannStack(){
++   Number *n1;
++
++   finishEditor();
++
++   SaveStackState(0);
++
++   n1 = setNumberReal(newNumber(), realBoltzmann);
++   Push(n1);
++
++   UndoStackState(1);
++}
++
++void ChargeStack(){
++   Number *n1;
++
++   finishEditor();
++
++   SaveStackState(0);
++
++   n1 = setNumberReal(newNumber(), realCharge);
++   Push(n1);
++
++   UndoStackState(1);
++}
++
++void E0Stack(){
++   Number *n1;
++
++   finishEditor();
++
++   SaveStackState(0);
++
++   n1 = setNumberReal(newNumber(), realE0);
++   Push(n1);
++
++   UndoStackState(1);
++}
++
++void Mu0Stack(){
++   Number *n1;
++
++   finishEditor();
++
++   SaveStackState(0);
++
++   n1 = setNumberReal(newNumber(), realMu0);
++   Push(n1);
++
++   UndoStackState(1);
++}
++
++void LightSpeedStack(){
++   Number *n1;
++
++   finishEditor();
++
++   SaveStackState(0);
++
++   n1 = setNumberReal(newNumber(), realLightSpeed);
++   Push(n1);
++
++   UndoStackState(1);
++}
++
+ void PiStack(){
+    Number *n1;
+ 
diff --git a/math/grpn/patches/patch-ap b/math/grpn/patches/patch-ap
new file mode 100644
index 00000000000..db8e0a0a3f6
--- /dev/null
+++ b/math/grpn/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- funcs.h.orig	Thu Apr  4 05:46:11 2002
++++ funcs.h	Fri Oct  7 14:24:25 2005
+@@ -41,6 +41,11 @@ void DupStack();
+ void PopStack();
+ void PushStack();
+ 
++void BoltzmannStack();
++void ChargeStack();
++void E0Stack();
++void Mu0Stack();
++void LightSpeedStack();
+ void PiStack();
+ 
+ void NegStack();
diff --git a/math/grpn/patches/patch-aq b/math/grpn/patches/patch-aq
new file mode 100644
index 00000000000..821bb12bba8
--- /dev/null
+++ b/math/grpn/patches/patch-aq
@@ -0,0 +1,18 @@
+$NetBSD: patch-aq,v 1.1 2005/10/07 12:31:25 rillig Exp $
+
+The patches patch-al upto patch-aq add the physical constants k, q, e0,
+mu0, and c.
+
+--- CHANGES.orig	Thu Apr  4 05:37:30 2002
++++ CHANGES	Fri Oct  7 14:24:25 2005
+@@ -29,3 +29,10 @@ v1.1.1
+ 
+ v1.1.2
+    Add db10 and db20 commands.
++
++v1.1.2nb1
++   Add k,q,e0,mu0, and c commands for Boltzmann's constant
++   (Joules/Kelvin), electron charge (coulomb), free space
++   permitivitty (Farads/meter), free space permeability
++	(Henries/meter), and the speed of light in a vacuum 
++	(meters/second).