6 files changed, 58 insertions, 227 deletions

diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index d00caae873ff..f7da40615fb3 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gltron
-PORTVERSION=	0.61
+PORTVERSION=	0.62
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gltron.sourceforge.net/download/
@@ -16,7 +16,8 @@ EXTRACT_SUFX=	-source.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D worm game for two players for X Window System
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
+LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod \
+		SDL_sound-1.0.0:${PORTSDIR}/audio/sdl_sound \
 		SDL_net.0:${PORTSDIR}/net/sdl_net \
 		png.5:${PORTSDIR}/graphics/png
 
@@ -24,26 +25,26 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${SDL_CONFIG}"
 
+MAN6=		gltron.6
+
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext ${PTHREAD_LIBS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
-	${REINPLACE_CMD} -e "s+#include <SDL/+#include <+g" ${WRKSRC}/*.[ch]
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-O2|@CFLAGS@|g'
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${TAR} -C ${WRKSRC} -cf - art data sounds | \
-		${TAR} -C ${DATADIR} --unlink -xf -
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG CREDITS README
+.for file in ChangeLog CREDITS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/games/gltron/distinfo b/games/gltron/distinfo
index f53a05ae3b7e..e98543972410 100644
--- a/games/gltron/distinfo
+++ b/games/gltron/distinfo
@@ -1 +1 @@
-MD5 (gltron-0.61-source.tar.gz) = bf2360ebb6c47ffa2f4d80a934aeb351
+MD5 (gltron-0.62-source.tar.gz) = cb62b09c39bd3f246432fa390e5e4881
diff --git a/games/gltron/files/patch-Makefile.in b/games/gltron/files/patch-Makefile.in
deleted file mode 100644
index 3ee216a447cd..000000000000
--- a/games/gltron/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/04/27 18:30:04	1.1
-+++ Makefile.in	2001/04/27 18:31:32
-@@ -20,7 +20,7 @@
- 
- CC = @CC@
- 
--CFLAGS = -c @CFLAGS@ @INCS@
-+CFLAGS = -c @CFLAGS@ @INCS@ -DPREFIX=\"@prefix@\"
- LIBS = @LIBS@
- 
- # fix these later
diff --git a/games/gltron/files/patch-ad b/games/gltron/files/patch-ad
deleted file mode 100644
index 2d5a41a186a8..000000000000
--- a/games/gltron/files/patch-ad
+++ /dev/null
@@ -1,160 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Apr 12 23:27:42 2001
-+++ configure	Fri Apr 27 21:44:23 2001
-@@ -536,7 +536,7 @@
- 
- 
- 
--LIBS='-L/usr/X11R6/lib'
-+LIBS="$LIBS $LDFLAGS"
- 
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
-@@ -972,7 +972,7 @@
- fi
- 
- 
--CFLAGS=""
-+CFLAGS="$CFLAGS $CPPFLAGS"
- 
- # Check whether --enable-warn or --disable-warn was given.
- if test "${enable_warn+set}" = set; then
-@@ -1023,7 +1023,7 @@
- fi
- 
- if test "x$enable_optimize" ; then
--	CFLAGS="$CFLAGS -O$enable_optimize"
-+	CFLAGS="$CFLAGS"
- fi
- 
- # Check whether --enable-network or --disable-network was given.
-@@ -1042,7 +1042,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lSDL_net  $LIBS"
-+LIBS="$LIBS -lSDL_net"
- cat > conftest.$ac_ext <<EOF
- #line 1048 "configure"
- #include "confdefs.h"
-@@ -1072,7 +1072,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lSDL_net $LIBS"
-+  LIBS="$LIBS -lSDL_net"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -1147,7 +1147,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lX11  $LIBS"
-+LIBS="$LIBS -lX11"
- cat > conftest.$ac_ext <<EOF
- #line 1153 "configure"
- #include "confdefs.h"
-@@ -1177,7 +1177,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lX11 $LIBS"
-+  LIBS="$LIBS -lX11"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -1191,7 +1191,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lGL  $LIBS"
-+LIBS="$LIBS -lGL"
- cat > conftest.$ac_ext <<EOF
- #line 1197 "configure"
- #include "confdefs.h"
-@@ -1221,7 +1221,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lGL $LIBS"
-+  LIBS="$LIBS -lGL"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -1229,14 +1229,14 @@
- fi
- 
- 
--echo $ac_n "checking for main in -lSDL""... $ac_c" 1>&6
--echo "configure:1234: checking for main in -lSDL" >&5
-+echo $ac_n "checking for main in -lSDL-1.1""... $ac_c" 1>&6
-+echo "configure:1234: checking for main in -lSDL-1.1" >&5
- ac_lib_var=`echo SDL'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lSDL  $LIBS"
-+LIBS="$LIBS -lSDL-1.1 ${PTHREAD_LIBS}"
- cat > conftest.$ac_ext <<EOF
- #line 1242 "configure"
- #include "confdefs.h"
-@@ -1262,8 +1262,8 @@
-   echo "$ac_t""yes" 1>&6
-   ${LN_S} -f system_sdl.c system.c ; \
- ${LN_S} -f system_sdl.h system.h ; \
--LIBS="$LIBS `sdl-config --libs`" ; \
--CFLAGS="$CFLAGS `sdl-config --cflags`" ; \
-+LIBS="$LIBS `$SDL_CONFIG --libs`" ; \
-+CFLAGS="$CFLAGS `$SDL_CONFIG --cflags`" ; \
- HAVE_SDL=1
- else
-   echo "$ac_t""no" 1>&6
-@@ -1274,7 +1274,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lglut  $LIBS"
-+LIBS="$LIBS -lglut"
- cat > conftest.$ac_ext <<EOF
- #line 1280 "configure"
- #include "confdefs.h"
-@@ -1320,7 +1320,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lSDL_mixer  $LIBS"
-+LIBS="-L$ac_default_prefix/lib -lSDL_mixer -lsmpeg $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1326 "configure"
- #include "confdefs.h"
-@@ -1357,7 +1357,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lmikmod  $LIBS"
-+LIBS="$LIBS -lmikmod"
- cat > conftest.$ac_ext <<EOF
- #line 1363 "configure"
- #include "confdefs.h"
-@@ -1445,7 +1445,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpng  $LIBS"
-+LIBS="$LIBS -lpng"
- cat > conftest.$ac_ext <<EOF
- #line 1451 "configure"
- #include "confdefs.h"
-@@ -1475,7 +1475,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpng $LIBS"
-+  LIBS="$LIBS -lpng"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/games/gltron/files/patch-gltron.c b/games/gltron/files/patch-gltron.c
deleted file mode 100644
index 22aa490bb87f..000000000000
--- a/games/gltron/files/patch-gltron.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- gltron.c.orig	Sun Apr 15 16:23:13 2001
-+++ gltron.c	Fri Apr 27 21:33:07 2001
-@@ -3,6 +3,8 @@
-   Copyright (C) 1999 by Andreas Umbach <marvin@dataway.ch>
- */
- 
-+#include <unistd.h>
-+
- #include "gltron.h"
- 
- /* todo: define the globals where I need them */
-@@ -98,7 +100,11 @@
-   SystemInit(&argc, argv);
- 
- #ifndef CURRENT_EQ_DATA_DIR
--  goto_installpath(argv[0]);
-+/*  goto_installpath(argv[0]);*/
-+  if (chdir(PREFIX "/share/gltron") != 0) {
-+    fprintf(stderr, "gltron: can't chdir into data directory");
-+    exit(1);
-+  }
- #endif
- 
-   /* initialize artpack list before loading settigns! */
diff --git a/games/gltron/pkg-plist b/games/gltron/pkg-plist
index a835d3287e73..84c37bf2d55b 100644
--- a/games/gltron/pkg-plist
+++ b/games/gltron/pkg-plist
@@ -1,7 +1,8 @@
 bin/gltron
-%%PORTDOCS%%share/doc/gltron/CHANGELOG
+%%PORTDOCS%%share/doc/gltron/ChangeLog
 %%PORTDOCS%%share/doc/gltron/CREDITS
 %%PORTDOCS%%share/doc/gltron/README
+share/gltron/art/arcade_spots/artpack.lua
 share/gltron/art/arcade_spots/gltron_floor.png
 share/gltron/art/arcade_spots/gltron_traildecal.png
 share/gltron/art/arcade_spots/gltron_wall_1.png
@@ -14,11 +15,10 @@ share/gltron/art/arcade_spots/skybox2.png
 share/gltron/art/arcade_spots/skybox3.png
 share/gltron/art/arcade_spots/skybox4.png
 share/gltron/art/arcade_spots/skybox5.png
-share/gltron/art/biohazard/artpack.ini
+share/gltron/art/biohazard/artpack.lua
 share/gltron/art/biohazard/babbage.0.png
 share/gltron/art/biohazard/babbage.1.png
 share/gltron/art/biohazard/gltron.png
-share/gltron/art/biohazard/gltron_crash.png
 share/gltron/art/biohazard/gltron_floor.png
 share/gltron/art/biohazard/gltron_logo.png
 share/gltron/art/biohazard/gltron_trail.png
@@ -33,16 +33,33 @@ share/gltron/art/biohazard/skybox2.png
 share/gltron/art/biohazard/skybox3.png
 share/gltron/art/biohazard/skybox4.png
 share/gltron/art/biohazard/skybox5.png
-share/gltron/art/default/artpack.ini
+share/gltron/art/classic/artpack.lua
+share/gltron/art/classic/babbage.0.png
+share/gltron/art/classic/babbage.1.png
+share/gltron/art/classic/gltron_floor.png
+share/gltron/art/classic/gltron_trail.png
+share/gltron/art/classic/gltron_traildecal.png
+share/gltron/art/classic/gltron_wall_1.png
+share/gltron/art/classic/gltron_wall_2.png
+share/gltron/art/classic/gltron_wall_3.png
+share/gltron/art/classic/gltron_wall_4.png
+share/gltron/art/classic/skybox0.png
+share/gltron/art/classic/skybox1.png
+share/gltron/art/classic/skybox2.png
+share/gltron/art/classic/skybox3.png
+share/gltron/art/classic/skybox4.png
+share/gltron/art/classic/skybox5.png
+share/gltron/art/classic/xenotron.0.png
+share/gltron/art/classic/xenotron.1.png
+share/gltron/art/default/artpack.lua
 share/gltron/art/default/babbage.0.png
 share/gltron/art/default/babbage.1.png
 share/gltron/art/default/gltron.png
 share/gltron/art/default/gltron_bitmap.png
-share/gltron/art/default/gltron_crash.png
 share/gltron/art/default/gltron_floor.png
+share/gltron/art/default/gltron_impact.png
 share/gltron/art/default/gltron_logo.png
 share/gltron/art/default/gltron_trail.png
-share/gltron/art/default/gltron_trail.png.bak
 share/gltron/art/default/gltron_traildecal.png
 share/gltron/art/default/gltron_wall_1.png
 share/gltron/art/default/gltron_wall_2.png
@@ -57,6 +74,7 @@ share/gltron/art/default/skybox5.png
 share/gltron/art/default/test.bitmap.png
 share/gltron/art/default/xenotron.0.png
 share/gltron/art/default/xenotron.1.png
+share/gltron/art/metalTron/artpack.lua
 share/gltron/art/metalTron/gltron_floor.png
 share/gltron/art/metalTron/gltron_wall_1.png
 share/gltron/art/metalTron/gltron_wall_2.png
@@ -70,19 +88,30 @@ share/gltron/art/metalTron/skybox4.png
 share/gltron/art/metalTron/skybox5.png
 share/gltron/data/babbage.ftx
 share/gltron/data/fonts.txt
+share/gltron/data/game_crash.ogg
 share/gltron/data/game_crash.wav
+share/gltron/data/game_engine.ogg
 share/gltron/data/game_engine.wav
-share/gltron/data/lightcycle high.obj
-share/gltron/data/lightcycle low.obj
-share/gltron/data/lightcycle med.obj
-share/gltron/data/menu.txt
-share/gltron/data/music/song_revenge_of_cats.it
+share/gltron/data/game_recognizer.ogg
+share/gltron/data/game_recognizer.wav
+share/gltron/data/lightcycle-high.obj
+share/gltron/data/lightcycle-low.obj
+share/gltron/data/lightcycle-med.obj
+share/gltron/data/lightcycle.mtl
+share/gltron/data/recognizer.mtl
 share/gltron/data/recognizer.obj
+share/gltron/data/recognizer_quad.obj
 share/gltron/data/settings.txt
 share/gltron/data/test.fbmp
-share/gltron/data/tron.mtl
-share/gltron/data/tron2.mtl
 share/gltron/data/xenotron.ftx
+share/gltron/music/song_revenge_of_cats.it
+share/gltron/scripts/audio.lua
+share/gltron/scripts/basics.lua
+share/gltron/scripts/config.lua
+share/gltron/scripts/menu.lua
+share/gltron/scripts/menu_functions.lua
+share/gltron/scripts/save.lua
+share/gltron/scripts/video.lua
 share/gltron/sounds/game_crash.wav
 share/gltron/sounds/game_engine.wav
 share/gltron/sounds/game_lose.wav
@@ -91,10 +120,12 @@ share/gltron/sounds/game_win.wav
 share/gltron/sounds/menu_action.wav
 share/gltron/sounds/menu_highlight.wav
 @dirrm share/gltron/sounds
-@dirrm share/gltron/data/music
+@dirrm share/gltron/scripts
+@dirrm share/gltron/music
 @dirrm share/gltron/data
 @dirrm share/gltron/art/metalTron
 @dirrm share/gltron/art/default
+@dirrm share/gltron/art/classic
 @dirrm share/gltron/art/biohazard
 @dirrm share/gltron/art/arcade_spots
 @dirrm share/gltron/art