Upgrade, 3.1.4 -> 3.1.6. The maintainer got the author's permission

(thanks!) so remove NO_CDROM.  It still requires a license for
commercial use so print that out in MESSAGE.

Closes PR ports/2843.

Submitted by:	bjn@visi.com

8 files changed, 161 insertions, 122 deletions

diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index 4f3f3cb9fe42..caf7773c4d7f 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for: sattrack
-# Version required:                  3.1.4
+# Version required:                  3.1.6
 # Date created:                      6 Apr 1996
 # Whom:                              Brent J. Nordquist <bjn@visi.com>
 #
-# $Id: Makefile,v 1.5 1996/12/07 09:28:41 max Exp $
+# $Id: Makefile,v 1.6 1997/01/28 08:11:05 asami Exp $
 #
 
-DISTNAME=          sattrack-3.1.4
+DISTNAME=          sattrack-3.1.6
 CATEGORIES=        astro
 MASTER_SITES=      http://ssl.berkeley.edu/isi_www/
 
 MAINTAINER=        bjn@visi.com
 
-NO_CDROM=	   "No bundling with commercial product without author's concent"
+WRKSRC=            ${WRKDIR}/SatTrack-3.1.6/src
 
-WRKSRC=            ${WRKDIR}/SatTrack/src
-MAKE_FLAGS=        PREFIX=${PREFIX} -f
+post-install:
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/astro/sattrack/distinfo b/astro/sattrack/distinfo
index 0b2d8824f4af..cc75d4573d24 100644
--- a/astro/sattrack/distinfo
+++ b/astro/sattrack/distinfo
@@ -1 +1 @@
-MD5 (sattrack-3.1.4.tar.gz) = bb3f605e5c30c09c46b0b10854f147cd
+MD5 (sattrack-3.1.6.tar.gz) = 1b4c4c409b6afea139dcd3fa1a3721fb
diff --git a/astro/sattrack/files/patch-aa b/astro/sattrack/files/patch-aa
index 36cc56c8abad..7d3321200936 100644
--- a/astro/sattrack/files/patch-aa
+++ b/astro/sattrack/files/patch-aa
@@ -1,11 +1,10 @@
-diff -c -r -P ../run/getsts ../../SatTrack-FreeBSD/run/getsts
-*** ../run/getsts	Wed Mar 29 00:10:16 1995
---- ../../SatTrack-FreeBSD/run/getsts	Sat Apr  6 22:09:38 1996
+*** ../run/getsts.orig	Tue Jan 14 13:21:06 1997
+--- ../run/getsts	Sun Mar  2 00:52:30 1997
 ***************
-*** 28,46 ****
-  set stsnum=71
-  set prelaunch=1
-  set mir=1
+*** 24,42 ****
+  #
+  set stsnum=81
+  set prelaunch=0
 ! set ftphost=192.149.89.61
 ! set satdir=/home/manfred
 ! set satuser=manfred
@@ -22,27 +21,31 @@ diff -c -r -P ../run/getsts ../../SatTrack-FreeBSD/run/getsts
   endif
   #
   cd $satdirusr/SatTrack/tle
---- 28,44 ----
-  set stsnum=71
-  set prelaunch=1
-  set mir=1
+--- 24,45 ----
+  #
+  set stsnum=81
+  set prelaunch=0
 ! set ftphost=spacelink.msfc.nasa.gov
 ! set satdir=/usr/local/lib
 ! set satuser=sattrack
   #
   #
   #
-! set userid=$USER@`hostname`
+! set hostdot=`hostname | grep '\.'`
+! if ("$hostdot" == "") then
+!     set userid=$USER@`hostname`.`domainname`
+! else
+!     set userid=$USER@`hostname`
+! endif
   #
 ! set satdirusr=$satdir
-! if (! -d $satdiruser/SatTrack/tle) then 
+! if (! -d $satdirusr/SatTrack/tle) then
 !     mkdir -p $satdirusr/SatTrack/tle
   endif
   #
   cd $satdirusr/SatTrack/tle
