4 files changed, 194 insertions, 58 deletions

diff --git a/science/jstrack/Makefile b/science/jstrack/Makefile
index bf75faac43f9..db4e64b14161 100644
--- a/science/jstrack/Makefile
+++ b/science/jstrack/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	jstrack
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 CATEGORIES=	science
-MASTER_SITES=	http://www.jstrack.org/jstrack/downloads/ \
+MASTER_SITES=	http://www.jstrack.org/${PORTNAME}/downloads/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	utisoft@gmail.com
@@ -24,7 +24,7 @@ LICENSE_PERMS=	no-dist-sell pkg-mirror no-pkg-sell auto-accept
 LICENSE_TEXT=	It is and always will be free, and [Jim Graham] wrote it...\
 		so don't charge money for it, and don't claim that you wrote it
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_TCL_RUN=	84
 USE_TK=		84
 NO_BUILD=	yes
@@ -55,9 +55,5 @@ post-install:
 	@${CHMOD} ugo+rx ${PREFIX}/lib/${PORTNAME}/${d}/*.t*
 .endfor
 	@(cd ${PREFIX}/lib/${PORTNAME} && ${TCLSH} autoconfig.tcl && ${RM} paths.tcl.old)
-.for f in filt/filt.tcl ftpfilt/autoftp.override.tcl ftpfilt/autoftp.tcl ftpfilt/ftp.tcl ftpfilt/ftplib.tcl ftpfilt/old_ftplib.tcl tracker/jstrack-text_only.tcl tracker/jstrack.tcl
-	@${REINPLACE_CMD} 's#\.\./paths.tcl#${PREFIX}/lib/jstrack/paths.tcl#g' \
-		${PREFIX}/lib/${PORTNAME}/${f}
-.endfor
 
 .include <bsd.port.mk>
diff --git a/science/jstrack/distinfo b/science/jstrack/distinfo
index d3e2201045ff..d1d5ceec87c0 100644
--- a/science/jstrack/distinfo
+++ b/science/jstrack/distinfo
@@ -1,3 +1,3 @@
-MD5 (jstrack-3.0.2.tar.gz) = 4f3364b5c2b5d3d088e27cc537cf0152
-SHA256 (jstrack-3.0.2.tar.gz) = adab5b6d720109d0f593a61a2647902b4dfe63bf2d3e814d4de5d79ac77af03f
-SIZE (jstrack-3.0.2.tar.gz) = 1425575
+MD5 (jstrack-3.0.3.tar.gz) = ddd25e8623eb1007a611397a0ed2e421
+SHA256 (jstrack-3.0.3.tar.gz) = a5665973dc4385ad9c1d3c4980bd811a34206024dc4b6d36873f8f8d9905fb6a
+SIZE (jstrack-3.0.3.tar.gz) = 1691869
diff --git a/science/jstrack/files/jstrack.sh.in b/science/jstrack/files/jstrack.sh.in
index 049f918ea2fc..6578cb62e01a 100644
--- a/science/jstrack/files/jstrack.sh.in
+++ b/science/jstrack/files/jstrack.sh.in
@@ -7,4 +7,5 @@ if {![catch {
 }]} {
     set myName $linkName
 }
+cd %%PREFIX%%/lib/jstrack/tracker
 source [file join [file dirname $myName] %%PREFIX%%/lib/jstrack/tracker/jstrack.tcl]
diff --git a/science/jstrack/pkg-plist b/science/jstrack/pkg-plist
index 09a92daf55eb..9f035ceb3dbe 100644
--- a/science/jstrack/pkg-plist
+++ b/science/jstrack/pkg-plist
@@ -1,25 +1,33 @@
 bin/jstrack
 lib/jstrack/autoconfig.tcl
+lib/jstrack/filt/advfilt.tcl
 lib/jstrack/filt/city.list
 lib/jstrack/filt/filt.tcl
-lib/jstrack/filt/filt.tcl.bak
 lib/jstrack/filt/missing_cities
 lib/jstrack/filt/read_fc.tcl
 lib/jstrack/filt/stormflag.bmp
 lib/jstrack/filt/winfilt.tk
+lib/jstrack/filt/wwfilt.tcl
 lib/jstrack/ftpfilt/TODO
 lib/jstrack/ftpfilt/autoftp.log
 lib/jstrack/ftpfilt/autoftp.override.tcl
-lib/jstrack/ftpfilt/autoftp.override.tcl.bak
 lib/jstrack/ftpfilt/autoftp.tcl
-lib/jstrack/ftpfilt/autoftp.tcl.bak
 lib/jstrack/ftpfilt/ftp.tcl
-lib/jstrack/ftpfilt/ftp.tcl.bak
 lib/jstrack/ftpfilt/ftplib.tcl
-lib/jstrack/ftpfilt/ftplib.tcl.bak
+lib/jstrack/ftpfilt/ftptmp/disc/2010062522.atl
+lib/jstrack/ftpfilt/ftptmp/disc/2010062602.atl
+lib/jstrack/ftpfilt/ftptmp/marine/2010062521.atl
+lib/jstrack/ftpfilt/ftptmp/marine/2010062602.atl
+lib/jstrack/ftpfilt/ftptmp/public/2010062521.atl
+lib/jstrack/ftpfilt/ftptmp/public/2010062523.atl
+lib/jstrack/ftpfilt/ftptmp/public/2010062602.atl
+lib/jstrack/ftpfilt/ftptmp/public/2010062605.atl
+lib/jstrack/ftpfilt/ftptmp/strike/2010062521.atl
+lib/jstrack/ftpfilt/ftptmp/strike/2010062523.atl
+lib/jstrack/ftpfilt/ftptmp/strike/2010062602.atl
+lib/jstrack/ftpfilt/ftptmp/strike/2010062605.atl
 lib/jstrack/ftpfilt/initial_timestamps.tcl
 lib/jstrack/ftpfilt/old_ftplib.tcl
-lib/jstrack/ftpfilt/old_ftplib.tcl.bak
 lib/jstrack/ftpfilt/support/initial_timestamps.tcl
 lib/jstrack/ftpfilt/support/mkmktm.tcl
 lib/jstrack/ftpfilt/timestamp.disc
@@ -29,17 +37,8 @@ lib/jstrack/ftpfilt/timestamp.strike
 lib/jstrack/paths.tcl
 lib/jstrack/tracker/config_citydefs.tcl
 lib/jstrack/tracker/config_user_citylist.tcl
-lib/jstrack/tracker/gulfvs.jpg
-lib/jstrack/tracker/imagery/atir.jpg
-lib/jstrack/tracker/imagery/atvs.jpg
-lib/jstrack/tracker/imagery/ecstir.jpg
-lib/jstrack/tracker/imagery/ecstvs.jpg
-lib/jstrack/tracker/imagery/huir.jpg
-lib/jstrack/tracker/imagery/huvs.jpg
 lib/jstrack/tracker/jstrack-text_only.tcl
-lib/jstrack/tracker/jstrack-text_only.tcl.bak
 lib/jstrack/tracker/jstrack.tcl
-lib/jstrack/tracker/jstrack.tcl.bak
 lib/jstrack/tracker/lib/bindings.tk
 lib/jstrack/tracker/lib/canvas.tk
 lib/jstrack/tracker/lib/capture_window.tk
@@ -74,6 +73,7 @@ lib/jstrack/tracker/lib/plot.tk
 lib/jstrack/tracker/lib/plotcity.tk
 lib/jstrack/tracker/lib/plotmenu.tk
 lib/jstrack/tracker/lib/read_any.tcl
+lib/jstrack/tracker/lib/read_vtec.tcl
 lib/jstrack/tracker/lib/saffsimp.tcl
 lib/jstrack/tracker/lib/saffsimp.tk
 lib/jstrack/tracker/lib/save_config.tcl
@@ -85,34 +85,12 @@ lib/jstrack/tracker/lib/user.tcl
 lib/jstrack/tracker/lib/userdata.tcl
 lib/jstrack/tracker/lib/userdata.tk
 lib/jstrack/tracker/options.tcl
+lib/jstrack/tracker/patch-better-citynames.txt
 lib/jstrack/tracker/sample_sysconfig.tcl
-lib/jstrack/tracker/storms/arthur.adv
-lib/jstrack/tracker/storms/arthur.dis
-lib/jstrack/tracker/storms/arthur.fc
-lib/jstrack/tracker/storms/arthur.trk
-lib/jstrack/tracker/storms/bertha.adv
-lib/jstrack/tracker/storms/bertha.dis
-lib/jstrack/tracker/storms/bertha.fc
-lib/jstrack/tracker/storms/bertha.trk
-lib/jstrack/tracker/storms/cristobal.adv
-lib/jstrack/tracker/storms/cristobal.dis
-lib/jstrack/tracker/storms/cristobal.fc
-lib/jstrack/tracker/storms/cristobal.trk
-lib/jstrack/tracker/storms/dolly.adv
-lib/jstrack/tracker/storms/dolly.dis
-lib/jstrack/tracker/storms/dolly.fc
-lib/jstrack/tracker/storms/dolly.trk
-lib/jstrack/tracker/storms/edouard.adv
-lib/jstrack/tracker/storms/edouard.dis
-lib/jstrack/tracker/storms/edouard.fc
-lib/jstrack/tracker/storms/edouard.trk
-lib/jstrack/tracker/storms/fay.adv
-lib/jstrack/tracker/storms/fay.dis
-lib/jstrack/tracker/storms/fay.fc
-lib/jstrack/tracker/storms/fay.trk
-lib/jstrack/tracker/storms/five.adv
-lib/jstrack/tracker/storms/five.dis
-lib/jstrack/tracker/storms/five.fc
+lib/jstrack/tracker/storms/alex.adv
+lib/jstrack/tracker/storms/alex.dis
+lib/jstrack/tracker/storms/alex.fc
+lib/jstrack/tracker/storms/alex.trk
 lib/jstrack/tracker/storms/merge
 lib/jstrack/tracker/storms/old/2007/chantal.adv
 lib/jstrack/tracker/storms/old/2007/chantal.dis
@@ -204,12 +182,168 @@ lib/jstrack/tracker/storms/old/2007/three.fc
 lib/jstrack/tracker/storms/old/2007/twelve.adv
 lib/jstrack/tracker/storms/old/2007/twelve.dis
 lib/jstrack/tracker/storms/old/2007/twelve.fc
-lib/jstrack/tracker/storms/three.adv
-lib/jstrack/tracker/storms/three.dis
-lib/jstrack/tracker/storms/three.fc
-lib/jstrack/tracker/storms/two.adv
-lib/jstrack/tracker/storms/two.dis
-lib/jstrack/tracker/storms/two.fc
+lib/jstrack/tracker/storms/old/2008/arthur.adv
+lib/jstrack/tracker/storms/old/2008/arthur.dis
+lib/jstrack/tracker/storms/old/2008/arthur.fc
+lib/jstrack/tracker/storms/old/2008/arthur.trk
+lib/jstrack/tracker/storms/old/2008/bertha.adv
+lib/jstrack/tracker/storms/old/2008/bertha.dis
+lib/jstrack/tracker/storms/old/2008/bertha.fc
+lib/jstrack/tracker/storms/old/2008/bertha.trk
+lib/jstrack/tracker/storms/old/2008/cristobal.adv
+lib/jstrack/tracker/storms/old/2008/cristobal.dis
+lib/jstrack/tracker/storms/old/2008/cristobal.fc
+lib/jstrack/tracker/storms/old/2008/cristobal.trk
+lib/jstrack/tracker/storms/old/2008/dolly.adv
+lib/jstrack/tracker/storms/old/2008/dolly.dis
+lib/jstrack/tracker/storms/old/2008/dolly.fc
+lib/jstrack/tracker/storms/old/2008/dolly.trk
+lib/jstrack/tracker/storms/old/2008/edouard.adv
+lib/jstrack/tracker/storms/old/2008/edouard.dis
+lib/jstrack/tracker/storms/old/2008/edouard.fc
+lib/jstrack/tracker/storms/old/2008/edouard.trk
+lib/jstrack/tracker/storms/old/2008/eight.adv
+lib/jstrack/tracker/storms/old/2008/eight.dis
+lib/jstrack/tracker/storms/old/2008/eight.fc
+lib/jstrack/tracker/storms/old/2008/fay.adv
+lib/jstrack/tracker/storms/old/2008/fay.dis
+lib/jstrack/tracker/storms/old/2008/fay.fc
+lib/jstrack/tracker/storms/old/2008/fay.trk
+lib/jstrack/tracker/storms/old/2008/fifteen.adv
+lib/jstrack/tracker/storms/old/2008/fifteen.dis
+lib/jstrack/tracker/storms/old/2008/fifteen.fc
+lib/jstrack/tracker/storms/old/2008/five.adv
+lib/jstrack/tracker/storms/old/2008/five.dis
+lib/jstrack/tracker/storms/old/2008/five.fc
+lib/jstrack/tracker/storms/old/2008/gustav.adv
+lib/jstrack/tracker/storms/old/2008/gustav.dis
+lib/jstrack/tracker/storms/old/2008/gustav.fc
+lib/jstrack/tracker/storms/old/2008/gustav.trk
+lib/jstrack/tracker/storms/old/2008/hanna.adv
+lib/jstrack/tracker/storms/old/2008/hanna.dis
+lib/jstrack/tracker/storms/old/2008/hanna.fc
+lib/jstrack/tracker/storms/old/2008/hanna.trk
+lib/jstrack/tracker/storms/old/2008/ike.adv
+lib/jstrack/tracker/storms/old/2008/ike.dis
+lib/jstrack/tracker/storms/old/2008/ike.fc
+lib/jstrack/tracker/storms/old/2008/ike.trk
+lib/jstrack/tracker/storms/old/2008/josephine.adv
+lib/jstrack/tracker/storms/old/2008/josephine.dis
+lib/jstrack/tracker/storms/old/2008/josephine.fc
+lib/jstrack/tracker/storms/old/2008/josephine.trk
+lib/jstrack/tracker/storms/old/2008/kyle.adv
+lib/jstrack/tracker/storms/old/2008/kyle.dis
+lib/jstrack/tracker/storms/old/2008/kyle.fc
+lib/jstrack/tracker/storms/old/2008/kyle.trk
+lib/jstrack/tracker/storms/old/2008/laura.adv
+lib/jstrack/tracker/storms/old/2008/laura.dis
+lib/jstrack/tracker/storms/old/2008/laura.fc
+lib/jstrack/tracker/storms/old/2008/laura.trk
+lib/jstrack/tracker/storms/old/2008/marco.adv
+lib/jstrack/tracker/storms/old/2008/marco.dis
+lib/jstrack/tracker/storms/old/2008/marco.fc
+lib/jstrack/tracker/storms/old/2008/marco.trk
+lib/jstrack/tracker/storms/old/2008/nana.adv
+lib/jstrack/tracker/storms/old/2008/nana.dis
+lib/jstrack/tracker/storms/old/2008/nana.fc
+lib/jstrack/tracker/storms/old/2008/nana.trk
+lib/jstrack/tracker/storms/old/2008/nine.adv
+lib/jstrack/tracker/storms/old/2008/nine.dis
+lib/jstrack/tracker/storms/old/2008/nine.fc
+lib/jstrack/tracker/storms/old/2008/omar.adv
+lib/jstrack/tracker/storms/old/2008/omar.dis
+lib/jstrack/tracker/storms/old/2008/omar.fc
+lib/jstrack/tracker/storms/old/2008/omar.trk
+lib/jstrack/tracker/storms/old/2008/paloma.adv
+lib/jstrack/tracker/storms/old/2008/paloma.dis
+lib/jstrack/tracker/storms/old/2008/paloma.fc
+lib/jstrack/tracker/storms/old/2008/paloma.trk
+lib/jstrack/tracker/storms/old/2008/seven.adv
+lib/jstrack/tracker/storms/old/2008/seven.dis
+lib/jstrack/tracker/storms/old/2008/seven.fc
+lib/jstrack/tracker/storms/old/2008/seventeen.adv
+lib/jstrack/tracker/storms/old/2008/seventeen.dis
+lib/jstrack/tracker/storms/old/2008/seventeen.fc
+lib/jstrack/tracker/storms/old/2008/sixteen.adv
+lib/jstrack/tracker/storms/old/2008/sixteen.dis
+lib/jstrack/tracker/storms/old/2008/sixteen.fc
+lib/jstrack/tracker/storms/old/2008/sixteen.trk
+lib/jstrack/tracker/storms/old/2008/ten.adv
+lib/jstrack/tracker/storms/old/2008/ten.dis
+lib/jstrack/tracker/storms/old/2008/ten.fc
+lib/jstrack/tracker/storms/old/2008/thirteen.adv
+lib/jstrack/tracker/storms/old/2008/thirteen.dis
+lib/jstrack/tracker/storms/old/2008/thirteen.fc
+lib/jstrack/tracker/storms/old/2008/three.adv
+lib/jstrack/tracker/storms/old/2008/three.dis
+lib/jstrack/tracker/storms/old/2008/three.fc
+lib/jstrack/tracker/storms/old/2008/two.adv
+lib/jstrack/tracker/storms/old/2008/two.dis
+lib/jstrack/tracker/storms/old/2008/two.fc
+lib/jstrack/tracker/storms/old/2009/ana.adv
+lib/jstrack/tracker/storms/old/2009/ana.dis
+lib/jstrack/tracker/storms/old/2009/ana.fc
+lib/jstrack/tracker/storms/old/2009/ana.trk
+lib/jstrack/tracker/storms/old/2009/bill.adv
+lib/jstrack/tracker/storms/old/2009/bill.dis
+lib/jstrack/tracker/storms/old/2009/bill.fc
+lib/jstrack/tracker/storms/old/2009/bill.trk
+lib/jstrack/tracker/storms/old/2009/claudette.adv
+lib/jstrack/tracker/storms/old/2009/claudette.dis
+lib/jstrack/tracker/storms/old/2009/claudette.fc
+lib/jstrack/tracker/storms/old/2009/claudette.trk
+lib/jstrack/tracker/storms/old/2009/danny.adv
+lib/jstrack/tracker/storms/old/2009/danny.dis
+lib/jstrack/tracker/storms/old/2009/danny.fc
+lib/jstrack/tracker/storms/old/2009/danny.trk
+lib/jstrack/tracker/storms/old/2009/eight.adv
+lib/jstrack/tracker/storms/old/2009/eight.dis
+lib/jstrack/tracker/storms/old/2009/eight.fc
+lib/jstrack/tracker/storms/old/2009/eight.trk
+lib/jstrack/tracker/storms/old/2009/eleven.adv
+lib/jstrack/tracker/storms/old/2009/eleven.dis
+lib/jstrack/tracker/storms/old/2009/eleven.fc
+lib/jstrack/tracker/storms/old/2009/erika.adv
+lib/jstrack/tracker/storms/old/2009/erika.dis
+lib/jstrack/tracker/storms/old/2009/erika.fc
+lib/jstrack/tracker/storms/old/2009/erika.trk
+lib/jstrack/tracker/storms/old/2009/four.adv
+lib/jstrack/tracker/storms/old/2009/four.dis
+lib/jstrack/tracker/storms/old/2009/four.fc
+lib/jstrack/tracker/storms/old/2009/fred.adv
+lib/jstrack/tracker/storms/old/2009/fred.dis
+lib/jstrack/tracker/storms/old/2009/fred.fc
+lib/jstrack/tracker/storms/old/2009/fred.trk
+lib/jstrack/tracker/storms/old/2009/grace.adv
+lib/jstrack/tracker/storms/old/2009/grace.dis
+lib/jstrack/tracker/storms/old/2009/grace.fc
+lib/jstrack/tracker/storms/old/2009/grace.trk
+lib/jstrack/tracker/storms/old/2009/henri.adv
+lib/jstrack/tracker/storms/old/2009/henri.dis
+lib/jstrack/tracker/storms/old/2009/henri.fc
+lib/jstrack/tracker/storms/old/2009/henri.trk
+lib/jstrack/tracker/storms/old/2009/ida.adv
+lib/jstrack/tracker/storms/old/2009/ida.dis
+lib/jstrack/tracker/storms/old/2009/ida.fc
+lib/jstrack/tracker/storms/old/2009/ida.trk
+lib/jstrack/tracker/storms/old/2009/one.adv
+lib/jstrack/tracker/storms/old/2009/one.dis
+lib/jstrack/tracker/storms/old/2009/one.fc
+lib/jstrack/tracker/storms/old/2009/one.trk
+lib/jstrack/tracker/storms/old/2009/seven.adv
+lib/jstrack/tracker/storms/old/2009/seven.dis
+lib/jstrack/tracker/storms/old/2009/seven.fc
+lib/jstrack/tracker/storms/old/2009/three.adv
+lib/jstrack/tracker/storms/old/2009/three.dis
+lib/jstrack/tracker/storms/old/2009/three.fc
+lib/jstrack/tracker/storms/old/2009/two.adv
+lib/jstrack/tracker/storms/old/2009/two.dis
+lib/jstrack/tracker/storms/old/2009/two.fc
+lib/jstrack/tracker/storms/one.adv
+lib/jstrack/tracker/storms/one.dis
+lib/jstrack/tracker/storms/one.fc
+@dirrm lib/jstrack/tracker/storms/old/2009
+@dirrm lib/jstrack/tracker/storms/old/2008
 @dirrm lib/jstrack/tracker/storms/old/2007
 @dirrm lib/jstrack/tracker/storms/old
 @dirrm lib/jstrack/tracker/storms
@@ -218,6 +352,11 @@ lib/jstrack/tracker/storms/two.fc
 @dirrm lib/jstrack/tracker/imagery
 @dirrm lib/jstrack/tracker
 @dirrm lib/jstrack/ftpfilt/support
+@dirrm lib/jstrack/ftpfilt/ftptmp/strike
+@dirrm lib/jstrack/ftpfilt/ftptmp/public
+@dirrm lib/jstrack/ftpfilt/ftptmp/marine
+@dirrm lib/jstrack/ftpfilt/ftptmp/disc
+@dirrm lib/jstrack/ftpfilt/ftptmp
 @dirrm lib/jstrack/ftpfilt
 @dirrm lib/jstrack/filt/tmp
 @dirrm lib/jstrack/filt