Update to 0.9.6.

10 files changed, 316 insertions, 202 deletions

diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index d7cdc67333d7..df716c65c4cb 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gcompris
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.6
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/games/gcompris/distinfo b/games/gcompris/distinfo
index e8c78d0daa6f..cb5ad5c1f65d 100644
--- a/games/gcompris/distinfo
+++ b/games/gcompris/distinfo
@@ -1 +1 @@
-MD5 (gcompris-0.9.2.tar.gz) = 3e6c7fd8b7676bcb43ca4df5a97e8c41
+MD5 (gcompris-0.9.6.tgz) = 55e2cb96fedbcf9cd0d8c415328de370
diff --git a/games/gcompris/files/patch-ac b/games/gcompris/files/patch-ac
index 4768fa465758..f7129bd61e53 100644
--- a/games/gcompris/files/patch-ac
+++ b/games/gcompris/files/patch-ac
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu Oct 25 15:10:26 2001
-+++ Makefile.in	Thu Oct 25 15:14:53 2001
+--- Makefile.in.orig	Wed Dec 19 12:49:19 2001
++++ Makefile.in	Wed Dec 19 13:21:48 2001
 @@ -192,9 +192,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
@@ -25,19 +25,24 @@ $FreeBSD$
  		install-data-local
  install-data: install-data-recursive
  
-@@ -498,13 +498,13 @@
+@@ -498,16 +498,16 @@
  	@$(NORMAL_INSTALL)
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+-	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in >/tmp/GCOMPRIS_LIST.txt ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
  	fi
  
  dist-hook:
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+-	  find @PACKAGE_DATA_DIR@ -name \*~  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  find @PACKAGE_DATA_DIR@ -name \*~ >/tmp/GCOMPRIS_LIST.txt ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
  	fi
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/gcompris/files/patch-src::gcompris::Makefile.in b/games/gcompris/files/patch-src::gcompris::Makefile.in
new file mode 100644
index 000000000000..f33d171eb367
--- /dev/null
+++ b/games/gcompris/files/patch-src::gcompris::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/gcompris/Makefile.in	2001/12/19 10:53:08	1.1
++++ src/gcompris/Makefile.in	2001/12/19 10:53:29
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ plugindir = @plugindir@
+ 
+-INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	$(GDK_PIXBUF_CFLAGS)	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gcompris
diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index 3e841782fdf4..446ea5119d1a 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -1,15 +1,20 @@
 bin/gcompris
 info/gcompris.info
 lib/gcompris/libalgebra.so
+lib/gcompris/libclick_on_letter.so
 lib/gcompris/libclickgame.so
 lib/gcompris/libclockgame.so
 lib/gcompris/libdraw.so
+lib/gcompris/liberase.so
 lib/gcompris/libgletters.so
 lib/gcompris/libimageid.so
+lib/gcompris/liblocale.so
 lib/gcompris/libmemory.so
 lib/gcompris/libmenu.so
+lib/gcompris/libmissingletter.so
 lib/gcompris/libparatrooper.so
 lib/gcompris/libplanegame.so
+lib/gcompris/librailroad.so
 lib/gcompris/libreading.so
 lib/gcompris/libshapegame.so
 lib/gcompris/libsmallnumbers.so
@@ -17,32 +22,28 @@ lib/gcompris/libwordsgame.so
 share/gnome/apps/Games/gcompris.desktop
 share/gnome/gcompris/boards/Makefile
 share/gnome/gcompris/boards/Makefile.am
-share/gnome/gcompris/boards/Makefile.am~
 share/gnome/gcompris/boards/Makefile.in
 share/gnome/gcompris/boards/README
-share/gnome/gcompris/boards/algebra.xml
-share/gnome/gcompris/boards/algebra.xml.in
-share/gnome/gcompris/boards/algebra.xml.in~
+share/gnome/gcompris/boards/algebra_by.xml
+share/gnome/gcompris/boards/algebra_by.xml.in
+share/gnome/gcompris/boards/algebra_div.xml
+share/gnome/gcompris/boards/algebra_div.xml.in
+share/gnome/gcompris/boards/algebra_minus.xml
+share/gnome/gcompris/boards/algebra_minus.xml.in
+share/gnome/gcompris/boards/algebra_plus.xml
+share/gnome/gcompris/boards/algebra_plus.xml.in
 share/gnome/gcompris/boards/algebramenu.xml
 share/gnome/gcompris/boards/algebramenu.xml.in
-share/gnome/gcompris/boards/algebramenu.xml.in~
 share/gnome/gcompris/boards/babymatch.xml
 share/gnome/gcompris/boards/babymatch.xml.in
-share/gnome/gcompris/boards/babymatch.xml.in~
 share/gnome/gcompris/boards/babymatch/board1_0.xml
-share/gnome/gcompris/boards/babymatch/board1_0.xml~
 share/gnome/gcompris/boards/babymatch/board2_0.xml
-share/gnome/gcompris/boards/babymatch/board2_0.xml~
 share/gnome/gcompris/boards/babymatch/board3_0.xml
-share/gnome/gcompris/boards/babymatch/board3_0.xml~
 share/gnome/gcompris/boards/babymatch/board4_0.xml
-share/gnome/gcompris/boards/babymatch/board4_0.xml~
 share/gnome/gcompris/boards/babymatch/board5_0.xml
 share/gnome/gcompris/boards/babymatch/board6_0.xml
-share/gnome/gcompris/boards/babymatch/board6_0.xml~
 share/gnome/gcompris/boards/babyshapes.xml
 share/gnome/gcompris/boards/babyshapes.xml.in
-share/gnome/gcompris/boards/babyshapes.xml.in~
 share/gnome/gcompris/boards/babyshapes/T_banana.png
 share/gnome/gcompris/boards/babyshapes/T_circle.png
 share/gnome/gcompris/boards/babyshapes/T_colonne.png
@@ -64,13 +65,9 @@ share/gnome/gcompris/boards/babyshapes/T_toron.png
 share/gnome/gcompris/boards/babyshapes/T_triangle.png
 share/gnome/gcompris/boards/babyshapes/banana.png
 share/gnome/gcompris/boards/babyshapes/board1_0.xml
-share/gnome/gcompris/boards/babyshapes/board1_0.xml~
 share/gnome/gcompris/boards/babyshapes/board2_0.xml
-share/gnome/gcompris/boards/babyshapes/board2_0.xml~
 share/gnome/gcompris/boards/babyshapes/board3_0.xml
-share/gnome/gcompris/boards/babyshapes/board3_0.xml~
 share/gnome/gcompris/boards/babyshapes/board4_0.xml
-share/gnome/gcompris/boards/babyshapes/board4_0.xml~
 share/gnome/gcompris/boards/babyshapes/circle.png
 share/gnome/gcompris/boards/babyshapes/colonne.png
 share/gnome/gcompris/boards/babyshapes/cone.png
@@ -89,23 +86,37 @@ share/gnome/gcompris/boards/babyshapes/sphere.png
 share/gnome/gcompris/boards/babyshapes/star.png
 share/gnome/gcompris/boards/babyshapes/toron.png
 share/gnome/gcompris/boards/babyshapes/triangle.png
-share/gnome/gcompris/boards/boardicons/algebra.png
+share/gnome/gcompris/boards/boardicons/algebra_by.png
+share/gnome/gcompris/boards/boardicons/algebra_div.png
+share/gnome/gcompris/boards/boardicons/algebra_minus.png
+share/gnome/gcompris/boards/boardicons/algebra_plus.png
 share/gnome/gcompris/boards/boardicons/algebramenu.png
 share/gnome/gcompris/boards/boardicons/babymatch.png
 share/gnome/gcompris/boards/boardicons/babyshapes.png
 share/gnome/gcompris/boards/boardicons/book.png
+share/gnome/gcompris/boards/boardicons/click_on_letter.png
 share/gnome/gcompris/boards/boardicons/clickgame.png
 share/gnome/gcompris/boards/boardicons/clockgame.png
 share/gnome/gcompris/boards/boardicons/colornforms.png
 share/gnome/gcompris/boards/boardicons/computer.png
 share/gnome/gcompris/boards/boardicons/draw.png
