4 files changed, 100 insertions, 84 deletions

diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index 1b23f6f5b636..8b8bfc466ce1 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	childsplay_plugins
-PORTVERSION=	0.80.1.1
-PORTREVISION=	8
+PORTVERSION=	0.90
 CATEGORIES=	games
-MASTER_SITES=	SF/childsplay/OldFiles
+MASTER_SITES=	SF/childsplay/childsplay-plugins/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bruno@tinkerbox.org
diff --git a/games/childsplay_plugins/distinfo b/games/childsplay_plugins/distinfo
index 7ed3f343ad0c..7278e049b8e0 100644
--- a/games/childsplay_plugins/distinfo
+++ b/games/childsplay_plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (childsplay_plugins-0.80.1.1.tgz) = 3591a4f6945dae0d1493778a15fa2321
-SHA256 (childsplay_plugins-0.80.1.1.tgz) = 35abe0fac3bd35b13b251806e29028740e8242cfe870ab22a6fd617c0c726df2
-SIZE (childsplay_plugins-0.80.1.1.tgz) = 3352850
+MD5 (childsplay_plugins-0.90.tgz) = 2abd77c938ce4297c3a6190637833ca5
+SHA256 (childsplay_plugins-0.90.tgz) = 3eff00eb1fb20f59b503071e61ca21eaf869969bb7cdc5f644ece5f6e48664c3
+SIZE (childsplay_plugins-0.90.tgz) = 4528735
diff --git a/games/childsplay_plugins/files/patch-install.sh b/games/childsplay_plugins/files/patch-install.sh
index a2c7253905dc..b315f40a01af 100644
--- a/games/childsplay_plugins/files/patch-install.sh
+++ b/games/childsplay_plugins/files/patch-install.sh
@@ -1,20 +1,17 @@
-diff -U 4 -r -N ./install.sh.orig ./install.sh
---- ./install.sh.orig	Fri Mar 18 09:51:09 2005
-+++ ./install.sh	Tue Mar 22 18:33:38 2005
-@@ -1,5 +1,5 @@
+--- install.sh.orig	2007-08-25 14:53:40.000000000 +0700
++++ install.sh	2010-03-06 12:25:59.000000000 +0600
+@@ -1,4 +1,4 @@
 -#!/bin/bash 
 +#!/bin/sh 
  # install childsplay.  
  # Be aware that childsplay probably won't work when you edit this file :-(
  # As of 11/2004 childsplay will be converted to follow the File System
- # Hierarchy (FSH).
-@@ -18,16 +18,16 @@
- then PREFIX=$1
- fi
+@@ -20,14 +20,14 @@
  
  LOCALEDIR=$PREFIX/share/locale
+ MTDIR=$PREFIX/bin
 -ASSETMLDIR=/usr/share/assetml
-+ASSETMLDIR=$PREFIX/share/assetml
++ASSETMLDIR=${PREFIX}/share/assetml
  PYTHON=`which python`
  SCOREDIR=/var/games
  DOCDIR=$PREFIX/share/doc/childsplay
@@ -27,9 +24,7 @@ diff -U 4 -r -N ./install.sh.orig ./install.sh
  SHARELIBDATADIR=$SHAREDIR/lib
  SHAREDATADIR=$SHAREDIR/Data
  
- ##################################################
-@@ -66,23 +66,8 @@
- fi
+@@ -76,21 +76,6 @@
  
  set -e
  
@@ -50,17 +45,4 @@ diff -U 4 -r -N ./install.sh.orig ./install.sh
 -fi
  echo " Installing in $CPDIR"
  
- if [ `expr $VERSION \< $DEPEN` -eq 1 ]
- then
-@@ -91,11 +76,8 @@
-     echo "exit";
-     exit 1
- fi
- 
--
--echo "Compiling modules to bytecode..."
--$PYTHON $CPDIR/install.py --compile $CWD/lib
- 
- echo " Copy libraries"
- for DIR in `ls $CWD/lib`
- do 
+ echo "Compiling modules to bytecode..."
diff --git a/games/childsplay_plugins/pkg-plist b/games/childsplay_plugins/pkg-plist
index 53c7bcc28ab3..9af18a1364ab 100644
--- a/games/childsplay_plugins/pkg-plist
+++ b/games/childsplay_plugins/pkg-plist
@@ -1,4 +1,4 @@
-childsplay/lib/.#numberhunt.py.1.4
+bin/MT_users2csv.py
 childsplay/lib/billiard.py
 childsplay/lib/billiard.pyc
 childsplay/lib/fallingletters.py
@@ -7,21 +7,20 @@ childsplay/lib/findsound.py
 childsplay/lib/findsound.pyc
 childsplay/lib/findsound2.py
 childsplay/lib/findsound2.pyc