-diff -c -r -P ../run/gettle ../../SatTrack-FreeBSD/run/gettle
-*** ../run/gettle	Wed Mar 15 04:26:06 1995
---- ../../SatTrack-FreeBSD/run/gettle	Sat Apr  6 21:20:43 1996
+*** ../run/gettle.orig	Tue Mar 14 22:26:06 1995
+--- ../run/gettle	Sun Mar  2 00:52:31 1997
 ***************
 *** 24,41 ****
   #
@@ -63,7 +66,7 @@ diff -c -r -P ../run/gettle ../../SatTrack-FreeBSD/run/gettle
       mkdir -p $satdirusr/SatTrack/tle
   endif
   #
---- 24,39 ----
+--- 24,44 ----
   #
   #
   #
@@ -73,18 +76,22 @@ diff -c -r -P ../run/gettle ../../SatTrack-FreeBSD/run/gettle
   #
   #
   #
-! set userid=$USER@`hostname`
+! set hostdot=`hostname | grep '\.'`
+! if ("$hostdot" == "") then
+!     set userid=$USER@`hostname`.`domainname`
+! else
+!     set userid=$USER@`hostname`
+! endif
   #
 ! set satdirusr=$satdir
-! if (! -d $satdiruser/SatTrack/tle) then 
+! if (! -d $satdirusr/SatTrack/tle) then
       mkdir -p $satdirusr/SatTrack/tle
   endif
   #
-diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
-*** ../src/Makefile	Fri Aug 25 17:39:13 1995
---- ../../SatTrack-FreeBSD/src/Makefile	Sat Apr  6 21:58:28 1996
+*** ../src/Makefile.orig	Mon Jan 13 17:51:01 1997
+--- ../src/Makefile	Sun Mar  2 00:52:30 1997
 ***************
-*** 92,101 ****
+*** 113,122 ****
   
   # Sun-4         (SPARCstation 5 or 10 with Solaris 2.x, using 'gcc' only)
   #
@@ -95,7 +102,7 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   
   # Apollo 700    (HP Apollo 9000 Series 700 with HPUX)
   #
---- 92,101 ----
+--- 113,122 ----
   
   # Sun-4         (SPARCstation 5 or 10 with Solaris 2.x, using 'gcc' only)
   #
@@ -107,7 +114,7 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   # Apollo 700    (HP Apollo 9000 Series 700 with HPUX)
   #
 ***************
-*** 148,157 ****
+*** 183,192 ****
   
   # i386          (i386 with FreeBSD)
   #
@@ -118,7 +125,7 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   
   #
   #-------------------------------------------------------------------------------
---- 148,157 ----
+--- 183,192 ----
   
   # i386          (i386 with FreeBSD)
   #
@@ -130,7 +137,7 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   #
   #-------------------------------------------------------------------------------
 ***************
-*** 193,199 ****
+*** 228,234 ****
   #CC_CUSR	= -DREVERSEVIDEO -DXWINDOW
   #CC_CUSR	= -DHOMEDIR -DREVERSEVIDEO -DXWINDOW
   
@@ -138,16 +145,16 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   
   #
   #-------------------------------------------------------------------------------
---- 193,199 ----
+--- 228,234 ----
   #CC_CUSR	= -DREVERSEVIDEO -DXWINDOW
   #CC_CUSR	= -DHOMEDIR -DREVERSEVIDEO -DXWINDOW
   
-! CC_CUSR		= -DREVERSEVIDEO -DSUNTRANSITS -DXWINDOW
+! CC_CUSR		= -DREVERSEVIDEO -DSUNTRANSITS -DXWINDOW 
   
   #
   #-------------------------------------------------------------------------------
 ***************
-*** 210,216 ****
+*** 245,251 ****
   # but should be accessible by other users as well.
   #
   
@@ -155,7 +162,7 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   
   #
   #-------------------------------------------------------------------------------
---- 210,217 ----
+--- 245,252 ----
   # but should be accessible by other users as well.
   #
   
@@ -165,50 +172,64 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   #
   #-------------------------------------------------------------------------------
 ***************
