Skip to content

Commit

Permalink
science/nest: Update 3.3 → 3.4
Browse files Browse the repository at this point in the history
Reported by:	portscout
  • Loading branch information
yurivict committed Jul 1, 2023
1 parent 563ddaa commit d336711
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 22 deletions.
4 changes: 2 additions & 2 deletions science/nest/Makefile
@@ -1,7 +1,6 @@
PORTNAME= nest
DISTVERSIONPREFIX= v
DISTVERSION= 3.3
PORTREVISION= 2
DISTVERSION= 3.4
CATEGORIES= science biology # NEST is used in neuroscience

MAINTAINER= yuri@FreeBSD.org
Expand Down Expand Up @@ -44,6 +43,7 @@ USES+= compiler:c++11-lang

# 2 tests are known to fail, see https://github.com/nest/nest-simulator/issues/2190
# tests require the port to be installed with DOCS=ON, see https://github.com/nest/nest-simulator/issues/2191
# many tests fail, see https://github.com/nest/nest-simulator/issues/2848

post-install:
@${REINPLACE_CMD} -i '' -e 's|^python3 |${PYTHON_CMD} |' ${STAGEDIR}${PREFIX}/share/nest/testsuite/do_tests.sh
Expand Down
6 changes: 3 additions & 3 deletions science/nest/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1652029146
SHA256 (nest-nest-simulator-v3.3_GH0.tar.gz) = 179462b966cc61f5785d2fee770bc36f86745598ace9cd97dd620622b62043ed
SIZE (nest-nest-simulator-v3.3_GH0.tar.gz) = 11081653
TIMESTAMP = 1688198308
SHA256 (nest-nest-simulator-v3.4_GH0.tar.gz) = c56699111f899045ba48e55e87d14eca8763b48ebbb3648beee701a36aa3af20
SIZE (nest-nest-simulator-v3.4_GH0.tar.gz) = 24985676
17 changes: 4 additions & 13 deletions science/nest/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
--- CMakeLists.txt.orig 2022-01-21 18:01:36 UTC
--- CMakeLists.txt.orig 2023-02-16 13:40:33 UTC
+++ CMakeLists.txt
@@ -100,7 +100,7 @@ set( CMAKE_INSTALL_DATADIR "share/${PROJECT_NAME}" CAC
################################################################################

# needed for pynest test suite
-if ( ${with-python} STREQUAL "ON" )
+if ( BUILD_PYTHON AND ${with-python} STREQUAL "ON" )
find_program( NOSETESTS NAMES nosetests )
endif ()

@@ -202,7 +202,7 @@ message("-- NEST version: ${NEST_VERSION_STRING}")
@@ -197,7 +197,7 @@ printInfo("-- NEST version: ${NEST_VERSION_STRING}")
enable_testing()
set( TEST_OPTS "" )

Expand All @@ -18,7 +9,7 @@
set( TEST_OPTS "${TEST_OPTS};--with-python=${PYTHON}" )
endif ()

@@ -231,9 +231,13 @@ add_custom_target( installcheck
@@ -226,9 +226,13 @@ add_custom_target( installcheck
################## Define Subdirectories here ##################
################################################################################

Expand All @@ -32,7 +23,7 @@
add_subdirectory( build_support )
add_subdirectory( lib )
add_subdirectory( libnestutil )
@@ -243,7 +247,7 @@ add_subdirectory( nest )
@@ -238,7 +242,7 @@ add_subdirectory( nest )
add_subdirectory( nestkernel )
add_subdirectory( thirdparty )
add_subdirectory( testsuite )
Expand Down
30 changes: 26 additions & 4 deletions science/nest/pkg-plist
Expand Up @@ -143,6 +143,7 @@ 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_propagator.h
include/nest/iaf_psc_alpha.h
include/nest/iaf_psc_alpha_multisynapse.h
include/nest/iaf_psc_alpha_ps.h
Expand Down Expand Up @@ -226,11 +227,9 @@ include/nest/poisson_generator.h
include/nest/poisson_generator_ps.h
include/nest/position.h
include/nest/pp_cond_exp_mc_urbanczik.h
include/nest/pp_pop_psc_delta.h
include/nest/pp_psc_delta.h
include/nest/ppd_sup_generator.h
include/nest/processes.h
include/nest/propagator_stability.h
include/nest/proxynode.h
include/nest/pseudo_recording_device.h
include/nest/pulsepacket_generator.h
Expand All @@ -257,6 +256,7 @@ include/nest/regula_falsi.h
include/nest/ring_buffer.h
include/nest/ring_buffer_impl.h
include/nest/scanner.h
include/nest/secondary_event.h
include/nest/send_buffer_position.h
include/nest/sharedptrdatum.h
include/nest/siegert_neuron.h
Expand Down Expand Up @@ -355,11 +355,23 @@ include/nest/vp_manager.h
include/nest/vp_manager_impl.h
include/nest/weight_recorder.h
lib/nest/libmodels.so
lib/nest/libmodels.so.3
lib/nest/libmodels.so.3.4
lib/nest/libnest.so
lib/nest/libnest.so.3
lib/nest/libnest.so.3.4
lib/nest/libnestkernel.so
lib/nest/libnestkernel.so.3
lib/nest/libnestkernel.so.3.4
lib/nest/libnestutil.so
lib/nest/libnestutil.so.3
lib/nest/libnestutil.so.3.4
lib/nest/libsli.so
lib/nest/libsli.so.3
lib/nest/libsli.so.3.4
lib/nest/libsli_readline.so
lib/nest/libsli_readline.so.3
lib/nest/libsli_readline.so.3.4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/nest/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/nest/lib/README.md
%%PYTHON%%%%PYTHON_SITELIBDIR%%/nest/lib/__init__.py
Expand Down Expand Up @@ -446,6 +458,7 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/mpitests/CMakeLists.txt
%%DATADIR%%/testsuite/mpitests/README
%%DATADIR%%/testsuite/mpitests/issue-1957.sli
%%DATADIR%%/testsuite/mpitests/issue-1974.sli
%%DATADIR%%/testsuite/mpitests/issue-2119.sli
%%DATADIR%%/testsuite/mpitests/issue-281.sli
%%DATADIR%%/testsuite/mpitests/issue-600.sli
Expand Down Expand Up @@ -519,8 +532,14 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/musictests/test_event_proxies_issue-696_sender.sli
%%DATADIR%%/testsuite/musictests/test_event_proxies_receiver.sli
%%DATADIR%%/testsuite/musictests/test_event_proxies_sender.sli
%%DATADIR%%/testsuite/musictests/test_message.music
%%DATADIR%%/testsuite/musictests/test_message0.dat
%%DATADIR%%/testsuite/musictests/test_message_receiver.sli
%%DATADIR%%/testsuite/musictests/test_music_failure1.music
%%DATADIR%%/testsuite/musictests/test_music_failure2.music
%%DATADIR%%/testsuite/musictests/test_rate_proxy.music
%%DATADIR%%/testsuite/musictests/test_rate_proxy_receiver.sli
%%DATADIR%%/testsuite/musictests/test_rate_proxy_sender.sli
%%DATADIR%%/testsuite/pytests/connect_test_base.py
%%DATADIR%%/testsuite/pytests/mpi/2/connect_test_base.py
%%DATADIR%%/testsuite/pytests/mpi/2/test_connect_all_to_all.py
Expand Down Expand Up @@ -555,6 +574,7 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/pytests/test_connect_one_to_one.py
%%DATADIR%%/testsuite/pytests/test_connect_pairwise_bernoulli.py
%%DATADIR%%/testsuite/pytests/test_connect_symmetric_pairwise_bernoulli.py
%%DATADIR%%/testsuite/pytests/test_copy_model.py
%%DATADIR%%/testsuite/pytests/test_create.py
%%DATADIR%%/testsuite/pytests/test_current_recording_generators.py
%%DATADIR%%/testsuite/pytests/test_erfc_neuron.py
Expand All @@ -567,6 +587,7 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/pytests/test_glif_cond.py
%%DATADIR%%/testsuite/pytests/test_glif_psc.py
%%DATADIR%%/testsuite/pytests/test_helper_functions.py
%%DATADIR%%/testsuite/pytests/test_iaf_singularity.py
%%DATADIR%%/testsuite/pytests/test_jonke_synapse.py
%%DATADIR%%/testsuite/pytests/test_json.py
%%DATADIR%%/testsuite/pytests/test_labeled_synapses.py
Expand Down Expand Up @@ -595,6 +616,7 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/pytests/test_regression_issue-1409.py
%%DATADIR%%/testsuite/pytests/test_regression_issue-2069.py
%%DATADIR%%/testsuite/pytests/test_regression_issue-2125.py
%%DATADIR%%/testsuite/pytests/test_regression_issue-2480.py
%%DATADIR%%/testsuite/pytests/test_siegert_neuron.py
%%DATADIR%%/testsuite/pytests/test_sp/test_conn_builder.py
%%DATADIR%%/testsuite/pytests/test_sp/test_disconnect.py
Expand Down Expand Up @@ -646,7 +668,9 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/regressiontests/issue-1610.sli
%%DATADIR%%/testsuite/regressiontests/issue-1640.sli
%%DATADIR%%/testsuite/regressiontests/issue-1703.py
%%DATADIR%%/testsuite/regressiontests/issue-2052.sli
%%DATADIR%%/testsuite/regressiontests/issue-211.sli
%%DATADIR%%/testsuite/regressiontests/issue-2282.sli
%%DATADIR%%/testsuite/regressiontests/issue-264.sli
%%DATADIR%%/testsuite/regressiontests/issue-311.sli
%%DATADIR%%/testsuite/regressiontests/issue-327.sli
Expand Down Expand Up @@ -722,7 +746,6 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/regressiontests/ticket-903.sli
%%DATADIR%%/testsuite/regressiontests/ticket-921.sli
%%DATADIR%%/testsuite/regressiontests/ticket-926.sli
%%DATADIR%%/testsuite/regressiontests/ticket-933.sli
%%DATADIR%%/testsuite/regressiontests/ticket-941.sli
%%DATADIR%%/testsuite/regressiontests/ticket-949.sli
%%DATADIR%%/testsuite/regressiontests/ticket-959.sli
Expand Down Expand Up @@ -864,7 +887,6 @@ lib/nest/libsli_readline.so
%%DATADIR%%/testsuite/unittests/test_poisson_generator_ps.sli
%%DATADIR%%/testsuite/unittests/test_poisson_ps_intervals.sli
%%DATADIR%%/testsuite/unittests/test_poisson_ps_min_interval.sli
%%DATADIR%%/testsuite/unittests/test_pp_pop_psc_delta.sli
%%DATADIR%%/testsuite/unittests/test_pp_psc_delta.sli
%%DATADIR%%/testsuite/unittests/test_ppd_sup_generator.sli
%%DATADIR%%/testsuite/unittests/test_psp_amplitude_consistency.sli
Expand Down

0 comments on commit d336711

Please sign in to comment.