8 files changed, 47 insertions, 109 deletions

diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 11f231f5f0d2..7f1cde1ccf32 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	ltris
-PORTVERSION=	010310
+PORTVERSION=	1.0.1
+PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		LIBS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lcompat"
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -30,9 +30,7 @@ pre-patch:
 post-install:
 	${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
 	${CHMOD} 2755 ${PREFIX}/bin/${PORTNAME}
-.for N in 0 1 2
-	${CHMOD} 664 /var/games/${PORTNAME}/highscore.${N}
-	${CHOWN} root:games /var/games/${PORTNAME}/highscore.${N}
-.endfor
+	${CHMOD} 664 /var/games/${PORTNAME}/ltris.hscr
+	${CHOWN} root:games /var/games/${PORTNAME}/ltris.hscr
 
 .include <bsd.port.mk>
diff --git a/games/ltris/distinfo b/games/ltris/distinfo
index 414b6720b6b4..64e4cc5cd347 100644
--- a/games/ltris/distinfo
+++ b/games/ltris/distinfo
@@ -1 +1 @@
-MD5 (ltris-010310.tar.gz) = 800964c90a74e6c66ec1b3e888b59ac2
+MD5 (ltris-1.0.1.tar.gz) = 76f87ccc12442b8107abe295c9167327
diff --git a/games/ltris/files/patch-aa b/games/ltris/files/patch-aa
deleted file mode 100644
index efc65f51557e..000000000000
--- a/games/ltris/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ltris/Makefile.in	2000/10/19 14:39:51	1.1
-+++ ltris/Makefile.in	2000/10/19 14:40:03
-@@ -76,7 +76,7 @@
- 
- bin_PROGRAMS = ltris
- ltris_SOURCES = tetris.cpp preview.cpp wave.cpp soundserver.cpp shrapnelllist.cpp shrapnell.cpp number.cpp gfx.S block.cpp bowl.cpp hiscore.cpp sdlsurface.cpp sdlfont.cpp sdl.cpp menuitem.cpp menu.cpp menumanager.cpp game.cpp main.cpp 
--ltris_LDADD = -lpthread -lSDL -lm
-+ltris_LDADD = #-lpthread -lSDL -lm
- 
- EXTRA_DIST = main.cpp game.cpp game.h menumanager.cpp menumanager.h menu.cpp menu.h menuitem.cpp menuitem.h sdl.cpp sdl.h sdlfont.cpp sdlfont.h sdlsurface.cpp sdlsurface.h defs.h hiscore.cpp hiscore.h bowl.cpp bowl.h block.cpp block.h gfx.h gfx.S number.cpp number.h shrapnell.cpp shrapnell.h shrapnelllist.cpp shrapnelllist.h soundserver.cpp soundserver.h wave.cpp wave.h preview.cpp preview.h tetris.cpp tetris.h bkgnd0.bmp bkgnd1.bmp bkgnd2.bmp bkgnd3.bmp bkgnd4.bmp blocks.bmp logo.bmp quest.bmp title.bmp click.wav explosion.wav stop.wav leftright.wav font_s.sdlfnt f_white.bmp f_yellow.bmp highscore.0 highscore.1 highscore.2
- 
diff --git a/games/ltris/files/patch-ab b/games/ltris/files/patch-ab
deleted file mode 100644
index 38c3422f631f..000000000000
--- a/games/ltris/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ltris/number.h	2000/10/19 14:34:25	1.1
-+++ ltris/number.h	2000/10/19 14:34:39
-@@ -24,6 +24,7 @@
-   */
- 
- #include "sdl.h"
-+#include <sys/types.h>
- #include <sys/timeb.h>
- 
- class Number {
diff --git a/games/ltris/files/patch-ac b/games/ltris/files/patch-ac
deleted file mode 100644
index 6fa8a779b0d4..000000000000
--- a/games/ltris/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- ltris/game.cpp.orig	Thu Oct 19 17:48:49 2000
-+++ ltris/game.cpp	Thu Oct 19 17:56:15 2000
-@@ -16,11 +16,17 @@
-  ***************************************************************************/
- 
- #include <SDL.h>
-+#include <sys/types.h>
-+#include <sys/timeb.h>
- #include <stdlib.h>
- #include <string.h>
- #include "game.h"
- #include "defs.h"
- #include "soundserver.h"
-+
-+extern "C" {
-+	int ftime(struct timeb *tp);
-+};
- 
- Game::Game()
- {
diff --git a/games/ltris/files/patch-ae b/games/ltris/files/patch-ae
index 966acad18dcb..6485c1c304fa 100644
--- a/games/ltris/files/patch-ae
+++ b/games/ltris/files/patch-ae
@@ -1,31 +1,16 @@
---- configure.orig	Thu Dec 21 19:28:40 2000
-+++ configure	Thu Dec 21 19:30:24 2000
-@@ -1272,7 +1272,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lSDL  $LIBS"
-+LIBS="$LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1278 "configure"
- #include "confdefs.h"
-@@ -1302,7 +1302,7 @@
- #define $ac_tr_lib 1
- EOF
+
+$FreeBSD$
+
+--- configure	2002/01/14 13:27:57	1.1
++++ configure	2002/01/14 13:28:20
+@@ -1617,8 +1617,8 @@
  
--  LIBS="-lSDL $LIBS"
-+  LIBS="$LIBS"
  
- else
-   echo "$ac_t""no" 1>&6
-@@ -1322,8 +1322,8 @@
  
+-inst_dir=$datadir/games/ltris
+-hi_dir=/var/lib/games
++inst_dir=$datadir/ltris
++hi_dir=/var/games/ltris
  
- 
--sdir=$datadir/games/ltris
--hdir=/var/lib/games/ltris
-+sdir=$datadir/ltris
-+hdir=/var/games/ltris
- inst_flag="-DSRC_DIR=\\\"$sdir/\\\""
- hi_inst_flag="-DHI_DIR=\\\"$hdir/\\\""
- 
+ # Check whether --enable-install or --disable-install was given.
+ if test "${enable_install+set}" = set; then
diff --git a/games/ltris/files/patch-af b/games/ltris/files/patch-af
deleted file mode 100644
index 52ea8a6a8a68..000000000000
--- a/games/ltris/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ltris/tetris.cpp	2001/03/11 09:32:03	1.1
-+++ ltris/tetris.cpp	2001/03/11 09:33:01
-@@ -84,6 +84,7 @@
- 		init_data.help = 0;
- 		init_data.bl_by_bl = 0;
- 		init_data.fullscreen = 0;
-+		init_data.slow = 0;
- 	}
- 	else
- 		fread(&init_data, sizeof(InitData), 1, f);
diff --git a/games/ltris/pkg-plist b/games/ltris/pkg-plist
index df23268d0224..edd4e508e0e8 100644
--- a/games/ltris/pkg-plist
+++ b/games/ltris/pkg-plist
@@ -1,23 +1,32 @@
 bin/ltris
-share/ltris/bkgnd0.bmp
-share/ltris/bkgnd1.bmp
-share/ltris/bkgnd2.bmp
-share/ltris/bkgnd3.bmp
-share/ltris/bkgnd4.bmp
-share/ltris/blocks.bmp
-share/ltris/click.wav
-share/ltris/explosion.wav
-share/ltris/f_white.bmp
-share/ltris/f_yellow.bmp
-share/ltris/font_s.sdlfnt
-share/ltris/leftright.wav
-share/ltris/logo.bmp
-share/ltris/quest.bmp
-share/ltris/stop.wav
-share/ltris/title.bmp
+share/ltris/figures
+share/ltris/gfx/back0.bmp
+share/ltris/gfx/back1.bmp
+share/ltris/gfx/back2.bmp
+share/ltris/gfx/back3.bmp
+share/ltris/gfx/back4.bmp
+share/ltris/gfx/back5.bmp
+share/ltris/gfx/balloon.bmp
+share/ltris/gfx/balloon_peek.bmp
+share/ltris/gfx/blocks.bmp
+share/ltris/gfx/f_small_white.bmp
+share/ltris/gfx/f_small_yellow.bmp
+share/ltris/gfx/f_tiny_black.bmp
+share/ltris/gfx/f_white.bmp
+share/ltris/gfx/f_yellow.bmp
+share/ltris/gfx/logo.bmp
+share/ltris/gfx/menuback.bmp
+share/ltris/gfx/quest.bmp
+share/ltris/sounds/click.wav
+share/ltris/sounds/excellent.wav
+share/ltris/sounds/explosion.wav
+share/ltris/sounds/leftright.wav
+share/ltris/sounds/motion.wav
+share/ltris/sounds/nextlevel.wav
+share/ltris/sounds/stop.wav
+@dirrm share/ltris/sounds
+@dirrm share/ltris/gfx
 @dirrm share/ltris
 @cwd /var/games
-ltris/highscore.0
-ltris/highscore.1
-ltris/highscore.2
+ltris/ltris.hscr
 @dirrm ltris