Patch file to bring FPLAN 1.1 to FPLAN 1.2
-------------------------------------
FILE: README
-------------------------------------
1c1
<         FPLAN v.1.1 - Flight Plan program.
---
>         FPLAN v.1.2 - Flight Plan program.
35a36,46
> 
>         NOTE: Version 1.2 incorporates a number of bug fixes submitted 
> by the following fine individuals:
> 
>         Chris Coffin    coffin@xroads.UUCP
>         Dave Buck       {amdahl,sun,megatest,plx,ardent,ubvax}!dlb!dave
>         Randy Bailey    randy@hpisla.HP.COM
>         Dave Lockwood   davel@vision.UUCP (Dave has also submitted SysV 
>                 patches which have, unfortunately, _not_ been incorporated
>                 into this distribution). 
>         Andy Schneider  ajs@sony.com
-------------------------------------
FILE: Makefile
-------------------------------------
1c1
< # $Id: Makefile,v 2.18 89/11/19 16:32:28 tynor Exp $
---
> # $Id: Makefile,v 2.21 90/10/26 18:48:26 tynor Exp Locker: tynor $
37a38
> DBS_LIBDIR = /usr/local/lib/preflight
41c42,43
< INSTALL  = install
---
> #INSTALL  = install
> INSTALL = cp
76c78
< C_SRC     = output.c main.c add.c misc.c db.c compute.c \
---
> C_SRC     = output.c main.c add.c misc.c db.c compute.c paddb.c \
93a96,98
> DIST_NAME  = fplan_1_2
> PATCH_NAME = $(DIST_NAME)__1_1.patch
> 
127c132
< db.o            : db.c wp_info.h mystring.h
---
> db.o            : db.c wp_info.h mystring.h config.h
141a147,161
> patch: 
>         -/bin/rm $(PATCH_NAME)
>         echo "Patch file to bring FPLAN 1.1 to FPLAN 1.2" > $(PATCH_NAME)
>         -( for f in $(DIST_FILES) ; \
>           do \
>              rcsdiff -w -t -rNET_RELEASE_1_1 $$f > /tmp/patch.$$ ;\
>              if [ $$? != 0 ] ; \
>              then \
>                echo "-------------------------------------" >> $(PATCH_NAME) ;\
>                echo FILE: $$f >> $(PATCH_NAME) ;\
>                echo "-------------------------------------" >> $(PATCH_NAME) ;\
>                cat /tmp/patch.$$ >> $(PATCH_NAME) ;\
>              fi ;\
>           done )
> 
146c166
<         -rm *.o *~ fp_tok.h fp_lex.c fp_yacc.c fplan paddb *.man
---
>         -rm *.o *~ fp_tok.h fp_lex.c fp_yacc.c fplan paddb *.man fplan.0? fplan.tar.Z
150,151c170,171
<         tar cfo fplan.tar $(DIST_FILES)
<         compress fplan.tar
---
>         tar cfo $(DIST_NAME).tar $(DIST_FILES)
>         compress $(DIST_NAME).tar
153,166c173,187
<         cat README > fplan.01
<         echo "" >> fplan.01
<         echo "#This is part 1/6 of FPLAN" >> fplan.01
<         shar2 -D -c README NEW_FEATURES EXAMPLE.fplan WHERE_DBS Makefile >> fplan.01
<         echo "#This is part 2/6 of FPLAN" > fplan.02
<         shar2 -D -c fplan.1 fplan.5 paddb.1 >> fplan.02
<         echo "#This is part 3/6 of FPLAN" > fplan.03
<         shar2 -D -c add.c compute.c >> fplan.03
<         echo "#This is part 4/6 of FPLAN" > fplan.04
<         shar2 -D -c output.c >> fplan.04
<         echo "#This is part 5/6 of FPLAN" > fplan.05
<         shar2 -D -c main.c misc.c db.c strings.c >> fplan.05
<         echo "#This is part 6/6 of FPLAN" > fplan.06
<         shar2 -D -c fp_lex.l fp_yacc.y sv_draw.c dosbuild.bat mystring.h wp_info.h reverse.c version.h >> fplan.06
---
>         cat README > $(DIST_NAME).01
>         echo "" >> $(DIST_NAME).01
>         echo "---- cut here ---- cut here ---- cut here ---- cut here ----" >> $(DIST_NAME).01
>         echo "# This is part 1/6 of FPLAN" >> $(DIST_NAME).01
>         shar2 -D -v README NEW_FEATURES EXAMPLE.fplan WHERE_DBS Makefile paddb.c >> $(DIST_NAME).01
>         echo "#This is part 2/6 of FPLAN" > $(DIST_NAME).02
>         shar2 -D -v fplan.1 fplan.5 paddb.1 >> $(DIST_NAME).02
>         echo "#This is part 3/6 of FPLAN" > $(DIST_NAME).03
>         shar2 -D -v add.c compute.c >> $(DIST_NAME).03
>         echo "#This is part 4/6 of FPLAN" > $(DIST_NAME).04
>         shar2 -D -v output.c >> $(DIST_NAME).04
>         echo "#This is part 5/6 of FPLAN" > $(DIST_NAME).05
>         shar2 -D -v main.c misc.c db.c strings.c >> $(DIST_NAME).05
>         echo "#This is part 6/6 of FPLAN" > $(DIST_NAME).06
>         shar2 -D -v fp_lex.l fp_yacc.y sv_draw.c dosbuild.bat mystring.h wp_info.h reverse.c version.h >> $(DIST_NAME).06
168c189
< install :
---
> install : $(EXE) $(MAN) 
171a193,206
> 
> install_dbs : $(DBS_LIBDIR)/vors.nav $(DBS_LIBDIR)/airports.nav
> 
> $(DBS_LIBDIR)/vors.nav : $(DBS_LIBDIR)/vors.txt
>         sort $(DBS_LIBDIR)/vors.txt -o $(DBS_LIBDIR)/vors.txt
>         paddb $(DBS_LIBDIR)/vors.txt $(DBS_LIBDIR)/vors.nav
> 
> $(DBS_LIBDIR)/airports.nav : $(DBS_LIBDIR)/airports.txt
>         sort $(DBS_LIBDIR)/airports.txt -o $(DBS_LIBDIR)/airports.txt
>         paddb $(DBS_LIBDIR)/airports.txt $(DBS_LIBDIR)/airports.nav
> 
> $(DBS_LIBDIR)/airports.txt $(DBS_LIBDIR)/vors.txt :
>         @echo DB files missing. See WHERE_DBS to get the databases.
> 
-------------------------------------
FILE: db.c
-------------------------------------
2c2
<  * $Id: db.c,v 2.9 89/11/11 19:09:34 tynor Exp $
---
>  * $Id: db.c,v 2.10 90/06/15 21:32:08 tynor Exp $
31a32
> #include "config.h"
37c38
< static char rcsid[] = "$Id: db.c,v 2.9 89/11/11 19:09:34 tynor Exp $";
---
> static char rcsid[] = "$Id: db.c,v 2.10 90/06/15 21:32:08 tynor Exp $";
42d42
< 
49d48
< 
51,81d49
< 
< /*
<  * environment variables for where the databases are:
<  */
< #define HOME            "HOME"
< #define NAV_PUBLIC      "NAV"
< #define NAV_PRIVATE     "NAV_PRIVATE"
< 
< #ifndef DEFAULT_PVT_DIRECTORY
< #ifdef MSDOS
< #define DEFAULT_PVT_DIRECTORY   "\\flight"
< #else
< #define DEFAULT_PVT_DIRECTORY   "~/preflight"
< #endif
< #endif
< 
< #ifndef DEFAULT_PUB_DIRECTORY
< #ifdef MSDOS
< #define DEFAULT_PUB_DIRECTORY   "\\lib\\flight"
< #else
< #define DEFAULT_PUB_DIRECTORY   "/usr/local/lib/preflight"
< #endif
< #endif
< 
< #ifdef MSDOS
< #define AIRPORTS_NAME "\\airports.nav"
< #define VORS_NAME     "\\vors.nav"
< #else
< #define AIRPORTS_NAME "/airports.nav"
< #define VORS_NAME     "/vors.nav"
< #endif
-------------------------------------
FILE: compute.c
-------------------------------------
2c2
<  * $Id: compute.c,v 2.6 89/11/14 20:27:46 tynor Exp $
---
>  * $Id: compute.c,v 2.7 90/06/15 21:31:55 tynor Exp $
28c28
< static char rcsid[] = "$Id: compute.c,v 2.6 89/11/14 20:27:46 tynor Exp $";
---
> static char rcsid[] = "$Id: compute.c,v 2.7 90/06/15 21:31:55 tynor Exp $";
136a137,141
>             waypoints[j].db->mag_variation =
>                waypoints[prev].db->mag_variation + 
>                   (waypoints[next].db->mag_variation -
>                    waypoints[prev].db->mag_variation) *
>                    waypoints[j].db->u.dist_since_last_wp / d;
269a275
>    normalize_heading (&vor_fix->heading);
272c278,288
<    if (force_from || (d > 180.0) || (d < -180.0)) {
---
>    
>    {
>       double anti;
>       double d1;
>       
>       anti = vor_fix->heading - 180;
>       normalize_heading( &anti );
>       d1 = plane_heading - anti;
>       d1 = ( d1 < 0.0 ) ? -d1 : d1;      /* normalize_heading(&d1); */
>       d  = ( d  < 0.0 ) ? -d  : d ;      /* normalize_heading(&d); */
>       if( force_from || ( d > d1 ) ) {
274a291
>       }
-------------------------------------
FILE: wp_info.h
-------------------------------------
2c2
<  * $Id: wp_info.h,v 2.7 89/11/05 17:34:38 tynor Exp $
---
>  * $Id: wp_info.h,v 2.8 89/12/03 13:59:43 tynor Exp $
32c32
< #define MI_PER_NM 1.3242928862  /* statute miles per natutical miles */
---
> #define MI_PER_NM 1.1507575757  /* statute miles per natutical miles */
-------------------------------------
FILE: version.h
-------------------------------------
1c1
< #define VERSION "1.1"
---
> #define VERSION "1.2"