+share/gnome/gcompris/boards/boardicons/erase.png
 share/gnome/gcompris/boards/boardicons/fun.png
 share/gnome/gcompris/boards/boardicons/gletters.png
 share/gnome/gcompris/boards/boardicons/imageid.png
 share/gnome/gcompris/boards/boardicons/imagename.png
+share/gnome/gcompris/boards/boardicons/locale.png
+share/gnome/gcompris/boards/boardicons/locale_de.png
+share/gnome/gcompris/boards/boardicons/locale_el.png
+share/gnome/gcompris/boards/boardicons/locale_en.png
+share/gnome/gcompris/boards/boardicons/locale_es.png
+share/gnome/gcompris/boards/boardicons/locale_fr.png
+share/gnome/gcompris/boards/boardicons/locale_sv.png
 share/gnome/gcompris/boards/boardicons/matritsa.png
 share/gnome/gcompris/boards/boardicons/memory.png
+share/gnome/gcompris/boards/boardicons/missing_letter.png
 share/gnome/gcompris/boards/boardicons/planegame.png
+share/gnome/gcompris/boards/boardicons/railroad.png
 share/gnome/gcompris/boards/boardicons/reading.png
 share/gnome/gcompris/boards/boardicons/readingh.png
 share/gnome/gcompris/boards/boardicons/scalesicon.png
@@ -113,18 +124,16 @@ share/gnome/gcompris/boards/boardicons/shapegame.png
 share/gnome/gcompris/boards/boardicons/smallnumbers.png
 share/gnome/gcompris/boards/boardicons/tuxpara.png
 share/gnome/gcompris/boards/boardicons/wordsgame.png
+share/gnome/gcompris/boards/click_on_letter.xml
+share/gnome/gcompris/boards/click_on_letter.xml.in
 share/gnome/gcompris/boards/clickgame.xml
 share/gnome/gcompris/boards/clickgame.xml.in
-share/gnome/gcompris/boards/clickgame.xml.in~
 share/gnome/gcompris/boards/clockgame.xml
 share/gnome/gcompris/boards/clockgame.xml.in
-share/gnome/gcompris/boards/clockgame.xml.in~
 share/gnome/gcompris/boards/computer.xml
 share/gnome/gcompris/boards/computer.xml.in
-share/gnome/gcompris/boards/computer.xml.in~
 share/gnome/gcompris/boards/draw.xml
 share/gnome/gcompris/boards/draw.xml.in
-share/gnome/gcompris/boards/draw.xml.in~
 share/gnome/gcompris/boards/draw/color-selector.jpg
 share/gnome/gcompris/boards/draw/draw-bg.jpg
 share/gnome/gcompris/boards/draw/tool-circle.png
@@ -138,6 +147,8 @@ share/gnome/gcompris/boards/draw/tool-move.png
 share/gnome/gcompris/boards/draw/tool-rectangle.png
 share/gnome/gcompris/boards/draw/tool-resize.png
 share/gnome/gcompris/boards/draw/tool-selector.jpg
+share/gnome/gcompris/boards/erase.xml
+share/gnome/gcompris/boards/erase.xml.in
 share/gnome/gcompris/boards/fishes/QueenAngel_0.png
 share/gnome/gcompris/boards/fishes/QueenAngel_1.png
 share/gnome/gcompris/boards/fishes/blueking2_0.png
@@ -202,15 +213,21 @@ share/gnome/gcompris/boards/fishes/teeth_6.png
 share/gnome/gcompris/boards/fishes/teeth_7.png
 share/gnome/gcompris/boards/fun.xml
 share/gnome/gcompris/boards/fun.xml.in
-share/gnome/gcompris/boards/fun.xml.in~
 share/gnome/gcompris/boards/gcompris/README
+share/gnome/gcompris/boards/gcompris/bonus/README
+share/gnome/gcompris/boards/gcompris/bonus/flower_bad.png
+share/gnome/gcompris/boards/gcompris/bonus/flower_good.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_bad.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_good.png
 share/gnome/gcompris/boards/gcompris/buttons/bad.png
 share/gnome/gcompris/boards/gcompris/buttons/bar_bg.jpg
 share/gnome/gcompris/boards/gcompris/buttons/button.png
+share/gnome/gcompris/boards/gcompris/buttons/button_large.png
+share/gnome/gcompris/boards/gcompris/buttons/button_large2.png
+share/gnome/gcompris/boards/gcompris/buttons/button_selected.png
 share/gnome/gcompris/boards/gcompris/buttons/button_small.png
 share/gnome/gcompris/boards/gcompris/buttons/button_style.png
+share/gnome/gcompris/boards/gcompris/buttons/difficulty_star.png
 share/gnome/gcompris/boards/gcompris/buttons/help.png
 share/gnome/gcompris/boards/gcompris/buttons/home.png
 share/gnome/gcompris/boards/gcompris/buttons/horver.png
@@ -224,7 +241,9 @@ share/gnome/gcompris/boards/gcompris/buttons/level6.png
 share/gnome/gcompris/boards/gcompris/buttons/level7.png
 share/gnome/gcompris/boards/gcompris/buttons/level8.png
 share/gnome/gcompris/boards/gcompris/buttons/level9.png
+share/gnome/gcompris/boards/gcompris/buttons/menuicon.png
 share/gnome/gcompris/boards/gcompris/buttons/ok.png
+share/gnome/gcompris/boards/gcompris/buttons/repeat.png
 share/gnome/gcompris/boards/gcompris/dialogbox.png
 share/gnome/gcompris/boards/gcompris/dice/gnome-dice0.png
 share/gnome/gcompris/boards/gcompris/dice/gnome-dice1.png
@@ -311,7 +330,6 @@ share/gnome/gcompris/boards/gcompris/letters/x.png
 share/gnome/gcompris/boards/gcompris/letters/y.png
 share/gnome/gcompris/boards/gcompris/letters/z.png
 share/gnome/gcompris/boards/gcompris/misc/README
-share/gnome/gcompris/boards/gcompris/misc/README~
 share/gnome/gcompris/boards/gcompris/misc/apple.png
 share/gnome/gcompris/boards/gcompris/misc/backcard.png
 share/gnome/gcompris/boards/gcompris/misc/bicycle.png
@@ -323,6 +341,8 @@ share/gnome/gcompris/boards/gcompris/misc/cerise.png
 share/gnome/gcompris/boards/gcompris/misc/cloud.png
 share/gnome/gcompris/boards/gcompris/misc/cocotier.png
 share/gnome/gcompris/boards/gcompris/misc/crown.png
+share/gnome/gcompris/boards/gcompris/misc/door1.png
+share/gnome/gcompris/boards/gcompris/misc/door2.png
 share/gnome/gcompris/boards/gcompris/misc/egg.png
 share/gnome/gcompris/boards/gcompris/misc/eggpot.png
 share/gnome/gcompris/boards/gcompris/misc/emptycard.png
@@ -341,6 +361,7 @@ share/gnome/gcompris/boards/gcompris/misc/minivan.png
 share/gnome/gcompris/boards/gcompris/misc/parachute.png
 share/gnome/gcompris/boards/gcompris/misc/peer.png
 share/gnome/gcompris/boards/gcompris/misc/pencil.png
+share/gnome/gcompris/boards/gcompris/misc/phone_note.png
 share/gnome/gcompris/boards/gcompris/misc/plane.png
 share/gnome/gcompris/boards/gcompris/misc/postcard.png
 share/gnome/gcompris/boards/gcompris/misc/postpoint.png
@@ -367,11 +388,8 @@ share/gnome/gcompris/boards/gcompris/nur03013.jpg
 share/gnome/gcompris/boards/gcompris/nur03505.jpg
 share/gnome/gcompris/boards/gletters.xml
 share/gnome/gcompris/boards/gletters.xml.in
