Index: branches/2015Q4/astro/gpstk/Makefile
===================================================================
--- branches/2015Q4/astro/gpstk/Makefile	(revision 400112)
+++ branches/2015Q4/astro/gpstk/Makefile	(revision 400113)
@@ -1,23 +1,23 @@
 # Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gpstk
 PORTVERSION=	2.5
 CATEGORIES=	astro devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for developing GPS applications
 
 LICENSE=	LGPL3
 
-USES=		cmake python:run
+USES=		cmake:outsource python:run
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
-EXTRACT_AFTER_ARGS=	--exclude .git
+CMAKE_SOURCE_PATH=	${WRKSRC}/dev
 
-WRKSRC=		${WRKDIR}/dev
+EXTRACT_AFTER_ARGS=	--exclude .git
 
 .include <bsd.port.mk>
Index: branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp
===================================================================
--- branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp	(revision 400112)
+++ branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp	(nonexistent)
@@ -1,10 +0,0 @@
---- ext/lib/Utilities/BinUtils.hpp.orig	2014-10-11 11:19:24 UTC
-+++ 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

Property changes on: branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp
===================================================================
--- branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp	(revision 400112)
+++ branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp	(nonexistent)
@@ -1,10 +0,0 @@
---- ext/lib/FileDirProc/FileHunter.cpp.orig	2014-10-10 19:46:15 UTC
-+++ ext/lib/FileDirProc/FileHunter.cpp
-@@ -52,6 +52,7 @@
- #ifndef _WIN32
- #include <unistd.h>
- #include <dirent.h>
-+#include <sys/syslimits.h>
- #else
- #include <io.h>
- #include <direct.h>

Property changes on: branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
===================================================================
--- branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp	(nonexistent)
+++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp	(revision 400113)
@@ -0,0 +1,10 @@
+--- 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>

Property changes on: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
===================================================================
--- branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp	(nonexistent)
+++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp	(revision 400113)
@@ -0,0 +1,10 @@
+--- 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

Property changes on: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 400112)
+++ branches/2015Q4	(revision 400113)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r399952