diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 6bb422f0f46f..09a5b6a1d776 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	xtide
-PORTVERSION=	2.15.6
+PORTVERSION=	2.16
 CATEGORIES=	astro geography
 MASTER_SITES=	https://flaterco.com/files/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TCD}${EXTRACT_SUFX} \
 		${DISTNAME_HARM}${EXTRACT_SUFX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Harmonic tide clock and tide predictor
 WWW=		https://flaterco.com/xtide/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		compiler:c++0x gmake libtool localbase tar:xz
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_header_tcd_h=yes \
 		ac_cv_lib_tcd_get_tide_db_header=yes
 CFLAGS+=	-Wno-deprecated-declarations
 CPPFLAGS+=	-I${WRKSRC_TCD} $$(libpng-config --I_opts)
 LDFLAGS+=	-L${WRKSRC_TCD}/.libs $$(libpng-config --L_opts)
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		WVS X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=		yes
 
 WVS_DESC=		Use world vector shoreline data (37MB)
 WVS_DISTFILES=		${DISTNAME_WVS}${EXTRACT_SUFX}
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xaw,xext,xmu,xpm,xt
 X11_CONFIGURE_WITH=	x
 X11_DESKTOP_ENTRIES=	"XTide" "" "xtide" "xtide" "" ""
 
 DISTNAME_TCD=	libtcd-2.2.7-r3
 WRKSRC_TCD=	${WRKDIR}/${DISTNAME_TCD:C/-r[0-9]+//}
-DISTNAME_HARM=	harmonics-dwf-20241229-free
+DISTNAME_HARM=	harmonics-dwf-20251228-free
 WRKSRC_HARM=	${WRKDIR}/${DISTNAME_HARM:C/-free//}
 DISTNAME_WVS=	wvs
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|"/etc/|"${PREFIX}/etc/| ; \
 		 s| /etc/| ${PREFIX}/etc/|' ${WRKSRC}/libxtide/Global.cc
 
 pre-configure:
 	@(cd ${WRKSRC_TCD} && ${SETENV} ${CONFIGURE_ENV} \
 		CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \
 		${SH} ./configure ${CONFIGURE_ARGS})
 
 pre-build:
 	@(cd ${WRKSRC_TCD} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/xtide.conf.sample
 	@${ECHO_CMD} "${DATADIR}/harmonics.tcd" >> ${WRKDIR}/xtide.conf.sample
 	@${ECHO_CMD} "${DATADIR}/wvs" >> ${WRKDIR}/xtide.conf.sample
 	@${LN} -sf ${DISTNAME_HARM}.tcd ${WRKSRC_HARM}/harmonics.tcd
 	@${LN} -sf icon_48x48_orig.png ${WRKSRC}/iconsrc/xtide.png
 
 pre-install:
 	@(cd ${WRKSRC_TCD} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		 ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcd.so.[0-9]*
 
 post-install:
 	(cd ${WRKDIR} && ${INSTALL_DATA} xtide.conf.sample \
 		${STAGEDIR}${PREFIX}/etc)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC_HARM} && ${INSTALL_DATA} harmonics.tcd \
 		${STAGEDIR}${DATADIR})
 
 post-install-WVS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/wvs
 	(cd ${WRKDIR} && ${INSTALL_DATA} wvs*.dat \
 		${STAGEDIR}${DATADIR}/wvs)
 
 post-install-X11-on:
 	(cd ${WRKSRC}/iconsrc && ${INSTALL_DATA} xtide.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>
diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo
index 364f3357f9d8..9590ce790975 100644
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1750155577
-SHA256 (xtide-2.15.6.tar.xz) = 91dfec1fa1a277d4f38e43d952c34765bb1b335a82299f094a995532c1d00ccf
-SIZE (xtide-2.15.6.tar.xz) = 578824
+TIMESTAMP = 1770168120
+SHA256 (xtide-2.16.tar.xz) = ed9415340ae60de1d76fb15ef142798fe227195909c97b0b1a32456d1c9b0d3e
+SIZE (xtide-2.16.tar.xz) = 575296
 SHA256 (libtcd-2.2.7-r3.tar.xz) = e1dde9aafb771eab57c676a99b4b79d61c6800990a0e72782bc20057a8a2d877
 SIZE (libtcd-2.2.7-r3.tar.xz) = 272284
-SHA256 (harmonics-dwf-20241229-free.tar.xz) = 70c0259848bee58e4e01942a46dc9d184167705ea83737252dd73285dfab1bc2
-SIZE (harmonics-dwf-20241229-free.tar.xz) = 865956
+SHA256 (harmonics-dwf-20251228-free.tar.xz) = 7639d4bb8311a66d75e1de45c69c908c46b26b24c6a305c0050b6cc16933f980
+SIZE (harmonics-dwf-20251228-free.tar.xz) = 893880
diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist
index a24e32791346..432ff1f63a17 100644
--- a/astro/xtide/pkg-plist
+++ b/astro/xtide/pkg-plist
@@ -1,79 +1,79 @@
 bin/tide
 %%X11%%bin/xtide
 @sample etc/xtide.conf.sample
 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
 include/tcd.h
 lib/libtcd.a
 lib/libtcd.so
 lib/libtcd.so.1
 lib/libtcd.so.1.0.2
 lib/libxtide.a
 lib/libxtide.so
-lib/libxtide.so.1
-lib/libxtide.so.1.0.6
+lib/libxtide.so.2
+lib/libxtide.so.2.0.0
 share/man/man1/tide.1.gz
 %%X11%%share/man/man1/xtide.1.gz
 share/man/man8/xttpd.8.gz
 sbin/xttpd
 share/libtcd/libtcd.html
 %%X11%%share/pixmaps/xtide.png
 %%DATADIR%%/harmonics.tcd
 %%WVS%%%%DATADIR%%/wvs/wvs1.dat
 %%WVS%%%%DATADIR%%/wvs/wvs12.dat
 %%WVS%%%%DATADIR%%/wvs/wvs250k.dat
 %%WVS%%%%DATADIR%%/wvs/wvs3.dat
 %%WVS%%%%DATADIR%%/wvs/wvs43.dat
 %%WVS%%%%DATADIR%%/wvs/wvsfull.dat