-share/gnome/gcompris/boards/gletters.xml.in~
-share/gnome/gcompris/boards/gletters.xml~
 share/gnome/gcompris/boards/imageid.xml
 share/gnome/gcompris/boards/imageid.xml.in
-share/gnome/gcompris/boards/imageid.xml.in~
 share/gnome/gcompris/boards/imageid/ballon.png
 share/gnome/gcompris/boards/imageid/banana.png
 share/gnome/gcompris/boards/imageid/bed.png
@@ -379,34 +397,41 @@ share/gnome/gcompris/boards/imageid/biberon.png
 share/gnome/gcompris/boards/imageid/board1.xml
 share/gnome/gcompris/boards/imageid/cake.png
 share/gnome/gcompris/boards/imageid/cartable.png
+share/gnome/gcompris/boards/imageid/imageid-bg.jpg
 share/gnome/gcompris/boards/imageid/maison.png
 share/gnome/gcompris/boards/imageid/pomme.png
 share/gnome/gcompris/boards/imagename.xml
 share/gnome/gcompris/boards/imagename.xml.in
-share/gnome/gcompris/boards/imagename.xml.in~
 share/gnome/gcompris/boards/imagename/board1_0.xml
-share/gnome/gcompris/boards/imagename/board1_0.xml~
 share/gnome/gcompris/boards/imagename/board2_0.xml
-share/gnome/gcompris/boards/imagename/board2_0.xml~
 share/gnome/gcompris/boards/imagename/board3_0.xml
-share/gnome/gcompris/boards/imagename/board3_0.xml~
 share/gnome/gcompris/boards/imagename/board4_0.xml
-share/gnome/gcompris/boards/imagename/board4_0.xml~
 share/gnome/gcompris/boards/imagename/board5_0.xml
-share/gnome/gcompris/boards/imagename/board5_0.xml~
 share/gnome/gcompris/boards/imagename/board6_0.xml
-share/gnome/gcompris/boards/imagename/board6_0.xml~
+share/gnome/gcompris/boards/locale.xml
+share/gnome/gcompris/boards/locale.xml.in
+share/gnome/gcompris/boards/locale_de.xml
+share/gnome/gcompris/boards/locale_de.xml.in
+share/gnome/gcompris/boards/locale_el.xml
+share/gnome/gcompris/boards/locale_el.xml.in
+share/gnome/gcompris/boards/locale_en.xml
+share/gnome/gcompris/boards/locale_en.xml.in
+share/gnome/gcompris/boards/locale_es.xml
+share/gnome/gcompris/boards/locale_es.xml.in
+share/gnome/gcompris/boards/locale_fr.xml
+share/gnome/gcompris/boards/locale_fr.xml.in
+share/gnome/gcompris/boards/locale_sv.xml
+share/gnome/gcompris/boards/locale_sv.xml.in
 share/gnome/gcompris/boards/memory.xml
 share/gnome/gcompris/boards/memory.xml.in
-share/gnome/gcompris/boards/memory.xml.in~
-share/gnome/gcompris/boards/memory.xml~
-share/gnome/gcompris/boards/memory/backcard.png
 share/gnome/gcompris/boards/menu.xml
 share/gnome/gcompris/boards/menu.xml.in
-share/gnome/gcompris/boards/menu.xml.in~
+share/gnome/gcompris/boards/missing_letter.xml
+share/gnome/gcompris/boards/missing_letter.xml.in
+share/gnome/gcompris/boards/missing_letter/board1.xml
+share/gnome/gcompris/boards/missing_letter/missingletter-bg.jpg
 share/gnome/gcompris/boards/paintings.xml
 share/gnome/gcompris/boards/paintings.xml.in
-share/gnome/gcompris/boards/paintings.xml.in~
 share/gnome/gcompris/boards/paintings/README
 share/gnome/gcompris/boards/paintings/board1_0.xml
 share/gnome/gcompris/boards/paintings/board2_0.xml
@@ -414,7 +439,6 @@ share/gnome/gcompris/boards/paintings/board3_0.xml
 share/gnome/gcompris/boards/paintings/board4_0.xml
 share/gnome/gcompris/boards/paintings/board5_0.xml
 share/gnome/gcompris/boards/paintings/board6_0.xml
-share/gnome/gcompris/boards/paintings/board6_1.xml
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_1.jpg
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_2.jpg
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_3.jpg
@@ -454,57 +478,61 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-5.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
 share/gnome/gcompris/boards/paratrooper.xml
 share/gnome/gcompris/boards/paratrooper.xml.in
-share/gnome/gcompris/boards/paratrooper.xml.in~
 share/gnome/gcompris/boards/planegame.xml
 share/gnome/gcompris/boards/planegame.xml.in
-share/gnome/gcompris/boards/planegame.xml.in~
+share/gnome/gcompris/boards/railroad.xml
+share/gnome/gcompris/boards/railroad.xml.in
+share/gnome/gcompris/boards/railroad/loco1.png
+share/gnome/gcompris/boards/railroad/loco2.png
+share/gnome/gcompris/boards/railroad/loco3.png
+share/gnome/gcompris/boards/railroad/loco4.png
+share/gnome/gcompris/boards/railroad/loco5.png
+share/gnome/gcompris/boards/railroad/loco6.png
+share/gnome/gcompris/boards/railroad/loco7.png
+share/gnome/gcompris/boards/railroad/loco8.png
+share/gnome/gcompris/boards/railroad/loco9.png
+share/gnome/gcompris/boards/railroad/railroad-bg.jpg
+share/gnome/gcompris/boards/railroad/railroad-bg.png
+share/gnome/gcompris/boards/railroad/wagon1.png
+share/gnome/gcompris/boards/railroad/wagon10.png
+share/gnome/gcompris/boards/railroad/wagon11.png
+share/gnome/gcompris/boards/railroad/wagon12.png
+share/gnome/gcompris/boards/railroad/wagon13.png
+share/gnome/gcompris/boards/railroad/wagon14.png
+share/gnome/gcompris/boards/railroad/wagon2.png
+share/gnome/gcompris/boards/railroad/wagon3.png
+share/gnome/gcompris/boards/railroad/wagon4.png
+share/gnome/gcompris/boards/railroad/wagon5.png
+share/gnome/gcompris/boards/railroad/wagon6.png
+share/gnome/gcompris/boards/railroad/wagon7.png
+share/gnome/gcompris/boards/railroad/wagon8.png
+share/gnome/gcompris/boards/railroad/wagon9.png
 share/gnome/gcompris/boards/reading.xml
 share/gnome/gcompris/boards/reading.xml.in
-share/gnome/gcompris/boards/reading.xml.in~
-share/gnome/gcompris/boards/reading/button.png
 share/gnome/gcompris/boards/reading/gcompris-bg.jpg
 share/gnome/gcompris/boards/readingh.xml
 share/gnome/gcompris/boards/readingh.xml.in
-share/gnome/gcompris/boards/readingh.xml.in~
 share/gnome/gcompris/boards/readingv.xml
 share/gnome/gcompris/boards/readingv.xml.in
-share/gnome/gcompris/boards/readingv.xml.in~
+share/gnome/gcompris/boards/scales/README
 share/gnome/gcompris/boards/scales/board1_0.xml
-share/gnome/gcompris/boards/scales/board1_0.xml~
 share/gnome/gcompris/boards/scales/board1_1.xml
-share/gnome/gcompris/boards/scales/board1_1.xml~
 share/gnome/gcompris/boards/scales/board1_2.xml
-share/gnome/gcompris/boards/scales/board1_2.xml~
 share/gnome/gcompris/boards/scales/board1_3.xml
-share/gnome/gcompris/boards/scales/board1_3.xml~
 share/gnome/gcompris/boards/scales/board1_4.xml
-share/gnome/gcompris/boards/scales/board1_4.xml~
 share/gnome/gcompris/boards/scales/board1_5.xml
-share/gnome/gcompris/boards/scales/board1_5.xml~
 share/gnome/gcompris/boards/scales/board2_0.xml
-share/gnome/gcompris/boards/scales/board2_0.xml~
 share/gnome/gcompris/boards/scales/board2_1.xml
