update XTide to 2.15.2

Changes are many, it has been 13 years of development. See

  https://flaterco.com/xtide/changelog.html

for more information

9 files changed, 174 insertions, 127 deletions

diff --git a/time/xtide/Makefile b/time/xtide/Makefile
index 1bcde20d774..115d80c93b6 100644
--- a/time/xtide/Makefile
+++ b/time/xtide/Makefile
@@ -1,48 +1,52 @@
-# $NetBSD: Makefile,v 1.8 2019/11/02 16:28:42 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/01/10 17:05:40 plunky Exp $
 
-DISTNAME=	xtide-2.8.3
-PKGREVISION=	5
-CATEGORIES=	misc x11
-MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
-DISTFILES=	${DISTNAME}.tar.bz2 ${HARMONICS_FILE}.bz2
+DISTNAME=	xtide-2.15.2
+CATEGORIES=	time misc x11
+MASTER_SITES=	https://flaterco.com/files/xtide/
+DISTFILES=	${DISTNAME}.tar.bz2 ${HARMONICS_FILE}.bz2 wvs.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.flaterco.com/
+HOMEPAGE=	http://flaterco.com/
 COMMENT=	X11 tide predictor
+LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++03
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 
 PREV_PKGPATH=	misc/xtide
 
 HARMONICS_FILE=	harmonics-dwf-20060708.tcd
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} X11BASE=${X11BASE:Q}
-EGDIR=			${PREFIX}/share/examples/xtide
-CONF_FILES=		${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
+EGDIR=		${PREFIX}/share/examples/xtide
+CONF_FILES=	${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-SUBST_CLASSES+=	xt
-SUBST_STAGE.xt=	pre-configure
-SUBST_FILES.xt=	DOCUMENTATION/*
-SUBST_SED.xt=	-e 's|/usr/local|${PREFIX}|g'
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	libxtide/Global.cc tide.1 xtide.1 xttpd.8
+SUBST_SED.paths=	-e 's,/etc/xtide.conf,${PKG_SYSCONFDIR}/xtide.conf,'
+SUBST_SED.paths+=	-e 's,/usr/local,${PREFIX},'
 
-PLIST_SUBST+=	HARMONICS_FILE=${HARMONICS_FILE:Q}
+INSTALLATION_DIRS=	share/xtide share/xtide/wvs ${EGDIR}
 
-INSTALLATION_DIRS=	share/xtide ${EGDIR}
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
-			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+PLIST_SUBST+=		HARMONICS_FILE=${HARMONICS_FILE:Q}
+
+DEPENDS+=	font-schumacher-misc>=1.1.2:../../fonts/font-schumacher-misc
 
 post-extract:
 	${ECHO} "${PREFIX}/share/xtide/${HARMONICS_FILE}" > ${WRKDIR}/xtide.conf
+	${ECHO} "${PREFIX}/share/xtide/wvs" >> ${WRKDIR}/xtide.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/xtide.conf ${DESTDIR}${EGDIR}/xtide.conf
 	${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${DESTDIR}${PREFIX}/share/xtide
+	${INSTALL_DATA} ${WRKDIR}/wvs*.dat ${DESTDIR}${PREFIX}/share/xtide/wvs
 
+.include "../../databases/libtcd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xtide/PLIST b/time/xtide/PLIST
index 4d05a888ff8..66c53d98093 100644
--- a/time/xtide/PLIST
+++ b/time/xtide/PLIST
@@ -1,9 +1,70 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/10 17:05:40 plunky Exp $
 bin/tide
 bin/xtide
+include/libxtide/Amplitude.hh
+include/libxtide/Angle.hh
+include/libxtide/Banner.hh
+include/libxtide/BetterMap.hh
+include/libxtide/Calendar.hh
+include/libxtide/CalendarFormC.hh
+include/libxtide/CalendarFormH.hh
+include/libxtide/CalendarFormL.hh
+include/libxtide/CalendarFormNotC.hh
+include/libxtide/CalendarFormT.hh
+include/libxtide/ClientSideFont.hh
+include/libxtide/Colors.hh
+include/libxtide/Configurable.hh
+include/libxtide/Constituent.hh
+include/libxtide/ConstituentSet.hh
+include/libxtide/Coordinates.hh
+include/libxtide/CurrentBearing.hh
+include/libxtide/Date.hh
+include/libxtide/Dstr.hh
+include/libxtide/Errors.hh
+include/libxtide/Global.hh
+include/libxtide/Graph.hh
+include/libxtide/HarmonicsFile.hh
+include/libxtide/HarmonicsPath.hh
+include/libxtide/Interval.hh
+include/libxtide/MetaField.hh
+include/libxtide/ModeFormat.hh
+include/libxtide/Nullable.hh
+include/libxtide/NullableInterval.hh
+include/libxtide/NullablePredictionValue.hh
+include/libxtide/Offsets.hh
+include/libxtide/PixelatedGraph.hh
+include/libxtide/PredictionValue.hh
+include/libxtide/RGBGraph.hh
+include/libxtide/SVGGraph.hh
+include/libxtide/SafeVector.hh
+include/libxtide/Settings.hh
+include/libxtide/Skycal.hh
+include/libxtide/Speed.hh
+include/libxtide/Station.hh
+include/libxtide/StationIndex.hh
+include/libxtide/StationRef.hh
+include/libxtide/SubordinateStation.hh
+include/libxtide/TTYGraph.hh
+include/libxtide/TideEvent.hh
+include/libxtide/TideEventsOrganizer.hh
+include/libxtide/Timestamp.hh
+include/libxtide/Units.hh
+include/libxtide/Year.hh
+include/libxtide/autoconf-defines.h
+include/libxtide/config.hh
+include/libxtide/libxtide.hh
+include/libxtide/rgb.hh
+include/libxtide/xmlparser.hh
+lib/libxtide.la
 man/man1/tide.1
 man/man1/xtide.1
 man/man8/xttpd.8
 sbin/xttpd
 share/examples/xtide/xtide.conf
 share/xtide/${HARMONICS_FILE}
+share/xtide/wvs/wvs1.dat
+share/xtide/wvs/wvs12.dat
+share/xtide/wvs/wvs250k.dat
+share/xtide/wvs/wvs3.dat
+share/xtide/wvs/wvs43.dat
+share/xtide/wvs/wvsfull.dat
diff --git a/time/xtide/distinfo b/time/xtide/distinfo
index 5d32b6b9643..1e39dd0b515 100644
--- a/time/xtide/distinfo
+++ b/time/xtide/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.4 2015/11/02 23:31:47 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/01/10 17:05:40 plunky Exp $
 
 SHA1 (harmonics-dwf-20060708.tcd.bz2) = 1f54ed856b064e485f7e386eb4a71965e83abfa4
 RMD160 (harmonics-dwf-20060708.tcd.bz2) = 754255ac5f2e36cf2dce587e7f9f7bd0561226d9
 SHA512 (harmonics-dwf-20060708.tcd.bz2) = 38988e5db30d734c6e937077a473a69eb1ef34ab9c5d493f4818f197734104223bdc0f069bd5a919d15c4d2685effc62aa85a439ae1803d7fa502a1a95d07fe5
 Size (harmonics-dwf-20060708.tcd.bz2) = 477682 bytes
-SHA1 (xtide-2.8.3.tar.bz2) = 0abfdf8a695facfeb239af0018e7b3c392592cb4
-RMD160 (xtide-2.8.3.tar.bz2) = 926d116d6d36b3e4ff5e4630e0df394a4f9a0a8b
-SHA512 (xtide-2.8.3.tar.bz2) = d1138890663756c0373f512e580fd09dc874ede96b17c32c1d08236b8ea16cf965e7a8fe7c4c1283c9e2db8e8127d4630a18790be7b1d13c63424a5fdf115e96
-Size (xtide-2.8.3.tar.bz2) = 463382 bytes
-SHA1 (patch-aa) = 8b9059e2870f6b8149e72ca33c452e75650f8230
-SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec
-SHA1 (patch-ac) = 5ba4062c3b0d2c05e3d758281bf6099a476d127a
-SHA1 (patch-ad) = cf18fb73096b3cef07fbf501fa1205fe126d1155
-SHA1 (patch-ae) = d93d25768341ac52a7379e4d4043c8f799072329
+SHA1 (wvs.tar.bz2) = 25149a2f8fbbd67e488c2ec3445443819b227925
+RMD160 (wvs.tar.bz2) = 0e83b847efc635f18bd96cc5a29149d5af41dc4d
+SHA512 (wvs.tar.bz2) = 780710449946a9a4118d7bcce4a9a62d253801744ec8d911f50b1e4a1530d1bb994fd92364fcd8fd9592d33053606e18c7b3d17acc22336d8f32bca887a88850
+Size (wvs.tar.bz2) = 37461520 bytes
+SHA1 (xtide-2.15.2.tar.bz2) = 0684d72df6e463822ac36016e248eaea07228340
+RMD160 (xtide-2.15.2.tar.bz2) = 70ce6fb263dcde492ccdf4d7541cf63c13a415cb
+SHA512 (xtide-2.15.2.tar.bz2) = adfcaeb0f87defb5918d80651b90de47f5afd5cf651fcf12fc1d02d970e8ac3fec613445b91464e72806037cfa9e576b880c8d361d3062f1bc3bc2df58da1ba6
+Size (xtide-2.15.2.tar.bz2) = 727048 bytes
+SHA1 (patch-configure) = 5b1ff8e08066e376da1817ad8d7a2358beb2a8a1
diff --git a/time/xtide/patches/patch-aa b/time/xtide/patches/patch-aa
deleted file mode 100644
index 4a38fb54b0b..00000000000
--- a/time/xtide/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
-
---- 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 "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.tcd\n\
--Please refer to the documentation for usage of /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/time/xtide/patches/patch-ab b/time/xtide/patches/patch-ab
deleted file mode 100644
index 455eb4117f3..00000000000
--- a/time/xtide/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
-
---- TideContext.cc.orig	Fri Mar 23 21:52:40 2001
-+++ TideContext.cc	Thu May 31 13:48:53 2001
-@@ -42,12 +42,12 @@
-   colors = in_colors;
-   settings = in_settings;
- 
--  // Get HFILE_PATH from environment or /etc/xtide.conf and create
-+  // Get HFILE_PATH from environment or ${PKG_SYSCONFDIR}/xtide.conf and create
-   // persistent HarmonicsPath
-   Dstr hfile_path (getenv ("HFILE_PATH"));
-   if (hfile_path.isNull()) {
-     FILE *configfile;
--    if ((configfile = fopen ("/etc/xtide.conf", "r"))) {
-+    if ((configfile = fopen (PKG_SYSCONFDIR "/xtide.conf", "r"))) {
-       hfile_path.getline (configfile);
-       fclose (configfile);
-     }
diff --git a/time/xtide/patches/patch-ac b/time/xtide/patches/patch-ac
deleted file mode 100644
index 3478ccb4058..00000000000
--- a/time/xtide/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2014/02/16 15:54:09 wiedi Exp $
-
---- Makefile.in.orig	2006-03-14 00:54:31.000000000 +0000
-+++ Makefile.in
-@@ -11,8 +11,8 @@ mandir=@mandir@
- # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
- CXX = @CXX@
- 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@
diff --git a/time/xtide/patches/patch-ad b/time/xtide/patches/patch-ad
deleted file mode 100644
index 360b9c0162f..00000000000
--- a/time/xtide/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
-
-Kill broken X11 check.
-
---- configure.orig	2006-03-14 01:54:31.000000000 +0100
-+++ configure
-@@ -2596,20 +2596,8 @@ fi
- 
- echo "$as_me:$LINENO: checking location of X11" >&5
- echo $ECHO_N "checking location of X11... $ECHO_C" >&6
--xroot="NOT FOUND"
--for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do
--  if test -r "$dir/lib/libXaw.so" -o -r "$dir/lib/libXaw.a" -o -r "$dir/lib/libXaw.dll.a"; then
--    xroot="$dir"
--    xlibdir="$dir/lib"
--    break
--  else
--    if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then
--      xroot="$dir"
--      xlibdir="$dir/lib64"
--      break
--    fi
--  fi
--done
-+xroot="$X11BASE"
-+xlibdir="$xroot/lib"
- echo "$as_me:$LINENO: result: $xroot" >&5
- echo "${ECHO_T}$xroot" >&6
- if test "$xroot" = "NOT FOUND"; then
diff --git a/time/xtide/patches/patch-ae b/time/xtide/patches/patch-ae
deleted file mode 100644
index 9858f02f437..00000000000
--- a/time/xtide/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/01/31 20:23:10 wiz Exp $
-
-Fix build with png-1.5.
-
---- RGBGraph.cc.orig	2006-03-14 01:59:34.000000000 +0000
-+++ RGBGraph.cc
-@@ -118,7 +118,7 @@ RGBGraph::writeAsPNG (png_rw_ptr write_d
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
--   if (setjmp(png_ptr->jmpbuf))
-+   if (setjmp(png_jmpbuf(png_ptr)))
-      barf (PNG_WRITE_FAILURE);
- 
-    /* set up the output control if you are using standard C streams */
diff --git a/time/xtide/patches/patch-configure b/time/xtide/patches/patch-configure
new file mode 100644
index 00000000000..21c0786d4fe
--- /dev/null
+++ b/time/xtide/patches/patch-configure
@@ -0,0 +1,78 @@
+$NetBSD: patch-configure,v 1.1 2020/01/10 17:05:40 plunky Exp $
+
+ensure test statement is portable
+
+--- configure.orig	2019-02-24 20:18:33.000000000 +0000
++++ configure
+@@ -16825,7 +16825,7 @@ fi
+ # Check whether --enable-time-workaround was given.
+ if test "${enable_time_workaround+set}" = set; then :
+   enableval=$enable_time_workaround;
+-    if test "$enable_time_workaround" == yes; then :
++    if test "$enable_time_workaround" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Y2038 workaround is enabled; time zones are disabled." >&5
+ $as_echo "$as_me: WARNING: Y2038 workaround is enabled; time zones are disabled." >&2;}
+@@ -16840,7 +16840,7 @@ fi
+ # Check whether --enable-systemd was given.
+ if test "${enable_systemd+set}" = set; then :
+   enableval=$enable_systemd;
+-    if test "$enable_systemd" == yes; then :
++    if test "$enable_systemd" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring xttpd for systemd." >&5
+ $as_echo "$as_me: Configuring xttpd for systemd." >&6;}
+@@ -16857,7 +16857,7 @@ fi
+ # Check whether --enable-gnu-attributes was given.
+ if test "${enable_gnu_attributes+set}" = set; then :
+   enableval=$enable_gnu_attributes;
+-    if test "$enable_gnu_attributes" == yes; then :
++    if test "$enable_gnu_attributes" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: GNU attributes are enabled." >&5
+ $as_echo "$as_me: GNU attributes are enabled." >&6;}
+@@ -16872,7 +16872,7 @@ fi
+ # Check whether --enable-semicolon-pathsep was given.
+ if test "${enable_semicolon_pathsep+set}" = set; then :
+   enableval=$enable_semicolon_pathsep;
+-    if test "$enable_semicolon_pathsep" == yes; then :
++    if test "$enable_semicolon_pathsep" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Using semicolon as HFILE_PATH separator." >&5
+ $as_echo "$as_me: Using semicolon as HFILE_PATH separator." >&6;}
+@@ -16887,7 +16887,7 @@ fi
+ # Check whether --enable-local-files was given.
+ if test "${enable_local_files+set}" = set; then :
+   enableval=$enable_local_files;
+-    if test "$enable_local_files" == yes; then :
++    if test "$enable_local_files" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Using local files." >&5
+ $as_echo "$as_me: Using local files." >&6;}
+@@ -16902,7 +16902,7 @@ fi
+ # Check whether --enable-3d was given.
+ if test "${enable_3d+set}" = set; then :
+   enableval=$enable_3d;
+-    if test "$enable_3d" == no; then :
++    if test "$enable_3d" = no; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Forcing plain Athena Widgets." >&5
+ $as_echo "$as_me: Forcing plain Athena Widgets." >&6;}
+@@ -16915,7 +16915,7 @@ fi
+ # Check whether --enable-moon-age was given.
+ if test "${enable_moon_age+set}" = set; then :
+   enableval=$enable_moon_age;
+-    if test "$enable_moon_age" == yes; then :
++    if test "$enable_moon_age" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling experimental moon age code." >&5
+ $as_echo "$as_me: Enabling experimental moon age code." >&6;}
+@@ -16930,7 +16930,7 @@ fi
+ # Check whether --enable-lm_hard was given.
+ if test "${enable_lm_hard+set}" = set; then :
+   enableval=$enable_lm_hard;
+-    if test "$enable_lm_hard" == yes; then :
++    if test "$enable_lm_hard" = yes; then :
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Linking with libm_hard instead of libm." >&5
+ $as_echo "$as_me: Linking with libm_hard instead of libm." >&6;}