4 files changed, 75 insertions, 38 deletions

diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 730524de2c9f..6b8c3770035d 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	soya3d
-PORTVERSION=	0.13.2
-PORTREVISION=	3
+PORTVERSION=	0.14
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.gna.org/soya/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,8 +18,7 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Very high level 3D engine for Python
 
 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
+		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
 		GLEW.1:${PORTSDIR}/graphics/glew \
 		openal.0:${PORTSDIR}/audio/openal \
@@ -41,7 +39,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.13
+SOYATUTVER=	0.14
 
 .if !defined(NOPORTDOCS)
 DISTFILES+=	SoyaTutorial-${SOYATUTVER}${EXTRACT_SUFX}
@@ -54,8 +52,7 @@ CFLAGS	+=	-fPIC
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		-e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/py-soya3d/distinfo b/graphics/py-soya3d/distinfo
index 43d5c1f53f6d..7f554b341f24 100644
--- a/graphics/py-soya3d/distinfo
+++ b/graphics/py-soya3d/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (python/Soya-0.14.tar.bz2) = 9fa56b14d3e9d5fcee073de650b3206f
+SHA256 (python/Soya-0.14.tar.bz2) = dcb93206d7154dc575ec6eeb7fa3ecfd6bfb78fa233db639e423857cd2a99590
+SIZE (python/Soya-0.14.tar.bz2) = 905659
+MD5 (python/SoyaTutorial-0.14.tar.bz2) = 241d4e56e21cf70487323b3b25f9c37c
+SHA256 (python/SoyaTutorial-0.14.tar.bz2) = 86d5b8189e7f7b4269976a65f23a51291bb99c6272f2884cbd129a6e9cc6cbec
+SIZE (python/SoyaTutorial-0.14.tar.bz2) = 5223674
diff --git a/graphics/py-soya3d/files/patch-setup.py b/graphics/py-soya3d/files/patch-setup.py
index 3f4842e8748b..0f3e569b5121 100644
--- a/graphics/py-soya3d/files/patch-setup.py
+++ b/graphics/py-soya3d/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2007-11-05 20:44:27.000000000 -0500
-+++ setup.py	2007-11-05 20:47:14.000000000 -0500
-@@ -22,6 +22,7 @@
+--- setup.py	2009-04-22 10:00:23.000000000 -0500
++++ setup.py	2009-04-22 10:03:23.000000000 -0500
+@@ -21,6 +21,7 @@
  
  # Modify the following if needed :
  USE_OPENAL = 1     # use OpenAL
@@ -8,20 +8,37 @@
  #USE_OPENAL = 0
  
  # Modify the following if needed :
