6 files changed, 187 insertions, 28 deletions
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index dc1873beeb04..02911d2d06d7 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -6,30 +6,41 @@
 #
 
 PORTNAME=	gltron
-PORTVERSION=	0.53
+PORTVERSION=	0.59
 CATEGORIES=	games
-MASTER_SITES=	http://www.ards.net/Andreas/gltron/
+MASTER_SITES=	http://gltron.sourceforge.net/download/
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	glut.3:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
+		glut.3:${PORTSDIR}/graphics/Mesa3
+
+.if defined(NO_SOUND)
+SOUND=""
+.else
+SOUND="-DSOUND"
+.endif
 
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAKE_ENV+=	OPT="${CFLAGS}"
+MAKE_ENV+=	OPT="${CFLAGS}" SOUND="${SOUND}"
+
+pre-build:
+	${PERL} -pi -e "s+#include <SDL\/+#include <+g" ${WRKSRC}/*.[ch]
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/gltron/
-.for FILE in *.sgi *.txt t-u-low.obj tron.mtl xenotron.ftx
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/gltron/
-.endfor
-	@${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gltron/ ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/data/*tx* ${WRKSRC}/data/*.png ${WRKSRC}/data/*.obj \
+			${WRKSRC}/data/*mtl ${WRKSRC}/data/*.it ${WRKSRC}/sounds/*wav \
+			${PREFIX}/share/gltron
+	${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/gltron
 .for file in CHANGELOG CREDITS README
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gltron
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gltron
 .endfor
 .endif
 
diff --git a/games/gltron/distinfo b/games/gltron/distinfo
index 7f46f7425025..232d24f7a61c 100644
--- a/games/gltron/distinfo
+++ b/games/gltron/distinfo
@@ -1 +1 @@
-MD5 (gltron-0.53.tar.gz) = 596aaa813c2c11411939e89a6d40d059
+MD5 (gltron-0.59.tar.gz) = 2927d29a83e500b3f8e1eff7cb1ed3ce
diff --git a/games/gltron/files/patch-ac b/games/gltron/files/patch-ac
index 47198d2ee6bb..e2bdd1d9aeca 100644
--- a/games/gltron/files/patch-ac
+++ b/games/gltron/files/patch-ac
@@ -1,14 +1,16 @@
---- file.c	Mon Jan  3 19:05:10 2000
-+++ file.c.new	Sun Feb 13 02:22:14 2000
-@@ -1,13 +1,16 @@
+--- file.c	Mon Apr 24 23:19:46 2000
++++ file.c.new	Mon Apr 24 23:25:07 2000
+@@ -1,14 +1,18 @@
  #include "gltron.h"
+ 
 +#ifndef SHARE1
 +#define SHARE1 "\"/usr/local/share/gltron\""
 +#endif
 +#ifndef SHARE2
 +#define SHARE2 "\"/usr/X11R6/share/gltron\""
 +#endif
- 
++
+ static char* subdir = "data";
  char* getFullPath(char *filename) {
    char *path;
    FILE *fp = NULL;
@@ -20,7 +22,7 @@
    /* check a few directories for the files and */
    /* return the full path. */
    
-@@ -43,8 +46,8 @@
+@@ -44,8 +48,8 @@
      printf("unsuccessful\n");
    }
  
@@ -31,7 +33,7 @@
  
    printf("checking '%s'", path);
    fp = fopen(path, "r");
-@@ -56,8 +59,8 @@
+@@ -57,8 +61,8 @@
    free(path);
    printf("unsuccessful\n");
  
