3 files changed, 95 insertions, 19 deletions

diff --git a/science/brian/Makefile b/science/brian/Makefile
index 8494b6e448a7..dc586df695d1 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	brian
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP \
 		SF/${PORTNAME}/Brian/${PORTVERSION}
 
-
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A clock-driven simulator for spiking neural networks
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0:${PORTSDIR}/math/py-numpy \
diff --git a/science/brian/distinfo b/science/brian/distinfo
index 53ee000bdf7f..8722c72961fa 100644
--- a/science/brian/distinfo
+++ b/science/brian/distinfo
@@ -1,3 +1,3 @@
-MD5 (brian-1.1.2.zip) = 97ada49eb33a314581d34be034e563b1
-SHA256 (brian-1.1.2.zip) = ca283df1d49cd111650b78a75b7ac14a655e5db8507804e623e4b34a2bef08b7
-SIZE (brian-1.1.2.zip) = 308367
+MD5 (brian-1.1.3.zip) = 1061bf5db014c9194c232e37b5715e46
+SHA256 (brian-1.1.3.zip) = 2c77334ce39854ca4f45c272c4b8721f9d025755ba09a853c30fd16e6973c6fe
+SIZE (brian-1.1.3.zip) = 339275
diff --git a/science/brian/pkg-plist b/science/brian/pkg-plist
index 1cbc8cb8b97c..f3af17b7b971 100644
--- a/science/brian/pkg-plist
+++ b/science/brian/pkg-plist
@@ -25,9 +25,12 @@
 %%PYTHON_SITELIBDIR%%/brian/correlatedspikes.py
 %%PYTHON_SITELIBDIR%%/brian/correlatedspikes.pyc
 %%PYTHON_SITELIBDIR%%/brian/correlatedspikes.pyo
-%%PYTHON_SITELIBDIR%%/brian/credits.py
-%%PYTHON_SITELIBDIR%%/brian/credits.pyc
-%%PYTHON_SITELIBDIR%%/brian/credits.pyo
+%%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.py
+%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.pyc
+%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.pyo
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.py
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.pyc
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.pyo
@@ -67,12 +70,27 @@
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.pyo
 %%PYTHON_SITELIBDIR%%/brian/globalprefs.py
 %%PYTHON_SITELIBDIR%%/brian/globalprefs.pyc
 %%PYTHON_SITELIBDIR%%/brian/globalprefs.pyo
 %%PYTHON_SITELIBDIR%%/brian/group.py
 %%PYTHON_SITELIBDIR%%/brian/group.pyc
 %%PYTHON_SITELIBDIR%%/brian/group.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/hears/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/erb.py
+%%PYTHON_SITELIBDIR%%/brian/hears/erb.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/erb.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/filtering.py
+%%PYTHON_SITELIBDIR%%/brian/hears/filtering.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/filtering.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/sounds.py
+%%PYTHON_SITELIBDIR%%/brian/hears/sounds.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/sounds.pyo
 %%PYTHON_SITELIBDIR%%/brian/inspection.py
 %%PYTHON_SITELIBDIR%%/brian/inspection.pyc
 %%PYTHON_SITELIBDIR%%/brian/inspection.pyo
@@ -112,9 +130,6 @@
 %%PYTHON_SITELIBDIR%%/brian/neurongroup.py
 %%PYTHON_SITELIBDIR%%/brian/neurongroup.pyc
 %%PYTHON_SITELIBDIR%%/brian/neurongroup.pyo
-%%PYTHON_SITELIBDIR%%/brian/neuronmodel.py
-%%PYTHON_SITELIBDIR%%/brian/neuronmodel.pyc
-%%PYTHON_SITELIBDIR%%/brian/neuronmodel.pyo
 %%PYTHON_SITELIBDIR%%/brian/optimiser.py
 %%PYTHON_SITELIBDIR%%/brian/optimiser.pyc
 %%PYTHON_SITELIBDIR%%/brian/optimiser.pyo
