3 files changed, 302 insertions, 168 deletions

diff --git a/astro/gpstk/Makefile b/astro/gpstk/Makefile
index e7460251235d..dbeb4f96e854 100644
--- a/astro/gpstk/Makefile
+++ b/astro/gpstk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=		gpstk
-PORTVERSION=		1.1
-PORTREVISION=		1
+PORTVERSION=		1.3
 CATEGORIES=		astro devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
+DISTNAME=		${PORTNAME}${PORTVERSION}.src
 
 MAINTAINER=		bms@FreeBSD.org
 COMMENT=		Toolkit for developing GPS applications
diff --git a/astro/gpstk/distinfo b/astro/gpstk/distinfo
index a8e08a6d899b..6a42d090649e 100644
--- a/astro/gpstk/distinfo
+++ b/astro/gpstk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpstk-1.1.tar.gz) = 11c97d2230a6234582fe41d180bee999
-SHA256 (gpstk-1.1.tar.gz) = 0fb638d1eb1c45030b8dfec6923352a5c790b5c30db23bc1e3edf92e6c5b7bbd
-SIZE (gpstk-1.1.tar.gz) = 3502402
+MD5 (gpstk1.3.src.tar.gz) = 6354aef8bd3f0504f238538c4c475404
+SHA256 (gpstk1.3.src.tar.gz) = 02cd171e74722eafeb44d99e877378c2dbbba6ba1847038fb92c589003f16412
+SIZE (gpstk1.3.src.tar.gz) = 6922759
diff --git a/astro/gpstk/pkg-plist b/astro/gpstk/pkg-plist
index 5857442e8de3..8038389f74bd 100644
--- a/astro/gpstk/pkg-plist
+++ b/astro/gpstk/pkg-plist
@@ -1,165 +1,300 @@
-lib/libgpstk.so
 lib/libgpstk.a