-share/gnome/gcompris/boards/scales/board2_1.xml~
 share/gnome/gcompris/boards/scales/board2_2.xml
-share/gnome/gcompris/boards/scales/board2_2.xml~
 share/gnome/gcompris/boards/scales/board2_3.xml
-share/gnome/gcompris/boards/scales/board2_3.xml~
 share/gnome/gcompris/boards/scales/board2_4.xml
-share/gnome/gcompris/boards/scales/board2_4.xml~
 share/gnome/gcompris/boards/scales/board2_5.xml
-share/gnome/gcompris/boards/scales/board2_5.xml~
 share/gnome/gcompris/boards/scales/board3_0.xml
-share/gnome/gcompris/boards/scales/board3_0.xml~
 share/gnome/gcompris/boards/scales/board3_1.xml
-share/gnome/gcompris/boards/scales/board3_1.xml~
 share/gnome/gcompris/boards/scales/board3_2.xml
-share/gnome/gcompris/boards/scales/board3_2.xml~
 share/gnome/gcompris/boards/scales/board3_3.xml
-share/gnome/gcompris/boards/scales/board3_3.xml~
 share/gnome/gcompris/boards/scales/board3_4.xml
-share/gnome/gcompris/boards/scales/board3_4.xml~
 share/gnome/gcompris/boards/scales/board3_5.xml
-share/gnome/gcompris/boards/scales/board3_5.xml~
 share/gnome/gcompris/boards/scales/masse.png
 share/gnome/gcompris/boards/scales/masse1.png
 share/gnome/gcompris/boards/scales/masse10.png
@@ -519,13 +547,38 @@ share/gnome/gcompris/boards/scales/masse9.png
 share/gnome/gcompris/boards/scales/scales.png
 share/gnome/gcompris/boards/scalesboard.xml
 share/gnome/gcompris/boards/scalesboard.xml.in
-share/gnome/gcompris/boards/scalesboard.xml.in~
 share/gnome/gcompris/boards/smallnumbers.xml
 share/gnome/gcompris/boards/smallnumbers.xml.in
-share/gnome/gcompris/boards/smallnumbers.xml.in~
+share/gnome/gcompris/boards/sounds/HOWTO_ENCODE
+share/gnome/gcompris/boards/sounds/fr/a.ogg
+share/gnome/gcompris/boards/sounds/fr/b.ogg
+share/gnome/gcompris/boards/sounds/fr/c.ogg
+share/gnome/gcompris/boards/sounds/fr/clic_on_letter.ogg
+share/gnome/gcompris/boards/sounds/fr/d.ogg
+share/gnome/gcompris/boards/sounds/fr/e.ogg
+share/gnome/gcompris/boards/sounds/fr/f.ogg
+share/gnome/gcompris/boards/sounds/fr/g.ogg
+share/gnome/gcompris/boards/sounds/fr/h.ogg
+share/gnome/gcompris/boards/sounds/fr/i.ogg
+share/gnome/gcompris/boards/sounds/fr/j.ogg
+share/gnome/gcompris/boards/sounds/fr/k.ogg
+share/gnome/gcompris/boards/sounds/fr/l.ogg
+share/gnome/gcompris/boards/sounds/fr/m.ogg
+share/gnome/gcompris/boards/sounds/fr/n.ogg
+share/gnome/gcompris/boards/sounds/fr/o.ogg
+share/gnome/gcompris/boards/sounds/fr/p.ogg
+share/gnome/gcompris/boards/sounds/fr/q.ogg
+share/gnome/gcompris/boards/sounds/fr/r.ogg
+share/gnome/gcompris/boards/sounds/fr/s.ogg
+share/gnome/gcompris/boards/sounds/fr/t.ogg
+share/gnome/gcompris/boards/sounds/fr/u.ogg
+share/gnome/gcompris/boards/sounds/fr/v.ogg
+share/gnome/gcompris/boards/sounds/fr/w.ogg
+share/gnome/gcompris/boards/sounds/fr/x.ogg
+share/gnome/gcompris/boards/sounds/fr/y.ogg
+share/gnome/gcompris/boards/sounds/fr/z.ogg
 share/gnome/gcompris/boards/wordsgame.xml
 share/gnome/gcompris/boards/wordsgame.xml.in
-share/gnome/gcompris/boards/wordsgame.xml.in~
 share/gnome/gcompris/boards/wordsgame/wordslevel1.de
 share/gnome/gcompris/boards/wordsgame/wordslevel1.en
 share/gnome/gcompris/boards/wordsgame/wordslevel1.es
@@ -552,47 +605,31 @@ share/gnome/gcompris/sounds/bonus.wav
 share/gnome/gcompris/sounds/crash.wav
 share/gnome/gcompris/sounds/gobble.wav
 share/gnome/gcompris/sounds/level.wav
+share/gnome/gcompris/sounds/train.wav
 share/gnome/help/gcompris/C/gcompris.html
 share/gnome/help/gcompris/C/overview.jpg
 share/gnome/help/gcompris/C/topic.dat
 share/gnome/pixmaps/gcompris.png
-share/gnome/xml/algebra.xml
-share/gnome/xml/algebramenu.xml
-share/gnome/xml/babymatch.xml
-share/gnome/xml/babyshapes.xml
-share/gnome/xml/clickgame.xml
-share/gnome/xml/clockgame.xml
-share/gnome/xml/computer.xml
-share/gnome/xml/draw.xml
-share/gnome/xml/fun.xml
-share/gnome/xml/gletters.xml
-share/gnome/xml/imageid.xml
-share/gnome/xml/imagename.xml
-share/gnome/xml/memory.xml
-share/gnome/xml/menu.xml
-share/gnome/xml/paintings.xml
-share/gnome/xml/paratrooper.xml
-share/gnome/xml/planegame.xml
-share/gnome/xml/reading.xml
-share/gnome/xml/readingh.xml
-share/gnome/xml/readingv.xml
-share/gnome/xml/scalesboard.xml
-share/gnome/xml/smallnumbers.xml
-share/gnome/xml/wordsgame.xml
 share/locale/de/LC_MESSAGES/gcompris.mo
+share/locale/el/LC_MESSAGES/gcompris.mo
 share/locale/es/LC_MESSAGES/gcompris.mo
 share/locale/fi/LC_MESSAGES/gcompris.mo
 share/locale/fr/LC_MESSAGES/gcompris.mo
 share/locale/it/LC_MESSAGES/gcompris.mo
 share/locale/nl/LC_MESSAGES/gcompris.mo
 share/locale/pt_BR/LC_MESSAGES/gcompris.mo
-@dirrm share/gnome/xml
+share/locale/ru/LC_MESSAGES/gcompris.mo
+share/locale/sv/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/help/gcompris/C
 @dirrm share/gnome/help/gcompris
 @dirrm share/gnome/gcompris/sounds
 @dirrm share/gnome/gcompris/boards/wordsgame
+@dirrm share/gnome/gcompris/boards/sounds/fr
+@dirrm share/gnome/gcompris/boards/sounds/en
+@dirrm share/gnome/gcompris/boards/sounds
 @dirrm share/gnome/gcompris/boards/scales
 @dirrm share/gnome/gcompris/boards/reading
+@dirrm share/gnome/gcompris/boards/railroad
 @dirrm share/gnome/gcompris/boards/paintings/level6
 @dirrm share/gnome/gcompris/boards/paintings/level5
 @dirrm share/gnome/gcompris/boards/paintings/level4
@@ -600,7 +637,7 @@ share/locale/pt_BR/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/gcompris/boards/paintings/level2
 @dirrm share/gnome/gcompris/boards/paintings/level1
 @dirrm share/gnome/gcompris/boards/paintings
