Updated xtide to 2.8.3.

Too many changes to list here.

6 files changed, 50 insertions, 65 deletions

diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index 5c8670806a9..c2d9e7e2be0 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,40 +1,38 @@
-# $NetBSD: Makefile,v 1.18 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/11/05 21:51:21 rillig Exp $
 
-DISTNAME=	xtide-2.4
-PKGREVISION=	5
-CATEGORIES= 	misc x11
+DISTNAME=	xtide-2.8.3
+CATEGORIES=	misc x11
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
-DISTFILES=	${XTIDE_SRC} harmonics.txt.gz offsets.xml.gz
+DISTFILES=	${DISTNAME}.tar.bz2 ${HARMONICS_FILE}.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.flaterco.com/
 COMMENT=	X11 tide predictor
 
-EXTRACT_ONLY=	${XTIDE_SRC}
-XTIDE_SRC=	${DISTNAME}${EXTRACT_SUFX}
-
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
+HARMONICS_FILE=	harmonics-dwf-20060708.tcd
+
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
 EGDIR=		${PREFIX}/share/examples/xtide
 CONF_FILES=	${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
 
-post-patch:
-	@cd ${WRKSRC}/DOCUMENTATION;					\
-	for f in *; do							\
-		${MV} $$f $$f.bak;					\
-		${SED} -e 's|/usr/local|${PREFIX}|g' < $$f.bak > $$f;	\
-	done
+SUBST_CLASSES+=	xt
+SUBST_STAGE.xt=	pre-configure
+SUBST_FILES.xt=	DOCUMENTATION/*
+SUBST_SED.xt=	-e 's|/usr/local|${PREFIX}|g'
+
+PLIST_SUBST+=	HARMONICS_FILE=${HARMONICS_FILE:Q}
+
+INSTALLATION_DIRS=	share/xtide ${EGDIR}
+
+post-extract:
+	${ECHO} "${PREFIX}/share/xtide/${HARMONICS_FILE}" > ${WRKDIR}/xtide.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xtide
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${GZCAT} ${DISTDIR}/harmonics.txt.gz > ${WRKDIR}/harmonics.txt
-	${GZCAT} ${DISTDIR}/offsets.xml.gz > ${WRKDIR}/offsets.xml
-	${CP} ${FILESDIR}/xtide.conf ${EGDIR}/xtide.conf
-	${CP} ${WRKDIR}/harmonics.txt ${PREFIX}/share/xtide
-	${CP} ${WRKDIR}/offsets.xml ${PREFIX}/share/xtide
+	${INSTALL_DATA} ${WRKDIR}/xtide.conf ${EGDIR}/xtide.conf
+	${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${PREFIX}/share/xtide
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/misc/xtide/PLIST b/misc/xtide/PLIST
index 2b17b173a15..0f4685386c4 100644
--- a/misc/xtide/PLIST
+++ b/misc/xtide/PLIST
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/22 21:14:46 jmmv Exp $
-bin/xtide
+@comment $NetBSD: PLIST,v 1.3 2006/11/05 21:51:21 rillig Exp $
 bin/tide
-sbin/xttpd
-man/man1/xtide.1
+bin/xtide
 man/man1/tide.1
+man/man1/xtide.1
 man/man8/xttpd.8
-share/xtide/harmonics.txt
-share/xtide/offsets.xml
+sbin/xttpd
 share/examples/xtide/xtide.conf
+share/xtide/${HARMONICS_FILE}
 @dirrm share/xtide
 @dirrm share/examples/xtide
diff --git a/misc/xtide/distinfo b/misc/xtide/distinfo
index d956d755f21..2558f5c241d 100644
--- a/misc/xtide/distinfo
+++ b/misc/xtide/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.6 2006/01/03 15:33:22 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/11/05 21:51:21 rillig Exp $
 
-SHA1 (xtide-2.4.tar.gz) = bbd97d1b11ea75bfb09df1c9ddd3e0bc5d3f3a35
-RMD160 (xtide-2.4.tar.gz) = fab0267c3bce260db36d190ab026da1caccdfcac
-Size (xtide-2.4.tar.gz) = 429295 bytes
-SHA1 (harmonics.txt.gz) = c603f47326ae4362fa4209db533bd53fb281f9ac
-RMD160 (harmonics.txt.gz) = 3f9d115f58a30e7b094e0d4f898865d54cfc50ac
-Size (harmonics.txt.gz) = 990208 bytes
-SHA1 (offsets.xml.gz) = 2cc596373b631e7a0146bac2b66a7754334ab5b7
-RMD160 (offsets.xml.gz) = d91a900450be1a1773c0fdecab3b8fee449bf9b0
-Size (offsets.xml.gz) = 150845 bytes
-SHA1 (patch-aa) = 48b0c37ba2f664f14508c2096184e75784958205
+SHA1 (harmonics-dwf-20060708.tcd.bz2) = 1f54ed856b064e485f7e386eb4a71965e83abfa4
+RMD160 (harmonics-dwf-20060708.tcd.bz2) = 754255ac5f2e36cf2dce587e7f9f7bd0561226d9
+Size (harmonics-dwf-20060708.tcd.bz2) = 477682 bytes
+SHA1 (xtide-2.8.3.tar.bz2) = 0abfdf8a695facfeb239af0018e7b3c392592cb4
+RMD160 (xtide-2.8.3.tar.bz2) = 926d116d6d36b3e4ff5e4630e0df394a4f9a0a8b
+Size (xtide-2.8.3.tar.bz2) = 463382 bytes
+SHA1 (patch-aa) = 8b9059e2870f6b8149e72ca33c452e75650f8230
 SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec
-SHA1 (patch-ac) = 4ccbdc0585fea1cdeb5514c77519e450b718f477
+SHA1 (patch-ac) = 07a0099f0d58b8774ae456470142314dabe38c1b
diff --git a/misc/xtide/files/xtide.conf b/misc/xtide/files/xtide.conf
deleted file mode 100644
index bd3a9e1b349..00000000000
--- a/misc/xtide/files/xtide.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/pkg/share/xtide/harmonics.txt:/usr/pkg/share/xtide/offsets.xml
diff --git a/misc/xtide/patches/patch-aa b/misc/xtide/patches/patch-aa
index e75aaddc2c5..396ba20c6b2 100644
--- a/misc/xtide/patches/patch-aa
+++ b/misc/xtide/patches/patch-aa
@@ -1,20 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/31 15:48:05 agc Exp $
+$NetBSD: patch-aa,v 1.2 2006/11/05 21:51:21 rillig Exp $
 
---- errors.cc.orig	Fri Mar 23 01:35:40 2001
-+++ errors.cc	Thu May 31 13:45:32 2001
-@@ -128,11 +128,11 @@
+--- errors.cc.orig	2004-11-17 17:27:18.000000000 +0100
++++ errors.cc	2006-11-05 21:59:29.000000000 +0100
+@@ -121,10 +121,10 @@ If the harmonics file has been updated, 
      break;
    case NO_HFILE_PATH:
      errout += "NO_HFILE_PATH\n\
 -If /etc/xtide.conf is not provided, you must set the environment variable\n\
-+If ${PREFIX}/etc/xtide.conf is not provided, you must set the environment variable\n\
++If "PKG_SYSCONFDIR"/xtide.conf is not provided, you must set the environment variable\n\
  HFILE_PATH to point to your harmonics files.  Example:\n\
--  export HFILE_PATH=/usr/local/share/xtide/harmonics.txt:\\\n\
--  /usr/local/share/xtide/offsets.xml\n\
+-  export HFILE_PATH=/usr/local/share/xtide/harmonics.tcd\n\
 -Please refer to the documentation for usage of /etc/xtide.conf.";
-+  export HFILE_PATH=${PREFIX}/share/xtide/harmonics.txt:\\\n\
-+  ${PREFIX}/share/xtide/offsets.xml\n\
-+Please refer to the documentation for usage of ${PREFIX}/etc/xtide.conf.";
++  export HFILE_PATH="PREFIX"/share/xtide/harmonics.tcd\n\
++Please refer to the documentation for usage of "PKG_SYSCONFDIR"/xtide.conf.";
      break;
    case IMPOSSIBLE_CONVERSION:
      errout += "IMPOSSIBLE_CONVERSION\n\
diff --git a/misc/xtide/patches/patch-ac b/misc/xtide/patches/patch-ac
index 29dbdda6cfa..03bc9ad4a12 100644
--- a/misc/xtide/patches/patch-ac
+++ b/misc/xtide/patches/patch-ac
@@ -1,21 +1,15 @@
-$NetBSD: patch-ac,v 1.4 2006/01/03 15:33:22 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2006/11/05 21:51:21 rillig Exp $
 
---- Makefile.in.orig	1999-11-07 16:39:32.000000000 +0000
-+++ Makefile.in
-@@ -9,13 +9,13 @@ sbindir=@sbindir@
- mandir=@mandir@
- 
- # Root of X11 tree
--XROOT = @xroot@
-+XROOT = ${X11BASE}
- 
- # Compiler and flags
+--- Makefile.in.orig	2004-12-20 15:15:05.000000000 +0100
++++ Makefile.in	2006-11-05 22:03:06.000000000 +0100
+@@ -11,8 +11,8 @@ mandir=@mandir@
  # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
  CXX = @CXX@
--CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -c
--LDFLAGS = @extraldflags@ -L@libdir@ -L$(XROOT)/lib -L/usr/local/lib -L/usr/contrib/lib -s -o
-+CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -DPREFIX='"${prefix}"' -DPKG_SYSCONFDIR='"@sysconfdir@"' -c
-+LDFLAGS = @extraldflags@ -L@libdir@ -Wl,-R@libdir@ -L$(XROOT)/lib -Wl,-R$(XROOT)/lib -s -o
+ CC = @CC@
+-CXXFLAGS = @extracxxflags@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @normalcxxflags@ -c
+-LDFLAGS = @extraldflags@ -L@libdir@ -L@xlibdir@ @normalldflags@ -o
++CXXFLAGS = @extracxxflags@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @normalcxxflags@ -DPREFIX='"${prefix}"' -DPKG_SYSCONFDIR='"@sysconfdir@"' -c
++LDFLAGS = @extraldflags@ -L@libdir@ -Wl,-R@libdir@ -L@xlibdir@ -Wl,-R@xlibdir@ @normalldflags@ -o
  
  # Extra switches and libs determined by configure.in
  extraswitches=@extraswitches@