3 files changed, 35 insertions, 62 deletions

diff --git a/games/ttt/Makefile b/games/ttt/Makefile
index 341f1a08b102..2fae0d59e21c 100644
--- a/games/ttt/Makefile
+++ b/games/ttt/Makefile
@@ -6,56 +6,38 @@
 #
 
 PORTNAME=	ttt
-PORTVERSION=	2003.03.14
-PORTREVISION=	5
+PORTVERSION=	2011.04
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/ttt/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/ttt/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple one or two player Tic Tac Toe game
 
-USE_GMAKE=	yes
-USE_SDL=	mixer sdl
-
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on
-
 # net/ttt
 CONFLICTS=	ttt-1*
 NO_LATEST_LINK=	yes
 
-.include <bsd.port.pre.mk>
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+USE_SDL=	sdl
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	aclocal automake autoheader autoconf
+AUTOMAKE_ARGS=	--add-missing --force
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
-# Fix Makefile.
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \
-		s|\(-Wall\)|${CFLAGS} \1|' \
-		${WRKSRC}/${MAKEFILE}
-
-# Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/${MAKEFILE}
-.endif
-
-# Fix paths to ${DATADIR}.
-	@${REINPLACE_CMD} -e 's|\(images/\)|${DATADIR}/\1| ; \
-		s|\(sounds/\)|${DATADIR}/\1|' \
-		${WRKSRC}/ttt.c
-
-do-install:
-# Program.
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-# Data.
-	${MKDIR} ${DATADIR}
-.for d in images sounds
-	${CP} -R ${WRKSRC}/${d} ${DATADIR}
-.endfor
-
-# Fix wrong permissions.
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	@${FIND} ${DATADIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	@${FIND} ${DATADIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} ${BINMODE}
-
-.include <bsd.port.post.mk>
+	@${REINPLACE_CMD} -e \
+		'/SDL_mixer/d' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e \
+		's|\./images|${DATADIR}/images|g' ${WRKSRC}/src/init.c
+
+post-install:
+	@${MKDIR} ${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/images/*.bmp ${DATADIR}/images
+
+.include <bsd.port.mk>
diff --git a/games/ttt/distinfo b/games/ttt/distinfo
index 12b129574529..7f8232ec9ef5 100644
--- a/games/ttt/distinfo
+++ b/games/ttt/distinfo
@@ -1,3 +1,2 @@
-MD5 (ttt-2003.03.14.tar.gz) = 25c00a720820614e75dd31a593b4aa3e
-SHA256 (ttt-2003.03.14.tar.gz) = 26061a321b48b31030cac7d4f2a2c66e0945e5bfb4f6f884fe082b4cb9ebd399
-SIZE (ttt-2003.03.14.tar.gz) = 130205
+SHA256 (ttt-2011.04.tar.gz) = 747e3ed66e37aae9ceb32599b209d36451e910899cdd36dbf44763e90213b81e
+SIZE (ttt-2011.04.tar.gz) = 140666
diff --git a/games/ttt/pkg-plist b/games/ttt/pkg-plist
index d744bd9645de..b4c37a718681 100644
--- a/games/ttt/pkg-plist
+++ b/games/ttt/pkg-plist
@@ -1,22 +1,14 @@
 bin/ttt
-%%DATADIR%%/images/grid.bmp
-%%DATADIR%%/images/o.bmp
-%%DATADIR%%/images/start_1ply.bmp
-%%DATADIR%%/images/start_2ply.bmp
-%%DATADIR%%/images/title.bmp
+%%DATADIR%%/images/game_board.bmp
+%%DATADIR%%/images/human_vs_computer.bmp
+%%DATADIR%%/images/human_vs_human.bmp
+%%DATADIR%%/images/mark_o.bmp
+%%DATADIR%%/images/mark_x.bmp
+%%DATADIR%%/images/program_logo.bmp
+%%DATADIR%%/images/status_draw.bmp
+%%DATADIR%%/images/status_win_o.bmp
+%%DATADIR%%/images/status_win_x.bmp
 %%DATADIR%%/images/turn_o.bmp
 %%DATADIR%%/images/turn_x.bmp
-%%DATADIR%%/images/win_draw.bmp
-%%DATADIR%%/images/win_o.bmp
-%%DATADIR%%/images/win_x.bmp
-%%DATADIR%%/images/x.bmp
-%%DATADIR%%/sounds/badspot.wav
-%%DATADIR%%/sounds/draw.wav
-%%DATADIR%%/sounds/intro.wav
-%%DATADIR%%/sounds/o.wav
-%%DATADIR%%/sounds/start.wav
-%%DATADIR%%/sounds/win.wav
-%%DATADIR%%/sounds/x.wav
-@dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%