7 files changed, 47 insertions, 342 deletions

diff --git a/astro/gpstk/Makefile b/astro/gpstk/Makefile
index a2c3020073d5..142ca9a44b02 100644
--- a/astro/gpstk/Makefile
+++ b/astro/gpstk/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gpstk
-PORTVERSION=	2.5
-PORTREVISION=	2
+PORTVERSION=	2.9
+DISTVERSIONPREFIX=	v
 CATEGORIES=	astro devel
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for developing GPS applications
@@ -17,8 +15,8 @@ USES=		cmake:outsource python:run
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/dev
-
-EXTRACT_AFTER_ARGS=	--exclude .git
+USE_GITHUB=	yes
+GH_ACCOUNT=	SGL-UT
+GH_PROJECT=	GPSTk
 
 .include <bsd.port.mk>
diff --git a/astro/gpstk/distinfo b/astro/gpstk/distinfo
index c8951b6f8979..289b922a256a 100644
--- a/astro/gpstk/distinfo
+++ b/astro/gpstk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gpstk-2.5.src.tar.gz) = 2b70544d301a86c45b68dd9e24df8415f520c3922905274e4d5d2dcdb3234834
-SIZE (gpstk-2.5.src.tar.gz) = 231183550
+TIMESTAMP = 1501609696
+SHA256 (SGL-UT-GPSTk-v2.9_GH0.tar.gz) = 5335ff9a9fc1b904969878a70570fd9a3ea54df4645a7802908829b7ecf2559e
+SIZE (SGL-UT-GPSTk-v2.9_GH0.tar.gz) = 88604609
diff --git a/astro/gpstk/files/patch-core_lib_Utilities_BinUtils.hpp b/astro/gpstk/files/patch-core_lib_Utilities_BinUtils.hpp
new file mode 100644
index 000000000000..4049f491b2a6
--- /dev/null
+++ b/astro/gpstk/files/patch-core_lib_Utilities_BinUtils.hpp
@@ -0,0 +1,10 @@
+--- core/lib/Utilities/BinUtils.hpp.orig	2017-08-01 17:51:01 UTC
++++ core/lib/Utilities/BinUtils.hpp
+@@ -57,6 +57,7 @@
+ #include "Exception.hpp"
+ #include <memory.h>
+ 
++#include <machine/endian.h>
+ #ifndef BYTE_ORDER
+ #ifdef _MSC_VER
+ #define LITTLE_ENDIAN 1
diff --git a/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp b/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
deleted file mode 100644
index 9f56b136c0cd..000000000000
--- a/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- dev/ext/lib/FileDirProc/FileHunter.cpp.orig	2014-10-10 19:46:15 UTC
-+++ dev/ext/lib/FileDirProc/FileHunter.cpp
-@@ -52,6 +52,7 @@ using namespace gpstk::StringUtils;
- #ifndef _WIN32
- #include <unistd.h>
- #include <dirent.h>
-+#include <sys/syslimits.h>
- #else
- #include <io.h>
- #include <direct.h>
diff --git a/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp b/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
deleted file mode 100644
index e97a970aa755..000000000000
--- a/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- dev/ext/lib/Utilities/BinUtils.hpp.orig	2014-10-10 19:46:16 UTC
-+++ dev/ext/lib/Utilities/BinUtils.hpp
-@@ -54,6 +54,7 @@
- 
- #include "Exception.hpp"
- 
-+#include <machine/endian.h>
- #ifndef BYTE_ORDER
- #ifdef _MSC_VER
- #define LITTLE_ENDIAN 1
diff --git a/astro/gpstk/pkg-descr b/astro/gpstk/pkg-descr
index 74a3b6ac7715..7e6a7d6e5e31 100644
--- a/astro/gpstk/pkg-descr
+++ b/astro/gpstk/pkg-descr
@@ -6,4 +6,4 @@ processing problems associated with GNSS such as processing or using
 standard formats such as RINEX.  The libraries are the basis for the more
 advanced applications distributed as part of the GPSTk suite.
 
-WWW: http://www.gpstk.org/
+WWW: https://github.com/SGL-UT/GPSTk
diff --git a/astro/gpstk/pkg-plist b/astro/gpstk/pkg-plist
index 74ae190aef58..d448bb5a6003 100644
--- a/astro/gpstk/pkg-plist
+++ b/astro/gpstk/pkg-plist
@@ -1,102 +1,23 @@
-bin/DDBase
-bin/DiscFix
 bin/PRSolve
 bin/RinDump
