3 files changed, 10 insertions, 164 deletions

diff --git a/science/nest/Makefile b/science/nest/Makefile
index 59960fb6f511..09e3253af673 100644
--- a/science/nest/Makefile
+++ b/science/nest/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	nest
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.14.0-2100
-DISTVERSIONSUFFIX=	-g788e93e3
+DISTVERSION=	2.16.0
 CATEGORIES=	science biology # NEST is used in neuroscience
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -27,8 +26,8 @@ OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_USES=		python
-PYTHON_CMAKE_ON=	-DCYTHON_EXECUTABLE:STRING=${PREFIX}/bin/cython-${PYTHON_VER}
 PYTHON_USE=		python=cython
+PYTHON_CMAKE_ON=	-DCYTHON_EXECUTABLE:STRING=${PREFIX}/bin/cython-${PYTHON_VER}
 
 PORTDOCS=		*
 
diff --git a/science/nest/distinfo b/science/nest/distinfo
index 752c1aab0f61..751bd9e058ee 100644
--- a/science/nest/distinfo
+++ b/science/nest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557603316
-SHA256 (nest-nest-simulator-v2.14.0-2100-g788e93e3_GH0.tar.gz) = 972dcbbe79e3a36bd7e83426dccd12197885537791f70ea9795079226a13aa44
-SIZE (nest-nest-simulator-v2.14.0-2100-g788e93e3_GH0.tar.gz) = 12376006
+TIMESTAMP = 1557648420
+SHA256 (nest-nest-simulator-v2.16.0_GH0.tar.gz) = abfeb61719dec54da9477be035bef1d9d764f4e7663f63f6a6d9211f967e0490
+SIZE (nest-nest-simulator-v2.16.0_GH0.tar.gz) = 6730320
diff --git a/science/nest/pkg-plist b/science/nest/pkg-plist
index 6dc976933eca..101a67c60bde 100644
--- a/science/nest/pkg-plist
+++ b/science/nest/pkg-plist
@@ -12,7 +12,6 @@ include/nest/aeif_cond_beta_multisynapse.h
 include/nest/aeif_cond_exp.h
 include/nest/aeif_psc_alpha.h
 include/nest/aeif_psc_delta.h
-include/nest/aeif_psc_delta_clopath.h
 include/nest/aeif_psc_exp.h
 include/nest/aggregatedatum.h
 include/nest/allocator.h
@@ -22,13 +21,10 @@ include/nest/arraydatum.h
 include/nest/bernoulli_connection.h
 include/nest/binary_neuron.h
 include/nest/binomial_randomdev.h
-include/nest/block_vector.h
 include/nest/booldatum.h
 include/nest/callbackdatum.h
 include/nest/charcode.h
 include/nest/clipped_randomdev.h
-include/nest/clopath_archiving_node.h
-include/nest/clopath_connection.h
 include/nest/common_properties_hom_w.h
 include/nest/common_synapse_properties.h
 include/nest/completed_checker.h
@@ -99,10 +95,8 @@ include/nest/growth_curve.h
 include/nest/growth_curve_factory.h
 include/nest/gsl_binomial_randomdev.h
 include/nest/gslrandomgen.h
-include/nest/hh_cond_beta_gap_traub.h
 include/nest/hh_cond_exp_traub.h
 include/nest/hh_psc_alpha.h
-include/nest/hh_psc_alpha_clopath.h
 include/nest/hh_psc_alpha_gap.h
 include/nest/histentry.h
 include/nest/ht_connection.h
@@ -111,9 +105,9 @@ include/nest/iaf_chs_2007.h
 include/nest/iaf_chxk_2008.h
 include/nest/iaf_cond_alpha.h
 include/nest/iaf_cond_alpha_mc.h
-include/nest/iaf_cond_beta.h
 include/nest/iaf_cond_exp.h
 include/nest/iaf_cond_exp_sfa_rr.h
+include/nest/iaf_neuron.h
 include/nest/iaf_psc_alpha.h
 include/nest/iaf_psc_alpha_canon.h
 include/nest/iaf_psc_alpha_multisynapse.h
@@ -283,7 +277,6 @@ include/nest/stdp_dopa_connection.h
 include/nest/stdp_pl_connection_hom.h
 include/nest/stdp_triplet_connection.h
 include/nest/step_current_generator.h
-include/nest/step_rate_generator.h
 include/nest/stimulating_device.h
 include/nest/stopwatch.h
 include/nest/string_utils.h
@@ -336,166 +329,21 @@ lib/librandom.so
 lib/libsli.so
 lib/libsli_readline.so
 lib/libtopology.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/nest/pynestkernel.so
+%%DATADIR%%/extras/EditorSupport/emacs/postscript-sli.el
+%%DATADIR%%/extras/EditorSupport/emacs/psvn.el
+%%DATADIR%%/extras/EditorSupport/emacs/sli.el
 %%DATADIR%%/extras/EditorSupport/vim/syntax/sli.vim
 %%PYTHON%%%%DATADIR%%/extras/do_tests.py
 %%DATADIR%%/extras/do_tests.sh
 %%DATADIR%%/help_generator/README.md
