svn commit: r403770 - head/science/psychopy

[Wen Heping]

Author: wen
Date: Tue Dec 15 10:58:47 2015
New Revision: 403770
URL: https://svnweb.freebsd.org/changeset/ports/403770

Log:
  - Update to 1.83.01 and unbreak
  
  PR:		205219
  Submitted by:	tkato432 at yahoo.com

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

Modified: head/science/psychopy/Makefile
==============================================================================
--- head/science/psychopy/Makefile	Tue Dec 15 10:19:14 2015	(r403769)
+++ head/science/psychopy/Makefile	Tue Dec 15 10:58:47 2015	(r403770)
@@ -2,17 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	psychopy
-PORTVERSION=	1.82.02
-PORTREVISION=	1
+PORTVERSION=	1.83.01
 CATEGORIES=	science python
-MASTER_SITES=	SF/psychpy/PsychoPy
-DISTNAME=	PsychoPy-${PORTVERSION}
+MASTER_SITES=	GH
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Psychophysics toolkit for Python
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv3 # (or later)
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
@@ -26,11 +22,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml
 
 NO_ARCH=	yes
 
-USES=		fortran python zip
+USE_GITHUB=	yes
+USES=		fortran python
 USE_PYTHON=	autoplist distutils
 USE_WX=		2.8
 WX_COMPS=	python
-WX_UNICODE=	yes
 
 PLIST_FILES=	bin/psychopy
 
@@ -42,6 +38,11 @@ DESKTOP_ENTRIES="PsychoPy" \
 		""
 
 .include <bsd.port.options.mk>
+post-patch:
+# https://github.com/psychopy/psychopy/issues/982
+	@${REINPLACE_CMD} -e \
+		's|str(,id_dict)|str(id.dict)|' \
+		${WRKSRC}/psychopy/demos/coder/iohub/elotouchscreen/run.py
 
 post-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/psychopy
@@ -55,7 +56,7 @@ post-build:
 .endif
 	@${ECHO_CMD} \
 		>> ${WRKDIR}/psychopy
-	@${ECHO_CMD} "${PYTHON_CMD} ${LOCALBASE}/bin/psychopyApp.py" \
+	@${ECHO_CMD} "${PYTHON_CMD} ${PREFIX}/bin/psychopyApp.py" \
 		>> ${WRKDIR}/psychopy
 
 post-install:

Modified: head/science/psychopy/distinfo
==============================================================================
--- head/science/psychopy/distinfo	Tue Dec 15 10:19:14 2015	(r403769)
+++ head/science/psychopy/distinfo	Tue Dec 15 10:58:47 2015	(r403770)
@@ -1,2 +1,2 @@
-SHA256 (PsychoPy-1.82.02.zip) = 100d432aca6df578a7b5a05142adca2fda5eb78e2847d06b83ae273cf7d9e715
-SIZE (PsychoPy-1.82.02.zip) = 11569884
+SHA256 (psychopy-psychopy-1.83.01_GH0.tar.gz) = be4747f6834017ac6da3742e948d4d8a0cac62771fc7569877bdc3a76f71e611
+SIZE (psychopy-psychopy-1.83.01_GH0.tar.gz) = 15172324