6 files changed, 224 insertions, 133 deletions

diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 6de270dcf6f6..92a1d35b1e61 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	soya3d
-PORTVERSION=	0.12
-PORTREVISION=	2
+PORTVERSION=	0.13.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/soya/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,12 +17,14 @@ DIST_SUBDIR=	python
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Very high level 3D engine for Python
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \
-		${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
+		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/pysdl_mixer/sdl_mixer.so:${PORTSDIR}/audio/py-sdl_mixer \
 		pyrexc:${PORTSDIR}/devel/pyrex
 LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
 		GLEW.1:${PORTSDIR}/graphics/glew \
+		openal.0:${PORTSDIR}/audio/openal \
+		alut.1:${PORTSDIR}/audio/freealut \
 		freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \
 		${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
@@ -41,7 +42,7 @@ PYDISTUTILS_PKGNAME=	Soya
 MANDIR=	${WRKDIR}/${DISTNAME}/manpage/man1
 MAN1=	soya_editor.1
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-SOYATUTVER=	0.12
+SOYATUTVER=	0.13
 
 .if !defined(NOPORTDOCS)
 DISTFILES+=	SoyaTutorial-${SOYATUTVER}${EXTRACT_SUFX}
@@ -53,35 +54,9 @@ DISTFILES+=	SoyaTutorial-${SOYATUTVER}${EXTRACT_SUFX}
 CFLAGS	+=	-fPIC
 .endif
 
-.if ${OSVERSION} < 500000
-STDINTFLAG=	true
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e \
-		's|malloc.h|stdlib.h|g' \
-		${WRKSRC}/ode-0.5/configurator.c
-	@${REINPLACE_CMD} -e \
-		's|g++|${CXX}|; \
-		s|-Wall||g; \
-		s|-L/usr/X11/lib|-lXext|; \
-		s|-L/usr/lib/X11R6||; \
-		s|-L/usr/lib/X11||; \
-		s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \
-		s|-fno-rtti||; \
-		s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \
-		${WRKSRC}/ode-0.5/config/makefile.unix-gcc
-	@${REINPLACE_CMD} -e \
-		's|^BUILD=debug|#BUILD=debug|; \
-		s|^#BUILD=release|BUILD=release|' \
-		${WRKSRC}/ode-0.5/config/user-settings
-.if defined(STDINTFLAG)
-	@cd ${WRKSRC} && \
-		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's|stdint.h|inttypes.h|g' "{}" \;
-.endif
-
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/py-soya3d/distinfo b/graphics/py-soya3d/distinfo
index e9673ccd26cc..43d5c1f53f6d 100644
--- a/graphics/py-soya3d/distinfo
+++ b/graphics/py-soya3d/distinfo
@@ -1,6 +1,6 @@
-MD5 (python/Soya-0.12.tar.bz2) = 402349553b8e4da383b16d6bdda14b55
-SHA256 (python/Soya-0.12.tar.bz2) = ee5f47ab50330754bbbd46cb85215a976591fa77780f767c607a672bcc41e284
-SIZE (python/Soya-0.12.tar.bz2) = 2135007
-MD5 (python/SoyaTutorial-0.12.tar.bz2) = 7c5b517619a07b4a8328b1cf0935438d
-SHA256 (python/SoyaTutorial-0.12.tar.bz2) = 2e8346cdeac6caff69e042a70def975ad4fb225e20e91877897315b44dad38fe
-SIZE (python/SoyaTutorial-0.12.tar.bz2) = 2128435
+MD5 (python/Soya-0.13.2.tar.bz2) = 98c129c2797bf2e5a36e3cd8d40fb189
+SHA256 (python/Soya-0.13.2.tar.bz2) = 083f87141ada2af334981a441ecd262dc2a0057116ad7792a5c5dd6424842683
+SIZE (python/Soya-0.13.2.tar.bz2) = 925070
+MD5 (python/SoyaTutorial-0.13.tar.bz2) = 80f864e56f6b293c73182e2273a78a1b
+SHA256 (python/SoyaTutorial-0.13.tar.bz2) = 23a3f39068bbfc901ad0dd5f6ed7f0c14c93d8ddf6c5d67d09e9cfa59c12fe3c
+SIZE (python/SoyaTutorial-0.13.tar.bz2) = 5595357
diff --git a/graphics/py-soya3d/files/patch-ode-0.5_Makefile b/graphics/py-soya3d/files/patch-ode-0.5_Makefile
deleted file mode 100644
index c86bc9521c70..000000000000
--- a/graphics/py-soya3d/files/patch-ode-0.5_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- ode-0.5/Makefile	Sun May  7 12:12:01 2006
-+++ ode-0.5/Makefile	Sun May  7 12:12:01 2006
-@@ -329,13 +329,13 @@
- 	-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
- 
- %$(OBJ): %.c
--	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
-+	$(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(DEFINES) $(C_OUT)$@ $<
- 
- %$(OBJ): %.cpp
--	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
-+	$(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
- 
- %.exe: %$(OBJ)
--	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
-+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
- 
- 
- # windows specific rules
-@@ -357,7 +357,7 @@
- 
- # unix-gcc specific dependency making
- 
--DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
-+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
- depend:
- 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
- 	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps
diff --git a/graphics/py-soya3d/files/patch-ode-0.5_configurator.c b/graphics/py-soya3d/files/patch-ode-0.5_configurator.c
deleted file mode 100644
index cd3138184107..000000000000
--- a/graphics/py-soya3d/files/patch-ode-0.5_configurator.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ode-0.5/configurator.c	Sun May  7 12:12:01 2006
-+++ ode-0.5/configurator.c	Sun May  7 12:12:52 2006
-@@ -222,7 +222,7 @@
-   write_header_comment (file,"is this a pentium on a gcc-based platform?");
-   write_to_file ("ctest.cpp",
- 		 "int main() {\n"
--		 "  asm (\"mov $0,%%eax\\n cpuid\\n\" : : : \"%eax\");\n"
-+		 "  asm (\"mov $0,%%eax\\n mov %%eax,(%%esi)\\n cpuid\\n\" : : : \"%eax\");\n"
- 		 "  return 0;\n"
- 		 "}\n");
-   delete_file ("ctest.exe");
diff --git a/graphics/py-soya3d/files/patch-setup.py b/graphics/py-soya3d/files/patch-setup.py
index a7dff9ece576..1f53e60a8f27 100644
--- a/graphics/py-soya3d/files/patch-setup.py
+++ b/graphics/py-soya3d/files/patch-setup.py
@@ -1,29 +1,10 @@
---- setup.py	Mon Aug 21 00:22:53 2006
-+++ setup.py	Mon Aug 21 00:24:52 2006
-@@ -99,6 +100,7 @@
- 	if USE_OPENAL:
- 		print "Sound support (with OpenAL) enabled..."
+--- setup.py.orig	Sun May 13 10:54:49 2007
++++ setup.py	Fri Aug 17 16:32:16 2007
+@@ -129,6 +129,7 @@
+ 		DEFINES.append(('SOYA_MACOSX',1))
+ 	else:
  		LIBS.append("openal")
 +		LIBS.append("alut")
- 		CONFIG_PXD_FILE.write("""include "sound/al.pxd"\n""")
- 		CONFIG_PYX_FILE.write("""include "sound/sound.pyx"\n""")
- 	else:
-@@ -133,14 +135,14 @@
- 			print "ODE and OPCODE have already been compiled; if you want to recompile them do:  cd %s ; make clean" % ODE_DIR
- 		else:
- 			print "Building ODE and OPCODE from %s" % ODE_DIR
--			do("cd %s ; make clean" % ODE_DIR)
--			do("cd %s ; make configure" % ODE_DIR)
--			do("cd %s ; make" % ODE_DIR)
-+			do("cd %s ; gmake clean" % ODE_DIR)
-+			do("cd %s ; gmake configure" % ODE_DIR)
-+			do("cd %s ; gmake" % ODE_DIR)
- 			print "ODE and OPCODE built successfully !"
- 			
- 	elif SDISTING:
- 		# Clean ODE, to remove configuration files and binaries
--		do("cd %s ; make clean" % ODE_DIR)
-+		do("cd %s ; gmake clean" % ODE_DIR)
- 	
- 	
- if HAVE_PYREX:
+ 
+ 
+ if "darwin" in sys.platform:
diff --git a/graphics/py-soya3d/pkg-plist b/graphics/py-soya3d/pkg-plist
index 83408113d2dc..4d2c19f5b061 100644
--- a/graphics/py-soya3d/pkg-plist
+++ b/graphics/py-soya3d/pkg-plist
@@ -5,30 +5,40 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/__init__.py
 %%PYTHON_SITELIBDIR%%/soya/__init__.pyc
 %%PYTHON_SITELIBDIR%%/soya/__init__.pyo
-%%PYTHON_SITELIBDIR%%/soya/_ode.so
 %%PYTHON_SITELIBDIR%%/soya/_soya.so
 %%PYTHON_SITELIBDIR%%/soya/ark2soya.py
 %%PYTHON_SITELIBDIR%%/soya/ark2soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/ark2soya.pyo
-%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.py
-%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.pyo
-%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.pyc
 %%PYTHON_SITELIBDIR%%/soya/blender2cal3d.py
 %%PYTHON_SITELIBDIR%%/soya/blender2cal3d.pyc
 %%PYTHON_SITELIBDIR%%/soya/blender2cal3d.pyo
+%%PYTHON_SITELIBDIR%%/soya/blender2cal3d_call.py
+%%PYTHON_SITELIBDIR%%/soya/blender2cal3d_call.pyc
+%%PYTHON_SITELIBDIR%%/soya/blender2cal3d_call.pyo
 %%PYTHON_SITELIBDIR%%/soya/blender2soya.py
 %%PYTHON_SITELIBDIR%%/soya/blender2soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/blender2soya.pyo
-%%PYTHON_SITELIBDIR%%/soya/data/shader_default.data
-%%PYTHON_SITELIBDIR%%/soya/main_loop.py
-%%PYTHON_SITELIBDIR%%/soya/main_loop.pyc
-%%PYTHON_SITELIBDIR%%/soya/main_loop.pyo
-%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.py
-%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.pyc
-%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.pyo
-%%PYTHON_SITELIBDIR%%/soya/terrain.py
-%%PYTHON_SITELIBDIR%%/soya/terrain.pyc
-%%PYTHON_SITELIBDIR%%/soya/terrain.pyo
+%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.py
+%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.pyc
+%%PYTHON_SITELIBDIR%%/soya/blender2soya_batch.pyo
+%%PYTHON_SITELIBDIR%%/soya/blendercal/__init__.py
+%%PYTHON_SITELIBDIR%%/soya/blendercal/__init__.pyc
+%%PYTHON_SITELIBDIR%%/soya/blendercal/__init__.pyo
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcconf.py
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcconf.pyc
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcconf.pyo
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcdata.py
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcdata.pyc
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcdata.pyo
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcgui.py
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcgui.pyc
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcgui.pyo
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcobject.py
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcobject.pyc
+%%PYTHON_SITELIBDIR%%/soya/blendercal/bcobject.pyo
+%%PYTHON_SITELIBDIR%%/soya/cal3d_export.py
+%%PYTHON_SITELIBDIR%%/soya/cal3d_export.pyc
+%%PYTHON_SITELIBDIR%%/soya/cal3d_export.pyo
 %%PYTHON_SITELIBDIR%%/soya/cerealizer4soya.py
 %%PYTHON_SITELIBDIR%%/soya/cerealizer4soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/cerealizer4soya.pyo
@@ -46,6 +56,7 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/data/fx.png
 %%PYTHON_SITELIBDIR%%/soya/data/particle_default.data
 %%PYTHON_SITELIBDIR%%/soya/data/shader.png
+%%PYTHON_SITELIBDIR%%/soya/data/shader_default.data
 %%PYTHON_SITELIBDIR%%/soya/data/soya3d_logo.png
 %%PYTHON_SITELIBDIR%%/soya/editor/__init__.py
 %%PYTHON_SITELIBDIR%%/soya/editor/__init__.pyc
@@ -71,6 +82,9 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/macosx.py
 %%PYTHON_SITELIBDIR%%/soya/macosx.pyc
 %%PYTHON_SITELIBDIR%%/soya/macosx.pyo
+%%PYTHON_SITELIBDIR%%/soya/main_loop.py
+%%PYTHON_SITELIBDIR%%/soya/main_loop.pyc
+%%PYTHON_SITELIBDIR%%/soya/main_loop.pyo
 %%PYTHON_SITELIBDIR%%/soya/math3d.py
 %%PYTHON_SITELIBDIR%%/soya/math3d.pyc
 %%PYTHON_SITELIBDIR%%/soya/math3d.pyo
@@ -83,9 +97,6 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/objmtl2soya.py
 %%PYTHON_SITELIBDIR%%/soya/objmtl2soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/objmtl2soya.pyo
-%%PYTHON_SITELIBDIR%%/soya/ode.py
-%%PYTHON_SITELIBDIR%%/soya/ode.pyc
-%%PYTHON_SITELIBDIR%%/soya/ode.pyo
 %%PYTHON_SITELIBDIR%%/soya/openal4soya.py
 %%PYTHON_SITELIBDIR%%/soya/openal4soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/openal4soya.pyo
@@ -141,6 +152,12 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/pudding/sysfont.py
 %%PYTHON_SITELIBDIR%%/soya/pudding/sysfont.pyc
 %%PYTHON_SITELIBDIR%%/soya/pudding/sysfont.pyo
+%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.py
+%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.pyc
+%%PYTHON_SITELIBDIR%%/soya/pygame_sound4soya.pyo
+%%PYTHON_SITELIBDIR%%/soya/q3bsp2soya.py
+%%PYTHON_SITELIBDIR%%/soya/q3bsp2soya.pyc
+%%PYTHON_SITELIBDIR%%/soya/q3bsp2soya.pyo
 %%PYTHON_SITELIBDIR%%/soya/ray.py
 %%PYTHON_SITELIBDIR%%/soya/ray.pyc
 %%PYTHON_SITELIBDIR%%/soya/ray.pyo
@@ -160,6 +177,15 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/sphere.py
 %%PYTHON_SITELIBDIR%%/soya/sphere.pyc
 %%PYTHON_SITELIBDIR%%/soya/sphere.pyo
+%%PYTHON_SITELIBDIR%%/soya/terrain.py
+%%PYTHON_SITELIBDIR%%/soya/terrain.pyc
+%%PYTHON_SITELIBDIR%%/soya/terrain.pyo
+%%PYTHON_SITELIBDIR%%/soya/tofu/__init__.py
+%%PYTHON_SITELIBDIR%%/soya/tofu/__init__.pyc
+%%PYTHON_SITELIBDIR%%/soya/tofu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/soya/tofu/sides.py
+%%PYTHON_SITELIBDIR%%/soya/tofu/sides.pyc
+%%PYTHON_SITELIBDIR%%/soya/tofu/sides.pyo
 %%PYTHON_SITELIBDIR%%/soya/tofu4soya.py
 %%PYTHON_SITELIBDIR%%/soya/tofu4soya.pyc
 %%PYTHON_SITELIBDIR%%/soya/tofu4soya.pyo
@@ -179,12 +205,10 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic-savingfile-cerealizer-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic-savingfile-pickle-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/blender-auto-exporter-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/buggy.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/buggy_trimesh.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-2.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-shadow-cellshading-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/tourneG.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/attente.caf
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/balazar.cfg
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/balazar.cmf
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/balazar.crf
@@ -195,7 +219,7 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/perso.cmf
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/recule.caf
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/tourneD.caf
-%%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/attente.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/animated_models/balazar/tourneG.caf
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/knife.blend
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/sword.blend
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/sword.blend1
@@ -215,6 +239,8 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/little-dunk.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/map.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/map1.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/images/map2.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/images/map3.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/metal1.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/oomad.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/shader.png
@@ -286,8 +312,22 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/modeling-smoothlit-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/modeling-solid-model-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/modeling-transparency-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouse-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/multiple-cameras-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/nested-world-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-1-base.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-2-base.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-3-mass_influence.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-4-pushable.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-5-hit_func.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-6-hit_func-2-other.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-7-hit_func-3-contacts.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-8-terrain.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-collision-9-box.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-gravity.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-join.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-mass.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/ode-test.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/particle-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/portal-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pudding-1.py
@@ -309,9 +349,9 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/raypicking-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/raypicking-2.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/raypicking-3.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-1-scaled.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-1-two-swords.jpeg
+%%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-2.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-2_0.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-2_1.jpeg
@@ -322,6 +362,9 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-3_2.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/basic-4.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-1.jpeg
+%%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-1_0.jpeg
+%%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-1_1.jpeg
+%%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-1_2.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-2.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/character-animation-shadow-cellshading-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/deform-1.jpeg
@@ -342,6 +385,7 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/modeling-smoothlit-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/modeling-solid-shape-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/modeling-transparency-1.jpeg
+%%PORTDOCS%%%%EXAMPLESDIR%%/results/mouse-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/nested-world-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/nested-world-1_1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/nested-world-1_2.jpeg
@@ -353,34 +397,164 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/terrain-1.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/terrain-2.jpeg
 %%PORTDOCS%%%%EXAMPLESDIR%%/run_tofudemo.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/soya-with-tk-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/speed-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/state-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/static-shadows-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/soya-with-tk-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/sound-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/terrain-2.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/terrain-1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/tofudemo.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/tofudemo_create_level.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/terrain-2.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/Default.xrf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/Material.xrf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/Plane.xmf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_portage_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_porte_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/attente_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/balazar.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/balazar.crf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/balazar.csf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/balazar.xsf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/bonus_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/bonus_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/bonus_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/bonus_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat0.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat0.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat0c.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat0c.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat1.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat1.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat1c.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat1c.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat2.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat2.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat3.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combat3.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combatc.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combatc.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combatcc.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/combatcc.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couic.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couic.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couicavant_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couicavant_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couicavant_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/couicavant_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_portage.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_portage.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/chute_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/freresurf_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/freresurf_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/freresurf_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/freresurf_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/garde.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/garde.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/marche.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/marche.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/mort.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/mort.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/neighbors_0-0
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/perso.cmf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/perso.xmf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/perso_poor.cmf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/photographie.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/photographie.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/recule.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/recule.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_portage_blu.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_portage_blu.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_portage_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_portage_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_red.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_red.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_rouge_001.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/saute_rouge_001.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/sort0.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/sort0.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/sort1.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/sort1.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/tourneD.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/tourneD.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/tourneG.caf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/animated_models/balazar/tourneG.xaf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/blender/balazar.blend
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/blender/balazar.blend1
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/balazar.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/chaume.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/ferme.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/grass.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/ground.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/map.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/snow.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/images/soustoit.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/levels/demo.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/balazar.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/chaume.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/ferme.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/grass.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/ground.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/snow.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/materials/soustoit.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/models/ferme.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/data/worlds/demo_static_part.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/demo.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/tofu/regtest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/traveling-camera-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/widget-1.py
 @dirrm %%PYTHON_SITELIBDIR%%/soya/editor
 @dirrm %%PYTHON_SITELIBDIR%%/soya/pudding/ext
 @dirrm %%PYTHON_SITELIBDIR%%/soya/pudding/styles
 @dirrm %%PYTHON_SITELIBDIR%%/soya/pudding
+@dirrm %%PYTHON_SITELIBDIR%%/soya/blendercal
+@dirrm %%PYTHON_SITELIBDIR%%/soya/tofu
 @dirrm %%PYTHON_SITELIBDIR%%/soya/data
 @dirrm %%PYTHON_SITELIBDIR%%/soya
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models/balazar
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/models
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/blender
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/images
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/levels
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/materials
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/models
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models/balazar
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/ms3d
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/sounds
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/svg
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/worlds
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/results
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/levels
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/blender
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/images
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/animated_models/balazar
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/animated_models
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/materials
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/models
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/worlds
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%