6 files changed, 70 insertions, 4 deletions
diff --git a/math/rapid/files/patch-Makefile b/math/rapid/files/patch-Makefile
index d1b577b52419..51fc70b66e7e 100644
--- a/math/rapid/files/patch-Makefile
+++ b/math/rapid/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	1997-07-03 18:54:09.000000000 +0200
-+++ Makefile	2015-05-29 23:02:09.707278000 +0200
+--- Makefile.orig	1997-07-03 16:54:09 UTC
++++ Makefile
 @@ -1,5 +1,5 @@
  
 -CC = CC -O
diff --git a/math/rapid/files/patch-RAPID.C b/math/rapid/files/patch-RAPID.C
new file mode 100644
index 000000000000..1318747cdee6
--- /dev/null
+++ b/math/rapid/files/patch-RAPID.C
@@ -0,0 +1,11 @@
+--- RAPID.C.orig	2018-05-16 10:56:45 UTC
++++ RAPID.C
+@@ -40,7 +40,7 @@
+ 
+ #include "RAPID_version.H"
+ 
+-static char rapidtag_data[] = "RAPIDTAG  file: "__FILE__"    date: "__DATE__"    time: "__TIME__;
++static char rapidtag_data[] = "RAPIDTAG  file: " __FILE__ "    date: " __DATE__ "    time: " __TIME__;
+ 
+ // to silence the compiler's complaints about unreferenced identifiers.
+ static void r1(char *f){  r1(f);  r1(rapidtag_data);  r1(rapid_version);}
diff --git a/math/rapid/files/patch-build.C b/math/rapid/files/patch-build.C
new file mode 100644
index 000000000000..97853e3e974a
--- /dev/null
+++ b/math/rapid/files/patch-build.C
@@ -0,0 +1,22 @@
+--- build.C.orig	1997-07-03 16:54:10 UTC
++++ build.C
+@@ -41,7 +41,7 @@
+ 
+ #include "RAPID_version.H"
+ 
+-static char rapidtag_data[] = "RAPIDTAG  file: "__FILE__"    date: "__DATE__"    time: "__TIME__;
++static char rapidtag_data[] = "RAPIDTAG  file: " __FILE__ "    date: " __DATE__ "    time: " __TIME__;
+ 
+ // to silence the compiler's complaints about unreferenced identifiers.
+ static void r1(char *f){  r1(f);  r1(rapidtag_data);  r1(rapid_version);}
+@@ -419,8 +419,8 @@ box::split_recurse(int *t, int n)
+       // see where it lies with respect to axdmp.
+       mean_from_moment(c, RAPID_moment[in]);
+       
+-      if (((pR[0][0]*c[0] + pR[1][0]*c[1] + pR[2][0]*c[2]) < axdmp)
+-	  && ((n!=2)) || ((n==2) && (i==0)))    
++      if ( (( (pR[0][0]*c[0] + pR[1][0]*c[1] + pR[2][0]*c[2]) < axdmp)
++	  && (n!=2)) || ((n==2) && (i==0)) )
+ 	{
+ 	  // accumulate first and second order moments for group 1
+ 	  accum_moment(M1, RAPID_moment[in]);
diff --git a/math/rapid/files/patch-collide.C b/math/rapid/files/patch-collide.C
new file mode 100644
index 000000000000..cb97df07f5d4
--- /dev/null
+++ b/math/rapid/files/patch-collide.C
@@ -0,0 +1,11 @@
+--- collide.C.orig	2018-05-16 10:58:09 UTC
++++ collide.C
+@@ -42,7 +42,7 @@
+ 
+ #include "RAPID_version.H"
+ 
+-static char rapidtag_data[] = "RAPIDTAG  file: "__FILE__"    date: "__DATE__"    time: "__TIME__;
++static char rapidtag_data[] = "RAPIDTAG  file: " __FILE__ "    date: " __DATE__ "    time: " __TIME__;
+ 
+ // to silence the compiler's complaints about unreferenced identifiers.
+ static void r1(char *f){  r1(f);  r1(rapidtag_data);  r1(rapid_version);}
diff --git a/math/rapid/files/patch-overlap.C b/math/rapid/files/patch-overlap.C
new file mode 100644
index 000000000000..6b3386f128e6
--- /dev/null
+++ b/math/rapid/files/patch-overlap.C
@@ -0,0 +1,22 @@
+--- overlap.C.orig	2018-05-16 10:58:45 UTC
++++ overlap.C
+@@ -41,7 +41,7 @@
+ 
+ #include "RAPID_version.H"
+ 
+-static char rapidtag_data[] = "RAPIDTAG  file: "__FILE__"    date: "__DATE__"    time: "__TIME__;
++static char rapidtag_data[] = "RAPIDTAG  file: " __FILE__ "    date: " __DATE__ "    time: " __TIME__;
+ 
+ // to silence the compiler's complaints about unreferenced identifiers.
+ static void r1(char *f){  r1(f);  r1(rapidtag_data);  r1(rapid_version);}
+@@ -221,8 +221,8 @@ models.
+ int
+ obb_disjoint(double B[3][3], double T[3], double a[3], double b[3])
+ {
+-  register double t, s;
+-  register int r;
++  double t, s;
++  int r;
+   double Bf[3][3];
+   const double reps = 1e-6;
+   
diff --git a/math/rapid/files/patch-sample_client.C b/math/rapid/files/patch-sample_client.C
index ea604b4b0542..722da1b58a1b 100644
--- a/math/rapid/files/patch-sample_client.C
+++ b/math/rapid/files/patch-sample_client.C
@@ -1,5 +1,5 @@
---- ./sample_client.C.orig	2014-02-21 11:34:06.215654443 +0100
-+++ ./sample_client.C	2014-02-21 11:34:17.068652509 +0100
+--- sample_client.C.orig	1997-07-03 16:54:09 UTC
++++ sample_client.C
 @@ -42,7 +42,7 @@
  #define LISTS 0