- Update to 20100309

3 files changed, 40 insertions, 38 deletions

diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index c790a8c0f23b..442f92c68394 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	palomino
-PORTVERSION=	20090615
-PORTREVISION=	4
+PORTVERSION=	20100309
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}-sim/release_src/${PORTVERSION} \
-		ftp://ftp.palomino3d.org/sim/
-
+MASTER_SITES=	ftp://ftp.palomino3d.org/sim/
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_data_misc_${MISC_VER}${EXTRACT_SUFX} \
 		${PORTNAME}_data_models_${MODELS_VER}${EXTRACT_SUFX} \
@@ -30,25 +27,30 @@ USE_LUA=	5.1
 LUA_COMPS=	lua:build
 MAKE_JOBS_SAFE=	yes
 
-MISC_VER=	20081206
+MISC_VER=	20091027
 MODELS_VER=	20090615
 SOUNDS_VER=	20080704
 TERRAIN_VER=	20080206
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	JOYSTICK "Enable joystick support through linux-js" on \
-		SOUND	"Enable sound support through plib" on \
+OPTIONS=	JOYSTICK "Enable joystick support through linux-js" off \
+		SDL	"SDL support for input sound and sound" on \
+		PLIB	"Enable sound support through plib" off \
 		GUI	"Enable FLTK GUI" on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_JOYSTICK)
+.if defined(WITH_JOYSTICK)
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 .endif
 
-.if !defined(WITHOUT_SOUND)
+.if !defined(WITHOUT_SDL)
+USE_SDL+=	sdl mixer
+.endif
+
+.if defined(WITHOUT_PLIB)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 .endif
 
@@ -59,21 +61,24 @@ LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
+	@${REINPLACE_CMD} -e '/ rt / d' ${WRKSRC}/CMakeModules/libraries.cmake
 	@${REINPLACE_CMD} -e '/COMMAND/ s|lua|${LUA_CMD}|' \
 		${WRKSRC}/build/lua_bind/CMakeLists.txt
-.if defined(WITHOUT_JOYSTICK)
-	@${REINPLACE_CMD} -e 's|OS_FREEBSD|0|' ${WRKSRC}/src/input/joystick.* \
-		${WRKSRC}/src/input/joystick_linux.* ${WRKSRC}/src/control/conf.cc
-.endif
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE(/ s|)| REQUIRED)|' \
-		${WRKSRC}/CMakeLists.txt
-.if defined(WITHOUT_SOUND)
-	@${REINPLACE_CMD} -e '/FIND_PACKAGE(PLIB/ d' ${WRKSRC}/CMakeLists.txt
+		${WRKSRC}/CMakeModules/libraries.cmake
+	@${REINPLACE_CMD} -e '/COMPILE_WITH_OSSIM/ d' ${WRKSRC}/CMakeLists.txt
+.if !defined(WITH_JOYSTICK)
+	@${REINPLACE_CMD} -e '/COMPILE_WITH_LINUX_JOYSTICK/ d' ${WRKSRC}/CMakeLists.txt
+.endif
+.if defined(WITHOUT_SDL)
+	@${REINPLACE_CMD} -e '/COMPILE_WITH_SDL/ d' ${WRKSRC}/CMakeLists.txt
+.endif
+.if !defined(WITH_PLIB)
+	@${REINPLACE_CMD} -e '/COMPILE_WITH_PLIB/ d' ${WRKSRC}/CMakeLists.txt
 .endif
 .if defined(WITHOUT_GUI)
-	@${REINPLACE_CMD} -e '/FIND_PACKAGE(FLTK/ d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e '/COMPILE_WITH_FLTK/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-	@${REINPLACE_CMD} -e '/FIND_PACKAGE(OSSIM/ d' ${WRKSRC}/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 a82f98fea294..ca9d18e86537 100644
--- a/games/palomino/distinfo
+++ b/games/palomino/distinfo
@@ -1,9 +1,9 @@
-MD5 (palomino_src_20090615.tar.bz2) = 8e16fbdc01f03ec8f4525b15a586c1a7
-SHA256 (palomino_src_20090615.tar.bz2) = 16925beb0f4b905d41615c674f18770fb7e5be9536d3397eb302d98e6f128833
-SIZE (palomino_src_20090615.tar.bz2) = 546465
-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_src_20100309.tar.bz2) = 5eeb1f7ecaacf9edf8de04c015c403dd
+SHA256 (palomino_src_20100309.tar.bz2) = a39d03bd357c2b6dab9716395d5f58a4a9597695aaaeadcf0827d17e52bff4b6
+SIZE (palomino_src_20100309.tar.bz2) = 586201
+MD5 (palomino_data_misc_20091027.tar.bz2) = 5536778ade0bb90add007d6b712aa909
+SHA256 (palomino_data_misc_20091027.tar.bz2) = f5b7183ae98a7842dcc626de388d396a50c98011745bc6afca7da402c13fdac8
+SIZE (palomino_data_misc_20091027.tar.bz2) = 632943
 MD5 (palomino_data_models_20090615.tar.bz2) = 7f119de1dee58dcd7b30ae817befb9d3
 SHA256 (palomino_data_models_20090615.tar.bz2) = 53acdb00a61cbfe5faca7c30276ae76a2d0c8a169eff292b54fc9701bfbe885a
 SIZE (palomino_data_models_20090615.tar.bz2) = 28634800