-include/gpstk/stl_helpers.hpp
-include/gpstk/icd_200_constants.hpp
-include/gpstk/gps_constants.hpp
-include/gpstk/getopt.h
-include/gpstk/geometry.hpp
-include/gpstk/convhelp.hpp
-include/gpstk/Xvt.hpp
-include/gpstk/X2Sequence.hpp
-include/gpstk/X1Sequence.hpp
-include/gpstk/WGS84Geoid.hpp
-include/gpstk/VectorOperators.hpp
-include/gpstk/VectorBaseOperators.hpp
-include/gpstk/VectorBase.hpp
-include/gpstk/Vector.hpp
-include/gpstk/ValidType.hpp
-include/gpstk/TropModel.hpp
-include/gpstk/Triple.hpp
-include/gpstk/TabularEphemerisStore.hpp
-include/gpstk/StringUtils.hpp
-include/gpstk/Stats.hpp
-include/gpstk/SatID.hpp
-include/gpstk/SVPCodeGen.hpp
-include/gpstk/SP3Stream.hpp
-include/gpstk/SP3Header.hpp
-include/gpstk/SP3EphemerisStore.hpp
-include/gpstk/SP3Data.hpp
-include/gpstk/SP3Base.hpp
-include/gpstk/SMODFStream.hpp
-include/gpstk/SMODFData.hpp
-include/gpstk/RungeKutta4.hpp
-include/gpstk/RinexObsStream.hpp
-include/gpstk/RinexObsHeader.hpp
-include/gpstk/RinexObsFilterOperators.hpp
-include/gpstk/RinexObsData.hpp
-include/gpstk/RinexObsBase.hpp
-include/gpstk/RinexNavStream.hpp
-include/gpstk/RinexNavHeader.hpp
-include/gpstk/RinexNavFilterOperators.hpp
-include/gpstk/RinexNavData.hpp
-include/gpstk/RinexNavBase.hpp
-include/gpstk/RinexMetStream.hpp
-include/gpstk/RinexMetHeader.hpp
-include/gpstk/RinexMetFilterOperators.hpp
-include/gpstk/RinexMetData.hpp
-include/gpstk/RinexMetBase.hpp
-include/gpstk/RinexEphemerisStore.hpp
-include/gpstk/RTFileFrame.hpp
-include/gpstk/RAIMSolution.hpp
-include/gpstk/Position.hpp
-include/gpstk/PolyFit.hpp
-include/gpstk/PCodeConst.hpp
-include/gpstk/ObservationStore.hpp
-include/gpstk/ObsRngDev.hpp
-include/gpstk/ObsClockModel.hpp
-include/gpstk/ORDEpoch.hpp
-include/gpstk/MiscMath.hpp
-include/gpstk/MatrixOperators.hpp
-include/gpstk/MatrixImplementation.hpp
-include/gpstk/MatrixFunctors.hpp
-include/gpstk/MatrixBaseOperators.hpp
-include/gpstk/MatrixBase.hpp
-include/gpstk/Matrix.hpp
-include/gpstk/MathBase.hpp
-include/gpstk/MSCStream.hpp
-include/gpstk/MSCData.hpp
-include/gpstk/LoopedFramework.hpp
-include/gpstk/LinearClockModel.hpp
-include/gpstk/IonoModelStore.hpp
-include/gpstk/IonoModel.hpp
-include/gpstk/GeoidModel.hpp
-include/gpstk/Geodetic.hpp
-include/gpstk/GenXSequence.hpp
-include/gpstk/GPSZcount.hpp
-include/gpstk/GPSGeoid.hpp
-include/gpstk/FileUtils.hpp
-include/gpstk/FileStore.hpp
-include/gpstk/FileSpec.hpp
-include/gpstk/FileHunter.hpp
-include/gpstk/FileFilterFrameWithHeader.hpp
-include/gpstk/FileFilterFrame.hpp
-include/gpstk/FileFilter.hpp
-include/gpstk/FICStreamBase.hpp
-include/gpstk/FICStream.hpp
-include/gpstk/FICHeader.hpp
-include/gpstk/FICFilterOperators.hpp
-include/gpstk/FICData.hpp
-include/gpstk/FICBase.hpp
-include/gpstk/FICAStream.hpp
-include/gpstk/FFTextStream.hpp
-include/gpstk/FFStreamError.hpp
-include/gpstk/FFStream.hpp
-include/gpstk/FFData.hpp
-include/gpstk/FFBinaryStream.hpp
-include/gpstk/Exception.hpp
-include/gpstk/EpochClockModel.hpp
-include/gpstk/EphemerisStore.hpp
-include/gpstk/EphemerisRange.hpp
-include/gpstk/EngNav.hpp
-include/gpstk/EngEphemeris.hpp
-include/gpstk/EngAlmanac.hpp
-include/gpstk/ECEF.hpp
-include/gpstk/DayTime.hpp
-include/gpstk/CommandOptionWithTimeArg.hpp
-include/gpstk/CommandOptionParser.hpp
-include/gpstk/CommandOption.hpp
-include/gpstk/CodeBuffer.hpp
-include/gpstk/ClockModel.hpp
-include/gpstk/BinUtils.hpp
-include/gpstk/BasicFramework.hpp
-include/gpstk/BCEphemerisStore.hpp
-include/gpstk/AlmanacStore.hpp
+lib/libgpstk.so
+lib/librxio.a
+lib/librxio.so
+include/gpstk/ANSITime.hpp
 include/gpstk/AlmOrbit.hpp