-@dirrm share/gnome/gcompris/boards/memory
+@dirrm share/gnome/gcompris/boards/missing_letter
 @dirrm share/gnome/gcompris/boards/imagename
 @dirrm share/gnome/gcompris/boards/imageid
 @dirrm share/gnome/gcompris/boards/gcompris/misc
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index d7cdc67333d7..df716c65c4cb 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gcompris
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.6
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/games/gcompris2/distinfo b/games/gcompris2/distinfo
index e8c78d0daa6f..cb5ad5c1f65d 100644
--- a/games/gcompris2/distinfo
+++ b/games/gcompris2/distinfo
@@ -1 +1 @@
-MD5 (gcompris-0.9.2.tar.gz) = 3e6c7fd8b7676bcb43ca4df5a97e8c41
+MD5 (gcompris-0.9.6.tgz) = 55e2cb96fedbcf9cd0d8c415328de370
diff --git a/games/gcompris2/files/patch-ac b/games/gcompris2/files/patch-ac
index 4768fa465758..f7129bd61e53 100644
--- a/games/gcompris2/files/patch-ac
+++ b/games/gcompris2/files/patch-ac
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu Oct 25 15:10:26 2001
-+++ Makefile.in	Thu Oct 25 15:14:53 2001
+--- Makefile.in.orig	Wed Dec 19 12:49:19 2001
++++ Makefile.in	Wed Dec 19 13:21:48 2001
 @@ -192,9 +192,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
@@ -25,19 +25,24 @@ $FreeBSD$
  		install-data-local
  install-data: install-data-recursive
  
-@@ -498,13 +498,13 @@
+@@ -498,16 +498,16 @@
  	@$(NORMAL_INSTALL)
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+-	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in >/tmp/GCOMPRIS_LIST.txt ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
  	fi
  
  dist-hook:
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+-	  find @PACKAGE_DATA_DIR@ -name \*~  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  find @PACKAGE_DATA_DIR@ -name \*~ >/tmp/GCOMPRIS_LIST.txt ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
  	fi
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/gcompris2/files/patch-src::gcompris::Makefile.in b/games/gcompris2/files/patch-src::gcompris::Makefile.in
new file mode 100644
index 000000000000..f33d171eb367
--- /dev/null
+++ b/games/gcompris2/files/patch-src::gcompris::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/gcompris/Makefile.in	2001/12/19 10:53:08	1.1
++++ src/gcompris/Makefile.in	2001/12/19 10:53:29
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ plugindir = @plugindir@
+ 
+-INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	$(GDK_PIXBUF_CFLAGS)	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gcompris
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index 3e841782fdf4..446ea5119d1a 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -1,15 +1,20 @@
 bin/gcompris
 info/gcompris.info
 lib/gcompris/libalgebra.so
+lib/gcompris/libclick_on_letter.so
 lib/gcompris/libclickgame.so
 lib/gcompris/libclockgame.so
 lib/gcompris/libdraw.so
+lib/gcompris/liberase.so
 lib/gcompris/libgletters.so
 lib/gcompris/libimageid.so
+lib/gcompris/liblocale.so
 lib/gcompris/libmemory.so
 lib/gcompris/libmenu.so
+lib/gcompris/libmissingletter.so
 lib/gcompris/libparatrooper.so
 lib/gcompris/libplanegame.so
+lib/gcompris/librailroad.so
 lib/gcompris/libreading.so
 lib/gcompris/libshapegame.so
 lib/gcompris/libsmallnumbers.so
@@ -17,32 +22,28 @@ lib/gcompris/libwordsgame.so
 share/gnome/apps/Games/gcompris.desktop
 share/gnome/gcompris/boards/Makefile
 share/gnome/gcompris/boards/Makefile.am
-share/gnome/gcompris/boards/Makefile.am~
 share/gnome/gcompris/boards/Makefile.in
 share/gnome/gcompris/boards/README
-share/gnome/gcompris/boards/algebra.xml
-share/gnome/gcompris/boards/algebra.xml.in
-share/gnome/gcompris/boards/algebra.xml.in~
+share/gnome/gcompris/boards/algebra_by.xml
+share/gnome/gcompris/boards/algebra_by.xml.in
+share/gnome/gcompris/boards/algebra_div.xml
+share/gnome/gcompris/boards/algebra_div.xml.in
+share/gnome/gcompris/boards/algebra_minus.xml
+share/gnome/gcompris/boards/algebra_minus.xml.in
+share/gnome/gcompris/boards/algebra_plus.xml
+share/gnome/gcompris/boards/algebra_plus.xml.in
 share/gnome/gcompris/boards/algebramenu.xml
 share/gnome/gcompris/boards/algebramenu.xml.in
-share/gnome/gcompris/boards/algebramenu.xml.in~
 share/gnome/gcompris/boards/babymatch.xml
 share/gnome/gcompris/boards/babymatch.xml.in
-share/gnome/gcompris/boards/babymatch.xml.in~
 share/gnome/gcompris/boards/babymatch/board1_0.xml
-share/gnome/gcompris/boards/babymatch/board1_0.xml~
 share/gnome/gcompris/boards/babymatch/board2_0.xml
-share/gnome/gcompris/boards/babymatch/board2_0.xml~
 share/gnome/gcompris/boards/babymatch/board3_0.xml
-share/gnome/gcompris/boards/babymatch/board3_0.xml~
 share/gnome/gcompris/boards/babymatch/board4_0.xml
-share/gnome/gcompris/boards/babymatch/board4_0.xml~
 share/gnome/gcompris/boards/babymatch/board5_0.xml
 share/gnome/gcompris/boards/babymatch/board6_0.xml
-share/gnome/gcompris/boards/babymatch/board6_0.xml~
 share/gnome/gcompris/boards/babyshapes.xml
 share/gnome/gcompris/boards/babyshapes.xml.in
-share/gnome/gcompris/boards/babyshapes.xml.in~
 share/gnome/gcompris/boards/babyshapes/T_banana.png
 share/gnome/gcompris/boards/babyshapes/T_circle.png
 share/gnome/gcompris/boards/babyshapes/T_colonne.png
@@ -64,13 +65,9 @@ share/gnome/gcompris/boards/babyshapes/T_toron.png
 share/gnome/gcompris/boards/babyshapes/T_triangle.png
 share/gnome/gcompris/boards/babyshapes/banana.png
 share/gnome/gcompris/boards/babyshapes/board1_0.xml
-share/gnome/gcompris/boards/babyshapes/board1_0.xml~
 share/gnome/gcompris/boards/babyshapes/board2_0.xml
-share/gnome/gcompris/boards/babyshapes/board2_0.xml~
 share/gnome/gcompris/boards/babyshapes/board3_0.xml
-share/gnome/gcompris/boards/babyshapes/board3_0.xml~
 share/gnome/gcompris/boards/babyshapes/board4_0.xml
-share/gnome/gcompris/boards/babyshapes/board4_0.xml~
 share/gnome/gcompris/boards/babyshapes/circle.png
 share/gnome/gcompris/boards/babyshapes/colonne.png
 share/gnome/gcompris/boards/babyshapes/cone.png
@@ -89,23 +86,37 @@ share/gnome/gcompris/boards/babyshapes/sphere.png
 share/gnome/gcompris/boards/babyshapes/star.png
 share/gnome/gcompris/boards/babyshapes/toron.png
 share/gnome/gcompris/boards/babyshapes/triangle.png
-share/gnome/gcompris/boards/boardicons/algebra.png
+share/gnome/gcompris/boards/boardicons/algebra_by.png
+share/gnome/gcompris/boards/boardicons/algebra_div.png
+share/gnome/gcompris/boards/boardicons/algebra_minus.png
+share/gnome/gcompris/boards/boardicons/algebra_plus.png
 share/gnome/gcompris/boards/boardicons/algebramenu.png
 share/gnome/gcompris/boards/boardicons/babymatch.png
 share/gnome/gcompris/boards/boardicons/babyshapes.png
 share/gnome/gcompris/boards/boardicons/book.png
+share/gnome/gcompris/boards/boardicons/click_on_letter.png
 share/gnome/gcompris/boards/boardicons/clickgame.png
 share/gnome/gcompris/boards/boardicons/clockgame.png
 share/gnome/gcompris/boards/boardicons/colornforms.png
 share/gnome/gcompris/boards/boardicons/computer.png
 share/gnome/gcompris/boards/boardicons/draw.png