-bin/RinEdit
-bin/RinNav
-bin/RinSum
-bin/bc2sp3
-bin/calgps
-bin/convertSSEph
-bin/glodump
-bin/lsfilt
-bin/mergeRinMet
-bin/mergeRinNav
-bin/mergeRinObs
-bin/mergeSRI
-bin/mpsolve
-bin/novaRinex
-bin/posInterp
+bin/df_diff
 bin/poscvt
-bin/rfw
-bin/rinexthin
-bin/rmoutlier
-bin/rmwcheck
-bin/rmwdiff
-bin/rnwcheck
-bin/rnwdiff
-bin/rowcheck
-bin/rowdiff
-bin/rstats
-bin/sp3version
-bin/testSSEph
 bin/timeconvert
-bin/tkalm
-bin/vecsol
 include/ANSITime.hpp
-include/ASConstant.hpp
-include/Adler32.hpp
-include/AllanDeviation.hpp
 include/AlmOrbit.hpp
-include/Antenna.hpp
-include/AntexBase.hpp
-include/AntexData.hpp
-include/AntexHeader.hpp
-include/AntexReader.hpp
-include/AntexStream.hpp
-include/AshtechALB.hpp
-include/AshtechData.hpp
-include/AshtechEPB.hpp
-include/AshtechMBEN.hpp
-include/AshtechPBEN.hpp
-include/AshtechStream.hpp
-include/AstronomicalFunctions.hpp
-include/AtmosphericDrag.hpp
-include/Axis.hpp
-include/AxisStyle.hpp
 include/BDSEphemeris.hpp
-include/BDSEphemerisStore.hpp
 include/BDSWeekSecond.hpp
-include/BLQDataReader.hpp
-include/Bancroft.hpp
-include/Base64Encoder.hpp
-include/BaseDistribution.hpp
 include/BasicFramework.hpp
-include/BasicModel.hpp
-include/BasicShape.hpp
 include/BinUtils.hpp
 include/BinexData.hpp
 include/BinexFilterOperators.hpp
 include/BinexStream.hpp
-include/Bitmap.hpp
 include/BivarStats.hpp
-include/BorderLayout.hpp
 include/BrcClockCorrection.hpp
 include/BrcKeplerOrbit.hpp
-include/CNAV2EphClk.hpp
-include/CNAVClock.hpp
-include/CNAVEphemeris.hpp
-include/CNavDataElement.hpp
-include/CNavDataElementStore.hpp
-include/CNavEOP.hpp
-include/CNavGGTO.hpp
-include/CNavISC.hpp
-include/CNavText.hpp
-include/CNavUTC.hpp
-include/CRC32.hpp
-include/Canvas.hpp
-include/CheckPRData.hpp
-include/Chi2Distribution.hpp
-include/CiraExponentialDrag.hpp
-include/Circle.hpp
 include/CivilTime.hpp
 include/ClockModel.hpp
 include/ClockSatStore.hpp
-include/CodeBuffer.hpp
-include/CodeKalmanSolver.hpp
-include/CodeSmoother.hpp
-include/Color.hpp
-include/ColorMap.hpp
 include/Combinations.hpp
 include/CommandLine.hpp
 include/CommandOption.hpp
@@ -104,56 +25,7 @@ include/CommandOptionParser.hpp
 include/CommandOptionWithCommonTimeArg.hpp
 include/CommandOptionWithPositionArg.hpp
 include/CommandOptionWithTimeArg.hpp
-include/Comment.hpp
 include/CommonTime.hpp