+include/gpstk/AlmanacStore.hpp
+include/gpstk/AshtechALB.hpp
+include/gpstk/AshtechData.hpp
+include/gpstk/AshtechEPB.hpp
+include/gpstk/AshtechMBEN.hpp
+include/gpstk/AshtechPBEN.hpp
+include/gpstk/AshtechStream.hpp
+include/gpstk/BCEphemerisStore.hpp
+include/gpstk/Bancroft.hpp
+include/gpstk/BasicFramework.hpp
+include/gpstk/BinUtils.hpp
+include/gpstk/BinexData.hpp
+include/gpstk/BinexFilterOperators.hpp
+include/gpstk/BinexStream.hpp
+include/gpstk/BivarStats.hpp
+include/gpstk/CheckPRData.hpp
+include/gpstk/CivilTime.hpp
+include/gpstk/ClockModel.hpp
+include/gpstk/CodeBuffer.hpp
+include/gpstk/CodeSmoother.hpp
+include/gpstk/CommandOption.hpp
+include/gpstk/CommandOptionParser.hpp
+include/gpstk/CommandOptionWithCommonTimeArg.hpp
+include/gpstk/CommandOptionWithPositionArg.hpp
+include/gpstk/CommandOptionWithTimeArg.hpp
+include/gpstk/CommonTime.hpp
+include/gpstk/ComputeCombination.hpp
+include/gpstk/ComputeIURAWeights.hpp
+include/gpstk/ComputeLC.hpp
+include/gpstk/ComputeLI.hpp
+include/gpstk/ComputeLdelta.hpp
+include/gpstk/ComputeMOPSWeights.hpp
+include/gpstk/ComputeMelbourneWubbena.hpp
+include/gpstk/ComputePC.hpp
+include/gpstk/ComputePI.hpp
+include/gpstk/ComputePdelta.hpp
+include/gpstk/DOP.hpp
+include/gpstk/DataHeaders.hpp
+include/gpstk/DataStatus.hpp
+include/gpstk/DataStructures.hpp
+include/gpstk/DayTime.hpp
+include/gpstk/DeltaOp.hpp
+include/gpstk/DeviceStream.hpp
+include/gpstk/ECEF.hpp
+include/gpstk/EngAlmanac.hpp
+include/gpstk/EngEphemeris.hpp
+include/gpstk/EngNav.hpp
+include/gpstk/EphReader.hpp
+include/gpstk/EphemerisRange.hpp
+include/gpstk/EphemerisStore.hpp
+include/gpstk/EpochClockModel.hpp
+include/gpstk/Exception.hpp
+include/gpstk/Expression.hpp
+include/gpstk/ExtractC1.hpp
+include/gpstk/ExtractCombinationData.hpp
+include/gpstk/ExtractD1.hpp
+include/gpstk/ExtractD2.hpp
+include/gpstk/ExtractData.hpp
+include/gpstk/ExtractL1.hpp
+include/gpstk/ExtractL2.hpp
+include/gpstk/ExtractLC.hpp
+include/gpstk/ExtractP1.hpp
+include/gpstk/ExtractP2.hpp
+include/gpstk/ExtractPC.hpp
+include/gpstk/FDStreamBuff.hpp
+include/gpstk/FFBinaryStream.hpp
+include/gpstk/FFData.hpp
+include/gpstk/FFIdentifier.hpp
+include/gpstk/FFStream.hpp
+include/gpstk/FFStreamError.hpp
+include/gpstk/FFTextStream.hpp
+include/gpstk/FICAStream.hpp
+include/gpstk/FICBase.hpp
+include/gpstk/FICData.hpp
+include/gpstk/FICData109.hpp
+include/gpstk/FICData162.hpp
+include/gpstk/FICData62.hpp
+include/gpstk/FICData9.hpp
+include/gpstk/FICFilterOperators.hpp
+include/gpstk/FICHeader.hpp
+include/gpstk/FICStream.hpp
+include/gpstk/FICStreamBase.hpp
+include/gpstk/FileFilter.hpp
+include/gpstk/FileFilterFrame.hpp
+include/gpstk/FileFilterFrameWithHeader.hpp
+include/gpstk/FileHunter.hpp
+include/gpstk/FileSpec.hpp
+include/gpstk/FileStore.hpp
+include/gpstk/FileUtils.hpp
+include/gpstk/GPSEpochWeekSecond.hpp
+include/gpstk/GPSGeoid.hpp
+include/gpstk/GPSWeekSecond.hpp
+include/gpstk/GPSWeekZcount.hpp
+include/gpstk/GPSZcount.hpp
+include/gpstk/GPSZcount29.hpp
+include/gpstk/GPSZcount32.hpp
+include/gpstk/GenXSequence.hpp
+include/gpstk/Geodetic.hpp
+include/gpstk/GeoidModel.hpp
+include/gpstk/IonoModel.hpp
+include/gpstk/IonoModelStore.hpp
+include/gpstk/JulianDate.hpp
+include/gpstk/LICSDetector.hpp
+include/gpstk/LinearClockModel.hpp
+include/gpstk/LoopedFramework.hpp
+include/gpstk/MDPHeader.hpp
+include/gpstk/MDPNavSubframe.hpp
+include/gpstk/MDPObsEpoch.hpp
+include/gpstk/MDPPVTSolution.hpp
+include/gpstk/MDPSelftestStatus.hpp
+include/gpstk/MJD.hpp
+include/gpstk/MOPSWeight.hpp
+include/gpstk/MSCData.hpp
+include/gpstk/MSCStream.hpp
+include/gpstk/MWCSDetector.hpp
+include/gpstk/MathBase.hpp
+include/gpstk/Matrix.hpp
+include/gpstk/MatrixBase.hpp
+include/gpstk/MatrixBaseOperators.hpp
+include/gpstk/MatrixFunctors.hpp
+include/gpstk/MatrixImplementation.hpp
+include/gpstk/MatrixOperators.hpp
+include/gpstk/MetReader.hpp
+include/gpstk/MiscMath.hpp
+include/gpstk/ModeledPR.hpp
+include/gpstk/ModeledPseudorangeBase.hpp
+include/gpstk/ModeledReferencePR.hpp
+include/gpstk/NablaOp.hpp
+include/gpstk/ORDEpoch.hpp
+include/gpstk/ObsClockModel.hpp
+include/gpstk/ObsEpochMap.hpp
+include/gpstk/ObsID.hpp
+include/gpstk/ObsReader.hpp
+include/gpstk/ObsRngDev.hpp
+include/gpstk/ObsUtils.hpp
+include/gpstk/OneFreqCSDetector.hpp
+include/gpstk/PCSmoother.hpp
+include/gpstk/PCodeConst.hpp
+include/gpstk/PRSolution.hpp
+include/gpstk/PolyFit.hpp
+include/gpstk/Position.hpp
+include/gpstk/RACRotation.hpp
+include/gpstk/RTFileFrame.hpp
+include/gpstk/RinexConverters.hpp
+include/gpstk/RinexEphemerisStore.hpp
+include/gpstk/RinexMetBase.hpp
+include/gpstk/RinexMetData.hpp
+include/gpstk/RinexMetFilterOperators.hpp
+include/gpstk/RinexMetHeader.hpp
+include/gpstk/RinexMetStream.hpp
+include/gpstk/RinexNavBase.hpp
+include/gpstk/RinexNavData.hpp
+include/gpstk/RinexNavFilterOperators.hpp
+include/gpstk/RinexNavHeader.hpp
+include/gpstk/RinexNavStream.hpp
+include/gpstk/RinexObsBase.hpp
+include/gpstk/RinexObsData.hpp
+include/gpstk/RinexObsFilterOperators.hpp
+include/gpstk/RinexObsHeader.hpp
+include/gpstk/RinexObsID.hpp
+include/gpstk/RinexObsStream.hpp
+include/gpstk/RinexSatID.hpp
+include/gpstk/RinexUtilities.hpp
+include/gpstk/RungeKutta4.hpp
+include/gpstk/SEMAlmanacStore.hpp
+include/gpstk/SEMBase.hpp
+include/gpstk/SEMData.hpp
+include/gpstk/SEMHeader.hpp
+include/gpstk/SEMStream.hpp
+include/gpstk/SMODFData.hpp
+include/gpstk/SMODFStream.hpp
+include/gpstk/SP3Base.hpp
+include/gpstk/SP3Data.hpp
+include/gpstk/SP3EphemerisStore.hpp
+include/gpstk/SP3Header.hpp
+include/gpstk/SP3SatID.hpp
+include/gpstk/SP3Stream.hpp
+include/gpstk/SVExclusionList.hpp
+include/gpstk/SVPCodeGen.hpp
+include/gpstk/SatID.hpp
+include/gpstk/SimpleFilter.hpp
+include/gpstk/SimpleIURAWeight.hpp
+include/gpstk/SimpleKalmanFilter.hpp
+include/gpstk/SolverBase.hpp
+include/gpstk/SolverLMS.hpp
+include/gpstk/SolverWMS.hpp
+include/gpstk/SourceID.hpp
+include/gpstk/Stats.hpp
+include/gpstk/StringUtils.hpp
+include/gpstk/SystemTime.hpp
+include/gpstk/TCPStream.hpp
+include/gpstk/TCPStreamBuff.hpp
+include/gpstk/TabularEphemerisStore.hpp
+include/gpstk/TimeConstants.hpp
+include/gpstk/TimeConverters.hpp
+include/gpstk/TimeNamedFileStream.hpp
+include/gpstk/TimeString.hpp
+include/gpstk/TimeTag.hpp
+include/gpstk/Triple.hpp
+include/gpstk/TropModel.hpp
+include/gpstk/TypeID.hpp
+include/gpstk/UnixTime.hpp
+include/gpstk/ValidType.hpp
+include/gpstk/Vector.hpp
+include/gpstk/VectorBase.hpp
+include/gpstk/VectorBaseOperators.hpp
+include/gpstk/VectorOperators.hpp
+include/gpstk/WGS84Geoid.hpp
+include/gpstk/WeightBase.hpp
+include/gpstk/WxObsMap.hpp
+include/gpstk/X1Sequence.hpp
+include/gpstk/X2Sequence.hpp
+include/gpstk/XYZ2NED.hpp
+include/gpstk/XYZ2NEU.hpp
+include/gpstk/Xvt.hpp
+include/gpstk/YDSTime.hpp
+include/gpstk/YumaAlmanacStore.hpp
+include/gpstk/YumaBase.hpp
+include/gpstk/YumaData.hpp
+include/gpstk/YumaHeader.hpp
+include/gpstk/YumaStream.hpp
+include/gpstk/convhelp.hpp
+include/gpstk/geometry.hpp
+include/gpstk/getopt.h
+include/gpstk/gps_constants.hpp
+include/gpstk/gpstkplatform.h
+include/gpstk/icd_200_constants.hpp
+include/gpstk/mergePCodeWords.h
+include/gpstk/miscenum.hpp
+include/gpstk/stl_helpers.hpp
 @dirrm include/gpstk
