Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Aug 2014 14:34:09 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366768 - in head: . games games/childsplay games/childsplay_plugins
Message-ID:  <201408311434.s7VEY93J072572@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sun Aug 31 14:34:08 2014
New Revision: 366768
URL: http://svnweb.freebsd.org/changeset/ports/366768
QAT: https://qat.redports.org/buildarchive/r366768/

Log:
  Unbreak childsplay by following it to its new WWW and MASTER_SITES.
  
  Update it to 1.6.3.
  
  childsplay_plugins doesn't seem to exist at all anymore, so remove it.

Deleted:
  head/games/childsplay_plugins/
Modified:
  head/MOVED
  head/games/Makefile
  head/games/childsplay/Makefile
  head/games/childsplay/distinfo
  head/games/childsplay/pkg-descr
  head/games/childsplay/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/MOVED	Sun Aug 31 14:34:08 2014	(r366768)
@@ -6518,3 +6518,4 @@ print/nl-acroread8||2014-08-30|Deprecate
 print/no-acroread8||2014-08-30|Deprecated: many security issues are reported and Adobe no longer actively supports Adobe Reader for Unix
 print/sv-acroread8||2014-08-30|Deprecated: many security issues are reported and Adobe no longer actively supports Adobe Reader for Unix
 net-p2p/p5-Net-DirectConnect-TigerHash||2014-08-31|Broken for many months and security/p5-Crypt-RHash is a suitable replacement
+games/childsplay_plugins||2014-08-31|Plugins package is no longer created for new versions of childsplay

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/games/Makefile	Sun Aug 31 14:34:08 2014	(r366768)
@@ -139,7 +139,6 @@
     SUBDIR += cheech
     SUBDIR += chessx
     SUBDIR += childsplay
-    SUBDIR += childsplay_plugins
     SUBDIR += chocolate-doom
     SUBDIR += chroma
     SUBDIR += chromium-bsu

Modified: head/games/childsplay/Makefile
==============================================================================
--- head/games/childsplay/Makefile	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/games/childsplay/Makefile	Sun Aug 31 14:34:08 2014	(r366768)
@@ -2,34 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	childsplay
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/Childsplay/
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Educative games for children
 
 LICENSE=	GPLv3
 
-BROKEN=		Unfetchable
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 
 NO_BUILD=	yes
 
-USES=		gettext shebangfix tar:tgz
+USES=		gettext shebangfix tar:tgz python:2
 USE_GNOME=	pygtk2
-USE_PYTHON=	2
 
 python_OLD_CMD=	/usr/bin/env python
-python_CMD=	/usr/bin/env python2
+python_CMD=	${SETENV} python2
 SHEBANG_FILES=	childsplay.py
+.for i in buttons funcs text dialogs gtk_widgets base
+SHEBANG_FILES+=	SPWidgets/$i.py
+.endfor
 
 DESKTOP_ENTRIES="Childsplay" "" "" "${PORTNAME}" "Game;Education;" ""
 
+CHILDSPLAYDIR=	${PYTHONPREFIX_SITELIBDIR}/childsplay
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/NoGtk/s|True|False|' ${WRKSRC}/SPConstants.py
@@ -39,25 +40,19 @@ post-patch:
 do-configure:
 	@${ECHO_CMD} "#!${SH}" > ${WRKDIR}/childsplay.sh
 	@${ECHO_CMD} >> ${WRKDIR}/childsplay.sh
-	@${ECHO_CMD} 'cd "${PYTHONPREFIX_SITELIBDIR}/childsplay"' >> ${WRKDIR}/childsplay.sh
+	@${ECHO_CMD} 'cd "${CHILDSPLAYDIR}"' >> ${WRKDIR}/childsplay.sh
 	@${ECHO_CMD} 'exec ${PYTHON_CMD} childsplay.py $$@' >> ${WRKDIR}/childsplay.sh
 
 do-install:
