update to 2.2

change maintainer to patseal@hyperhost.net

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

5 files changed, 45 insertions, 60 deletions

diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 4be5df6dd6e7..3c9dab0c1325 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -6,20 +6,24 @@
 #
 
 PORTNAME=	xtide
-PORTVERSION=	1.6.2
+PORTVERSION=	2.2
 CATEGORIES=	astro
-MASTER_SITES=	http://www.universe.digex.net/~dave/files/
-DISTFILES=	xtide-1.6.2.tar.gz harmonics.gz
+MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} harmonics.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	brion@queeg.com
+MAINTAINER=	patseal@hyperhost.net
+
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
+		png.3:${PORTSDIR}/graphics/png
 
 # www.universe.digex.net is broken
 FETCH_BEFORE_ARGS=	-t
 
-EXTRACT_ONLY=	xtide-1.6.2.tar.gz
-USE_IMAKE=	yes
-NO_WRKSUBDIR=	yes
-MAN1=		xtide.1
+USE_X_PREFIX=	yes
+HAS_CONFIGURE=	yes
+MAN1=	xtide.1 tide.1
+MAN8=	xttpd.8
 MANCOMPRESSED=	no
 
 post-extract:
@@ -27,8 +31,12 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xtide.man ${PREFIX}/man/man1/xtide.1
-	@${MKDIR} ${PREFIX}/lib/xtide
-	${INSTALL_DATA} ${WRKSRC}/harmonics ${PREFIX}/lib/xtide
+	${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xttpd ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xtide.1 ${PREFIX}/man/man1/xtide.1
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/tide.1 ${PREFIX}/man/man1/tide.1
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xttpd.8 ${PREFIX}/man/man8/xttpd.8
+	@${MKDIR} ${PREFIX}/share/xtide
+	${INSTALL_DATA} ${WRKSRC}/harmonics ${PREFIX}/share/xtide
 
 .include <bsd.port.mk>
diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo
index b6b2b671d539..7bd17e80907b 100644
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@@ -1,2 +1,2 @@
-MD5 (xtide-1.6.2.tar.gz) = 7f5213b17b9f7f16918722c83e602089
-MD5 (harmonics.gz) = 32d90ec87498b11b5e62c9eb45873f3f
+MD5 (xtide-2.2.tar.gz) = a2e9ef7a0eea27de87a12efa0339ac85
+MD5 (harmonics.gz) = aeb7f495cb816ea636a6ea2a0eda491a
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");
diff --git a/astro/xtide/pkg-descr b/astro/xtide/pkg-descr
index 0965333e2090..ce2acff233ca 100644
--- a/astro/xtide/pkg-descr
+++ b/astro/xtide/pkg-descr
@@ -4,12 +4,9 @@ extensions for X, plain ASCII, and HTML.
 
 You may need to replace the harmonics file used by this port by one
 better suited to your area; there are a number of harmonics files
-available at http://www.universe.digex.net/~dave/files/.  You will
-also have to specify your location either by setting the LOCATION
-environment variable, by using the -location script, or by creating
-an appropriate ~/.xtiderc. 
+available at http://www.flaterco.com/xtide/files.html.
 
-WWW: http://www.universe.digex.net/~dave/xtide/xtide.html
+WWW: http://www.flaterco.com/xtide/
 
-- Brion Moss
-brion@queeg.com
+- Patrick Seal
+patseal@hyperhsot.net
diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist
index 22fc66692eeb..d8ffa1004664 100644
--- a/astro/xtide/pkg-plist
+++ b/astro/xtide/pkg-plist
@@ -1,3 +1,5 @@
 bin/xtide
-lib/xtide/harmonics
-@dirrm lib/xtide
+bin/tide
+sbin/xttpd
+share/xtide/harmonics
+@dirrm share/xtide