-*** 221,226 ****
---- 222,231 ----
-  SRC		= $(HOME)/SatTrack/src
-  OBJ    		= $(HOME)/SatTrack/obj
-  RUN     	= $(HOME)/SatTrack/run
-+ DATA    	= $(HOME)/SatTrack/data
-+ PRED    	= $(HOME)/SatTrack/pred
-+ TLE     	= $(HOME)/SatTrack/tle
-+ DOC     	= $(HOME)/SatTrack/doc
+*** 253,261 ****
+  # SATTRACK SUB-DIRECTORIES
+  #
+  
+! SRC		= $(HOME)/SatTrack/src
+! OBJ    		= $(HOME)/SatTrack/obj
+! RUN     	= $(HOME)/SatTrack/run
+  
+  INC		= $(SRC)/include
+  
+--- 254,266 ----
+  # SATTRACK SUB-DIRECTORIES
+  #
+  
+! SRC		= $(HOME)/SatTrack-3.1.6/src
+! OBJ    		= $(HOME)/SatTrack-3.1.6/obj
+! RUN     	= $(HOME)/SatTrack-3.1.6/run
+! DATA    	= $(HOME)/SatTrack-3.1.6/data
+! PRED    	= $(HOME)/SatTrack-3.1.6/pred
+! TLE     	= $(HOME)/SatTrack-3.1.6/tle
+! DOC     	= $(HOME)/SatTrack-3.1.6/doc
   
   INC		= $(SRC)/include
   
 ***************
-*** 283,294 ****
+*** 318,330 ****
   #X11		= /usr/include
   #X11		= /usr/local/include
   #X11		= /usr/include/X11
 ! X11		= /usr/openwin/include
   
 ! LX11		= -lX11 -lXt                                           # X11R5
+  #LX11		= -lXt -lX11 -lsocket                                  # SCOV5
   #LX11		= -L/usr/openwin/lib -lX11 -lXt
   
   #LX11		= -lX11 -lXt -lICE -lSM                                # X11R6
   #LX11		= -L/usr/openwin/lib -lX11 -lXt -lICE -lSM
   
   #CC_CXINC	=
---- 288,301 ----
+--- 323,337 ----
   #X11		= /usr/include
   #X11		= /usr/local/include
   #X11		= /usr/include/X11
 ! #X11		= /usr/openwin/include
-! X11		= /usr/X11R6/include
+! X11		= $(X11BASE)/include
   
 ! #LX11		= -lX11 -lXt                                           # X11R5
+  #LX11		= -lXt -lX11 -lsocket                                  # SCOV5
   #LX11		= -L/usr/openwin/lib -lX11 -lXt
   
   #LX11		= -lX11 -lXt -lICE -lSM                                # X11R6
-+ LX11		= -L/usr/X11R6/lib -lX11 -lXt -lICE -lSM
++ LX11		= -L$(X11BASE)/lib -lX11 -lXt -lICE -lSM
   #LX11		= -L/usr/openwin/lib -lX11 -lXt -lICE -lSM
   
   #CC_CXINC	=
 ***************
-*** 319,324 ****
---- 326,355 ----
+*** 355,360 ****
+--- 362,391 ----
   	cd $(RUN) ; \
   	/bin/rm -f fixchecksum makeamsat makepassesx maketles maketlex \
   	satfilter sattrack xdemo
@@ -239,11 +260,10 @@ diff -c -r -P ../src/Makefile ../../SatTrack-FreeBSD/src/Makefile
   
   #
   #-------------------------------------------------------------------------------
-diff -c -r -P ../src/include/sattrack.h ../../SatTrack-FreeBSD/src/include/sattrack.h
-*** ../src/include/sattrack.h	Thu Feb 15 17:11:49 1996
---- ../../SatTrack-FreeBSD/src/include/sattrack.h	Sat Apr  6 21:45:26 1996
+*** ../src/include/sattrack.h.orig	Tue Jan 14 09:38:38 1997
+--- ../src/include/sattrack.h	Sun Mar  2 00:52:30 1997
 ***************