+share/gnome/gcompris/boards/boardicons/erase.png
 share/gnome/gcompris/boards/boardicons/fun.png
 share/gnome/gcompris/boards/boardicons/gletters.png
 share/gnome/gcompris/boards/boardicons/imageid.png
 share/gnome/gcompris/boards/boardicons/imagename.png
+share/gnome/gcompris/boards/boardicons/locale.png
+share/gnome/gcompris/boards/boardicons/locale_de.png
+share/gnome/gcompris/boards/boardicons/locale_el.png
+share/gnome/gcompris/boards/boardicons/locale_en.png
+share/gnome/gcompris/boards/boardicons/locale_es.png
+share/gnome/gcompris/boards/boardicons/locale_fr.png
+share/gnome/gcompris/boards/boardicons/locale_sv.png
 share/gnome/gcompris/boards/boardicons/matritsa.png
 share/gnome/gcompris/boards/boardicons/memory.png
+share/gnome/gcompris/boards/boardicons/missing_letter.png
 share/gnome/gcompris/boards/boardicons/planegame.png
+share/gnome/gcompris/boards/boardicons/railroad.png
 share/gnome/gcompris/boards/boardicons/reading.png
 share/gnome/gcompris/boards/boardicons/readingh.png
 share/gnome/gcompris/boards/boardicons/scalesicon.png
@@ -113,18 +124,16 @@ share/gnome/gcompris/boards/boardicons/shapegame.png
 share/gnome/gcompris/boards/boardicons/smallnumbers.png
 share/gnome/gcompris/boards/boardicons/tuxpara.png
 share/gnome/gcompris/boards/boardicons/wordsgame.png
+share/gnome/gcompris/boards/click_on_letter.xml
+share/gnome/gcompris/boards/click_on_letter.xml.in
 share/gnome/gcompris/boards/clickgame.xml
 share/gnome/gcompris/boards/clickgame.xml.in
-share/gnome/gcompris/boards/clickgame.xml.in~
 share/gnome/gcompris/boards/clockgame.xml
 share/gnome/gcompris/boards/clockgame.xml.in
-share/gnome/gcompris/boards/clockgame.xml.in~
 share/gnome/gcompris/boards/computer.xml
 share/gnome/gcompris/boards/computer.xml.in
-share/gnome/gcompris/boards/computer.xml.in~
 share/gnome/gcompris/boards/draw.xml
 share/gnome/gcompris/boards/draw.xml.in
-share/gnome/gcompris/boards/draw.xml.in~
 share/gnome/gcompris/boards/draw/color-selector.jpg
 share/gnome/gcompris/boards/draw/draw-bg.jpg
 share/gnome/gcompris/boards/draw/tool-circle.png
@@ -138,6 +147,8 @@ share/gnome/gcompris/boards/draw/tool-move.png
 share/gnome/gcompris/boards/draw/tool-rectangle.png
 share/gnome/gcompris/boards/draw/tool-resize.png
 share/gnome/gcompris/boards/draw/tool-selector.jpg
+share/gnome/gcompris/boards/erase.xml
+share/gnome/gcompris/boards/erase.xml.in
 share/gnome/gcompris/boards/fishes/QueenAngel_0.png
 share/gnome/gcompris/boards/fishes/QueenAngel_1.png
 share/gnome/gcompris/boards/fishes/blueking2_0.png
@@ -202,15 +213,21 @@ share/gnome/gcompris/boards/fishes/teeth_6.png
 share/gnome/gcompris/boards/fishes/teeth_7.png
 share/gnome/gcompris/boards/fun.xml
 share/gnome/gcompris/boards/fun.xml.in
-share/gnome/gcompris/boards/fun.xml.in~
 share/gnome/gcompris/boards/gcompris/README
+share/gnome/gcompris/boards/gcompris/bonus/README
+share/gnome/gcompris/boards/gcompris/bonus/flower_bad.png
+share/gnome/gcompris/boards/gcompris/bonus/flower_good.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_bad.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_good.png
 share/gnome/gcompris/boards/gcompris/buttons/bad.png
 share/gnome/gcompris/boards/gcompris/buttons/bar_bg.jpg
 share/gnome/gcompris/boards/gcompris/buttons/button.png
+share/gnome/gcompris/boards/gcompris/buttons/button_large.png
+share/gnome/gcompris/boards/gcompris/buttons/button_large2.png
+share/gnome/gcompris/boards/gcompris/buttons/button_selected.png
 share/gnome/gcompris/boards/gcompris/buttons/button_small.png
 share/gnome/gcompris/boards/gcompris/buttons/button_style.png
+share/gnome/gcompris/boards/gcompris/buttons/difficulty_star.png
 share/gnome/gcompris/boards/gcompris/buttons/help.png
 share/gnome/gcompris/boards/gcompris/buttons/home.png
 share/gnome/gcompris/boards/gcompris/buttons/horver.png
@@ -224,7 +241,9 @@ share/gnome/gcompris/boards/gcompris/buttons/level6.png
 share/gnome/gcompris/boards/gcompris/buttons/level7.png
 share/gnome/gcompris/boards/gcompris/buttons/level8.png
 share/gnome/gcompris/boards/gcompris/buttons/level9.png
+share/gnome/gcompris/boards/gcompris/buttons/menuicon.png
 share/gnome/gcompris/boards/gcompris/buttons/ok.png
+share/gnome/gcompris/boards/gcompris/buttons/repeat.png
 share/gnome/gcompris/boards/gcompris/dialogbox.png
 share/gnome/gcompris/boards/gcompris/dice/gnome-dice0.png
 share/gnome/gcompris/boards/gcompris/dice/gnome-dice1.png
@@ -311,7 +330,6 @@ share/gnome/gcompris/boards/gcompris/letters/x.png
 share/gnome/gcompris/boards/gcompris/letters/y.png
 share/gnome/gcompris/boards/gcompris/letters/z.png
 share/gnome/gcompris/boards/gcompris/misc/README
-share/gnome/gcompris/boards/gcompris/misc/README~
 share/gnome/gcompris/boards/gcompris/misc/apple.png
 share/gnome/gcompris/boards/gcompris/misc/backcard.png
 share/gnome/gcompris/boards/gcompris/misc/bicycle.png
@@ -323,6 +341,8 @@ share/gnome/gcompris/boards/gcompris/misc/cerise.png
 share/gnome/gcompris/boards/gcompris/misc/cloud.png
 share/gnome/gcompris/boards/gcompris/misc/cocotier.png
 share/gnome/gcompris/boards/gcompris/misc/crown.png
+share/gnome/gcompris/boards/gcompris/misc/door1.png
+share/gnome/gcompris/boards/gcompris/misc/door2.png
 share/gnome/gcompris/boards/gcompris/misc/egg.png
 share/gnome/gcompris/boards/gcompris/misc/eggpot.png
 share/gnome/gcompris/boards/gcompris/misc/emptycard.png
@@ -341,6 +361,7 @@ share/gnome/gcompris/boards/gcompris/misc/minivan.png
 share/gnome/gcompris/boards/gcompris/misc/parachute.png
 share/gnome/gcompris/boards/gcompris/misc/peer.png
 share/gnome/gcompris/boards/gcompris/misc/pencil.png
+share/gnome/gcompris/boards/gcompris/misc/phone_note.png
 share/gnome/gcompris/boards/gcompris/misc/plane.png
 share/gnome/gcompris/boards/gcompris/misc/postcard.png
 share/gnome/gcompris/boards/gcompris/misc/postpoint.png
@@ -367,11 +388,8 @@ share/gnome/gcompris/boards/gcompris/nur03013.jpg
 share/gnome/gcompris/boards/gcompris/nur03505.jpg
 share/gnome/gcompris/boards/gletters.xml
 share/gnome/gcompris/boards/gletters.xml.in
-share/gnome/gcompris/boards/gletters.xml.in~
-share/gnome/gcompris/boards/gletters.xml~
 share/gnome/gcompris/boards/imageid.xml
 share/gnome/gcompris/boards/imageid.xml.in
