Attachment 165585 Details for Bug 206254 – science_psychopy.diff

[patch] science_psychopy.diff

science_psychopy.diff (text/plain), 3.44 KB, created by tkato432 on 2016-01-14 18:36:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-01-14 18:36:06 UTC

Size: 3.44 KB

patch

obsolete

>diff -urN /usr/ports/science/psychopy/Makefile science/psychopy/Makefile
>--- /usr/ports/science/psychopy/Makefile	2016-01-13 07:48:57.537681000 +0900
>+++ science/psychopy/Makefile	2016-01-15 00:00:00.000000000 +0900
>@@ -2,9 +2,8 @@
> # $FreeBSD: head/science/psychopy/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $
> 
> PORTNAME=	psychopy
>-PORTVERSION=	1.83.01
>+PORTVERSION=	1.83.03
> CATEGORIES=	science python
>-MASTER_SITES=	GH
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Psychophysics toolkit for Python
>@@ -14,15 +13,17 @@
> 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 @@
> 		"" \
> 		""
> 
>+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:
>diff -urN /usr/ports/science/psychopy/distinfo science/psychopy/distinfo
>--- /usr/ports/science/psychopy/distinfo	2015-12-15 23:20:23.286456000 +0900
>+++ science/psychopy/distinfo	2016-01-15 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/science/psychopy/pkg-descr science/psychopy/pkg-descr
>--- /usr/ports/science/psychopy/pkg-descr	2015-08-24 03:50:00.818602000 +0900
>+++ science/psychopy/pkg-descr	2016-01-15 00:00:00.000000000 +0900
>@@ -1,12 +1,12 @@
>-PsychoPy is an open-source package for creating psychology stimuli
>-in Python (A real and free alternative to Matlab). PsychoPy combines
>-the graphical strengths of OpenGL with the easy Python syntax to give
>+PsychoPy is an open-source package for creating psychology stimuli in
>+Python (A real and free alternative to Matlab). PsychoPy combines the
>+graphical strengths of OpenGL with the easy Python syntax to give
> psychophysics a free and simple stimulus presentation and control
> package.
> 
>-The goal is to provide, for the busy scientist (including me!), tools
>-to control timing and windowing and a simple set of pre-packaged
>-stimuli and methods. The code is platform independent, using Python
>-and C libraries that are widely available.
>+The goal is to provide, for the busy scientist, tools to control timing
>+and windowing and a simple set of pre-packaged stimuli and methods. The
>+code is platform independent, using Python and C libraries that are
>+widely available.
> 
> WWW: http://www.psychopy.org/

Actions: View | Diff

Attachments on bug 206254: 165585