-*** 55,67 ****
+*** 74,86 ****
   /*                                                                            */
   /******************************************************************************/
   
@@ -257,7 +277,7 @@ diff -c -r -P ../src/include/sattrack.h ../../SatTrack-FreeBSD/src/include/sattr
   #define TLE                   "SatTrack/tle"
   #define SRC                   "SatTrack/src"
   #define INC                   "SatTrack/src/include"
---- 55,69 ----
+--- 74,88 ----
   /*                                                                            */
   /******************************************************************************/
   
@@ -273,4 +293,3 @@ diff -c -r -P ../src/include/sattrack.h ../../SatTrack-FreeBSD/src/include/sattr
   #define TLE                   "SatTrack/tle"
   #define SRC                   "SatTrack/src"
   #define INC                   "SatTrack/src/include"
-Only in ../src: patch
diff --git a/astro/sattrack/pkg-comment b/astro/sattrack/pkg-comment
index 98ffa10ab6f1..383d22dd8b62 100644
--- a/astro/sattrack/pkg-comment
+++ b/astro/sattrack/pkg-comment
@@ -1 +1 @@
-Satellite tracking program.
+Real-time satellite tracking and orbit propagation program.
diff --git a/astro/sattrack/pkg-descr b/astro/sattrack/pkg-descr
index f21e136e0b96..241de804f72d 100644
--- a/astro/sattrack/pkg-descr
+++ b/astro/sattrack/pkg-descr
@@ -1,15 +1,33 @@
-This is a port of SatTrack version 3.1, written by manfred Bester.
-SatTrack is a satellite tracking program.  It provides two different
-live displays, for single or multiple satellites, and two different
-orbit prediction facilities.  Cursor controls used in both live
-displays are compatible with the VT100 standard, which allows the
-program to be run basically from any terminal.  An X Window color
-graphics display with the typical world map tracking chart and a
-number of important features has been added in this version.  The
-orbit prediction can be run either interactively or in a batch
-mode.  In the latter case all necessary parameters are specified
-on the command line.
-
-Port to FreeBSD 2.1 by
+This is a port of SatTrack version 3.1, which is
+Copyright (c) 1992-1997 Bester Tracking Systems. All Rights Reserved.
+
+SatTrack is a real-time satellite tracking and orbit propagation
+program with an X11 color world map tracking chart. It provides
+two different live displays, for single or multiple satellites,
+and two different orbit prediction modes.  Cursor controls used in
+the numerical live displays are compatible with the VT100 standard,
+which allows the program to be run basically from any terminal
+without the graphics display. If the program is run from an X Window
+terminal, the realtime graphics display can be started up. It will
+show the location of any number of specified satellites like the
+Space Shuttle or the Russian Space Station Mir, featuring the circle
+of visibility for any selected spacecraft and for the primary and
+a number of secondary ground stations.  Also shown are the ground
+track for the next three orbits, the black-out zones for communication
+through the TDRSS network, Mission Elapsed Time (MET), the terminator,
+spacecraft lighting conditions and other details. The world maps
+are provided in two different styles with four different sizes
+each.  Program SatTrack is particularly interesting for the upcoming
+Shuttle - Mir rendezvous missions.
+
+Current on-line information on SatTrack can be found on the World
+Wide Web page with the following URL:
+
+	http://www.bester.com
+
+The much advanced commercial off-the-shelf version of SatTrack
+(V4.0) can be obtained from Bester Tracking Systems.
+
+Port to FreeBSD 2.2 by
 Brent J. Nordquist <bjn@visi.com>
