Attachment 164075 Details for Bug 205219 – science_psychopy.diff

[patch] science_psychopy.diff

science_psychopy.diff (text/plain), 1.99 KB, created by tkato432 on 2015-12-10 18:41:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-12-10 18:41:08 UTC

Size: 1.99 KB

patch

obsolete

>diff -urN /usr/ports/science/psychopy/Makefile science/psychopy/Makefile
>--- /usr/ports/science/psychopy/Makefile	2015-11-09 22:25:53.678851000 +0900
>+++ science/psychopy/Makefile	2015-12-11 00:00:00.000000000 +0900
>@@ -2,17 +2,13 @@
> # $FreeBSD: head/science/psychopy/Makefile 401096 2015-11-09 12:59:03Z antoine $
> 
> 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@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,12 @@
> 
> 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
> 
>@@ -43,6 +40,12 @@
> 
> .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
> 	@${ECHO_CMD} "#!${SH}" \
>@@ -55,7 +58,7 @@
> .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:
>diff -urN /usr/ports/science/psychopy/distinfo science/psychopy/distinfo
>--- /usr/ports/science/psychopy/distinfo	2015-09-06 04:05:56.333774000 +0900
>+++ science/psychopy/distinfo	2015-12-11 00:00:00.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 205219: 164075