diff --git a/astro/gpstk/Makefile b/astro/gpstk/Makefile
index 1fe1eb16694f..537bce5ae502 100644
--- a/astro/gpstk/Makefile
+++ b/astro/gpstk/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Toolkit for developing GPS applications
 
 LICENSE=	LGPL3
 
-USES=		cmake python:run
+USES=		cmake:outsource python:run
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
+CMAKE_SOURCE_PATH=	${WRKSRC}/dev
+
 EXTRACT_AFTER_ARGS=	--exclude .git
 
-WRKSRC=		${WRKDIR}/dev
-
 .include <bsd.port.mk>
diff --git a/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp b/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
new file mode 100644
index 000000000000..9f56b136c0cd
--- /dev/null
+++ b/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp
@@ -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>
diff --git a/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp b/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
similarity index 56%
rename from astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp
rename to astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
index d10f3334c34a..e97a970aa755 100644
--- a/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp
+++ b/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp
@@ -1,5 +1,5 @@
---- ext/lib/Utilities/BinUtils.hpp.orig	2014-10-11 11:19:24 UTC
-+++ ext/lib/Utilities/BinUtils.hpp
+--- 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"
diff --git a/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp b/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp
deleted file mode 100644
index 0324e2c03b1a..000000000000
--- a/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp
+++ /dev/null
@@ -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>