-	(cd ${WRKDIR} && ${INSTALL_SCRIPT} childsplay.sh \
-		${STAGEDIR}/${PREFIX}/bin/childsplay)
-	@${MKDIR} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/childsplay
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.py \
-		${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/childsplay)
-.for i in SPWidgets alphabetsounds lib
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} \
-		${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/childsplay)
-.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/childsplay.sh ${STAGEDIR}${PREFIX}/bin/childsplay
+	@${MKDIR} ${STAGEDIR}${CHILDSPLAYDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${CHILDSPLAYDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "SPWidgets alphabetsounds lib" \
+		${STAGEDIR}${CHILDSPLAYDIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share)
+	${INSTALL_DATA} ${WRKSRC}/sp_content.db ${STAGEDIR}${CHILDSPLAYDIR}
+
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
-	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/locale
-	(cd ${WRKSRC}/locale && ${COPYTREE_SHARE} . \
-		${STAGEDIR}/${PREFIX}/share/locale)
-	${INSTALL_DATA} ${WRKSRC}/sp_content.db \
-		${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/childsplay
 
 .include <bsd.port.mk>

Modified: head/games/childsplay/distinfo
==============================================================================
--- head/games/childsplay/distinfo	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/games/childsplay/distinfo	Sun Aug 31 14:34:08 2014	(r366768)
@@ -1,2 +1,2 @@
-SHA256 (childsplay-2.5.tgz) = 832e25b2c74c8120b43c24e523d97c28c656267bbf0fa5eb3998b1a09764bd4d
-SIZE (childsplay-2.5.tgz) = 24255083
+SHA256 (childsplay-2.6.3.tgz) = 7755b49f718c30ad613fe7cd2285e3c17b04e615b59555746f4e79544171c4a9
+SIZE (childsplay-2.6.3.tgz) = 24257284

Modified: head/games/childsplay/pkg-descr
==============================================================================
--- head/games/childsplay/pkg-descr	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/games/childsplay/pkg-descr	Sun Aug 31 14:34:08 2014	(r366768)
@@ -5,4 +5,4 @@ easy. Childsplay uses a plugin system fo
 to check the childsplay-plugins page. (There are two built-in games;
 Memory and a typing game)
 
-WWW: http://childsplay.sourceforge.net
+WWW: http://www.childsplay.mobi

Modified: head/games/childsplay/pkg-plist
==============================================================================
--- head/games/childsplay/pkg-plist	Sun Aug 31 14:31:25 2014	(r366767)
+++ head/games/childsplay/pkg-plist	Sun Aug 31 14:34:08 2014	(r366768)
@@ -366,6 +366,7 @@ bin/childsplay
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/sounds/blub0.wav
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/sounds/glockenschmoutz.ogg
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/sounds/poolsplash.wav
+%%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FlashcardsData/flashcards.rc
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FourrowData/1.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FourrowData/10.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FourrowData/2.png
@@ -907,7 +908,6 @@ bin/childsplay
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/gui/themes/seniorplay/81px_right_green.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/gui/themes/seniorplay/SPWidgets.rc
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/SP_menu.xml
-%%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/SP_menu.xml.back
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/background.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/bottom_menubar.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/core_info_button.png
@@ -947,6 +947,8 @@ bin/childsplay
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/findsound_ro.icon.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/fishtank.icon.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/fishtank_ro.icon.png
+%%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/flashcards.icon.png
+%%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/flashcards_ro.icon.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/fourrow.icon.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/fourrow_ro.icon.png
 %%PYTHON_SITELIBDIR%%/childsplay/lib/SPData/themes/childsplay/menuicons/ichanger.icon.png
@@ -1196,6 +1198,8 @@ bin/childsplay
 %%PYTHON_SITELIBDIR%%/childsplay/lib/findsound.pyc
 %%PYTHON_SITELIBDIR%%/childsplay/lib/fishtank.py
 %%PYTHON_SITELIBDIR%%/childsplay/lib/fishtank.pyc
+%%PYTHON_SITELIBDIR%%/childsplay/lib/flashcards.py
+%%PYTHON_SITELIBDIR%%/childsplay/lib/flashcards.pyc
 %%PYTHON_SITELIBDIR%%/childsplay/lib/fourrow.py
 %%PYTHON_SITELIBDIR%%/childsplay/lib/fourrow.pyc
 %%PYTHON_SITELIBDIR%%/childsplay/lib/ichanger.py
@@ -1353,6 +1357,7 @@ share/locale/vi/LC_MESSAGES/childsplay.m
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/IchangerData/images
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/IchangerData
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FourrowData
+@dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FlashcardsData
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/sounds
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/backgrounds/seniorplay
 @dirrm %%PYTHON_SITELIBDIR%%/childsplay/lib/CPData/FishtankData/backgrounds/childsplay



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408311434.s7VEY93J072572>