update to 2.2

change maintainer to patseal@hyperhost.net

PR:		18064
Submitted by:	    Patrick Seal <patseal@hyperhost.net>

1 files changed, 16 insertions, 38 deletions

diff --git a/astro/xtide/files/patch-aa b/astro/xtide/files/patch-aa
index 9cc52a2a2a5a..fc4fef86d367 100644
--- a/astro/xtide/files/patch-aa
+++ b/astro/xtide/files/patch-aa
@@ -1,41 +1,19 @@
-*** config.h.orig	Thu Aug 28 19:28:16 1997
---- config.h	Sat Aug 30 23:08:31 1997
+*** TideContext.cc.orig	Mon Apr 17 16:16:02 2000
+--- TideContext.cc	Mon Apr 17 16:17:00 2000
 ***************
-*** 8,25 ****
-  #ifdef OS2
-  #define hfile "harmonic"
-  #else
-! #define hfile "harmonics"
-  #endif
+*** 53,59 ****
+      }
+    }
+    if (hfile_path.isNull())
+!     hfile_path = "harmonics";
+    harmonicsPath = new HarmonicsPath (hfile_path);
   
-  /* Default location to show tides for */
-  /* This is overridden by the LOCATION environment variable or by the
-     -location switch. */
-! #define deflocation "Baltimore (Fort McHenry)"
+    homedir = getenv ("HOME");
+--- 53,59 ----
+      }
+    }
+    if (hfile_path.isNull())
+!     hfile_path = "/usr/X11R6/share/harmonics";
+    harmonicsPath = new HarmonicsPath (hfile_path);
   
-  /* System default config file, read only if neither ~/.[x]tiderc nor
-     -config is present.  sysconfig is for tide, xsysconfig is for xtide. */
-! #define sysconfig "/usr/lib/tiderc"
-! #define xsysconfig "/usr/lib/xtiderc"
-  
-  /* This gives the location of the compiled java classes tide.class and
-     xtide.class.  You should change it to point to your local copies if
---- 8,25 ----
-  #ifdef OS2
-  #define hfile "harmonic"
-  #else
-! #define hfile "/usr/X11R6/lib/xtide/harmonics"
-  #endif
-  
-  /* Default location to show tides for */
-  /* This is overridden by the LOCATION environment variable or by the
-     -location switch. */
-! #define deflocation "San Francisco, California"
-  
-  /* System default config file, read only if neither ~/.[x]tiderc nor
-     -config is present.  sysconfig is for tide, xsysconfig is for xtide. */
-! #define sysconfig "/usr/X11R6/lib/xtide/tiderc"
-! #define xsysconfig "/usr/X11R6/lib/xtide/xtiderc"
-  
-  /* This gives the location of the compiled java classes tide.class and
-     xtide.class.  You should change it to point to your local copies if
+    homedir = getenv ("HOME");