-%%DATADIR%%/help_generator/assets/css/ie.css
-%%DATADIR%%/help_generator/assets/css/jquery.mmenu.all.css
-%%DATADIR%%/help_generator/assets/css/jss-style.min.css
-%%DATADIR%%/help_generator/assets/css/moeppel1.png
-%%DATADIR%%/help_generator/assets/css/moeppel2.png
-%%DATADIR%%/help_generator/assets/css/nest-initiative-logo.png
-%%DATADIR%%/help_generator/assets/css/prettify.css
-%%DATADIR%%/help_generator/assets/css/style.css
-%%DATADIR%%/help_generator/assets/images/arrow.png
-%%DATADIR%%/help_generator/assets/js/code-prettify/COPYING
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-apollo.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-basic.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-clj.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-css.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-dart.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-erlang.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-go.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-hs.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-lasso.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-lisp.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-llvm.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-logtalk.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-lua.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-matlab.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-ml.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-mumps.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-n.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-pascal.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-proto.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-r.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-rd.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-rust.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-scala.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-sql.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-swift.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-tcl.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-tex.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-vb.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-vhdl.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-wiki.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-xq.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/lang-yaml.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/prettify.css
-%%DATADIR%%/help_generator/assets/js/code-prettify/prettify.js
-%%DATADIR%%/help_generator/assets/js/code-prettify/run_prettify.js
-%%DATADIR%%/help_generator/assets/js/highlight/CHANGES.md
-%%DATADIR%%/help_generator/assets/js/highlight/LICENSE
-%%DATADIR%%/help_generator/assets/js/highlight/README.md
-%%DATADIR%%/help_generator/assets/js/highlight/README.ru.md
-%%DATADIR%%/help_generator/assets/js/highlight/highlight.pack.js
-%%DATADIR%%/help_generator/assets/js/highlight/styles/agate.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/androidstudio.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/arduino-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/arta.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/ascetic.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-cave-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-cave-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-dune-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-dune-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-estuary-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-estuary-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-forest-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-forest-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-heath-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-heath-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-lakeside-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-lakeside-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-plateau-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-plateau-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-savanna-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-savanna-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-seaside-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-seaside-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-sulphurpool-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atelier-sulphurpool-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atom-one-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/atom-one-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/brown-paper.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/brown-papersq.png
-%%DATADIR%%/help_generator/assets/js/highlight/styles/codepen-embed.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/color-brewer.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/darcula.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/darkula.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/default.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/docco.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/dracula.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/far.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/foundation.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/github-gist.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/github.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/googlecode.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/grayscale.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/gruvbox-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/gruvbox-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/hopscotch.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/hybrid.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/idea.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/ir-black.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/kimbie.dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/kimbie.light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/magula.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/mono-blue.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/monokai-sublime.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/monokai.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/obsidian.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/ocean.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/paraiso-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/paraiso-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/pojoaque.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/pojoaque.jpg
-%%DATADIR%%/help_generator/assets/js/highlight/styles/purebasic.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/qtcreator_dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/qtcreator_light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/railscasts.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/rainbow.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/routeros.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/school-book.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/school-book.png
-%%DATADIR%%/help_generator/assets/js/highlight/styles/solarized-dark.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/solarized-light.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/sunburst.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/tomorrow-night-blue.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/tomorrow-night-bright.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/tomorrow-night-eighties.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/tomorrow-night.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/tomorrow.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/vs.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/vs2015.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/xcode.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/xt256.css
-%%DATADIR%%/help_generator/assets/js/highlight/styles/zenburn.css
-%%DATADIR%%/help_generator/assets/js/html5shiv.min.js
-%%DATADIR%%/help_generator/assets/js/jquery-3.1.1.min.js
-%%DATADIR%%/help_generator/assets/js/jquery-migrate-3.0.0.js
-%%DATADIR%%/help_generator/assets/js/jquery.mmenu.all.js
-%%DATADIR%%/help_generator/assets/js/jquery.sldr.js
-%%DATADIR%%/help_generator/assets/js/jss-script.min.js
-%%DATADIR%%/help_generator/conf.py
-%%DATADIR%%/help_generator/examples.sh
 %%DATADIR%%/help_generator/generate_help.py
 %%DATADIR%%/help_generator/generate_helpindex.py
 %%DATADIR%%/help_generator/helpers.py
-%%DATADIR%%/help_generator/make-slider.sh
 %%DATADIR%%/help_generator/templates/cmd.tpl.html
 %%DATADIR%%/help_generator/templates/footer.tpl.html
 %%DATADIR%%/help_generator/templates/helpindex.tpl.html
-%%DATADIR%%/help_generator/templates/nb-code.tpl.json
-%%DATADIR%%/help_generator/templates/nb-md.tpl.json
-%%DATADIR%%/help_generator/templates/nb.tpl.json
 %%DATADIR%%/help_generator/templates/nest.tpl.css
-%%DATADIR%%/help_generator/templates/overview-sample-footer.tmpl
-%%DATADIR%%/help_generator/templates/overview-sample-header.tmpl
-%%DATADIR%%/help_generator/templates/sample-footer.tmpl
-%%DATADIR%%/help_generator/templates/sample-header.tmpl
-%%DATADIR%%/help_generator/webdoc.py
 %%DATADIR%%/help_generator/writers.py
 %%DATADIR%%/sli/FormattedIO.sli
 %%DATADIR%%/sli/arraylib.sli
@@ -517,4 +365,3 @@ lib/libtopology.so
 %%DATADIR%%/sli/topology-interface.sli
 %%DATADIR%%/sli/typeinit.sli
 %%DATADIR%%/sli/unittest.sli
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/nest/pynestkernel.so