(ham/predict) Updated to 2.2.6

Release 2.2.6:
By John A. Magliacane <kd2bd@amsat.org> (20-May-2020):

* The installer program has been replaced by a bash script that
  configures, compiles, and installs PREDICT and several companion
    client utility applications.

* The SingleTrack and MultiTrack displays have been modified for
  more consistent performance across a wider range of terminals.

* PREDICT's "vocalizer" now employs the Advanced Linux Sound
  Architecture (ALSA) environment instead of OSS in response
    to recent changes in v5.6 and later Linux kernels.

* The handling of geosynchronous and geostationary satellites
  has been improved, but still needs to be used with caution.

* 100 MHz normalized downlink Doppler shift information has been
  added to all -p and -f command-line outputs.

* The documentation and the transponder database file have been
  updated, and the format of the man page has been corrected.

3 files changed, 10 insertions, 21 deletions

diff --git a/ham/predict/Makefile b/ham/predict/Makefile
index cbfdbd945c4..f8b4e7ce0ee 100644
--- a/ham/predict/Makefile
+++ b/ham/predict/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2020/06/16 12:43:24 mef Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/16 13:43:36 mef Exp $
 #
 
-DISTNAME=	predict-2.2.5
+DISTNAME=	predict-2.2.6
 CATEGORIES=	ham
 MASTER_SITES=	http://www.qsl.net/kd2bd/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	dbj@NetBSD.org
 HOMEPAGE=	https://www.qsl.net/kd2bd/predict.html
@@ -31,7 +30,7 @@ INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/predict/default share/predict/vo
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/vocalizer/vocalizer.sh ${DESTDIR}${PREFIX}/share/predict/vocalizer/vocalizer
-	${INSTALL_MAN} ${WRKSRC}/docs/man/predict.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/predict.1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/predict.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/predict.1
 	${INSTALL_DATA} ${WRKSRC}/vocalizer/*.wav ${DESTDIR}${PREFIX}/share/predict/vocalizer/
 	${INSTALL_DATA} ${WRKSRC}/default/predict.* ${DESTDIR}${PREFIX}/share/predict/default/
 
diff --git a/ham/predict/distinfo b/ham/predict/distinfo
index e474fdf721f..ddafa5b3d0d 100644
--- a/ham/predict/distinfo
+++ b/ham/predict/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/06/16 12:43:25 mef Exp $
+$NetBSD: distinfo,v 1.3 2020/06/16 13:43:36 mef Exp $
 
-SHA1 (predict-2.2.5.tar.bz2) = a39ec4f9ed4c55a9d6975e0c8ff4384aec4ff448
-RMD160 (predict-2.2.5.tar.bz2) = 9f09bd837f35da82aa9c64d4c99e576ca701557c
-SHA512 (predict-2.2.5.tar.bz2) = d936c3ffc1b65422f6cabae89272a1f630a6935971cebfe9ae189949e10c3ca8440aeecb696bd7ada4105e63fbb558b6f19d3cffc7ceed46a07bbf4e6f4dbf72
-Size (predict-2.2.5.tar.bz2) = 1468465 bytes
-SHA1 (patch-predict.c) = c1f55eecb718f2786d1138dd7cb4123b150d92db
+SHA1 (predict-2.2.6.tar.gz) = 469a72086091b2153ecf337387f003f88dc77c6c
+RMD160 (predict-2.2.6.tar.gz) = f98f69d1d9adf01802e93069989a5c0211876a6f
+SHA512 (predict-2.2.6.tar.gz) = d1a6bac26335eda1038160f0850c16bf850ec5b9037b57dde32c52f9a5be22426852abe91d69463c3b00903ea2cf35f66fe3cd42ecbdeb2c702f048445d0ad24
+Size (predict-2.2.6.tar.gz) = 1642742 bytes
+SHA1 (patch-predict.c) = d66c416e44d81cca09a6d18da753623f75ae7390
diff --git a/ham/predict/patches/patch-predict.c b/ham/predict/patches/patch-predict.c
index 9944ed0f219..a4f3296ecf5 100644
--- a/ham/predict/patches/patch-predict.c
+++ b/ham/predict/patches/patch-predict.c
@@ -1,7 +1,6 @@
-$NetBSD: patch-predict.c,v 1.2 2020/06/16 12:43:25 mef Exp $
+$NetBSD: patch-predict.c,v 1.3 2020/06/16 13:43:36 mef Exp $
 
 sundry fixes to server mode:
-  fix buffer size issue looking for netport
   provide default port if getservbyname fails
   provide default proto if getprotobyname fails
   fix inexplicable incorrect listen call
@@ -9,15 +8,6 @@ remove reference to exended ascii symbol for degrees
 
 --- predict.c.orig	2006-05-14 23:19:56.000000000 +0000
 +++ predict.c
-@@ -172,7 +172,7 @@ double	tsince, jul_epoch, jul_utc, eclip
- 	moon_az, moon_el, moon_dx, moon_ra, moon_dec, moon_gha, moon_dv;
- 
- char	qthfile[50], tlefile[50], dbfile[50], temp[80], output[25],
--	serial_port[15], resave=0, reload_tle=0, netport[7],
-+	serial_port[15], resave=0, reload_tle=0, netport[8],
- 	once_per_second=0, ephem[5], sat_sun_status, findsun,
- 	calc_squint, database=0, xterm, io_lat='N', io_lon='W';
- 
 @@ -1984,6 +1984,7 @@ int passivesock(char *service, char *pro
  
  	struct servent *pse;