6 files changed, 211 insertions, 133 deletions

diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 077c5eec9e92..80e2b1bedfa0 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	tuxracer
-PORTVERSION=	0.12.1
-PORTREVISION=	1
+PORTVERSION=	0.61
+#PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tuxracer
@@ -16,45 +16,27 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 
 MAINTAINER=	anholt@teleport.com
 
-LIB_DEPENDS=	glut.3:${PORTSDIR}/graphics/Mesa3 \
-		tcl82.1:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
+		tcl83.1:${PORTSDIR}/lang/tcl83
 
-USE_X_PREFIX=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl-inc="${LOCALBASE}/include/tcl8.2" \
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
+		THREAD_LIB="${PTHREAD_LIB}"
+CONFIGURE_ARGS=	--with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
 		--with-tcl-libs="${LOCALBASE}/lib" \
-		--with-tcl-lib-name=tcl82 \
-		--with-glut-libs="${X11BASE}/lib" \
-		--with-glut-inc="${X11BASE}/include" \
+		--with-gl-libs="${X11BASE}/lib" \
+		--with-gl-inc="${X11BASE}/include" \
 		--with-data-dir=${PREFIX}/share/tuxracer
 
-CFLAGS+=	-L${X11BASE}/lib
-
 WORKDATA=	${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
 COURSEDIRS=	1 2 3 4 5 6 7 8 9 10 11
 
 post-install:
 	${MKDIR} ${DATADIR}/courses
-.for i in ${COURSEDIRS}
-		${MKDIR} ${DATADIR}/courses/${i}
-		${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${DATADIR}/courses/${i}/
-		${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${DATADIR}/courses/${i}/
-		${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${DATADIR}/courses/${i}/
-		${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${DATADIR}/courses/${i}/
-.endfor
-	${MKDIR} ${DATADIR}/courses/common
-	${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${DATADIR}/courses/common/
-	${INSTALL_DATA} ${WORKDATA}/tux.tcl ${DATADIR}/
+	(cd ${WORKDATA} && ${TAR} -c -f - *) | \
+		(cd ${SHAREDIR} && ${TAR} -x -f - )
 
 .include <bsd.port.mk>
diff --git a/games/etuxracer/distinfo b/games/etuxracer/distinfo
index 6cbcfd75c93e..cea7f120a642 100644
--- a/games/etuxracer/distinfo
+++ b/games/etuxracer/distinfo
@@ -1,2 +1,2 @@
-MD5 (tuxracer-0.12.1.tar.gz) = 05019a59d229de17cc4bc4938194993b
-MD5 (tuxracer-data-0.12.1.tar.gz) = 9cff81ed6b0e492e9acab3d16dce19a2
+MD5 (tuxracer-0.61.tar.gz) = 206e8197ceaf0f00b25d4e2b4156e563
+MD5 (tuxracer-data-0.61.tar.gz) = aef877fee9e1a56483ff01fbdfb1e4b3
diff --git a/games/etuxracer/files/patch-configure b/games/etuxracer/files/patch-configure
deleted file mode 100644
index 1932f9caef48..000000000000
--- a/games/etuxracer/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	Tue Apr 18 09:05:12 2000
-+++ configure	Mon Jan 15 03:26:36 2001
-@@ -2776,7 +2776,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lMesaGL  $LIBS"
-+LIBS="-lMesaGL -lc_r $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2782 "configure"
- #include "confdefs.h"
-@@ -2810,7 +2810,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lMesaGL $LIBS"
-+  LIBS="-lMesaGL -lc_r $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -2874,7 +2874,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lMesaGLU  $LIBS"
-+LIBS="-lMesaGLU -lc_r $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2880 "configure"
- #include "confdefs.h"
-@@ -2908,7 +2908,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lMesaGLU $LIBS"
-+  LIBS="-lMesaGLU -lc_r $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/games/etuxracer/files/patch-configure.in b/games/etuxracer/files/patch-configure.in
new file mode 100644
index 000000000000..d55ba9935293
--- /dev/null
+++ b/games/etuxracer/files/patch-configure.in
@@ -0,0 +1,32 @@
+--- configure.in.orig	Mon Apr 30 16:23:53 2001
++++ configure.in	Mon Apr 30 16:39:21 2001
+@@ -303,6 +303,10 @@
+ 
+ saved_LIBS="$LIBS"
+ 
++if test "x$THREAD_LIB" = "x" ; then
++	THREAD_LIB="-lpthread"
++fi
++
+ AC_DEFUN( CHECK_FOR_GL_LIB, [
+     AC_MSG_CHECKING([for $GL_LIB_NAME library])
+     LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
+@@ -313,15 +317,15 @@
+ 	TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME"
+ 
+     else
+-	dnl Try with -lpthread
++	dnl Try with pthreads
+ 
+ 	AC_MSG_CHECKING([for $GL_LIB_NAME library (with pthreads)])
+-	LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME -lpthread"
++	LIBS="$saved_LIBS $TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME $THREAD_LIB"
+ 	AC_TRY_LINK( , , have_GL=yes, have_GL=no)
+ 	AC_MSG_RESULT([$have_GL])
+ 
+ 	if test "x$have_GL" = "xyes" ; then
+-	    TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME -lpthread"
++	    TR_LIBS="$TR_LIBS $GL_LDOPTS -l$GL_LIB_NAME $THREAD_LIB"
+ 	fi
+     fi
+ ])
diff --git a/games/etuxracer/pkg-descr b/games/etuxracer/pkg-descr
index 35d1739d7143..bb420f28fe1b 100644
--- a/games/etuxracer/pkg-descr
+++ b/games/etuxracer/pkg-descr
@@ -1,7 +1,7 @@
 Tux Racer is a 3d penguin racing game.  The object is to guide Tux down
 an icy slope while avoiding trees and rocks.
 
-WWW: http://tuxracer.sourceforge.net/
+WWW: http://www.tuxracer.com/
 
 - Eric Anholt
 anholt@teleport.com
diff --git a/games/etuxracer/pkg-plist b/games/etuxracer/pkg-plist
index 61fb71cfd45c..67029916d5f7 100644
--- a/games/etuxracer/pkg-plist
+++ b/games/etuxracer/pkg-plist
@@ -1,71 +1,173 @@
 bin/tuxracer
-share/tuxracer/courses/1/course.tcl
-share/tuxracer/courses/1/elev.rgb
-share/tuxracer/courses/1/terrain.rgb
-share/tuxracer/courses/1/trees.rgb
-share/tuxracer/courses/10/course.tcl
-share/tuxracer/courses/10/elev.rgb
-share/tuxracer/courses/10/terrain.rgb
-share/tuxracer/courses/10/trees.rgb
-share/tuxracer/courses/11/course.tcl
-share/tuxracer/courses/11/elev.rgb
-share/tuxracer/courses/11/terrain.rgb
-share/tuxracer/courses/11/trees.rgb
-share/tuxracer/courses/2/course.tcl
-share/tuxracer/courses/2/elev.rgb
-share/tuxracer/courses/2/terrain.rgb
-share/tuxracer/courses/2/trees.rgb
-share/tuxracer/courses/3/course.tcl
-share/tuxracer/courses/3/elev.rgb
-share/tuxracer/courses/3/terrain.rgb
-share/tuxracer/courses/3/trees.rgb
-share/tuxracer/courses/4/course.tcl
-share/tuxracer/courses/4/elev.rgb
-share/tuxracer/courses/4/terrain.rgb
-share/tuxracer/courses/4/trees.rgb
-share/tuxracer/courses/5/course.tcl
-share/tuxracer/courses/5/elev.rgb
-share/tuxracer/courses/5/terrain.rgb
-share/tuxracer/courses/5/trees.rgb
-share/tuxracer/courses/6/course.tcl
-share/tuxracer/courses/6/elev.rgb
-share/tuxracer/courses/6/terrain.rgb
-share/tuxracer/courses/6/trees.rgb
-share/tuxracer/courses/7/course.tcl
-share/tuxracer/courses/7/elev.rgb
-share/tuxracer/courses/7/terrain.rgb
-share/tuxracer/courses/7/trees.rgb
-share/tuxracer/courses/8/course.tcl
-share/tuxracer/courses/8/elev.rgb
-share/tuxracer/courses/8/terrain.rgb
-share/tuxracer/courses/8/trees.rgb
-share/tuxracer/courses/9/course.tcl
-share/tuxracer/courses/9/elev.rgb
-share/tuxracer/courses/9/terrain.rgb
-share/tuxracer/courses/9/trees.rgb
-share/tuxracer/courses/common/background1.rgb
-share/tuxracer/courses/common/background2.rgb
-share/tuxracer/courses/common/background3.rgb
+share/tuxracer/courses/bumpy_ride/course.tcl
+share/tuxracer/courses/bumpy_ride/elev.rgb
+share/tuxracer/courses/bumpy_ride/preview.rgb
+share/tuxracer/courses/bumpy_ride/terrain.rgb
+share/tuxracer/courses/bumpy_ride/trees.rgb
+@dirrm share/tuxracer/courses/bumpy_ride
+share/tuxracer/courses/course_idx.tcl
+share/tuxracer/courses/bunny_hill/course.tcl
+share/tuxracer/courses/bunny_hill/elev.rgb
+share/tuxracer/courses/bunny_hill/preview.rgb
+share/tuxracer/courses/bunny_hill/terrain.rgb
+share/tuxracer/courses/bunny_hill/trees.rgb
+@dirrm share/tuxracer/courses/bunny_hill
+share/tuxracer/courses/common/buttprint.rgb
+share/tuxracer/courses/common/buttstart.rgb
+share/tuxracer/courses/common/buttstop.rgb
+share/tuxracer/courses/common/cloudyback.rgb
+share/tuxracer/courses/common/cloudybottom.rgb
+share/tuxracer/courses/common/cloudyfront.rgb
+share/tuxracer/courses/common/cloudyleft.rgb
+share/tuxracer/courses/common/cloudyright.rgb
+share/tuxracer/courses/common/cloudytop.rgb
+share/tuxracer/courses/common/courseinit.tcl
+share/tuxracer/courses/common/cupicon.rgb
+share/tuxracer/courses/common/envmap.rgb
+share/tuxracer/courses/common/finish.rgb
+share/tuxracer/courses/common/flag.rgb
+share/tuxracer/courses/common/foggy_light.tcl
+share/tuxracer/courses/common/herring_standard.rgb
+share/tuxracer/courses/common/herringrunicon.rgb
 share/tuxracer/courses/common/ice.rgb
+share/tuxracer/courses/common/night_light.tcl
+share/tuxracer/courses/common/nightback.rgb
+share/tuxracer/courses/common/nightbottom.rgb
+share/tuxracer/courses/common/nightenv.rgb
+share/tuxracer/courses/common/nightfront.rgb
+share/tuxracer/courses/common/nightleft.rgb
+share/tuxracer/courses/common/nightright.rgb
+share/tuxracer/courses/common/nighttop.rgb
+share/tuxracer/courses/common/nopreview.rgb
 share/tuxracer/courses/common/rock.rgb
+share/tuxracer/courses/common/shrub.rgb
 share/tuxracer/courses/common/snow.rgb
-share/tuxracer/courses/common/standard_light.tcl
+share/tuxracer/courses/common/snowparticles.rgb
+share/tuxracer/courses/common/start.rgb
+share/tuxracer/courses/common/sunny_light.tcl
+share/tuxracer/courses/common/sunnyback.rgb
+share/tuxracer/courses/common/sunnybottom.rgb
+share/tuxracer/courses/common/sunnyfront.rgb
+share/tuxracer/courses/common/sunnyleft.rgb
+share/tuxracer/courses/common/sunnyright.rgb
+share/tuxracer/courses/common/sunnytop.rgb
 share/tuxracer/courses/common/tree.rgb
+share/tuxracer/courses/common/tree_barren.rgb
+share/tuxracer/courses/common/tux_walk.tcl
 share/tuxracer/courses/common/tree_polyhedron.tcl
 share/tuxracer/courses/common/tux_moonwalk.tcl
-share/tuxracer/courses/common/tux_walk.tcl
-share/tuxracer/tux.tcl
 @dirrm share/tuxracer/courses/common
-@dirrm share/tuxracer/courses/9
-@dirrm share/tuxracer/courses/8
-@dirrm share/tuxracer/courses/7
-@dirrm share/tuxracer/courses/6
-@dirrm share/tuxracer/courses/5
-@dirrm share/tuxracer/courses/4
-@dirrm share/tuxracer/courses/3
-@dirrm share/tuxracer/courses/2
-@dirrm share/tuxracer/courses/11
-@dirrm share/tuxracer/courses/10
-@dirrm share/tuxracer/courses/1
+share/tuxracer/courses/contrib/downhill_fear/course.tcl
+share/tuxracer/courses/contrib/downhill_fear/elev.rgb
+share/tuxracer/courses/contrib/downhill_fear/preview.rgb
+share/tuxracer/courses/contrib/downhill_fear/terrain.rgb
+share/tuxracer/courses/contrib/downhill_fear/trees.rgb
+@dirrm share/tuxracer/courses/contrib/downhill_fear
+share/tuxracer/courses/contrib/ice_canyon/course.tcl
+share/tuxracer/courses/contrib/ice_canyon/elev.rgb
+share/tuxracer/courses/contrib/ice_canyon/preview.rgb
+share/tuxracer/courses/contrib/ice_canyon/terrain.rgb
+share/tuxracer/courses/contrib/ice_canyon/trees.rgb
+@dirrm share/tuxracer/courses/contrib/ice_canyon
+share/tuxracer/courses/contrib/ingos_speedway/course.tcl
+share/tuxracer/courses/contrib/ingos_speedway/elev.rgb
+share/tuxracer/courses/contrib/ingos_speedway/preview.rgb
+share/tuxracer/courses/contrib/ingos_speedway/terrain.rgb
+share/tuxracer/courses/contrib/ingos_speedway/trees.rgb
+@dirrm share/tuxracer/courses/contrib/ingos_speedway
+share/tuxracer/courses/contrib/jools_big_mountain/course.tcl
+share/tuxracer/courses/contrib/jools_big_mountain/elev.rgb
+share/tuxracer/courses/contrib/jools_big_mountain/preview.rgb
+share/tuxracer/courses/contrib/jools_big_mountain/terrain.rgb
+share/tuxracer/courses/contrib/jools_big_mountain/trees.rgb
+@dirrm share/tuxracer/courses/contrib/jools_big_mountain
+share/tuxracer/courses/contrib/nebula/course.tcl
+share/tuxracer/courses/contrib/nebula/elev.rgb
+share/tuxracer/courses/contrib/nebula/preview.rgb
+share/tuxracer/courses/contrib/nebula/terrain.rgb
+share/tuxracer/courses/contrib/nebula/trees.rgb
+@dirrm share/tuxracer/courses/contrib/nebula
+share/tuxracer/courses/contrib/penguins_cant_fly/course.tcl
+share/tuxracer/courses/contrib/penguins_cant_fly/elev.rgb
+share/tuxracer/courses/contrib/penguins_cant_fly/preview.rgb
+share/tuxracer/courses/contrib/penguins_cant_fly/terrain.rgb
+share/tuxracer/courses/contrib/penguins_cant_fly/trees.rgb
+@dirrm share/tuxracer/courses/contrib/penguins_cant_fly
+share/tuxracer/courses/contrib/sentinel_towers/course.tcl
+share/tuxracer/courses/contrib/sentinel_towers/elev.rgb
+share/tuxracer/courses/contrib/sentinel_towers/preview.rgb
+share/tuxracer/courses/contrib/sentinel_towers/terrain.rgb
+share/tuxracer/courses/contrib/sentinel_towers/trees.rgb
+@dirrm share/tuxracer/courses/contrib/sentinel_towers
+share/tuxracer/courses/contrib/twin_paths/course.tcl
+share/tuxracer/courses/contrib/twin_paths/elev.rgb
+share/tuxracer/courses/contrib/twin_paths/preview.rgb
+share/tuxracer/courses/contrib/twin_paths/terrain.rgb
+share/tuxracer/courses/contrib/twin_paths/trees.rgb
+@dirrm share/tuxracer/courses/contrib/twin_paths
+@dirrm share/tuxracer/courses/contrib
+share/tuxracer/courses/frozen_river/course.tcl
+share/tuxracer/courses/frozen_river/elev.rgb
+share/tuxracer/courses/frozen_river/preview.rgb
+share/tuxracer/courses/frozen_river/terrain.rgb
+share/tuxracer/courses/frozen_river/trees.rgb
+@dirrm share/tuxracer/courses/frozen_river
+share/tuxracer/courses/path_of_daggers/course.tcl
+share/tuxracer/courses/path_of_daggers/elev.rgb
+share/tuxracer/courses/path_of_daggers/preview.rgb
+share/tuxracer/courses/path_of_daggers/terrain.rgb
+share/tuxracer/courses/path_of_daggers/trees.rgb
+@dirrm share/tuxracer/courses/path_of_daggers
+share/tuxracer/courses/twisty_slope/course.tcl
+share/tuxracer/courses/twisty_slope/elev.rgb
+share/tuxracer/courses/twisty_slope/preview.rgb
+share/tuxracer/courses/twisty_slope/terrain.rgb
+share/tuxracer/courses/twisty_slope/trees.rgb
+@dirrm share/tuxracer/courses/twisty_slope
 @dirrm share/tuxracer/courses
+share/tuxracer/README
+share/tuxracer/fonts/trebuchet.tfm
+share/tuxracer/fonts/trebuchet_white.rgb
+share/tuxracer/fonts/trebuchet_yel_blk.rgb
+@dirrm share/tuxracer/fonts
+share/tuxracer/music/options1-jt.it
+share/tuxracer/music/race1-jt.it
+share/tuxracer/music/race2-jt.it
+share/tuxracer/music/readme
+share/tuxracer/music/start1-jt.it
+share/tuxracer/music/wonrace1-jt.it
+@dirrm share/tuxracer/music
+share/tuxracer/sounds/tux_hit_tree1.wav
+share/tuxracer/sounds/tux_on_ice1.wav
+share/tuxracer/sounds/tux_on_rock1.wav
+share/tuxracer/sounds/tux_on_snow1.wav
+share/tuxracer/sounds/fish_pickup1.wav
+share/tuxracer/sounds/fish_pickup2.wav
+share/tuxracer/sounds/fish_pickup3.wav
+@dirrm share/tuxracer/sounds
+share/tuxracer/textures/checkmark.rgb
+share/tuxracer/textures/conditions_button.rgb
+share/tuxracer/textures/gaugeenergymask.rgb
+share/tuxracer/textures/gaugeoutline.rgb
+share/tuxracer/textures/gaugespeedmask.rgb
+share/tuxracer/textures/herringicon.rgb
+share/tuxracer/textures/listbox_arrows.rgb
+share/tuxracer/textures/menu_bottom_left.rgb
+share/tuxracer/textures/menu_bottom_right.rgb
+share/tuxracer/textures/menu_title.rgb
+share/tuxracer/textures/menu_top_left.rgb
+share/tuxracer/textures/menu_top_right.rgb
+share/tuxracer/textures/mirror_button.rgb
+share/tuxracer/textures/mouse_cursor.rgb
+share/tuxracer/textures/noicon.rgb
+share/tuxracer/textures/snow_button.rgb
+share/tuxracer/textures/splash_bl.rgb
+share/tuxracer/textures/splash_br.rgb
+share/tuxracer/textures/splash_tl.rgb
+share/tuxracer/textures/splash_tr.rgb
+share/tuxracer/textures/tuxlife.rgb
+share/tuxracer/textures/wind_button.rgb
+@dirrm share/tuxracer/textures
+share/tuxracer/tux.tcl
+share/tuxracer/tuxracer_init.tcl
 @dirrm share/tuxracer