-share/gnome/gcompris/boards/imageid.xml.in~
 share/gnome/gcompris/boards/imageid/ballon.png
 share/gnome/gcompris/boards/imageid/banana.png
 share/gnome/gcompris/boards/imageid/bed.png
@@ -379,34 +397,41 @@ share/gnome/gcompris/boards/imageid/biberon.png
 share/gnome/gcompris/boards/imageid/board1.xml
 share/gnome/gcompris/boards/imageid/cake.png
 share/gnome/gcompris/boards/imageid/cartable.png
+share/gnome/gcompris/boards/imageid/imageid-bg.jpg
 share/gnome/gcompris/boards/imageid/maison.png
 share/gnome/gcompris/boards/imageid/pomme.png
 share/gnome/gcompris/boards/imagename.xml
 share/gnome/gcompris/boards/imagename.xml.in
-share/gnome/gcompris/boards/imagename.xml.in~
 share/gnome/gcompris/boards/imagename/board1_0.xml
-share/gnome/gcompris/boards/imagename/board1_0.xml~
 share/gnome/gcompris/boards/imagename/board2_0.xml
-share/gnome/gcompris/boards/imagename/board2_0.xml~
 share/gnome/gcompris/boards/imagename/board3_0.xml
-share/gnome/gcompris/boards/imagename/board3_0.xml~
 share/gnome/gcompris/boards/imagename/board4_0.xml
-share/gnome/gcompris/boards/imagename/board4_0.xml~
 share/gnome/gcompris/boards/imagename/board5_0.xml
-share/gnome/gcompris/boards/imagename/board5_0.xml~
 share/gnome/gcompris/boards/imagename/board6_0.xml
-share/gnome/gcompris/boards/imagename/board6_0.xml~
+share/gnome/gcompris/boards/locale.xml
+share/gnome/gcompris/boards/locale.xml.in
+share/gnome/gcompris/boards/locale_de.xml
+share/gnome/gcompris/boards/locale_de.xml.in
+share/gnome/gcompris/boards/locale_el.xml
+share/gnome/gcompris/boards/locale_el.xml.in
+share/gnome/gcompris/boards/locale_en.xml
+share/gnome/gcompris/boards/locale_en.xml.in
+share/gnome/gcompris/boards/locale_es.xml
+share/gnome/gcompris/boards/locale_es.xml.in
+share/gnome/gcompris/boards/locale_fr.xml
+share/gnome/gcompris/boards/locale_fr.xml.in
+share/gnome/gcompris/boards/locale_sv.xml
+share/gnome/gcompris/boards/locale_sv.xml.in
 share/gnome/gcompris/boards/memory.xml
 share/gnome/gcompris/boards/memory.xml.in
-share/gnome/gcompris/boards/memory.xml.in~
-share/gnome/gcompris/boards/memory.xml~
-share/gnome/gcompris/boards/memory/backcard.png
 share/gnome/gcompris/boards/menu.xml
 share/gnome/gcompris/boards/menu.xml.in
-share/gnome/gcompris/boards/menu.xml.in~
+share/gnome/gcompris/boards/missing_letter.xml
+share/gnome/gcompris/boards/missing_letter.xml.in
+share/gnome/gcompris/boards/missing_letter/board1.xml
+share/gnome/gcompris/boards/missing_letter/missingletter-bg.jpg
 share/gnome/gcompris/boards/paintings.xml
 share/gnome/gcompris/boards/paintings.xml.in
-share/gnome/gcompris/boards/paintings.xml.in~
 share/gnome/gcompris/boards/paintings/README
 share/gnome/gcompris/boards/paintings/board1_0.xml
 share/gnome/gcompris/boards/paintings/board2_0.xml
@@ -414,7 +439,6 @@ share/gnome/gcompris/boards/paintings/board3_0.xml
 share/gnome/gcompris/boards/paintings/board4_0.xml
 share/gnome/gcompris/boards/paintings/board5_0.xml
 share/gnome/gcompris/boards/paintings/board6_0.xml
-share/gnome/gcompris/boards/paintings/board6_1.xml
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_1.jpg
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_2.jpg
 share/gnome/gcompris/boards/paintings/level1/bazille_rampart_3.jpg
@@ -454,57 +478,61 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-5.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
 share/gnome/gcompris/boards/paratrooper.xml
 share/gnome/gcompris/boards/paratrooper.xml.in
-share/gnome/gcompris/boards/paratrooper.xml.in~
 share/gnome/gcompris/boards/planegame.xml
 share/gnome/gcompris/boards/planegame.xml.in
-share/gnome/gcompris/boards/planegame.xml.in~
+share/gnome/gcompris/boards/railroad.xml
+share/gnome/gcompris/boards/railroad.xml.in
+share/gnome/gcompris/boards/railroad/loco1.png
+share/gnome/gcompris/boards/railroad/loco2.png
+share/gnome/gcompris/boards/railroad/loco3.png
+share/gnome/gcompris/boards/railroad/loco4.png
+share/gnome/gcompris/boards/railroad/loco5.png
+share/gnome/gcompris/boards/railroad/loco6.png
+share/gnome/gcompris/boards/railroad/loco7.png
+share/gnome/gcompris/boards/railroad/loco8.png
+share/gnome/gcompris/boards/railroad/loco9.png
+share/gnome/gcompris/boards/railroad/railroad-bg.jpg
+share/gnome/gcompris/boards/railroad/railroad-bg.png
+share/gnome/gcompris/boards/railroad/wagon1.png
+share/gnome/gcompris/boards/railroad/wagon10.png
+share/gnome/gcompris/boards/railroad/wagon11.png
+share/gnome/gcompris/boards/railroad/wagon12.png
+share/gnome/gcompris/boards/railroad/wagon13.png
+share/gnome/gcompris/boards/railroad/wagon14.png
+share/gnome/gcompris/boards/railroad/wagon2.png
+share/gnome/gcompris/boards/railroad/wagon3.png
+share/gnome/gcompris/boards/railroad/wagon4.png
+share/gnome/gcompris/boards/railroad/wagon5.png
+share/gnome/gcompris/boards/railroad/wagon6.png
+share/gnome/gcompris/boards/railroad/wagon7.png
+share/gnome/gcompris/boards/railroad/wagon8.png
+share/gnome/gcompris/boards/railroad/wagon9.png
 share/gnome/gcompris/boards/reading.xml
 share/gnome/gcompris/boards/reading.xml.in
-share/gnome/gcompris/boards/reading.xml.in~
-share/gnome/gcompris/boards/reading/button.png
 share/gnome/gcompris/boards/reading/gcompris-bg.jpg
 share/gnome/gcompris/boards/readingh.xml
 share/gnome/gcompris/boards/readingh.xml.in
-share/gnome/gcompris/boards/readingh.xml.in~
 share/gnome/gcompris/boards/readingv.xml
 share/gnome/gcompris/boards/readingv.xml.in
-share/gnome/gcompris/boards/readingv.xml.in~
+share/gnome/gcompris/boards/scales/README
 share/gnome/gcompris/boards/scales/board1_0.xml
-share/gnome/gcompris/boards/scales/board1_0.xml~
 share/gnome/gcompris/boards/scales/board1_1.xml
-share/gnome/gcompris/boards/scales/board1_1.xml~
 share/gnome/gcompris/boards/scales/board1_2.xml
-share/gnome/gcompris/boards/scales/board1_2.xml~
 share/gnome/gcompris/boards/scales/board1_3.xml
-share/gnome/gcompris/boards/scales/board1_3.xml~
 share/gnome/gcompris/boards/scales/board1_4.xml
-share/gnome/gcompris/boards/scales/board1_4.xml~
 share/gnome/gcompris/boards/scales/board1_5.xml
-share/gnome/gcompris/boards/scales/board1_5.xml~
 share/gnome/gcompris/boards/scales/board2_0.xml
-share/gnome/gcompris/boards/scales/board2_0.xml~
 share/gnome/gcompris/boards/scales/board2_1.xml