-childsplay/lib/in.ps
-childsplay/lib/in.ps~
-childsplay/lib/numberhunt.ps
+childsplay/lib/multiTables.py
+childsplay/lib/multiTables.pyc
 childsplay/lib/numbers.py
 childsplay/lib/numbers.pyc
-childsplay/lib/out.ps
 childsplay/lib/packid.py
 childsplay/lib/packid.pyc
 childsplay/lib/pong.py
 childsplay/lib/pong.pyc
+childsplay/lib/puzzle.py
+childsplay/lib/puzzle.pyc
 childsplay/lib/soundNpic.py
 childsplay/lib/soundNpic.pyc
 childsplay/lib/soundmemory.py
 childsplay/lib/soundmemory.pyc
-share/assetml/childsplay/sounds-misc/po/Translation.raw
 share/assetml/childsplay/sounds-misc/catmeow.ogg
 share/assetml/childsplay/sounds-misc/cow.ogg
 share/assetml/childsplay/sounds-misc/elephant.ogg
@@ -30,6 +29,7 @@ share/assetml/childsplay/sounds-misc/lion.ogg
 share/assetml/childsplay/sounds-misc/passby.ogg
 share/assetml/childsplay/sounds-misc/phone1.ogg
 share/assetml/childsplay/sounds-misc/plane.ogg
+share/assetml/childsplay/sounds-misc/po/Translation.raw
 share/assetml/childsplay/sounds-misc/police.ogg
 share/assetml/childsplay/sounds-misc/rocket.ogg
 share/assetml/childsplay/sounds-misc/rooster.ogg
@@ -40,16 +40,7 @@ share/assetml/childsplay/sounds-misc/sneeze3.ogg
 share/assetml/childsplay/sounds-misc/sounds-misc.assetml
 share/assetml/childsplay/sounds-misc/tomtom.ogg
 share/assetml/childsplay/sounds-misc/train.ogg
-share/childsplay/Data/icons/billiard.icon.png
-share/childsplay/Data/icons/soundNpic.icon.png
-share/childsplay/Data/icons/pong.icon.png
-share/childsplay/Data/icons/packid.icon.png
-share/childsplay/Data/icons/numbers.icon.png
-share/childsplay/Data/icons/findsound2.icon.png
-share/childsplay/Data/icons/findsound.icon.png
-share/childsplay/Data/icons/fallingletters.icon.png
-share/childsplay/Data/icons/soundmemory.icon.png
-share/childsplay/Data/AlphabetSounds/en/z.ogg
+share/childsplay/Data/AlphabetSounds/en/1.ogg
 share/childsplay/Data/AlphabetSounds/en/10.ogg
 share/childsplay/Data/AlphabetSounds/en/11.ogg
 share/childsplay/Data/AlphabetSounds/en/12.ogg
@@ -94,24 +85,36 @@ share/childsplay/Data/AlphabetSounds/en/v.ogg
 share/childsplay/Data/AlphabetSounds/en/w.ogg
 share/childsplay/Data/AlphabetSounds/en/x.ogg
 share/childsplay/Data/AlphabetSounds/en/y.ogg
-share/childsplay/Data/AlphabetSounds/en/1.ogg
-share/childsplay/lib/ConfigData/pongrc
-share/childsplay/lib/BilliardData/sndh.wav
+share/childsplay/Data/AlphabetSounds/en/z.ogg
+share/childsplay/Data/icons/billiard.icon.png
+share/childsplay/Data/icons/fallingletters.icon.png
+share/childsplay/Data/icons/findsound.icon.png
+share/childsplay/Data/icons/findsound2.icon.png
+share/childsplay/Data/icons/multiTables.icon.png
+share/childsplay/Data/icons/numbers.icon.png
+share/childsplay/Data/icons/packid.icon.png
+share/childsplay/Data/icons/pong.icon.png
+share/childsplay/Data/icons/puzzle.icon.png
+share/childsplay/Data/icons/soundNpic.icon.png
+share/childsplay/Data/icons/soundmemory.icon.png
+share/childsplay/lib/BilliardData/backgr.png
 share/childsplay/lib/BilliardData/ball1.png
 share/childsplay/lib/BilliardData/ball2.png
-share/childsplay/lib/BilliardData/backgr.png
+share/childsplay/lib/BilliardData/hole.png
+share/childsplay/lib/BilliardData/sndh.wav
 share/childsplay/lib/BilliardData/sndt.wav
 share/childsplay/lib/BilliardData/stick.png
-share/childsplay/lib/BilliardData/hole.png
-share/childsplay/lib/FallingLettersData/scenery2.png
+share/childsplay/lib/ConfigData/fallinglettersrc
+share/childsplay/lib/ConfigData/pongrc
 share/childsplay/lib/FallingLettersData/scenery0.png
 share/childsplay/lib/FallingLettersData/scenery1.png