-include/ComputeCombination.hpp
-include/ComputeDOP.hpp
-include/ComputeIURAWeights.hpp
-include/ComputeIonoModel.hpp
-include/ComputeLC.hpp
-include/ComputeLI.hpp
-include/ComputeLdelta.hpp
-include/ComputeLinear.hpp
-include/ComputeMOPSWeights.hpp
-include/ComputeMelbourneWubbena.hpp
-include/ComputePC.hpp
-include/ComputePI.hpp
-include/ComputePdelta.hpp
-include/ComputeSatPCenter.hpp
-include/ComputeSimpleWeights.hpp
-include/ComputeTropModel.hpp
-include/ComputeWindUp.hpp
-include/ConfData.hpp
-include/ConfDataItem.hpp
-include/ConfDataReader.hpp
-include/ConfDataSection.hpp
-include/ConfDataStructures.hpp
-include/ConfDataWriter.hpp
-include/ConstraintSystem.hpp
-include/ConvertC1ToP1.hpp
-include/CorrectCodeBiases.hpp
-include/CorrectObservables.hpp
-include/DCBDataReader.hpp
-include/DDid.hpp
-include/DataHeaders.hpp
-include/DataStatus.hpp
-include/DataStructures.hpp
-include/Decimate.hpp
-include/DeltaOp.hpp
-include/Differentiator.hpp
-include/DiscCorr.hpp
-include/DoubleOp.hpp
-include/Dumper.hpp
-include/EGM96GravityModel.hpp
-include/ENUUtil.hpp
-include/EOPDataStore.hpp
-include/EPSImage.hpp
-include/EarthBody.hpp
-include/EarthOceanTide.hpp
-include/EarthOrientation.hpp
-include/EarthPoleTide.hpp
-include/EarthSolidTide.hpp
-include/EclipsedSatFilter.hpp
 include/EllipsoidModel.hpp
 include/EngAlmanac.hpp
 include/EngEphemeris.hpp
@@ -162,21 +34,12 @@ include/EphemerisRange.hpp
 include/Epoch.hpp
 include/EpochClockModel.hpp
 include/EpochDataStore.hpp
-include/Equation.hpp
-include/EquationOfMotion.hpp
-include/EquationSystem.hpp
 include/Exception.hpp
-include/Expression.hpp
-include/ExtractCombinationData.hpp
-include/ExtractData.hpp
-include/ExtractLC.hpp
-include/ExtractPC.hpp
 include/FFBinaryStream.hpp
 include/FFData.hpp
 include/FFStream.hpp
 include/FFStreamError.hpp
 include/FFTextStream.hpp
-include/FIRDifferentiator5thOrder.hpp
 include/FileFilter.hpp
 include/FileFilterFrame.hpp
 include/FileFilterFrameWithHeader.hpp
@@ -184,73 +47,36 @@ include/FileHunter.hpp
 include/FileSpec.hpp
 include/FileStore.hpp
 include/FileUtils.hpp
-include/Fillable.hpp
-include/FilterBase.hpp
-include/ForceModel.hpp
-include/ForceModelList.hpp
-include/Frame.hpp
 include/GALWeekSecond.hpp
-include/GDSUtils.hpp
 include/GNSSconstants.hpp
-include/GPSAlmanacStore.hpp
 include/GPSEllipsoid.hpp
 include/GPSEphemeris.hpp
 include/GPSEphemerisStore.hpp
-include/GPSOrbElemStore.hpp
 include/GPSWeek.hpp
 include/GPSWeekSecond.hpp
 include/GPSWeekZcount.hpp
 include/GPSZcount.hpp
 include/GPS_URA.hpp
-include/GSatID.hpp
 include/GalEphemeris.hpp
-include/GalEphemerisStore.hpp
-include/GaussianDistribution.hpp
-include/GenXSequence.hpp
-include/GeneralConstraint.hpp
-include/GeneralEquations.hpp
-include/GeodeticFrames.hpp
 include/GloEphemeris.hpp
 include/GloEphemerisStore.hpp
-include/GraphicsConstants.hpp
-include/GravitationalDelay.hpp
-include/GridLayout.hpp
-include/HLayout.hpp
-include/HarrisPriesterDrag.hpp
 include/HelmertTransform.hpp
-include/Helper.hpp
-include/IERS.hpp
-include/IERSConventions.hpp
 include/InOutFramework.hpp
-include/Integrator.hpp
-include/InterpolatedColorMap.hpp
-include/IonexBase.hpp
-include/IonexData.hpp
-include/IonexHeader.hpp
-include/IonexModel.hpp
-include/IonexStore.hpp
-include/IonexStream.hpp
 include/IonoModel.hpp
 include/IonoModelStore.hpp
-include/JGM3GravityModel.hpp
 include/JulianDate.hpp
-include/KalmanFilter.hpp
-include/Keeper.hpp
-include/KeplerOrbit.hpp
-include/LICSDetector.hpp
-include/LICSDetector2.hpp
-include/Layout.hpp
-include/Line.hpp
-include/LinePlot.hpp
+include/LNavAlmValFilter.hpp
+include/LNavCookFilter.hpp
+include/LNavCrossSourceFilter.hpp
+include/LNavEmptyFilter.hpp
+include/LNavEphMaker.hpp
+include/LNavFilterData.hpp
+include/LNavParityFilter.hpp
+include/LNavTLMHOWFilter.hpp
 include/LinearClockModel.hpp
