3 files changed, 64 insertions, 6 deletions

diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile
index 8fb5cc2d7230..acbb18e9e478 100644
--- a/science/opensim-core/Makefile
+++ b/science/opensim-core/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	OpenSim
-DISTVERSION=	4.0
-PORTREVISION=	3
+DISTVERSION=	4.0-601
+DISTVERSIONSUFFIX=	-ga2574fcda
 CATEGORIES=	science
 PKGNAMESUFFIX=	-core
 
@@ -27,7 +27,14 @@ CXXFLAGS+=	-I${LOCALBASE}/include/docopt
 CONFIGURE_ENV+=	SIMBODY_HOME=${LOCALBASE}
 CMAKE_OFF=	OPENSIM_COPY_DEPENDENCIES DO_TESTING
 
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=		PYTHON DOCS
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
+
+PYTHON_CMAKE_BOOL=	BUILD_PYTHON_WRAPPING
+PYTHON_USES=		python
+PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
+
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 PORTDOCS=		*
 
diff --git a/science/opensim-core/distinfo b/science/opensim-core/distinfo
index e0b2b1446886..ebb2234ebdde 100644
--- a/science/opensim-core/distinfo
+++ b/science/opensim-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542256927
-SHA256 (opensim-org-opensim-core-4.0_GH0.tar.gz) = 3d9be82786d3040368b862ef4cf192bfdd34b996cab53aba6d86b6e74f6ba0d1
-SIZE (opensim-org-opensim-core-4.0_GH0.tar.gz) = 45202145
+TIMESTAMP = 1566662120
+SHA256 (opensim-org-opensim-core-4.0-601-ga2574fcda_GH0.tar.gz) = 1ae677519fc7a6f389923e38ca8bc77497793ff05a6c8325e88cc5a4bbffcb73
+SIZE (opensim-org-opensim-core-4.0-601-ga2574fcda_GH0.tar.gz) = 49239379
diff --git a/science/opensim-core/pkg-plist b/science/opensim-core/pkg-plist
index b754d832633f..5899379221fc 100644
--- a/science/opensim-core/pkg-plist
+++ b/science/opensim-core/pkg-plist
@@ -50,6 +50,8 @@ include/OpenSim/Analyses/StaticOptimization.h
 include/OpenSim/Analyses/StaticOptimizationTarget.h
 include/OpenSim/Analyses/osimAnalyses.h
 include/OpenSim/Analyses/osimAnalysesDLL.h
+include/OpenSim/Common/APDMDataReader.h
+include/OpenSim/Common/APDMDataReaderSettings.h
 include/OpenSim/Common/About.h
 include/OpenSim/Common/AbstractDataTable.h
 include/OpenSim/Common/AbstractProperty.h
@@ -69,12 +71,14 @@ include/OpenSim/Common/DebugUtilities.h
 include/OpenSim/Common/DelimFileAdapter.h
 include/OpenSim/Common/Event.h
 include/OpenSim/Common/Exception.h
+include/OpenSim/Common/ExperimentalSensor.h
 include/OpenSim/Common/FileAdapter.h
 include/OpenSim/Common/Function.h
 include/OpenSim/Common/FunctionAdapter.h
 include/OpenSim/Common/FunctionSet.h
 include/OpenSim/Common/GCVSpline.h
 include/OpenSim/Common/GCVSplineSet.h
+include/OpenSim/Common/IMUDataReader.h
 include/OpenSim/Common/IO.h
 include/OpenSim/Common/LinearFunction.h
 include/OpenSim/Common/Lmdif.h
@@ -142,6 +146,8 @@ include/OpenSim/Common/VectorFunction.h
 include/OpenSim/Common/VectorFunctionUncoupledNxN.h
 include/OpenSim/Common/XMLDocument.h
 include/OpenSim/Common/XYFunctionInterface.h
+include/OpenSim/Common/XsensDataReader.h
+include/OpenSim/Common/XsensDataReaderSettings.h
 include/OpenSim/Common/gcvspl.h
 include/OpenSim/Common/osimCommon.h
 include/OpenSim/Common/osimCommonDLL.h
@@ -243,6 +249,11 @@ include/OpenSim/Simulation/Model/SystemEnergyProbe.h
 include/OpenSim/Simulation/Model/TwoFrameLinker.h
 include/OpenSim/Simulation/Model/Umberger2010MuscleMetabolicsProbe.h
 include/OpenSim/Simulation/MomentArmSolver.h
+include/OpenSim/Simulation/OpenSense/ExperimentalFrame.h
+include/OpenSim/Simulation/OpenSense/ExperimentalMarker.h
+include/OpenSim/Simulation/OpenSense/InverseKinematicsStudy.h
+include/OpenSim/Simulation/OpenSense/OpenSenseUtilities.h
+include/OpenSim/Simulation/OrientationsReference.h
 include/OpenSim/Simulation/Reference.h
 include/OpenSim/Simulation/RegisterTypes_osimSimulation.h
 include/OpenSim/Simulation/SimbodyEngine/BallJoint.h
@@ -347,3 +358,43 @@ lib/libosimExampleComponents.so
 lib/libosimLepton.so
 lib/libosimSimulation.so
 lib/libosimTools.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_actuators.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_analyses.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_common.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_examplecomponents.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_simbody.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_simulation.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/_tools.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/actuators.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/analyses.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/common.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/examplecomponents.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/simbody.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/simulation.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/arm26.osim
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/dataWithNaNsOfDifferentCases.trc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/futureOrientationInverseKinematics.trc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/gait10dof18musc_subject01.osim
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/gait2392_cmc_actuators_empty_model.xml
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/gait2392_setup_forward_empty_model.xml
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/std_subject01_walk1_ik.mot
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/storage.sto
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/subject02_grf_HiFreq.mot
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_DataAdapter.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_DataTable.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_TableSourceReporter.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_access_subcomponents.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_basics.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_component_interface.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_consistent_with_jython.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_simbody.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_simulation_utilities.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_sockets_inputs_outputs.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_states_trajectory.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/test_swig_additional_interface.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/walking2.c3d
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tests/walking5.c3d
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/tools.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/opensim/version.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/setup.py