Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Oct 2020 00:49:26 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r552163 - in head/comms/predict: . files
Message-ID:  <202010130049.09D0nQ0u091509@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Tue Oct 13 00:49:26 2020
New Revision: 552163
URL: https://svnweb.freebsd.org/changeset/ports/552163

Log:
  - Update to 2.2.7
  - Change upstream repository
  - Clean up Makefiles
  - Remove obsolete Created by: line
  
  Release 2.2.7:
  By John A. Magliacane <kd2bd@amsat.org> (12-Oct-2020):
  
  * Fixed the vocalizer build script to use bash rather than
    the default system shell (which could be something else entirely).
  
  * Vocalizer now uses improved (faster and royality-free) speech
    samples generated through https://ttsmp3.com/
  
  * Improved the keyboard handling to permit cursor and function
    keys to be depressed without causing undesired program behavior.
  
  * Modified the degree symbol displayed after the Eclipse Depth angle
    in Single Tracking Mode for better consistancy across a wider range
    of terminals.
  
  * Since ISS visibility doesn't require a very dark sky, the sun angle
    visibility threshold for the ISS was lowered from -12.0 degrees
    (Nautical Twilight) to -8.0 degrees (between Nautical and Civil
    Twilight).
  
  * Several additional display changes were made for improved operation
    under Android platforms.
  
  * The kepupdate script is now installed by default.
  
  ----------------------------------------------------------------------------
  
  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.
  
  ----------------------------------------------------------------------------
  
  Release 2.2.5:
  By John A. Magliacane <kd2bd@amsat.org> (05-May-2018):
  
  * Fixed coding bugs identified by GCC v8.1.0.
  
  * Re-arranged GCC arguments in installer.c for better
    compatibility with more recent versions of GCC.
  
  * Added a -dp command-line option to PREDICT to
    provide quick Doppler shift estimates in CSV format.
    (Thanks Joeal Subash)
  
  * Updated the documentation to reflect the changes.
  
  ----------------------------------------------------------------------------
  
  Release 2.2.4:
  By John A. Magliacane <kd2bd@amsat.org> (12-Mar-2018):
  
  * Fixed a bug affecting the -f switch that sometimes caused
    a failure to return proper output.  (Tnx: Andrej Lajovic)
  
  * Fixed a bug in installer.c that sometimes caused a failure
    to properly install PREDICT's executable into /usr/local/bin
    by default.
  
  * Added <errno.h> header to gsat-1.1.0/src/callbacks.c
  
  ----------------------------------------------------------------------------

Deleted:
  head/comms/predict/files/patch-predict.c
Modified:
  head/comms/predict/Makefile
  head/comms/predict/distinfo   (contents, props changed)
  head/comms/predict/files/Makefile
  head/comms/predict/files/predict.h   (contents, props changed)
  head/comms/predict/files/vocalizer.h   (contents, props changed)
  head/comms/predict/pkg-plist   (contents, props changed)

Modified: head/comms/predict/Makefile
==============================================================================
--- head/comms/predict/Makefile	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/Makefile	Tue Oct 13 00:49:26 2020	(r552163)
@@ -1,10 +1,9 @@
-# Created by: db
 # $FreeBSD$
 
-PORTNAME=	predict
-PORTVERSION=	2.2.3
-CATEGORIES=	comms astro hamradio
-MASTER_SITES=	ftp://ftp.amsat.org/amsat/software/Linux/ \
+PORTNAME=		predict
+PORTVERSION=	2.2.7
+CATEGORIES=		comms astro hamradio
+MASTER_SITES=	https://www.qsl.net/kd2bd/ \
 		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -12,14 +11,16 @@ COMMENT=	Satellite tracking program for amateur radio 
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libasound.so:audio/alsa-lib
+
 USES=		ncurses
 INSTALL_TARGET=	install install.man
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/vocalizer.h > ${WRKSRC}/vocalizer/vocalizer.h
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%STAGEDIR%%|${STAGEDIR}|g' \
-	    ${FILESDIR}/Makefile  > ${WRKSRC}/Makefile
+		-e 's|%%CC%%|${CC}|g' -e 's|%%CFLAGS%%|${CFLAGS}|g' \
+			${FILESDIR}/Makefile  > ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

Modified: head/comms/predict/distinfo
==============================================================================
--- head/comms/predict/distinfo	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/distinfo	Tue Oct 13 00:49:26 2020	(r552163)
@@ -1,2 +1,3 @@
-SHA256 (predict-2.2.3.tar.gz) = fbaa7c78227a2216ee22b25c914c4dd538abfc22d96f0bb5d21e3e61976e5166
-SIZE (predict-2.2.3.tar.gz) = 1639784
+TIMESTAMP = 1602533134
+SHA256 (predict-2.2.7.tar.gz) = bc4e828209996daefa591aad2e27320786f86b4da949df6a8c3f167ab035fd71
+SIZE (predict-2.2.7.tar.gz) = 1887048