-include/LinearCombinations.hpp
 include/LoopedFramework.hpp
 include/MJD.hpp
-include/MOPSWeight.hpp
-include/MWCSDetector.hpp
 include/MainAdapter.hpp
-include/Markable.hpp
-include/Marker.hpp
 include/MathBase.hpp
 include/Matrix.hpp
 include/MatrixBase.hpp
@@ -258,74 +84,32 @@ include/MatrixBaseOperators.hpp
 include/MatrixFunctors.hpp
 include/MatrixImplementation.hpp
 include/MatrixOperators.hpp
-include/MemoryUtils.hpp
-include/MetReader.hpp
 include/MiscMath.hpp
-include/ModelObs.hpp
-include/ModelObsFixedStation.hpp
-include/ModeledPR.hpp
-include/ModeledPseudorangeBase.hpp
-include/ModeledReferencePR.hpp
-include/MoonForce.hpp
-include/MoonPosition.hpp
-include/Msise00Drag.hpp
-include/NEDUtil.hpp
-include/NablaOp.hpp
+include/NMCTMeta.hpp
 include/Namelist.hpp
-include/NetworkObsStreams.hpp
-include/NovatelData.hpp
-include/NovatelStream.hpp
+include/NavFilter.hpp
+include/NavFilterKey.hpp
+include/NavFilterMgr.hpp
+include/NavID.hpp
 include/ORDEpoch.hpp
 include/ObsClockModel.hpp
 include/ObsEpochMap.hpp
 include/ObsID.hpp
 include/ObsIDInitializer.hpp
 include/ObsRngDev.hpp
-include/OceanLoading.hpp
-include/OneFreqCSDetector.hpp
-include/OrbElem.hpp
-include/OrbElemRinex.hpp
-include/OrbElemStore.hpp
 include/OrbitEph.hpp
 include/OrbitEphStore.hpp
-include/PCSmoother.hpp
-include/PCodeConst.hpp
-include/PNG.hpp
 include/PRSolution.hpp
-include/PRSolution2.hpp
-include/PSImage.hpp
-include/PSImageBase.hpp
 include/PZ90Ellipsoid.hpp
 include/PackedNavBits.hpp
-include/Palette.hpp
-include/Path.hpp
-include/PhaseCodeAlignment.hpp
-include/PhaseWindup.hpp
-include/PlanetEphemeris.hpp
-include/Plot.hpp
-include/PoleTides.hpp
 include/PolyFit.hpp
-include/Polygon.hpp
 include/Position.hpp
 include/PositionSatStore.hpp
-include/PowerSum.hpp
-include/PreciseRange.hpp
-include/ProblemSatFilter.hpp
-include/ProcessingClass.hpp
-include/ProcessingList.hpp
-include/ProcessingVector.hpp
-include/Pruner.hpp
-include/PvtStore.hpp
 include/QZSEphemeris.hpp
-include/QZSEphemerisStore.hpp
 include/QZSWeekSecond.hpp
 include/RACRotation.hpp
 include/RTFileFrame.hpp
-include/Rectangle.hpp
 include/ReferenceFrame.hpp
-include/ReferenceFrames.hpp
-include/RelativityEffect.hpp
-include/RequireObservables.hpp
 include/Rinex3ClockBase.hpp
 include/Rinex3ClockData.hpp
 include/Rinex3ClockHeader.hpp
@@ -344,8 +128,8 @@ include/Rinex3ObsStream.hpp
 include/RinexClockBase.hpp
 include/RinexClockData.hpp
 include/RinexClockHeader.hpp
-include/RinexClockStore.hpp
 include/RinexClockStream.hpp
+include/RinexDatum.hpp
 include/RinexEphemerisStore.hpp
 include/RinexMetBase.hpp
 include/RinexMetData.hpp
@@ -365,125 +149,57 @@ include/RinexObsID.hpp
 include/RinexObsStream.hpp
 include/RinexSatID.hpp
 include/RinexUtilities.hpp
-include/RobustStats.hpp
-include/RungeKutta4.hpp
-include/RungeKuttaFehlberg.hpp
-include/SEMAlmanacStore.hpp
-include/SEMBase.hpp
-include/SEMData.hpp
-include/SEMHeader.hpp
-include/SEMStream.hpp
-include/SMODFData.hpp
-include/SMODFStream.hpp
 include/SP3Base.hpp
 include/SP3Data.hpp
 include/SP3EphemerisStore.hpp
 include/SP3Header.hpp
 include/SP3SatID.hpp
 include/SP3Stream.hpp