+share/childsplay/lib/FallingLettersData/scenery2.png
 share/childsplay/lib/Findsound2Data/Data/back.jpg
 share/childsplay/lib/Findsound2Data/Data/soundbut.png
 share/childsplay/lib/FindsoundData/Data/back.jpg
 share/childsplay/lib/FindsoundData/Data/soundbut.png
-share/childsplay/lib/FindsoundData/Images/level1/elephant.png
 share/childsplay/lib/FindsoundData/Images/level1/cow.png
+share/childsplay/lib/FindsoundData/Images/level1/elephant.png
 share/childsplay/lib/FindsoundData/Images/level1/frog.png
 share/childsplay/lib/FindsoundData/Images/level1/lion.png
 share/childsplay/lib/FindsoundData/Images/level1/rooster.png
@@ -127,8 +130,8 @@ share/childsplay/lib/FindsoundData/Images/level3/guitar.png
 share/childsplay/lib/FindsoundData/Images/level3/harp.png
 share/childsplay/lib/FindsoundData/Images/level3/piano.png
 share/childsplay/lib/FindsoundData/Images/level3/violin.png
-share/childsplay/lib/FindsoundData/Sounds/level1/elephant.ogg
 share/childsplay/lib/FindsoundData/Sounds/level1/cow.ogg
+share/childsplay/lib/FindsoundData/Sounds/level1/elephant.ogg
 share/childsplay/lib/FindsoundData/Sounds/level1/frog.ogg
 share/childsplay/lib/FindsoundData/Sounds/level1/lion.ogg
 share/childsplay/lib/FindsoundData/Sounds/level1/rooster.ogg
@@ -144,9 +147,15 @@ share/childsplay/lib/FindsoundData/Sounds/level3/guitar.ogg
 share/childsplay/lib/FindsoundData/Sounds/level3/harp.ogg
 share/childsplay/lib/FindsoundData/Sounds/level3/piano.ogg
 share/childsplay/lib/FindsoundData/Sounds/level3/violin.ogg
+share/childsplay/lib/MultiTablesData/arrow.gif
+share/childsplay/lib/MultiTablesData/correct.wav
+share/childsplay/lib/MultiTablesData/failed.ogg
+share/childsplay/lib/MultiTablesData/levelarrow.gif
+share/childsplay/lib/MultiTablesData/tablesdiploma.png
+share/childsplay/lib/MultiTablesData/victory.ogg
 share/childsplay/lib/NumbersData/balloon.png
 share/childsplay/lib/NumbersData/shot.wav
-share/childsplay/lib/PackidData/words-nl
+share/childsplay/lib/PackidData/aardbei.png
 share/childsplay/lib/PackidData/appel.png
 share/childsplay/lib/PackidData/banaan.png
 share/childsplay/lib/PackidData/brick.png
@@ -183,28 +192,36 @@ share/childsplay/lib/PackidData/peer.png
 share/childsplay/lib/PackidData/sea.png
 share/childsplay/lib/PackidData/waka.wav
 share/childsplay/lib/PackidData/walk.wav
+share/childsplay/lib/PackidData/words-ar
+share/childsplay/lib/PackidData/words-ca
 share/childsplay/lib/PackidData/words-de
 share/childsplay/lib/PackidData/words-en
 share/childsplay/lib/PackidData/words-es
 share/childsplay/lib/PackidData/words-fr
-share/childsplay/lib/PackidData/aardbei.png
+share/childsplay/lib/PackidData/words-he
+share/childsplay/lib/PackidData/words-id
+share/childsplay/lib/PackidData/words-nl
+share/childsplay/lib/PackidData/words-no
+share/childsplay/lib/PackidData/words-pt
+share/childsplay/lib/PackidData/words-sl
+share/childsplay/lib/PackidData/words-sv
+share/childsplay/lib/PongData/arrow_down.png
 share/childsplay/lib/PongData/arrow_up.png
+share/childsplay/lib/PongData/bump.wav
+share/childsplay/lib/PongData/goal.wav
 share/childsplay/lib/PongData/loser.jpg
 share/childsplay/lib/PongData/multi_pc.jpg
 share/childsplay/lib/PongData/multi_person.jpg
 share/childsplay/lib/PongData/pick.wav
 share/childsplay/lib/PongData/single.jpg
 share/childsplay/lib/PongData/winner.jpg
-share/childsplay/lib/PongData/arrow_down.png
-share/childsplay/lib/PongData/bump.wav
-share/childsplay/lib/PongData/goal.wav
 share/childsplay/lib/PongData/winner.ogg
 share/childsplay/lib/SoundMemory/but_back.png
 share/childsplay/lib/SoundMemory/but_bleu_up.png
 share/childsplay/lib/SoundMemory/but_red_down.png
