7 files changed, 107 insertions, 26 deletions

diff --git a/comms/predict/Makefile b/comms/predict/Makefile
index 8a521c90fc2f..fe62b3272740 100644
--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@@ -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 @@ COMMENT=	Satellite tracking program for amateur radio satellites
 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 --git a/comms/predict/distinfo b/comms/predict/distinfo
index a4846dbf6871..a458bd13fc76 100644
--- a/comms/predict/distinfo
+++ b/comms/predict/distinfo
@@ -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 --git a/comms/predict/files/Makefile b/comms/predict/files/Makefile
index 20fb3df53470..ae7b719aeaf3 100644
--- a/comms/predict/files/Makefile
+++ b/comms/predict/files/Makefile
@@ -11,33 +11,28 @@ CFLAGS	=	-O2
 .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 --git a/comms/predict/files/patch-predict.c b/comms/predict/files/patch-predict.c
new file mode 100644
index 000000000000..8c76ca342342
--- /dev/null
+++ b/comms/predict/files/patch-predict.c
@@ -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 --git a/comms/predict/files/predict.h b/comms/predict/files/predict.h
index 72739891eed3..e0d913cbd353 100644
--- a/comms/predict/files/predict.h
+++ b/comms/predict/files/predict.h
@@ -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 --git a/comms/predict/files/vocalizer.h b/comms/predict/files/vocalizer.h
new file mode 100644
index 000000000000..1cf9ae955aab
--- /dev/null
+++ b/comms/predict/files/vocalizer.h
@@ -0,0 +1 @@
+char *path={"%%PREFIX%%/share/predict/vocalizer/"};
diff --git a/comms/predict/pkg-plist b/comms/predict/pkg-plist
new file mode 100644
index 000000000000..73c35a319d43
--- /dev/null
+++ b/comms/predict/pkg-plist
@@ -0,0 +1,47 @@
+bin/predict
+bin/vocalizer
+%%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
+%%DATADIR%%/vocalizer/eight.wav
+%%DATADIR%%/vocalizer/eighteen.wav
+%%DATADIR%%/vocalizer/eighty.wav
+%%DATADIR%%/vocalizer/elevation.wav
+%%DATADIR%%/vocalizer/eleven.wav
+%%DATADIR%%/vocalizer/fifteen.wav
+%%DATADIR%%/vocalizer/fifty.wav
+%%DATADIR%%/vocalizer/five.wav
+%%DATADIR%%/vocalizer/forty.wav
+%%DATADIR%%/vocalizer/four.wav
+%%DATADIR%%/vocalizer/fourteen.wav
+%%DATADIR%%/vocalizer/hundred.wav
+%%DATADIR%%/vocalizer/intro.wav
+%%DATADIR%%/vocalizer/los.wav
+%%DATADIR%%/vocalizer/nine.wav
+%%DATADIR%%/vocalizer/nineteen.wav
+%%DATADIR%%/vocalizer/ninety.wav
+%%DATADIR%%/vocalizer/one.wav
+%%DATADIR%%/vocalizer/receding.wav
+%%DATADIR%%/vocalizer/seven.wav
+%%DATADIR%%/vocalizer/seventeen.wav
+%%DATADIR%%/vocalizer/seventy.wav
+%%DATADIR%%/vocalizer/six.wav
+%%DATADIR%%/vocalizer/sixteen.wav
+%%DATADIR%%/vocalizer/sixty.wav
+%%DATADIR%%/vocalizer/sunlight.wav
+%%DATADIR%%/vocalizer/ten.wav
+%%DATADIR%%/vocalizer/thirteen.wav
+%%DATADIR%%/vocalizer/thirty.wav
+%%DATADIR%%/vocalizer/three.wav
+%%DATADIR%%/vocalizer/twelve.wav
+%%DATADIR%%/vocalizer/twenty.wav
+%%DATADIR%%/vocalizer/two.wav
+%%DATADIR%%/vocalizer/visible.wav
+%%DATADIR%%/vocalizer/zero.wav
+@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%/vocalizer
+@dirrm %%DATADIR%%