Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Apr 2000 17:27:54 -0400 (EDT)
From:      patseal@hyperhost.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/18064: Port update: xtide
Message-ID:  <20000417212754.ECE54137F57@foobar.foobar.eyep.net>

next in thread | raw e-mail | index | archive | help

>Number:         18064
>Category:       ports
>Synopsis:       Port update: xtide
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 17 14:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Seal
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
>Environment:

>Description:

xtide-1.6.2 -> xtide-2.2

Approval from previous maintainer brion@queeg.com

>How-To-Repeat:


diff -ruN xtide.orig/Makefile xtide/Makefile
--- xtide.orig/Makefile	Sat Apr  8 18:02:13 2000
+++ xtide/Makefile	Mon Apr 17 16:42:57 2000
@@ -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
 
-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
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+USE_X_PREFIX=	yes
+HAS_CONFIGURE=	yes
+MAN1=	xtide.1 tide.1
+MAN8=	xttpd.8
 MANCOMPRESSED=	no
 
 post-extract:
@@ -27,8 +31,12 @@
 
 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 -ruN xtide.orig/files/md5 xtide/files/md5
--- xtide.orig/files/md5	Mon Sep 28 05:04:03 1998
+++ xtide/files/md5	Mon Apr 17 15:41:02 2000
@@ -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) = 7979e4bc33c2a71ce77766b5cce10723
diff -ruN xtide.orig/patches/patch-aa xtide/patches/patch-aa
--- xtide.orig/patches/patch-aa	Fri Nov 28 15:44:19 1997
+++ xtide/patches/patch-aa	Mon Apr 17 16:21:45 2000
@@ -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);
+  
+    homedir = getenv ("HOME");
+--- 53,59 ----
+      }
+    }
+    if (hfile_path.isNull())
+!     hfile_path = "/usr/X11R6/share/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)"
-  
-  /* 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 -ruN xtide.orig/pkg/DESCR xtide/pkg/DESCR
--- xtide.orig/pkg/DESCR	Sun May  2 17:21:34 1999
+++ xtide/pkg/DESCR	Mon Apr 17 16:35:03 2000
@@ -4,12 +4,9 @@
 
 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 -ruN xtide.orig/pkg/PLIST xtide/pkg/PLIST
--- xtide.orig/pkg/PLIST	Thu Aug 13 17:06:37 1998
+++ xtide/pkg/PLIST	Mon Apr 17 16:36:28 2000
@@ -1,3 +1,5 @@
 bin/xtide
-lib/xtide/harmonics
-@dirrm lib/xtide
+bin/tide
+sbin/xttpd
+share/xtide/harmonics
+@dirrm share/xtide

>Fix:

	


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000417212754.ECE54137F57>