@@ -142,15 +157,57 @@
 %%PYTHON_SITELIBDIR%%/brian/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/brian/tests/testinterface.py
-%%PYTHON_SITELIBDIR%%/brian/tests/testinterface.pyc
-%%PYTHON_SITELIBDIR%%/brian/tests/testinterface.pyo
-%%PYTHON_SITELIBDIR%%/brian/tests/testverification.py
-%%PYTHON_SITELIBDIR%%/brian/tests/testverification.pyc
-%%PYTHON_SITELIBDIR%%/brian/tests/testverification.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_epsp.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_epsp.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_epsp.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_exponential_current.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_exponential_current.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_exponential_current.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_clock.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_clock.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_clock.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_connection.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_connection.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_connection.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_magic.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_magic.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_magic.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_monitor.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_monitor.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_monitor.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_reset.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_reset.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_reset.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_threshold.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_threshold.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_threshold.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_units.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_units.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_units.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_unitsafefunctions.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_unitsafefunctions.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_unitsafefunctions.pyo
 %%PYTHON_SITELIBDIR%%/brian/threshold.py
 %%PYTHON_SITELIBDIR%%/brian/threshold.pyc
 %%PYTHON_SITELIBDIR%%/brian/threshold.pyo
+%%PYTHON_SITELIBDIR%%/brian/timedarray.py
+%%PYTHON_SITELIBDIR%%/brian/timedarray.pyc
+%%PYTHON_SITELIBDIR%%/brian/timedarray.pyo
 %%PYTHON_SITELIBDIR%%/brian/units.py
 %%PYTHON_SITELIBDIR%%/brian/units.pyc
 %%PYTHON_SITELIBDIR%%/brian/units.pyo
@@ -175,6 +232,12 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/setup.py
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/setup.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/setup.pyo
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/ccircular_wrap.cxx
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/ccircular.h
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/ccircular.i
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/numpy.i
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/circular.cpp
+%%PYTHON_SITELIBDIR%%/brian/utils/ccircular/swigcompile.bat
 %%PYTHON_SITELIBDIR%%/brian/utils/circular.py
 %%PYTHON_SITELIBDIR%%/brian/utils/circular.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/circular.pyo
@@ -196,6 +259,14 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/testfastexp2.py
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/testfastexp2.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/testfastexp2.pyo
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fastexp_wrap.cxx
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fastexp.h
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fexp.h
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fastexp.i
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/numpy.i
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fastexp.cpp
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/swigcompile.bat
+%%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fexp.c
 %%PYTHON_SITELIBDIR%%/brian/utils/information_theory.py
 %%PYTHON_SITELIBDIR%%/brian/utils/information_theory.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/information_theory.pyo
@@ -205,15 +276,22 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/parameters.py
 %%PYTHON_SITELIBDIR%%/brian/utils/parameters.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/parameters.pyo
+%%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.py
+%%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.pyc
+%%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.pyo
 %%PYTHON_SITELIBDIR%%/brian/utils/statistics.py
 %%PYTHON_SITELIBDIR%%/brian/utils/statistics.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/statistics.pyo
 %%PYTHON_SITELIBDIR%%/brian/utils/tabulate.py
 %%PYTHON_SITELIBDIR%%/brian/utils/tabulate.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/tabulate.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/brian/deprecated
 @dirrm %%PYTHON_SITELIBDIR%%/brian/experimental/cuda
 @dirrm %%PYTHON_SITELIBDIR%%/brian/experimental
+@dirrm %%PYTHON_SITELIBDIR%%/brian/hears
 @dirrm %%PYTHON_SITELIBDIR%%/brian/library
+@dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness
+@dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testinterface
 @dirrm %%PYTHON_SITELIBDIR%%/brian/tests
 @dirrm %%PYTHON_SITELIBDIR%%/brian/utils/ccircular
 @dirrm %%PYTHON_SITELIBDIR%%/brian/utils/fastexp