Tue Jun 16 13:43:36 2020 UTC ()
(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.


(mef)
diff -r1.7 -r1.8 pkgsrc/ham/predict/Makefile
diff -r1.2 -r1.3 pkgsrc/ham/predict/distinfo
diff -r1.2 -r1.3 pkgsrc/ham/predict/patches/patch-predict.c
cvs diff -r1.7 -r1.8 pkgsrc/ham/predict/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/predict/Makefile 2020/06/16 12:43:24 1.7
+++ pkgsrc/ham/predict/Makefile 2020/06/16 13:43:36 1.8
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1# $NetBSD: Makefile,v 1.7 2020/06/16 12:43:24 mef Exp $ 1# $NetBSD: Makefile,v 1.8 2020/06/16 13:43:36 mef Exp $
2# 2#
3 3
4DISTNAME= predict-2.2.5 4DISTNAME= predict-2.2.6
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= http://www.qsl.net/kd2bd/ 6MASTER_SITES= http://www.qsl.net/kd2bd/
7EXTRACT_SUFX= .tar.bz2 
8 7
9MAINTAINER= dbj@NetBSD.org 8MAINTAINER= dbj@NetBSD.org
10HOMEPAGE= https://www.qsl.net/kd2bd/predict.html 9HOMEPAGE= https://www.qsl.net/kd2bd/predict.html
11COMMENT= Curses satellite tracking/orbital prediction program 10COMMENT= Curses satellite tracking/orbital prediction program
12 11
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15FAKE_NCURSES= yes 14FAKE_NCURSES= yes
16USE_LANGUAGES= c 15USE_LANGUAGES= c
17 16
18LDFLAGS.SunOS+= -lsocket -lnsl 17LDFLAGS.SunOS+= -lsocket -lnsl
19 18
20do-configure: 19do-configure:
21 printf "const char predictpath[] = \"${PREFIX}/share/predict/\";\n" > "${WRKSRC}/predict.h" 20 printf "const char predictpath[] = \"${PREFIX}/share/predict/\";\n" > "${WRKSRC}/predict.h"
22 printf "const int soundcard = 1;\n" >> "${WRKSRC}/predict.h" 21 printf "const int soundcard = 1;\n" >> "${WRKSRC}/predict.h"
23 printf "const char version[] = \"$$(cat "${WRKSRC}/.version")\";\n" >> "${WRKSRC}/predict.h" 22 printf "const char version[] = \"$$(cat "${WRKSRC}/.version")\";\n" >> "${WRKSRC}/predict.h"
24 23
25do-build: 24do-build:
26 cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} predict.c -o predict -lm -lncurses -lpthread 25 cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} predict.c -o predict -lm -lncurses -lpthread
27 ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/vocalizer.sh > ${WRKSRC}/vocalizer/vocalizer.sh 26 ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/vocalizer.sh > ${WRKSRC}/vocalizer/vocalizer.sh
28 27
29INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/predict/default share/predict/vocalizer 28INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/predict/default share/predict/vocalizer
30 29
31do-install: 30do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/ 31 ${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/
33 ${INSTALL_SCRIPT} ${WRKSRC}/vocalizer/vocalizer.sh ${DESTDIR}${PREFIX}/share/predict/vocalizer/vocalizer 32 ${INSTALL_SCRIPT} ${WRKSRC}/vocalizer/vocalizer.sh ${DESTDIR}${PREFIX}/share/predict/vocalizer/vocalizer
34 ${INSTALL_MAN} ${WRKSRC}/docs/man/predict.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/predict.1 33 ${INSTALL_MAN} ${WRKSRC}/docs/man/predict.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/predict.1
35 ${INSTALL_DATA} ${WRKSRC}/vocalizer/*.wav ${DESTDIR}${PREFIX}/share/predict/vocalizer/ 34 ${INSTALL_DATA} ${WRKSRC}/vocalizer/*.wav ${DESTDIR}${PREFIX}/share/predict/vocalizer/
36 ${INSTALL_DATA} ${WRKSRC}/default/predict.* ${DESTDIR}${PREFIX}/share/predict/default/ 35 ${INSTALL_DATA} ${WRKSRC}/default/predict.* ${DESTDIR}${PREFIX}/share/predict/default/
37 36
38# Run time only dependency on the play utility 37# Run time only dependency on the play utility
39DEPENDS+= sox-[0-9]*:../../audio/sox 38DEPENDS+= sox-[0-9]*:../../audio/sox
40 39
41.include "../../mk/curses.buildlink3.mk" 40.include "../../mk/curses.buildlink3.mk"
42.include "../../mk/pthread.buildlink3.mk" 41.include "../../mk/pthread.buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/ham/predict/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/predict/distinfo 2020/06/16 12:43:25 1.2
+++ pkgsrc/ham/predict/distinfo 2020/06/16 13:43:36 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2020/06/16 12:43:25 mef Exp $ 1$NetBSD: distinfo,v 1.3 2020/06/16 13:43:36 mef Exp $
2 2
3SHA1 (predict-2.2.5.tar.bz2) = a39ec4f9ed4c55a9d6975e0c8ff4384aec4ff448 3SHA1 (predict-2.2.6.tar.gz) = 469a72086091b2153ecf337387f003f88dc77c6c
4RMD160 (predict-2.2.5.tar.bz2) = 9f09bd837f35da82aa9c64d4c99e576ca701557c 4RMD160 (predict-2.2.6.tar.gz) = f98f69d1d9adf01802e93069989a5c0211876a6f
5SHA512 (predict-2.2.5.tar.bz2) = d936c3ffc1b65422f6cabae89272a1f630a6935971cebfe9ae189949e10c3ca8440aeecb696bd7ada4105e63fbb558b6f19d3cffc7ceed46a07bbf4e6f4dbf72 5SHA512 (predict-2.2.6.tar.gz) = d1a6bac26335eda1038160f0850c16bf850ec5b9037b57dde32c52f9a5be22426852abe91d69463c3b00903ea2cf35f66fe3cd42ecbdeb2c702f048445d0ad24
6Size (predict-2.2.5.tar.bz2) = 1468465 bytes 6Size (predict-2.2.6.tar.gz) = 1642742 bytes
7SHA1 (patch-predict.c) = c1f55eecb718f2786d1138dd7cb4123b150d92db 7SHA1 (patch-predict.c) = d66c416e44d81cca09a6d18da753623f75ae7390
cvs diff -r1.2 -r1.3 pkgsrc/ham/predict/patches/patch-predict.c (expand / switch to unified diff)

--- pkgsrc/ham/predict/patches/patch-predict.c 2020/06/16 12:43:25 1.2
+++ pkgsrc/ham/predict/patches/patch-predict.c 2020/06/16 13:43:36 1.3
@@ -1,33 +1,23 @@ @@ -1,33 +1,23 @@
1$NetBSD: patch-predict.c,v 1.2 2020/06/16 12:43:25 mef Exp $ 1$NetBSD: patch-predict.c,v 1.3 2020/06/16 13:43:36 mef Exp $
2 2
3sundry fixes to server mode: 3sundry fixes to server mode:
4 fix buffer size issue looking for netport 
5 provide default port if getservbyname fails 4 provide default port if getservbyname fails
6 provide default proto if getprotobyname fails 5 provide default proto if getprotobyname fails
7 fix inexplicable incorrect listen call 6 fix inexplicable incorrect listen call
8remove reference to exended ascii symbol for degrees 7remove reference to exended ascii symbol for degrees
9 8
10--- predict.c.orig 2006-05-14 23:19:56.000000000 +0000 9--- predict.c.orig 2006-05-14 23:19:56.000000000 +0000
11+++ predict.c 10+++ predict.c
12@@ -172,7 +172,7 @@ double tsince, jul_epoch, jul_utc, eclip 
13 moon_az, moon_el, moon_dx, moon_ra, moon_dec, moon_gha, moon_dv; 
14  
15 char qthfile[50], tlefile[50], dbfile[50], temp[80], output[25], 
16- serial_port[15], resave=0, reload_tle=0, netport[7], 
17+ serial_port[15], resave=0, reload_tle=0, netport[8], 
18 once_per_second=0, ephem[5], sat_sun_status, findsun, 
19 calc_squint, database=0, xterm, io_lat='N', io_lon='W'; 
20  
21@@ -1984,6 +1984,7 @@ int passivesock(char *service, char *pro 11@@ -1984,6 +1984,7 @@ int passivesock(char *service, char *pro
22  12
23 struct servent *pse; 13 struct servent *pse;
24 struct protoent *ppe; 14 struct protoent *ppe;
25+ struct protoent ppedef = { 0, 0, 17 }; // udp 15+ struct protoent ppedef = { 0, 0, 17 }; // udp
26 struct sockaddr_in sin; 16 struct sockaddr_in sin;
27 int sd, type; 17 int sd, type;
28  18
29@@ -1996,14 +1997,12 @@ int passivesock(char *service, char *pro 19@@ -1996,14 +1997,12 @@ int passivesock(char *service, char *pro
30  20
31 else if ((sin.sin_port=htons((unsigned short)atoi(service)))==0) 21 else if ((sin.sin_port=htons((unsigned short)atoi(service)))==0)
32 { 22 {
33- bailout("Can't get service"); 23- bailout("Can't get service");