-share/childsplay/lib/SoundNpicData/Level1/sheep.png
 share/childsplay/lib/SoundNpicData/Level1/cow.ogg
 share/childsplay/lib/SoundNpicData/Level1/cow.png
+share/childsplay/lib/SoundNpicData/Level1/elephant.ogg
 share/childsplay/lib/SoundNpicData/Level1/elephant.png
 share/childsplay/lib/SoundNpicData/Level1/frog.ogg
 share/childsplay/lib/SoundNpicData/Level1/frog.png
@@ -213,28 +230,46 @@ share/childsplay/lib/SoundNpicData/Level1/lion.png
 share/childsplay/lib/SoundNpicData/Level1/rooster.ogg
 share/childsplay/lib/SoundNpicData/Level1/rooster.png
 share/childsplay/lib/SoundNpicData/Level1/sheep.ogg
-share/childsplay/lib/SoundNpicData/Level1/elephant.ogg
-@dirrm share/assetml/childsplay/sounds-misc/po
-@dirrm share/assetml/childsplay/sounds-misc
-@dirrm share/childsplay/Data/AlphabetSounds/en
-@dirrm share/childsplay/Data/AlphabetSounds
-@dirrm share/childsplay/lib/BilliardData
-@dirrm share/childsplay/lib/FallingLettersData
-@dirrm share/childsplay/lib/Findsound2Data/Data
-@dirrm share/childsplay/lib/Findsound2Data
-@dirrm share/childsplay/lib/FindsoundData/Data
-@dirrm share/childsplay/lib/FindsoundData/Images/level1
-@dirrm share/childsplay/lib/FindsoundData/Images/level2
-@dirrm share/childsplay/lib/FindsoundData/Images/level3
-@dirrm share/childsplay/lib/FindsoundData/Images
-@dirrm share/childsplay/lib/FindsoundData/Sounds/level1
-@dirrm share/childsplay/lib/FindsoundData/Sounds/level2
+share/childsplay/lib/SoundNpicData/Level1/sheep.png
+share/childsplay/lib/puzzleData/birthday_cake.png
+share/childsplay/lib/puzzleData/boat.png
+share/childsplay/lib/puzzleData/bus.png
+share/childsplay/lib/puzzleData/car01.png
+share/childsplay/lib/puzzleData/chick-hatched.png
+share/childsplay/lib/puzzleData/frog.png
+share/childsplay/lib/puzzleData/grapes.png
+share/childsplay/lib/puzzleData/miner.png
+share/childsplay/lib/puzzleData/paint.png
+share/childsplay/lib/puzzleData/pineapple.png
+share/childsplay/lib/puzzleData/slate.png
+share/childsplay/lib/puzzleData/tux.png
+share/childsplay/lib/puzzleData/wooden_cottage.png
+share/doc/childsplay/README
+share/doc/childsplay/README-PACKID
+share/doc/childsplay/README.MT_users2csv
+@dirrm share/childsplay/lib/puzzleData
+@dirrm share/childsplay/lib/SoundNpicData/Level1
+@dirrm share/childsplay/lib/SoundNpicData
+@dirrm share/childsplay/lib/SoundMemory
+@dirrm share/childsplay/lib/PongData
+@dirrm share/childsplay/lib/PackidData
+@dirrm share/childsplay/lib/NumbersData
+@dirrm share/childsplay/lib/MultiTablesData
 @dirrm share/childsplay/lib/FindsoundData/Sounds/level3
+@dirrm share/childsplay/lib/FindsoundData/Sounds/level2
+@dirrm share/childsplay/lib/FindsoundData/Sounds/level1
 @dirrm share/childsplay/lib/FindsoundData/Sounds
+@dirrm share/childsplay/lib/FindsoundData/Images/level3
+@dirrm share/childsplay/lib/FindsoundData/Images/level2
+@dirrm share/childsplay/lib/FindsoundData/Images/level1
+@dirrm share/childsplay/lib/FindsoundData/Images
+@dirrm share/childsplay/lib/FindsoundData/Data
 @dirrm share/childsplay/lib/FindsoundData
-@dirrm share/childsplay/lib/NumbersData
-@dirrm share/childsplay/lib/PackidData
-@dirrm share/childsplay/lib/PongData
-@dirrm share/childsplay/lib/SoundMemory
-@dirrm share/childsplay/lib/SoundNpicData/Level1
-@dirrm share/childsplay/lib/SoundNpicData
+@dirrm share/childsplay/lib/Findsound2Data/Data
+@dirrm share/childsplay/lib/Findsound2Data
+@dirrm share/childsplay/lib/FallingLettersData
+@dirrm share/childsplay/lib/BilliardData
+@dirrm share/childsplay/Data/AlphabetSounds/en
+@dirrm share/childsplay/Data/AlphabetSounds
+@dirrm share/assetml/childsplay/sounds-misc/po
+@dirrm share/assetml/childsplay/sounds-misc