diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 482dac55a93d..6f9cb80d6c32 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
-DISTVERSION=	0.9.7v2
-PORTREVISION=	1
+DISTVERSION=	0.9.7
 CATEGORIES=	science lang
-MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION:R}
+MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index 5bb95282246d..9c7721360480 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484504557
-SHA256 (gdl-0.9.7v2.tgz) = f7e2e0de96b0a8b53a4f45c12d52844341d48797625557eee6edea55ade5c379
-SIZE (gdl-0.9.7v2.tgz) = 1840666
+TIMESTAMP = 1486500102
+SHA256 (gdl-0.9.7.tgz) = 2b5945d06e4d95f01cb70a3c432ac2fa4c81e1b3ac7c02687a6704ab042a7e21
+SIZE (gdl-0.9.7.tgz) = 1828799
diff --git a/science/gnudatalanguage/pkg-plist b/science/gnudatalanguage/pkg-plist
index 51c6032a27a3..3dfb9293c857 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -1,17 +1,12 @@
 bin/gdl
 man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CVS/Entries
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CVS/Repository
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CVS/Root
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am.~1.155.~
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/add_error.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/banner_for_testsuite.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/CVS/Entries
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/CVS/Repository
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/CVS/Root
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_multiply.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/byte_array.h5
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/checks
@@ -227,6 +222,7 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_1.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_2.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qhull.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qhull.pro.~1.1.~
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qromb.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qromo.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_random.pro
@@ -262,6 +258,7 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_titles.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_trisol.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tv.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tv.pro.~1.12.~
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tv_ps.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tvlct.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_typename.pro
@@ -289,6 +286,7 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/calendar.pro
 %%DATADIR%%/lib/congrid.pro
 %%DATADIR%%/lib/correlate.pro
+%%DATADIR%%/lib/correlate.pro.~1.2.~
 %%DATADIR%%/lib/delvar.pro
 %%DATADIR%%/lib/deriv.pro
 %%DATADIR%%/lib/diag_matrix.pro