Re: childsplay needs py-numpy

2021-03-07 Thread Stuart Henderson 
On 2021/03/07 21:01, Stuart Henderson wrote:
> On 2021/03/07 18:13, Remi Locherer wrote:
> > On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote:
> > > On 2021/03/07 13:12, Remi Locherer wrote:
> > > > Without numpy childsplay fails to start (see cairoimage.py).
> > > > 
> > > > OK?
> > > 
> > > ok.  I wonder if we should split off a py2-numpy..
> > 
> > Actually, there is a version 3.3 from 2018 that does not need numpy.
> > It still depends on Python 2 though ...
> > 
> > Changelog:
> > https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog
> > 
> > OK?
> 
> Oh that's better. Seems to work fine here, OK
> 

Timo Myyrä sent a similar diff back in 2018, but without -py-numpy..

Re: childsplay needs py-numpy

2021-03-07 Thread Stuart Henderson 
On 2021/03/07 18:13, Remi Locherer wrote:
> On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote:
> > On 2021/03/07 13:12, Remi Locherer wrote:
> > > Without numpy childsplay fails to start (see cairoimage.py).
> > > 
> > > OK?
> > 
> > ok.  I wonder if we should split off a py2-numpy..
> 
> Actually, there is a version 3.3 from 2018 that does not need numpy.
> It still depends on Python 2 though ...
> 
> Changelog:
> https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog
> 
> OK?

Oh that's better. Seems to work fine here, OK

Re: childsplay needs py-numpy

2021-03-07 Thread Remi Locherer 
On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote:
> On 2021/03/07 13:12, Remi Locherer wrote:
> > Without numpy childsplay fails to start (see cairoimage.py).
> > 
> > OK?
> 
> ok.  I wonder if we should split off a py2-numpy..

Actually, there is a version 3.3 from 2018 that does not need numpy.
It still depends on Python 2 though ...

Changelog:
https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog

OK?


Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile7 Mar 2021 15:26:03 -   1.32
+++ Makefile7 Mar 2021 16:45:33 -
@@ -2,9 +2,8 @@
 
 COMMENT=   collection of educational activities for young children
 
-DISTNAME=  childsplay-2.6.5
+DISTNAME=  childsplay-3.3
 EXTRACT_SUFX=  .tgz
-REVISION = 4
 
 CATEGORIES=games education
 
@@ -23,7 +22,6 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
 
 RUN_DEPENDS=   databases/py-sqlalchemy \
devel/pygame \
-   math/py-numpy \
x11/py-gtk2
 
 NO_TEST=   Yes
@@ -32,7 +30,6 @@ NO_BUILD= Yes
 MODPY_ADJ_FILES=childsplay.py
 
 pre-configure:
-   perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/pangofont.py
echo '#!/bin/sh' >${WRKSRC}/childsplay.sh
echo >>${WRKSRC}/childsplay.sh
echo 'cd ${MODPY_SITEPKG}/childsplay' >>${WRKSRC}/childsplay.sh
@@ -46,7 +43,7 @@ do-install:
cp -Rp ${WRKSRC}/locale ${PREFIX}/share
${INSTALL_DATA} ${WRKSRC}/sp_content.db \
${WRKINST}/${MODPY_SITEPKG}/childsplay
-.for i in SPWidgets alphabetsounds lib
+.for i in SPWidgets alphabet-sounds lib
cp -Rp ${WRKSRC}/$i ${WRKINST}/${MODPY_SITEPKG}/childsplay
 .endfor
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: distinfo
===
RCS file: /cvs/ports/games/childsplay/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo12 Sep 2014 06:37:12 -  1.7
+++ distinfo7 Mar 2021 16:45:33 -
@@ -1,2 +1,2 @@
-SHA256 (childsplay-2.6.5.tgz) = FrIy2z4YBuN3SOz1Y1I8/X2nj+a4amJcY+WJk7c8qIo=
-SIZE (childsplay-2.6.5.tgz) = 24091891
+SHA256 (childsplay-3.3.tgz) = Pcve+HIVBa3VqBH1BKZVk0upHUvIWgtt7ZMPRH68Ogc=
+SIZE (childsplay-3.3.tgz) = 33297165
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/childsplay/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   6 Jul 2014 09:09:10 -   1.4
+++ pkg/PLIST   7 Mar 2021 16:45:34 -
@@ -62,8 +62,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/dialogs.pyc
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.py
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.py
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.pyc
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.py
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.pyc
 lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/text.py
@@ -80,59 +78,1039 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/childsplay/Version.pyc
 lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.py
 lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/10.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/11.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/12.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/13.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/14.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/15.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/16.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/17.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/18.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/19.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/20.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0030.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0031.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0032.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0033.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0034.ogg

Re: childsplay needs py-numpy

2021-03-07 Thread Stuart Henderson 
On 2021/03/07 13:12, Remi Locherer wrote:
> Without numpy childsplay fails to start (see cairoimage.py).
> 
> OK?

ok.  I wonder if we should split off a py2-numpy..

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/childsplay/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile  23 Feb 2021 19:39:22 -  1.31
> +++ Makefile  7 Mar 2021 11:41:22 -
> @@ -4,7 +4,7 @@ COMMENT=  collection of educational activ
>  
>  DISTNAME=childsplay-2.6.5
>  EXTRACT_SUFX=.tgz
> -REVISION =   3
> +REVISION =   4
>  
>  CATEGORIES=  games education
>  
> @@ -23,6 +23,7 @@ BUILD_DEPENDS=  ${_MODPY_BUILD_DEPENDS}
>  
>  RUN_DEPENDS= databases/py-sqlalchemy \
>   devel/pygame \
> + math/py-numpy \
>   x11/py-gtk2
>  
>  NO_TEST= Yes
>

childsplay needs py-numpy

2021-03-07 Thread Remi Locherer 
Without numpy childsplay fails to start (see cairoimage.py).

OK?


Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile23 Feb 2021 19:39:22 -  1.31
+++ Makefile7 Mar 2021 11:41:22 -
@@ -4,7 +4,7 @@ COMMENT=collection of educational activ
 
 DISTNAME=  childsplay-2.6.5
 EXTRACT_SUFX=  .tgz
-REVISION = 3
+REVISION = 4
 
 CATEGORIES=games education
 
@@ -23,6 +23,7 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
 
 RUN_DEPENDS=   databases/py-sqlalchemy \
devel/pygame \
+   math/py-numpy \
x11/py-gtk2
 
 NO_TEST=   Yes