Modified: head/comms/predict/files/Makefile
==============================================================================
--- head/comms/predict/files/Makefile	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/files/Makefile	Tue Oct 13 00:49:26 2020	(r552163)
@@ -2,17 +2,9 @@
 
 PREFIX=		%%PREFIX%%
 STAGEDIR=	%%STAGEDIR%%
+CC=			%%CC%%
+CFLAGS=		%%CFLAGS%%
 
-.ifndef	CC
-CC	= 	-cc
-.endif
-.ifndef CPPFLAGS
-CPPFLAGS =
-.endif
-.ifndef	CFLAGS
-CFLAGS	=	-O2
-.endif
-
 default:	all
 all:		predict vocalizer/vocalizer
 
@@ -21,7 +13,7 @@ predict:	predict.c predict.h
 		${CC} ${CFLAGS} -o predict predict.c ${LIBS}
 
 vocalizer/vocalizer:	vocalizer/vocalizer.c vocalizer/vocalizer.h
-		${CC} ${CFLAGS} -o vocalizer/vocalizer vocalizer/vocalizer.c ${LIBS}
+		${CC} ${CFLAGS} -I${LOCALBASE}/include -o vocalizer/vocalizer vocalizer/vocalizer.c -L${LOCALBASE}/lib ${LIBS} -lasound
 
 clean:
 	rm -f *.o predict *core *~ \#* *.txt vocalizer/vocalizer
@@ -30,14 +22,16 @@ install:
 	mkdir -p ${STAGEDIR}${PREFIX}/share/predict/
 	mkdir ${STAGEDIR}${PREFIX}/share/predict/default
 	mkdir ${STAGEDIR}${PREFIX}/share/predict/vocalizer
-	cp default/predict.db ${STAGEDIR}${PREFIX}/share/predict/default
-	cp default/predict.qth ${STAGEDIR}${PREFIX}/share/predict/default
-	cp default/predict.tle ${STAGEDIR}${PREFIX}/share/predict/default
-	cp vocalizer/*.wav ${STAGEDIR}${PREFIX}/share/predict/vocalizer
-	cp predict ${STAGEDIR}${PREFIX}/bin
-	cp vocalizer/vocalizer ${STAGEDIR}${PREFIX}/bin
+	install -m 0644 default/predict.db ${STAGEDIR}${PREFIX}/share/predict/default
+	install -m 0644 default/predict.qth ${STAGEDIR}${PREFIX}/share/predict/default
+	install -m 0644 default/predict.tle ${STAGEDIR}${PREFIX}/share/predict/default
+	install -m 0644 vocalizer/*.wav ${STAGEDIR}${PREFIX}/share/predict/vocalizer
+	install predict ${STAGEDIR}${PREFIX}/bin
+	strip ${STAGEDIR}${PREFIX}/bin/predict
+	install vocalizer/vocalizer ${STAGEDIR}${PREFIX}/bin
+	strip ${STAGEDIR}${PREFIX}/bin/vocalizer
 
 install.man:
-	install docs/man/predict.1 ${STAGEDIR}${PREFIX}/man/man1
+	install -m 0644  docs/man/predict.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .PHONY:	clean build

Modified: head/comms/predict/files/predict.h
==============================================================================
--- head/comms/predict/files/predict.h	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/files/predict.h	Tue Oct 13 00:49:26 2020	(r552163)
@@ -1 +1 @@
-char *predictpath={"%%PREFIX%%/share/predict/"}, soundcard=1, *version={"2.2.3"};
+char *predictpath={"/usr/local/share/predict/"}, soundcard=1, *version={"2.2.3"};

Modified: head/comms/predict/files/vocalizer.h
==============================================================================
--- head/comms/predict/files/vocalizer.h	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/files/vocalizer.h	Tue Oct 13 00:49:26 2020	(r552163)
@@ -1 +1 @@
-char *path={"%%PREFIX%%/share/predict/vocalizer/"};
+char *path={"/usr/local/share/predict/vocalizer/"};

Modified: head/comms/predict/pkg-plist
==============================================================================
--- head/comms/predict/pkg-plist	Tue Oct 13 00:47:56 2020	(r552162)
+++ head/comms/predict/pkg-plist	Tue Oct 13 00:49:26 2020	(r552163)
@@ -4,7 +4,6 @@ man/man1/predict.1.gz
 %%DATADIR%%/default/predict.db
 %%DATADIR%%/default/predict.qth
 %%DATADIR%%/default/predict.tle
-%%DATADIR%%/vocalizer/alarm.wav
 %%DATADIR%%/vocalizer/approaching.wav
 %%DATADIR%%/vocalizer/azimuth.wav
 %%DATADIR%%/vocalizer/eclipse.wav



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010130049.09D0nQ0u091509>