Date: Tue, 16 May 2006 21:05:17 -0400 From: Diane Bruce <db@db.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97378: [PATCH] comms/predict: [SUMMARIZE CHANGES] Message-ID: <E1FgATV-0000tk-Ca@heceta.db.net> Resent-Message-ID: <200605170110.k4H1AJCV038446@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97378 >Category: ports >Synopsis: [PATCH] comms/predict: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 17 01:10:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 4.11-RELEASE-p9 i386 >Organization: Not terribly. >Environment: System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005 >Description: [DESCRIBE CHANGES] Updated to latest version Added file(s): - files/patch-predict.c - files/vocalizer.h - pkg-plist Removed file(s): - Makefile.orig - distinfo.orig Port maintainer (db@db.net) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- predict-2.2.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/predict/Makefile /usr/home/db/predict/Makefile --- /usr/ports/comms/predict/Makefile Wed Feb 15 22:28:50 2006 +++ /usr/home/db/predict/Makefile Tue May 16 20:28:14 2006 @@ -6,7 +6,7 @@ # PORTNAME= predict -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= comms astro hamradio MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ @@ -16,11 +16,11 @@ INSTALL_TARGET= install install.man MAN1= predict.1 -PLIST_FILES= bin/predict MAKE_ENV= LIBS="${PTHREAD_LIBS}" 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 ${CP} ${FILESDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/comms/predict/Makefile.orig /usr/home/db/predict/Makefile.orig --- /usr/ports/comms/predict/Makefile.orig Fri Aug 20 04:12:47 2004 +++ /usr/home/db/predict/Makefile.orig Wed Dec 31 19:00:00 1969 @@ -1,28 +0,0 @@ -# ports collection makefile for: predict -# Date created: 11 February 2004 -# Whom: db -# -# $FreeBSD: ports/comms/predict/Makefile,v 1.3 2004/08/09 18:30:35 kris Exp $ -# - -PORTNAME= predict -PORTVERSION= 2.2.2 -CATEGORIES= comms astro -MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ - -MAINTAINER= db@db.net -COMMENT= Satellite tracking program for amateur radio satellites - -BROKEN= Size mismatch - -INSTALL_TARGET= install install.man - -MAN1= predict.1 -PLIST_FILES= bin/predict -MAKE_ENV= LIBS="${PTHREAD_LIBS}" - -post-patch: - ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h - ${CP} ${FILESDIR}/Makefile ${WRKSRC} - -.include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/comms/predict/distinfo /usr/home/db/predict/distinfo --- /usr/ports/comms/predict/distinfo Wed Feb 15 22:28:50 2006 +++ /usr/home/db/predict/distinfo Tue May 16 13:19:34 2006 @@ -1,3 +1,3 @@ -MD5 (predict-2.2.2.tar.gz) = 4baafda1943e41cbe486e38d42b0e206 -SHA256 (predict-2.2.2.tar.gz) = e4d2a41721be9aeac533df157c733efa409892d61f058fdb31f204bd7f97df5a -SIZE (predict-2.2.2.tar.gz) = 1637911 +MD5 (predict-2.2.3.tar.gz) = 8060cd69bcd54a21ec7994ee3665c1b8 +SHA256 (predict-2.2.3.tar.gz) = fbaa7c78227a2216ee22b25c914c4dd538abfc22d96f0bb5d21e3e61976e5166 +SIZE (predict-2.2.3.tar.gz) = 1639784 diff -ruN --exclude=CVS /usr/ports/comms/predict/distinfo.orig /usr/home/db/predict/distinfo.orig --- /usr/ports/comms/predict/distinfo.orig Fri Aug 20 04:15:58 2004 +++ /usr/home/db/predict/distinfo.orig Wed Dec 31 19:00:00 1969 @@ -1,2 +0,0 @@ -MD5 (predict-2.2.2.tar.gz) = 2512bc6b584ece66de027e46f114ab53 -SIZE (predict-2.2.2.tar.gz) = 1637893 diff -ruN --exclude=CVS /usr/ports/comms/predict/files/Makefile /usr/home/db/predict/files/Makefile --- /usr/ports/comms/predict/files/Makefile Fri Jun 25 17:52:16 2004 +++ /usr/home/db/predict/files/Makefile Tue May 16 18:15:47 2006 @@ -11,33 +11,28 @@ .endif default: all +all: predict vocalizer/vocalizer -all: predict +LIBS += -lm -lncurses +predict: predict.c predict.h + ${CC} ${CFLAGS} -o predict predict.c ${LIBS} -SRCS = \ - predict.c - -OBJS = ${SRCS:.c=.o} -LIBS += -lm -lncurses -o predict -# -# -HDRS = predict.h - -predict: ${OBJS} ${HDRS} - ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS} - -.c.o: - ${CC} ${CPPFLAGS} ${CFLAGS} -c $< - -,v.c: - co $< +vocalizer/vocalizer: vocalizer/vocalizer.c vocalizer/vocalizer.h + ${CC} ${CFLAGS} -o vocalizer/vocalizer vocalizer/vocalizer.c ${LIBS} clean: - rm -f *.o predict *core *~ \#* *.txt + rm -f *.o predict *core *~ \#* *.txt vocalizer/vocalizer install: - echo INSTALL + mkdir -p ${PREFIX}/share/predict/ + mkdir ${PREFIX}/share/predict/default + mkdir ${PREFIX}/share/predict/vocalizer + cp default/predict.db ${PREFIX}/share/predict/default + cp default/predict.qth ${PREFIX}/share/predict/default + cp default/predict.tle ${PREFIX}/share/predict/default + cp vocalizer/*.wav ${PREFIX}/share/predict/vocalizer install predict ${PREFIX}/bin + install vocalizer/vocalizer ${PREFIX}/bin install.man: install docs/man/predict.1 ${PREFIX}/man/man1 diff -ruN --exclude=CVS /usr/ports/comms/predict/files/patch-predict.c /usr/home/db/predict/files/patch-predict.c --- /usr/ports/comms/predict/files/patch-predict.c Wed Dec 31 19:00:00 1969 +++ /usr/home/db/predict/files/patch-predict.c Tue May 16 20:51:47 2006 @@ -0,0 +1,38 @@ +--- predict.c.orig Tue May 16 20:48:30 2006 ++++ predict.c Tue May 16 20:49:36 2006 +@@ -5128,7 +5128,7 @@ + + if ((old_visibility=='V' || old_visibility=='D') && visibility=='N') + { +- sprintf(command,"%svocalizer/vocalizer eclipse &",predictpath); ++ sprintf(command,"vocalizer eclipse &",predictpath); + system(command); + eclipse_alarm=1; + oldtime-=0.000015*sqrt(sat_alt); +@@ -5136,7 +5136,7 @@ + + if (old_visibility=='N' && (visibility=='V' || visibility=='D')) + { +- sprintf(command,"%svocalizer/vocalizer sunlight &",predictpath); ++ sprintf(command,"vocalizer sunlight &",predictpath); + system(command); + eclipse_alarm=1; + oldtime-=0.000015*sqrt(sat_alt); +@@ -5151,7 +5151,7 @@ + if (sat_range_rate>0.0) + approaching='-'; + +- sprintf(command,"%svocalizer/vocalizer %.0f %.0f %c %c &",predictpath,sat_azi,sat_ele,approaching,visibility); ++ sprintf(command,"vocalizer %.0f %.0f %c %c &",predictpath,sat_azi,sat_ele,approaching,visibility); + system(command); + oldtime=CurrentDaynum(); + old_visibility=visibility; +@@ -5273,7 +5273,7 @@ + { + /* Announce LOS */ + +- sprintf(command,"%svocalizer/vocalizer los &",predictpath); ++ sprintf(command,"vocalizer los &",predictpath); + system(command); + } + } diff -ruN --exclude=CVS /usr/ports/comms/predict/files/predict.h /usr/home/db/predict/files/predict.h --- /usr/ports/comms/predict/files/predict.h Fri Jun 25 17:52:16 2004 +++ /usr/home/db/predict/files/predict.h Tue May 16 17:01:12 2006 @@ -1 +1 @@ -char *predictpath={"%%PREFIX%%/bin/predict"}, soundcard=1, *version={"2.2.2"}; +char *predictpath={"%%PREFIX%%/share/predict/"}, soundcard=1, *version={"2.2.3"}; diff -ruN --exclude=CVS /usr/ports/comms/predict/files/vocalizer.h /usr/home/db/predict/files/vocalizer.h --- /usr/ports/comms/predict/files/vocalizer.h Wed Dec 31 19:00:00 1969 +++ /usr/home/db/predict/files/vocalizer.h Tue May 16 20:31:58 2006 @@ -0,0 +1 @@ +char *path={"%%PREFIX%%/share/predict/vocalizer/"}; diff -ruN --exclude=CVS /usr/ports/comms/predict/pkg-plist /usr/home/db/predict/pkg-plist --- /usr/ports/comms/predict/pkg-plist Wed Dec 31 19:00:00 1969 +++ /usr/home/db/predict/pkg-plist Tue May 16 18:24:15 2006 @@ -0,0 +1,47 @@ +bin/predict +bin/vocalizer +share/predict/default/predict.db +share/predict/default/predict.qth +share/predict/default/predict.tle +share/predict/vocalizer/alarm.wav +share/predict/vocalizer/approaching.wav +share/predict/vocalizer/azimuth.wav +share/predict/vocalizer/eclipse.wav +share/predict/vocalizer/eight.wav +share/predict/vocalizer/eighteen.wav +share/predict/vocalizer/eighty.wav +share/predict/vocalizer/elevation.wav +share/predict/vocalizer/eleven.wav +share/predict/vocalizer/fifteen.wav +share/predict/vocalizer/fifty.wav +share/predict/vocalizer/five.wav +share/predict/vocalizer/forty.wav +share/predict/vocalizer/four.wav +share/predict/vocalizer/fourteen.wav +share/predict/vocalizer/hundred.wav +share/predict/vocalizer/intro.wav +share/predict/vocalizer/los.wav +share/predict/vocalizer/nine.wav +share/predict/vocalizer/nineteen.wav +share/predict/vocalizer/ninety.wav +share/predict/vocalizer/one.wav +share/predict/vocalizer/receding.wav +share/predict/vocalizer/seven.wav +share/predict/vocalizer/seventeen.wav +share/predict/vocalizer/seventy.wav +share/predict/vocalizer/six.wav +share/predict/vocalizer/sixteen.wav +share/predict/vocalizer/sixty.wav +share/predict/vocalizer/sunlight.wav +share/predict/vocalizer/ten.wav +share/predict/vocalizer/thirteen.wav +share/predict/vocalizer/thirty.wav +share/predict/vocalizer/three.wav +share/predict/vocalizer/twelve.wav +share/predict/vocalizer/twenty.wav +share/predict/vocalizer/two.wav +share/predict/vocalizer/visible.wav +share/predict/vocalizer/zero.wav +@dirrm share/predict/default +@dirrm share/predict/vocalizer +@dirrm share/predict --- predict-2.2.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1FgATV-0000tk-Ca>