-bin/timcvt
-bin/stringutiltest
-bin/rowdiff
-bin/rowcheck
-bin/rnwdiff
-bin/rnwcheck
-bin/rmwdiff
-bin/rmwcheck
-bin/rktest
-bin/rinexthin
-bin/rinex_obs_test
-bin/rinex_obs_read_write
-bin/rinex_nav_test
-bin/rinex_nav_read_write
-bin/rinex_met_test
-bin/rinex_met_read_write
-bin/reszilla
-bin/positiontest
-bin/petest
-bin/navdmp
-bin/mergeRinObs
-bin/mergeRinNav
-bin/mergeRinMet
-bin/mergeFIC
-bin/gpszcounttest
-bin/ficfica
-bin/ficdiff
-bin/ficcheck
-bin/ficafic
-bin/ficacheck
-bin/fic2rin
-bin/exceptiontest
-bin/ephdiff
-bin/daytimetest
-bin/aoa2rin
-bin/TECMaps
-bin/RinexDump
-bin/RinSum
-bin/ResCor
-bin/NavMerge
-bin/MatrixTest
-bin/IonoBias
-bin/FileSpecTest
-bin/EphComp
-bin/EditRinex
+bin/DDBase
 bin/DiscFix
-bin/DayTimeToleranceTest
-bin/DayTimeIncrementTest
-bin/DayTimeConversionTest
-bin/AnotherFileFilterTest
+bin/EditRinex
+bin/IonoBias
+bin/NavMerge
+bin/PRSolve
+bin/ResCor
+bin/RinSum
+bin/RinexDump
+bin/TECMaps
+bin/ash2mdp
+bin/bc2sp3
+bin/calgps
+bin/daa
+bin/ddGen
+bin/ddPlot
+bin/ddmerge
+bin/ephdiff
+bin/fic2rin
+bin/ficacheck
+bin/ficafic
+bin/ficcheck
+bin/ficdiff
+bin/ficfica
+bin/findMoreThan12
+bin/mdp2rinex
+bin/mdptool
+bin/mergeFIC
+bin/mergeRinMet
+bin/mergeRinNav
+bin/mergeRinObs
+bin/mergeSRI
+bin/mpsolve
+bin/navdmp
+bin/novaRinex
+bin/ordClock
+bin/ordEdit
+bin/ordGen
+bin/ordLinEst
+bin/ordPlot
+bin/ordStats
+bin/posInterp
+bin/poscvt
+bin/rfw
+bin/rinexpvt
+bin/rinexthin
+bin/rmwcheck
+bin/rmwdiff
+bin/rnwcheck
+bin/rnwdiff
+bin/rowcheck
+bin/rowdiff
+bin/rstats
+bin/rtAshtech
+bin/sp3version
+bin/tcptest
+bin/timeconvert
+bin/tnl
+bin/tsrif
+bin/tsrifsu
+bin/tsriftu
+bin/vecsol
+bin/wheresat