- Update to 20090511

- Mark MAKE_JOBS_SAFE

3 files changed, 38 insertions, 16 deletions

diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index ab52429fd004..6c4fb9fda5e3 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	palomino
-PORTVERSION=	20081229
-PORTREVISION=	2
+PORTVERSION=	20090511
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-sim \
 		ftp://ftp.palomino3d.org/sim/
@@ -27,9 +26,10 @@ USE_GL=		gl
 USE_CMAKE=	yes
 USE_LUA=	5.1
 LUA_COMPS=	lua:build
+MAKE_JOBS_SAFE=	yes
 
 MISC_VER=	20081206
-MODELS_VER=	20081229
+MODELS_VER=	20090511
 SOUNDS_VER=	20080704
 TERRAIN_VER=	20080206
 
@@ -70,7 +70,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE(FLTK/ d' ${WRKSRC}/CMakeLists.txt
 .endif
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE(OSSIM/ d' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|ENV||' ${WRKSRC}/build/program/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|string sDataDir|&="${DATADIR}/data/"|'\
 	       	${WRKSRC}/src/base/conf.cc
 	@${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|"scripts"|"${DATADIR}/scripts"|' \
diff --git a/games/palomino/distinfo b/games/palomino/distinfo
index 3afa751dcca9..b5fe94e883bc 100644
--- a/games/palomino/distinfo
+++ b/games/palomino/distinfo
@@ -1,12 +1,12 @@
-MD5 (palomino_src_20081229.tar.bz2) = c4d01fb9fe558a33658beb3a27b2c021
-SHA256 (palomino_src_20081229.tar.bz2) = 2b972140547b2feaa0b15e9f48fa2f9c42790886a8eb6cfaf6fabe0b0d3d8995
-SIZE (palomino_src_20081229.tar.bz2) = 514825
+MD5 (palomino_src_20090511.tar.bz2) = 2ac33a08ea2ee1ca596bf7e8b9673f30
+SHA256 (palomino_src_20090511.tar.bz2) = 88576d657f50234be5bb10cf881eebd246a24990875738893ca83299dc1ca3de
+SIZE (palomino_src_20090511.tar.bz2) = 526362
 MD5 (palomino_data_misc_20081206.tar.bz2) = eadfacbae4b0703da7347e89ba03fa1e
 SHA256 (palomino_data_misc_20081206.tar.bz2) = 8cf5721cd1ac20173d60b45b72262390624e60f0980318521e2c37135628513c
 SIZE (palomino_data_misc_20081206.tar.bz2) = 616719
-MD5 (palomino_data_models_20081229.tar.bz2) = d5e560d6acc91337163c9942df9ff4d4
-SHA256 (palomino_data_models_20081229.tar.bz2) = 8e4505ee2371c612282fd26fc6f823c02fd6f24e2d279047808665c83a2ab478
-SIZE (palomino_data_models_20081229.tar.bz2) = 25696106
+MD5 (palomino_data_models_20090511.tar.bz2) = f549b59c17762377cc642475852db94f
+SHA256 (palomino_data_models_20090511.tar.bz2) = 8c11603928aaea1c77890d01fd656f3b9a24ee9d77c5b61c5a7cd204523b481b
+SIZE (palomino_data_models_20090511.tar.bz2) = 26145486
 MD5 (palomino_data_sounds_20080704.tar.bz2) = 63997e8f8e9b436a7994380aa29ba1fc
 SHA256 (palomino_data_sounds_20080704.tar.bz2) = 7d5819575c539195a0d9e7145c7a92bf03257ba34aac0257f6aa55676a576b2a
 SIZE (palomino_data_sounds_20080704.tar.bz2) = 488862
diff --git a/games/palomino/pkg-plist b/games/palomino/pkg-plist
index f3bcc1c4bea4..c52555a56ed7 100644
--- a/games/palomino/pkg-plist
+++ b/games/palomino/pkg-plist
@@ -14,6 +14,7 @@ bin/palomino
 %%DOCSDIR%%/images/sprite1.png
 %%DOCSDIR%%/images/sprite2.png
 %%DOCSDIR%%/images/sprite3.png
+%%DOCSDIR%%/issues.html
 %%DOCSDIR%%/lua_scripts.html
 %%DOCSDIR%%/manual.css
 %%DOCSDIR%%/manual.html
@@ -35,6 +36,7 @@ bin/palomino
 %%DOCSDIR%%/module_object.html
 %%DOCSDIR%%/module_physics.html
 %%DOCSDIR%%/module_program.html
+%%DOCSDIR%%/module_shader.html
 %%DOCSDIR%%/module_sky.html
 %%DOCSDIR%%/module_sound.html
 %%DOCSDIR%%/module_view.html
@@ -106,13 +108,13 @@ bin/palomino
 %%DATADIR%%/data/models/f15c/F15CNose.png
 %%DATADIR%%/data/models/f15c/F15CRudder.png
 %%DATADIR%%/data/models/f15c/F15CSide.png
-%%DATADIR%%/data/models/f15c/f15c.ac.gz
+%%DATADIR%%/data/models/f15c/f15c.osg.gz
 %%DATADIR%%/data/models/f16/README.txt
-%%DATADIR%%/data/models/f16/f16.ac.gz
+%%DATADIR%%/data/models/f16/f16.osg.gz
 %%DATADIR%%/data/models/f16/f16.png
 %%DATADIR%%/data/models/f16/f16trans.png
 %%DATADIR%%/data/models/f16/sidewinder.ac
-%%DATADIR%%/data/models/f18/f18.ac.gz
+%%DATADIR%%/data/models/f18/f18.osg.gz
 %%DATADIR%%/data/models/f18/f18cockpit.png
 %%DATADIR%%/data/models/f18/f18tail.png
 %%DATADIR%%/data/models/f18/f18top.png
@@ -329,7 +331,7 @@ bin/palomino
 %%DATADIR%%/data/models/spitfire/seafire-tx-03.png
 %%DATADIR%%/data/models/spitfire/seafire-tx-04.png
 %%DATADIR%%/data/models/spitfire/seafire-tx-05.png
-%%DATADIR%%/data/models/spitfire/seafireIIIc.ac.gz
+%%DATADIR%%/data/models/spitfire/seafireIIIc.osg.gz
 %%DATADIR%%/data/models/spitfire/spitfire-asi.png
 %%DATADIR%%/data/models/spitfire/spitfire-attitude.png
 %%DATADIR%%/data/models/spitfire/spitfire-boost.png
@@ -344,7 +346,6 @@ bin/palomino
 %%DATADIR%%/data/models/spitfire/spitfire-tx-04.png
 %%DATADIR%%/data/models/spitfire/spitfire-tx-05.png
 %%DATADIR%%/data/models/spitfire/spitfire-vsi.png
-%%DATADIR%%/data/models/spitfire/spitfireIIa.ac
 %%DATADIR%%/data/models/spitfire/starter.ac
 %%DATADIR%%/data/models/spitfire/switch.png
 %%DATADIR%%/data/models/spitfire/throttle.ac
@@ -372,7 +373,7 @@ bin/palomino
 %%DATADIR%%/data/models/su37/SU-37-reheat.png
 %%DATADIR%%/data/models/su37/SU-37-top.png
 %%DATADIR%%/data/models/su37/Trajectory-Marker.ac
-%%DATADIR%%/data/models/su37/su37.ac.gz
+%%DATADIR%%/data/models/su37/su37.osg.gz
 %%DATADIR%%/data/palomino.conf
 %%DATADIR%%/data/physics_a4.conf
 %%DATADIR%%/data/physics_corsair.conf
@@ -390,6 +391,27 @@ bin/palomino
 %%DATADIR%%/data/physics_su37.conf
 %%DATADIR%%/data/replays/replayTakeoffFrontSlot.dat.gz
 %%DATADIR%%/data/replays/replayTakeoffRearSlot.dat.gz
+%%DATADIR%%/data/shaders/aircraft_alphaForce_frag.glsl
+%%DATADIR%%/data/shaders/aircraft_alphaForce_vert.glsl
+%%DATADIR%%/data/shaders/aircraft_alphaTex_frag.glsl
+%%DATADIR%%/data/shaders/aircraft_alphaTex_vert.glsl
+%%DATADIR%%/data/shaders/aircraft_frag.glsl
+%%DATADIR%%/data/shaders/aircraft_highSpecular_frag.glsl
+%%DATADIR%%/data/shaders/aircraft_highSpecular_vert.glsl
+%%DATADIR%%/data/shaders/aircraft_material_frag.glsl
+%%DATADIR%%/data/shaders/aircraft_material_vert.glsl
+%%DATADIR%%/data/shaders/aircraft_vert.glsl
+%%DATADIR%%/data/shaders/color_frag.glsl
+%%DATADIR%%/data/shaders/color_vert.glsl
+%%DATADIR%%/data/shaders/default_frag.glsl
+%%DATADIR%%/data/shaders/default_vert.glsl
+%%DATADIR%%/data/shaders/inc_ComputeDiffuseSpecular.glsl
+%%DATADIR%%/data/shaders/inc_aircraft_frag.glsl
+%%DATADIR%%/data/shaders/inc_brightness_frag.glsl
+%%DATADIR%%/data/shaders/inc_fog_frag.glsl
+%%DATADIR%%/data/shaders/inc_frag.glsl
+%%DATADIR%%/data/shaders/inc_vert.glsl
+%%DATADIR%%/data/shaders/module.txt
 %%DATADIR%%/data/sounds/README.txt
 %%DATADIR%%/data/sounds/beep1.wav.gz
 %%DATADIR%%/data/sounds/beep2.wav.gz
@@ -456,6 +478,7 @@ bin/palomino
 @dirrm %%DATADIR%%/data/textures
 @dirrm %%DATADIR%%/data/terrain
 @dirrm %%DATADIR%%/data/sounds
+@dirrm %%DATADIR%%/data/shaders
 @dirrm %%DATADIR%%/data/replays
 @dirrm %%DATADIR%%/data/models/su37
 @dirrm %%DATADIR%%/data/models/sr71