-@@ -76,12 +77,6 @@
+@@ -32,7 +33,7 @@
+ INCDIR = [
+ 	#"ode-0.5/include",
+ 	"/usr/include",
+-	"/usr/local/include",
++	"%%LOCALBASE%%/include",
+ 	"/usr/X11R6/include",
+ 	"/usr/X11/include",
+ 	"/usr/include/freetype2",
+@@ -48,7 +49,7 @@
+ LIBDIR = [
+ 	#"ode-0.5/lib",
+ 	"/usr/lib",
+-	"/usr/local/lib",
++	"%%LOCALBASE%%/lib",
+ 	"/opt/local/lib", # For Mac OS X "darwin port"
+ 	"/usr/X11R6/lib",
+ 	"/usr/X11/lib",
+@@ -79,11 +80,6 @@
  SDISTING = ("sdist" in sys.argv[1:]) and not ("--help" in sys.argv[1:])
  
- 
+ MACOSX_DEPLOYMENT_TARGET  = os.getenv('MACOSX_DEPLOYMENT_TARGET')
 -try:
 -	from Pyrex.Distutils import build_ext
 -	HAVE_PYREX = 1
 -except:
 -	HAVE_PYREX = 0
--
- HERE = os.path.dirname(sys.argv[0])
- #ODE_DIR = os.path.join(HERE, "ode-0.5")
- DEFINES = []
-@@ -129,6 +124,7 @@
+ 
+ # Only enable Pyrex compilation for SVN sources
+ if not os.path.exists(os.path.join(os.path.dirname(__file__), ".svn")):
+@@ -159,6 +155,7 @@
  		DEFINES.append(('SOYA_MACOSX',1))
  	else:
  		LIBS.append("openal")
diff --git a/graphics/py-soya3d/pkg-plist b/graphics/py-soya3d/pkg-plist
index 4d2c19f5b061..cb5c776c7f47 100644
--- a/graphics/py-soya3d/pkg-plist
+++ b/graphics/py-soya3d/pkg-plist
@@ -73,6 +73,18 @@ bin/soya_editor
 %%PYTHON_SITELIBDIR%%/soya/facecutter.py
 %%PYTHON_SITELIBDIR%%/soya/facecutter.pyc
 %%PYTHON_SITELIBDIR%%/soya/facecutter.pyo
+%%PYTHON_SITELIBDIR%%/soya/gui/__init__.py
+%%PYTHON_SITELIBDIR%%/soya/gui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/soya/gui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/soya/gui/style.py
+%%PYTHON_SITELIBDIR%%/soya/gui/style.pyc
+%%PYTHON_SITELIBDIR%%/soya/gui/style.pyo
+%%PYTHON_SITELIBDIR%%/soya/gui/tree.py
+%%PYTHON_SITELIBDIR%%/soya/gui/tree.pyc
+%%PYTHON_SITELIBDIR%%/soya/gui/tree.pyo
+%%PYTHON_SITELIBDIR%%/soya/gui/widgets.py
+%%PYTHON_SITELIBDIR%%/soya/gui/widgets.pyc
+%%PYTHON_SITELIBDIR%%/soya/gui/widgets.pyo
 %%PYTHON_SITELIBDIR%%/soya/label3d.py
 %%PYTHON_SITELIBDIR%%/soya/label3d.pyc
 %%PYTHON_SITELIBDIR%%/soya/label3d.pyo
@@ -205,6 +217,7 @@ 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%%/bsp-game_skel.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-2.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/character-animation-shadow-cellshading-1.py
@@ -223,6 +236,7 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/knife.blend
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/sword.blend
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/blender/sword.blend1
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/bsp/bsp_demo.bsp
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/balazar.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/block2.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/images/cloud.png
@@ -261,6 +275,7 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/grass.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/ground.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/knife.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/little-dunk.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/metal1.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/snow.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/materials/soustoit.data
@@ -273,6 +288,8 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/cube.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/earth.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/ferme.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/models/knife.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/models/knife@with_sword_material.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/moon.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/sun.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/models/sword.data
@@ -287,6 +304,7 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/cube.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/earth.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/ferme.data
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/knife@with_sword_material.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/level_tofudemo_static.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/moon.data
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/worlds/pyramid.data
@@ -300,6 +318,9 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/game_skel-3.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/game_skel-4.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/game_skel-5.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gui-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gui-2.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gui-background-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/label3D-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/modeling-1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/modeling-2.py
@@ -396,7 +417,6 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/results/static-shadows-1.jpeg
 %%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
@@ -524,7 +544,10 @@ bin/soya_editor
 %%PORTDOCS%%%%EXAMPLESDIR%%/tofu/demo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/tofu/regtest.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/traveling-camera-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial-tour.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/widget-1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/widget-background-1.py
+@dirrm %%PYTHON_SITELIBDIR%%/soya/gui
 @dirrm %%PYTHON_SITELIBDIR%%/soya/editor
 @dirrm %%PYTHON_SITELIBDIR%%/soya/pudding/ext
 @dirrm %%PYTHON_SITELIBDIR%%/soya/pudding/styles
@@ -533,20 +556,6 @@ bin/soya_editor
 @dirrm %%PYTHON_SITELIBDIR%%/soya/tofu
 @dirrm %%PYTHON_SITELIBDIR%%/soya/data
 @dirrm %%PYTHON_SITELIBDIR%%/soya
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%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/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
@@ -557,4 +566,18 @@ bin/soya_editor
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data/worlds
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu/data
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tofu
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/results
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/materials
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/blender
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/bsp
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/images
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/levels
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models/balazar
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/animated_models
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data/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%%