-Sat Apr  6 22:29:02  1996
+Sun Mar  2 1997
diff --git a/astro/sattrack/pkg-message b/astro/sattrack/pkg-message
new file mode 100644
index 000000000000..81cf6f20411a
--- /dev/null
+++ b/astro/sattrack/pkg-message
@@ -0,0 +1,13 @@
+###
+SatTrack V3.1.6
+Copyright (c) 1992-1997 Bester Tracking Systems. All Rights Reserved.
+
+Phone: (510) 654-7824
+Email: license@bester.com
+WWW:   www.bester.com
+
+NOTE:  A license is not required for private, non-commercial use.
+Purchasing the FreeBSD CD-ROM does not entitle the user to use
+SatTrack or parts of it commercially.  Commercial usage of SatTrack
+must be licensed by Bester Tracking Systems.
+###
diff --git a/astro/sattrack/pkg-plist b/astro/sattrack/pkg-plist
index cd7f5f7a6430..5421eec0df38 100644
--- a/astro/sattrack/pkg-plist
+++ b/astro/sattrack/pkg-plist
@@ -11,70 +11,59 @@ bin/satfilter
 bin/sattrack
 bin/transits
 bin/xsattrackdemo
-share/doc/SatTrack/skyview_1.gif
-share/doc/SatTrack/skyview_2.gif
-share/doc/SatTrack/skyview_3.gif
-share/doc/SatTrack/skyview_4.gif
-share/doc/SatTrack/worldmap_1.gif
-share/doc/SatTrack/skyview_5.gif
-share/doc/SatTrack/worldmap_2.gif
-share/doc/SatTrack/worldmap_3.gif
-share/doc/SatTrack/sattrack.doc
-share/doc/SatTrack/COPYRIGHT
-share/doc/SatTrack/info.tle.general
-share/doc/SatTrack/info.cities
-share/doc/SatTrack/info.cities.japan
-share/doc/SatTrack/info.cities.canada
-share/doc/SatTrack/info.tle.shuttle
-share/doc/SatTrack/info.freqs.p3d
-share/doc/SatTrack/info.TrakBox.TS-790.JR1EDE
-share/doc/SatTrack/xmenu_1.gif
+lib/SatTrack/data/COPYRIGHT
+lib/SatTrack/data/README_DATA
+lib/SatTrack/data/batch.dat
 lib/SatTrack/data/cities.dat
+lib/SatTrack/data/defaults0.dat
 lib/SatTrack/data/index.dat
 lib/SatTrack/data/modes.dat
 lib/SatTrack/data/satlist_all.dat
 lib/SatTrack/data/satlist_am.dat
 lib/SatTrack/data/satlist_com.dat
+lib/SatTrack/data/satlist_demo.dat
+lib/SatTrack/data/satlist_geost.dat
 lib/SatTrack/data/satlist_glo.dat
 lib/SatTrack/data/satlist_gor.dat
 lib/SatTrack/data/satlist_gps.dat
+lib/SatTrack/data/satlist_ir.dat
+lib/SatTrack/data/satlist_leoe.dat
+lib/SatTrack/data/satlist_leom.dat
+lib/SatTrack/data/satlist_leop.dat
 lib/SatTrack/data/satlist_mir.dat
-lib/SatTrack/data/README_DATA
+lib/SatTrack/data/satlist_mwo.dat
+lib/SatTrack/data/satlist_nasa.dat
+lib/SatTrack/data/satlist_noaa.dat
 lib/SatTrack/data/satlist_pbbs.dat
+lib/SatTrack/data/satlist_rb.dat
 lib/SatTrack/data/satlist_sci.dat
 lib/SatTrack/data/satlist_tv.dat
 lib/SatTrack/data/satlist_vis.dat
 lib/SatTrack/data/satlist_wx.dat
-lib/SatTrack/data/tlelist.dat
-lib/SatTrack/data/satlist_rb.dat
 lib/SatTrack/data/satlist_wxall.dat
-lib/SatTrack/data/satlist_mwo.dat
-lib/SatTrack/data/batch.dat
-lib/SatTrack/data/satlist_leom.dat
-lib/SatTrack/data/satlist_leop.dat
-lib/SatTrack/data/satlist_leoe.dat
-lib/SatTrack/data/satlist_nasa.dat
-lib/SatTrack/data/satlist_ir.dat
-lib/SatTrack/data/defaults0.dat
-lib/SatTrack/data/satlist_geost.dat
-lib/SatTrack/data/satlist_noaa.dat
-lib/SatTrack/data/satlist_demo.dat
+lib/SatTrack/data/tlelist.dat
+lib/SatTrack/pred/COPYRIGHT
 lib/SatTrack/pred/README_PRED