diff --git a/games/palomino/pkg-plist b/games/palomino/pkg-plist
index ce25b8c413de..151a99a63091 100644
--- a/games/palomino/pkg-plist
+++ b/games/palomino/pkg-plist
@@ -1,7 +1,6 @@
 bin/palomino
 %%DOCSDIR%%/coding.html
 %%DOCSDIR%%/compression.html
-%%DOCSDIR%%/contents.html
 %%DOCSDIR%%/crash.html
 %%DOCSDIR%%/docs.css
 %%DOCSDIR%%/images/arrowBlue.gif
@@ -14,6 +13,7 @@ bin/palomino
 %%DOCSDIR%%/images/sprite1.png
 %%DOCSDIR%%/images/sprite2.png
 %%DOCSDIR%%/images/sprite3.png
+%%DOCSDIR%%/index.html
 %%DOCSDIR%%/issues.html
 %%DOCSDIR%%/lua_scripts.html
 %%DOCSDIR%%/manual.css
@@ -45,7 +45,9 @@ bin/palomino
 %%DOCSDIR%%/rules.html
 %%DOCSDIR%%/scene.html
 %%DOCSDIR%%/terrain.html
+%%DATADIR%%/data/fonts/README.txt
 %%DATADIR%%/data/fonts/arial.ttf
+%%DATADIR%%/data/fonts/masque.ttf
 %%DATADIR%%/data/joystick.conf
 %%DATADIR%%/data/models/README.txt
 %%DATADIR%%/data/models/a4/README.txt
@@ -417,11 +419,14 @@ bin/palomino
 %%DATADIR%%/data/shaders/inc_brightness_frag.glsl
 %%DATADIR%%/data/shaders/inc_color_vert.glsl
 %%DATADIR%%/data/shaders/inc_fog_frag.glsl
+%%DATADIR%%/data/shaders/inc_fog_vert.glsl
 %%DATADIR%%/data/shaders/inc_frag.glsl
 %%DATADIR%%/data/shaders/inc_shadow_frag.glsl
 %%DATADIR%%/data/shaders/inc_shadow_vert.glsl
 %%DATADIR%%/data/shaders/inc_vert.glsl
 %%DATADIR%%/data/shaders/module.txt
+%%DATADIR%%/data/shaders/nop_frag.glsl
+%%DATADIR%%/data/shaders/nop_vert.glsl
 %%DATADIR%%/data/shaders/reference/inc_DirectionalLight_vert.glsl
 %%DATADIR%%/data/shaders/reference/inc_PointLight_vert.glsl
 %%DATADIR%%/data/shaders/reference/inc_SpotLight_vert.glsl
@@ -461,7 +466,9 @@ bin/palomino
 %%DATADIR%%/scripts/hud.lua
 %%DATADIR%%/scripts/joystick.lua
 %%DATADIR%%/scripts/keyboard.lua
+%%DATADIR%%/scripts/keyboard_defs.lua
 %%DATADIR%%/scripts/lib.lua
+%%DATADIR%%/scripts/manipulator_mode.lua
 %%DATADIR%%/scripts/mission.lua
 %%DATADIR%%/scripts/mission_carrier.lua
 %%DATADIR%%/scripts/mission_ossim.lua
@@ -469,24 +476,14 @@ bin/palomino
 %%DATADIR%%/scripts/replay.lua
 %%DATADIR%%/scripts/scene.lua
 %%DATADIR%%/scripts/scene_GoldenGate.lua
-%%DATADIR%%/scripts/sim.lua
+%%DATADIR%%/scripts/sim_generic.lua
+%%DATADIR%%/scripts/sim_specific.lua
 %%DATADIR%%/scripts/sound.lua
 %%DATADIR%%/scripts/startup.lua
-%%DATADIR%%/scripts/tests/DerivedClass.lua
-%%DATADIR%%/scripts/tests/bools.lua
-%%DATADIR%%/scripts/tests/class_Test.lua
-%%DATADIR%%/scripts/tests/iterator.lua
-%%DATADIR%%/scripts/tests/lib.lua
-%%DATADIR%%/scripts/tests/numbers.lua
-%%DATADIR%%/scripts/tests/simple.lua
-%%DATADIR%%/scripts/tests/strings.lua
-%%DATADIR%%/scripts/tests/tables.lua
-%%DATADIR%%/scripts/tests/vec.lua
 %%DATADIR%%/scripts/tick.lua
 %%DATADIR%%/scripts/timer.lua
 %%DATADIR%%/scripts/views.lua
 %%DATADIR%%/scripts/weapons.lua
-@dirrm %%DATADIR%%/scripts/tests
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/data/textures
 @dirrm %%DATADIR%%/data/terrain