-share/gnome/gcompris/boards/scales/board2_1.xml~
 share/gnome/gcompris/boards/scales/board2_2.xml
-share/gnome/gcompris/boards/scales/board2_2.xml~
 share/gnome/gcompris/boards/scales/board2_3.xml
-share/gnome/gcompris/boards/scales/board2_3.xml~
 share/gnome/gcompris/boards/scales/board2_4.xml
-share/gnome/gcompris/boards/scales/board2_4.xml~
 share/gnome/gcompris/boards/scales/board2_5.xml
-share/gnome/gcompris/boards/scales/board2_5.xml~
 share/gnome/gcompris/boards/scales/board3_0.xml
-share/gnome/gcompris/boards/scales/board3_0.xml~
 share/gnome/gcompris/boards/scales/board3_1.xml
-share/gnome/gcompris/boards/scales/board3_1.xml~
 share/gnome/gcompris/boards/scales/board3_2.xml
-share/gnome/gcompris/boards/scales/board3_2.xml~
 share/gnome/gcompris/boards/scales/board3_3.xml
-share/gnome/gcompris/boards/scales/board3_3.xml~
 share/gnome/gcompris/boards/scales/board3_4.xml
-share/gnome/gcompris/boards/scales/board3_4.xml~
 share/gnome/gcompris/boards/scales/board3_5.xml
-share/gnome/gcompris/boards/scales/board3_5.xml~
 share/gnome/gcompris/boards/scales/masse.png
 share/gnome/gcompris/boards/scales/masse1.png
 share/gnome/gcompris/boards/scales/masse10.png
@@ -519,13 +547,38 @@ share/gnome/gcompris/boards/scales/masse9.png
 share/gnome/gcompris/boards/scales/scales.png
 share/gnome/gcompris/boards/scalesboard.xml
 share/gnome/gcompris/boards/scalesboard.xml.in
-share/gnome/gcompris/boards/scalesboard.xml.in~
 share/gnome/gcompris/boards/smallnumbers.xml
 share/gnome/gcompris/boards/smallnumbers.xml.in
-share/gnome/gcompris/boards/smallnumbers.xml.in~
+share/gnome/gcompris/boards/sounds/HOWTO_ENCODE
+share/gnome/gcompris/boards/sounds/fr/a.ogg
+share/gnome/gcompris/boards/sounds/fr/b.ogg
+share/gnome/gcompris/boards/sounds/fr/c.ogg
+share/gnome/gcompris/boards/sounds/fr/clic_on_letter.ogg
+share/gnome/gcompris/boards/sounds/fr/d.ogg
+share/gnome/gcompris/boards/sounds/fr/e.ogg
+share/gnome/gcompris/boards/sounds/fr/f.ogg
+share/gnome/gcompris/boards/sounds/fr/g.ogg
+share/gnome/gcompris/boards/sounds/fr/h.ogg
+share/gnome/gcompris/boards/sounds/fr/i.ogg
+share/gnome/gcompris/boards/sounds/fr/j.ogg
+share/gnome/gcompris/boards/sounds/fr/k.ogg
+share/gnome/gcompris/boards/sounds/fr/l.ogg
+share/gnome/gcompris/boards/sounds/fr/m.ogg
+share/gnome/gcompris/boards/sounds/fr/n.ogg
+share/gnome/gcompris/boards/sounds/fr/o.ogg
+share/gnome/gcompris/boards/sounds/fr/p.ogg
+share/gnome/gcompris/boards/sounds/fr/q.ogg
+share/gnome/gcompris/boards/sounds/fr/r.ogg
+share/gnome/gcompris/boards/sounds/fr/s.ogg
+share/gnome/gcompris/boards/sounds/fr/t.ogg
+share/gnome/gcompris/boards/sounds/fr/u.ogg
+share/gnome/gcompris/boards/sounds/fr/v.ogg
+share/gnome/gcompris/boards/sounds/fr/w.ogg
+share/gnome/gcompris/boards/sounds/fr/x.ogg
+share/gnome/gcompris/boards/sounds/fr/y.ogg
+share/gnome/gcompris/boards/sounds/fr/z.ogg
 share/gnome/gcompris/boards/wordsgame.xml
 share/gnome/gcompris/boards/wordsgame.xml.in
-share/gnome/gcompris/boards/wordsgame.xml.in~
 share/gnome/gcompris/boards/wordsgame/wordslevel1.de
 share/gnome/gcompris/boards/wordsgame/wordslevel1.en
 share/gnome/gcompris/boards/wordsgame/wordslevel1.es
@@ -552,47 +605,31 @@ share/gnome/gcompris/sounds/bonus.wav
 share/gnome/gcompris/sounds/crash.wav
 share/gnome/gcompris/sounds/gobble.wav
 share/gnome/gcompris/sounds/level.wav
+share/gnome/gcompris/sounds/train.wav
 share/gnome/help/gcompris/C/gcompris.html
 share/gnome/help/gcompris/C/overview.jpg
 share/gnome/help/gcompris/C/topic.dat
 share/gnome/pixmaps/gcompris.png
-share/gnome/xml/algebra.xml
-share/gnome/xml/algebramenu.xml
-share/gnome/xml/babymatch.xml
-share/gnome/xml/babyshapes.xml
-share/gnome/xml/clickgame.xml
-share/gnome/xml/clockgame.xml
-share/gnome/xml/computer.xml
-share/gnome/xml/draw.xml
-share/gnome/xml/fun.xml
-share/gnome/xml/gletters.xml
-share/gnome/xml/imageid.xml
-share/gnome/xml/imagename.xml
-share/gnome/xml/memory.xml
-share/gnome/xml/menu.xml
-share/gnome/xml/paintings.xml
-share/gnome/xml/paratrooper.xml
-share/gnome/xml/planegame.xml
-share/gnome/xml/reading.xml
-share/gnome/xml/readingh.xml
-share/gnome/xml/readingv.xml
-share/gnome/xml/scalesboard.xml
-share/gnome/xml/smallnumbers.xml
-share/gnome/xml/wordsgame.xml
 share/locale/de/LC_MESSAGES/gcompris.mo
+share/locale/el/LC_MESSAGES/gcompris.mo
 share/locale/es/LC_MESSAGES/gcompris.mo
 share/locale/fi/LC_MESSAGES/gcompris.mo
 share/locale/fr/LC_MESSAGES/gcompris.mo
 share/locale/it/LC_MESSAGES/gcompris.mo
 share/locale/nl/LC_MESSAGES/gcompris.mo
 share/locale/pt_BR/LC_MESSAGES/gcompris.mo
-@dirrm share/gnome/xml
+share/locale/ru/LC_MESSAGES/gcompris.mo
+share/locale/sv/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/help/gcompris/C
 @dirrm share/gnome/help/gcompris
 @dirrm share/gnome/gcompris/sounds
 @dirrm share/gnome/gcompris/boards/wordsgame
+@dirrm share/gnome/gcompris/boards/sounds/fr
+@dirrm share/gnome/gcompris/boards/sounds/en
+@dirrm share/gnome/gcompris/boards/sounds
 @dirrm share/gnome/gcompris/boards/scales
 @dirrm share/gnome/gcompris/boards/reading
+@dirrm share/gnome/gcompris/boards/railroad
 @dirrm share/gnome/gcompris/boards/paintings/level6
 @dirrm share/gnome/gcompris/boards/paintings/level5
 @dirrm share/gnome/gcompris/boards/paintings/level4
@@ -600,7 +637,7 @@ share/locale/pt_BR/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/gcompris/boards/paintings/level2
 @dirrm share/gnome/gcompris/boards/paintings/level1
 @dirrm share/gnome/gcompris/boards/paintings
-@dirrm share/gnome/gcompris/boards/memory
+@dirrm share/gnome/gcompris/boards/missing_letter
 @dirrm share/gnome/gcompris/boards/imagename
 @dirrm share/gnome/gcompris/boards/imageid
 @dirrm share/gnome/gcompris/boards/gcompris/misc