+lib/SatTrack/tle/COPYRIGHT
+lib/SatTrack/tle/README_TLE
 lib/SatTrack/tle/debris.dat
 lib/SatTrack/tle/gorizont.dat
-lib/SatTrack/tle/mir-92.dat
-lib/SatTrack/tle/mir-93.dat
+lib/SatTrack/tle/gps-ops.dat
+lib/SatTrack/tle/molniya.dat
 lib/SatTrack/tle/p3d.dat
-lib/SatTrack/tle/sts-70.dat
+lib/SatTrack/tle/sts-81.bak
+lib/SatTrack/tle/sts-81.dat
+lib/SatTrack/tle/sts-81.dat.all
 lib/SatTrack/tle/sts.dat
 lib/SatTrack/tle/test.dat
 lib/SatTrack/tle/tle.bak
 lib/SatTrack/tle/tle.dat
-lib/SatTrack/tle/mir-94.dat
+lib/SatTrack/tle/tles.dat
 lib/SatTrack/tle/tlex.dat
 lib/SatTrack/tle/tvro.dat
 lib/SatTrack/tle/visual.dat
-lib/SatTrack/tle/README_TLE
-lib/SatTrack/tle/tles.dat
-lib/SatTrack/tle/sts-69.dat
-lib/SatTrack/tle/sts-72.dat
+share/doc/SatTrack/COPYRIGHT
+share/doc/SatTrack/info.TrakBox.TS-790.JR1EDE
+share/doc/SatTrack/info.freqs.p3d
+share/doc/SatTrack/info.tle.general
+share/doc/SatTrack/sattrack.doc
diff --git a/astro/sattrack/scripts/post-patch b/astro/sattrack/scripts/post-patch
index d0ce89147e2e..cd8b008ca075 100644
--- a/astro/sattrack/scripts/post-patch
+++ b/astro/sattrack/scripts/post-patch
@@ -1,17 +1,17 @@
 #!/bin/sh
 #
-# post-patch for sattrack-3.1.4
+# post-patch for sattrack-3.1.6
 # modify bin scripts to point to correct install dir
 #
 # script by Brent J. Nordquist <bjn@visi.com>
-# Sun Apr  7 00:08:56  1996
+# Sun Mar  2 1997
 #
 if [ -z "$WRKDIR" ]; then
 	WRKDIR="$1"
 fi
-RUN="$WRKDIR/SatTrack/run"
+RUN="$WRKDIR/SatTrack-3.1.6/run"
 if [ -z "$WRKDIR" -o ! -d "$RUN" ]; then
-	echo $0: bad work directory $RUN 1>&2
+	echo $0: bad work directory $RUN >&2
 	exit 1
 fi
 cd $RUN
@@ -19,25 +19,25 @@ if [ -z "$PREFIX" ]; then
 	PREFIX="$2"
 fi
 if [ -z "$PREFIX" ]; then
-	echo $0: PREFIX not given 1>&2
+	echo $0: PREFIX not given >&2
 	exit 2
 fi
 
 do_subst()
 {
 	if [ ! -r $1 ]; then
-		echo $0: cannot find file $1 1>&2
+		echo $0: cannot find file $1 >&2
 		exit 3
 	fi
 	sed "s@set satdir=.*\$@set satdir=$PREFIX/lib@" <$1 >$1.$$
 	if [ $? != 0 ]; then
-		echo $0: $1 sed failure 1>&2
+		echo $0: $1 sed failure >&2
 		rm -f $1.$$
 		exit 4
 	fi
 	cat $1.$$ >$1
 	if [ $? != 0 ]; then
-		echo $0: $1 cat failure 1>&2
+		echo $0: $1 cat failure >&2
 		rm -f $1
 		mv $1.$$ $1
 		exit 5