diff --git a/games/gltron/files/patch-ad b/games/gltron/files/patch-ad
new file mode 100644
index 000000000000..07ca7abf1cb0
--- /dev/null
+++ b/games/gltron/files/patch-ad
@@ -0,0 +1,91 @@
+--- configure.orig	Thu Mar 30 11:22:00 2000
++++ configure	Fri Apr 28 14:46:13 2000
+@@ -523,7 +523,7 @@
+ 
+ 
+ 
+-LIBS='-L/usr/X11R6/lib'
++LIBS='-L$ac_default_prefix/lib -L/usr/X11R6/lib'
+ CC='gcc'
+ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+ echo "configure:530: checking for main in -lm" >&5
+@@ -701,14 +701,14 @@
+ { echo "configure: error: GLU should come with OpenGL" 1>&2; exit 1; }
+ fi
+ 
+-echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
+-echo "configure:706: checking for main in -lpthread" >&5
++echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6
++echo "configure:706: checking for main in -pthread" >&5
+ ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 714 "configure"
+ #include "confdefs.h"
+@@ -738,21 +738,21 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-pthread $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ { echo "configure: error: SDL needs pthread to run properly" 1>&2; exit 1; }
+ fi
+ 
+-echo $ac_n "checking for main in -lSDL""... $ac_c" 1>&6
+-echo "configure:750: checking for main in -lSDL" >&5
++echo $ac_n "checking for main in -lSDL-1.1""... $ac_c" 1>&6
++echo "configure:750: checking for main in -lSDL-1.1" >&5
+ ac_lib_var=`echo SDL'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lSDL -lpthread $LIBS"
++LIBS="-L$ac_default_prefix/lib -lSDL-1.1 -pthread $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 758 "configure"
+ #include "confdefs.h"
+@@ -782,7 +782,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lSDL $LIBS"
++  LIBS="-L$ac_default_prefix/lib -lSDL-1.1 $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -796,7 +796,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 802 "configure"
+ #include "confdefs.h"
+@@ -826,7 +826,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lSDL_mixer $LIBS"
++  LIBS="-lSDL_mixer -lsmpeg $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -840,7 +840,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpng  $LIBS"
++LIBS="-L$ac_default_prefix/lib -lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 846 "configure"
+ #include "confdefs.h"
diff --git a/games/gltron/files/patch-ae b/games/gltron/files/patch-ae
new file mode 100644
index 000000000000..9438f671c396
--- /dev/null
+++ b/games/gltron/files/patch-ae
@@ -0,0 +1,34 @@
+--- Makefile.in.orig	Tue Mar 21 23:34:04 2000
++++ Makefile.in	Fri Apr 28 14:22:24 2000
+@@ -1,11 +1,16 @@
+ # Makefile for gltron
+ 
+-SHELL = /bin/sh
+-OPT = -O2
+-CFLAGS = -c -pedantic -Wall -DSOUND
+-GL_LIBS = -lm -lGL -lGLU -lSDL -lpthread -lpng
+-XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11
+-SNDLIBS =  -lSDL_mixer
++PREFIX		?=	/usr/X11R6
++LOCALBASE	?=	/usr/local
++X11BASE		?=	/usr/X11R6
++SHELL		=	/bin/sh
++SOUND		?=	-DSOUND
++OPT		=	-Wall ${SOUND} -DSHARE1="\"$(PREFIX)/share/gltron\"" -DSHARE2="\"$(X11BASE)/share/gltron\""
++INCS		=	-I$(LOCALBASE)/include -I$(X11BASE)/include -I$(LOCALBASE)/include/SDL11
++CFLAGS		?=	-O -pipe
++GL_LIBS		=	-lm -lGL -lGLU -lSDL-1.1 -pthread -lpng
++XLIBS		=	-L$(X11BASE)/lib -lX11
++SNDLIBS		=	-L$(LOCALBASE)/lib -lSDL_mixer -lSDL-1.1 -lsmpeg
+ 
+ GLTRON_INSTALLDIR = /usr/bin
+ GLTRON_HOME = /usr/share/games/gltron
+@@ -45,7 +50,7 @@
+ all: gltron
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(OPT) $<
++	$(CC) -c $(CFLAGS) $(OPT) $(INCS) $<
+ 
+ gltron: $(OBJ_SOUND)
+ 	$(CC) $(OPT) -o gltron $(OBJ_SOUND) $(GL_LIBS) $(XLIBS) $(SNDLIBS)
diff --git a/games/gltron/pkg-plist b/games/gltron/pkg-plist
index bf1c7904e0f5..a7033a460eb8 100644
--- a/games/gltron/pkg-plist
+++ b/games/gltron/pkg-plist
@@ -1,17 +1,38 @@
 bin/gltron
-share/doc/gltron/CHANGELOG
-share/doc/gltron/CREDITS
-share/doc/gltron/README
-share/gltron/gltron.sgi
-share/gltron/gltron_crash.sgi
-share/gltron/gltron_floor.sgi
-share/gltron/gltron_wall.sgi
+share/gltron/babbage.0.png
+share/gltron/babbage.1.png
+share/gltron/babbage.ftx
+share/gltron/fonts.txt
+share/gltron/game_crash.wav
+share/gltron/game_engine.wav
+share/gltron/game_lose.wav
+share/gltron/game_start.wav
+share/gltron/game_win.wav
+share/gltron/gltron.it
+share/gltron/gltron.png
+share/gltron/gltron_crash.png
+share/gltron/gltron_floor.png
+share/gltron/gltron_logo.png
+share/gltron/gltron_trail.png
+share/gltron/gltron_traildecal.png
+share/gltron/gltron_wall_1.png
+share/gltron/gltron_wall_2.png
+share/gltron/gltron_wall_3.png
+share/gltron/gltron_wall_4.png
+share/gltron/lightcycle high.obj
+share/gltron/lightcycle low.obj
+share/gltron/lightcycle med.obj
 share/gltron/menu.txt
+share/gltron/menu_action.wav
+share/gltron/menu_highlight.wav
 share/gltron/settings.txt
-share/gltron/t-u-low.obj
 share/gltron/tron.mtl
-share/gltron/xenotron.0.sgi
-share/gltron/xenotron.1.sgi
+share/gltron/tron2.mtl
+share/gltron/xenotron.0.png
+share/gltron/xenotron.1.png
 share/gltron/xenotron.ftx
-@dirrm share/doc/gltron
+share/doc/gltron/CHANGELOG
+share/doc/gltron/CREDITS
+share/doc/gltron/README
 @dirrm share/gltron
+@dirrm share/doc/gltron