svn commit: r406546 - head/science/psychopy

[Martin Wilke]

Author: miwi
Date: Mon Jan 18 05:56:13 2016
New Revision: 406546
URL: https://svnweb.freebsd.org/changeset/ports/406546

Log:
  - Update to 1.83.03
  
  PR:		206254
  Submitted by:	maintainer

Modified:
  head/science/psychopy/Makefile
  head/science/psychopy/distinfo

Modified: head/science/psychopy/Makefile
==============================================================================
--- head/science/psychopy/Makefile	Mon Jan 18 05:54:53 2016	(r406545)
+++ head/science/psychopy/Makefile	Mon Jan 18 05:56:13 2016	(r406546)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	psychopy
-PORTVERSION=	1.83.01
+PORTVERSION=	1.83.03
 CATEGORIES=	science python
-MASTER_SITES=	GH
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Psychophysics toolkit for Python
@@ -14,15 +13,17 @@ LICENSE=	GPLv3+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:${PORTSDIR}/graphics/py-pyglet \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:${PORTSDIR}/math/py-pandas \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:${PORTSDIR}/science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}openpyxl>0:${PORTSDIR}/textproc/py-openpyxl \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
+		${PYGAME} \
 		${PYNUMPY}
 
 NO_ARCH=	yes
 
 USE_GITHUB=	yes
+
 USES=		fortran python
 USE_PYTHON=	autoplist distutils
 USE_WX=		2.8
@@ -37,11 +38,18 @@ DESKTOP_ENTRIES="PsychoPy" \
 		"" \
 		""
 
+OPTIONS_DEFINE_i386=	PYGLET
+OPTIONS_DEFAULT_i386=	PYGLET
+
+PYGLET_DESC=		Drawing support via Pyglet
+PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:${PORTSDIR}/graphics/py-pyglet
+
 .include <bsd.port.options.mk>
+
 post-patch:
 # https://github.com/psychopy/psychopy/issues/982
 	@${REINPLACE_CMD} -e \
-		's|str(,id_dict)|str(id.dict)|' \
+		's|str(,id_dict)|str(id_dict)|' \
 		${WRKSRC}/psychopy/demos/coder/iohub/elotouchscreen/run.py
 
 post-build:

Modified: head/science/psychopy/distinfo
==============================================================================
--- head/science/psychopy/distinfo	Mon Jan 18 05:54:53 2016	(r406545)
+++ head/science/psychopy/distinfo	Mon Jan 18 05:56:13 2016	(r406546)
@@ -1,2 +1,2 @@
-SHA256 (psychopy-psychopy-1.83.01_GH0.tar.gz) = be4747f6834017ac6da3742e948d4d8a0cac62771fc7569877bdc3a76f71e611
-SIZE (psychopy-psychopy-1.83.01_GH0.tar.gz) = 15172324
+SHA256 (psychopy-psychopy-1.83.03_GH0.tar.gz) = 608c0eac0021b3ec06e250243459c607f656e4210bfd7fefaaae330341b3e873
+SIZE (psychopy-psychopy-1.83.03_GH0.tar.gz) = 15230958