-include/SRI.hpp
-include/SRIFilter.hpp
-include/SRIMatrix.hpp
-include/SRIleastSquares.hpp
-include/SVExclusionList.hpp
-include/SVGImage.hpp
 include/SVNumXRef.hpp
-include/SVPCodeGen.hpp
-include/SatArcMarker.hpp
-include/SatDataReader.hpp
 include/SatID.hpp
-include/SatOrbit.hpp
-include/SatOrbitPropagator.hpp
-include/SatPass.hpp
-include/ScatterPlot.hpp
-include/SeriesList.hpp
-include/SimpleFilter.hpp
-include/SimpleIURAWeight.hpp
-include/SimpleKalmanFilter.hpp
-include/SolarPosition.hpp
-include/SolarRadiationPressure.hpp
-include/SolarSystem.hpp
-include/SolidEarthTides.hpp
-include/SolidTides.hpp
-include/SolverBase.hpp
-include/SolverGeneral.hpp
-include/SolverLMS.hpp
-include/SolverPPP.hpp
-include/SolverPPPFB.hpp
-include/SolverWMS.hpp
-include/SourceID.hpp
-include/Spacecraft.hpp
-include/SpecialFunctions.hpp
-include/SphericalHarmonicGravity.hpp
-include/Splitter.hpp
+include/SinexBase.hpp
+include/SinexBlock.hpp
+include/SinexData.hpp
+include/SinexHeader.hpp
+include/SinexStream.hpp
+include/SinexTypes.hpp
 include/Stats.hpp
-include/StochasticModel.hpp
-include/StreamBuf.hpp
 include/StringUtils.hpp
-include/StrokeStyle.hpp
-include/StudentDistribution.hpp
-include/SunEarthSatGeometry.hpp
-include/SunForce.hpp
-include/SunPosition.hpp
-include/SurfacePlot.hpp
-include/Synchronize.hpp
 include/SystemTime.hpp
 include/TabularSatStore.hpp
-include/Text.hpp
-include/TextStyle.hpp
+include/TestUtil.hpp
 include/TimeConstants.hpp
 include/TimeConverters.hpp
-include/TimeNamedFileStream.hpp
+include/TimeRange.hpp
 include/TimeString.hpp
 include/TimeSystem.hpp
 include/TimeSystemCorr.hpp
 include/TimeTag.hpp
 include/Triple.hpp
 include/TropModel.hpp
-include/TypeID.hpp
-include/UTCTime.hpp
 include/UnixTime.hpp
-include/VDrawException.hpp
-include/VGImage.hpp
-include/VGState.hpp
-include/VLayout.hpp
 include/ValidType.hpp
-include/Variable.hpp
 include/Vector.hpp
 include/VectorBase.hpp
 include/VectorBaseOperators.hpp
 include/VectorOperators.hpp
-include/ViewerManager.hpp
 include/WGS84Ellipsoid.hpp
 include/Week.hpp
 include/WeekSecond.hpp
-include/WeightBase.hpp
 include/WxObsMap.hpp
-include/X1Sequence.hpp
-include/X2Sequence.hpp
-include/XYZ2NED.hpp
-include/XYZ2NEU.hpp
-include/Xv.hpp
 include/Xvt.hpp
 include/XvtStore.hpp
 include/YDSTime.hpp
-include/YumaAlmanacStore.hpp
-include/YumaBase.hpp
-include/YumaData.hpp
-include/YumaHeader.hpp
-include/YumaStream.hpp
-include/compass_constants.hpp
+include/build_config.h
 include/convhelp.hpp
 include/expandtilde.hpp
-include/format.hpp
-include/geometry.hpp
 include/gps_constants.hpp
 include/gpstkplatform.h
-include/index.hpp
 include/logstream.hpp
-include/mergePCodeWords.h
-include/plottypes.hpp
-include/random.hpp
 include/singleton.hpp
 include/stl_helpers.hpp
 lib/libgpstk.so
+share/cmake/GPSTK/GPSTKConfig.cmake
+share/cmake/GPSTK/GPSTKConfigVersion.cmake
+share/cmake/GPSTK/GPSTKTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/GPSTK/GPSTKTargets.cmake