- Update to 1.3

- Add CREDITS to DOCS
- Break lines around 80 characters
- Mute MKDIR and add symlink for the CREDITS
- Remove obsolete REINPLACE, changed by upstream

4 files changed, 13 insertions, 34 deletions

diff --git a/games/tong/Makefile b/games/tong/Makefile
index 2621645f771e..be1fc953b75f 100644
--- a/games/tong/Makefile
+++ b/games/tong/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tong
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	games
 MASTER_SITES=	http://www.nongnu.org/tong/
 
@@ -15,7 +14,7 @@ LICENSE=	GPLv3
 USES=		gmake
 USE_SDL=	image mixer sdl
 
-PORTDOCS=	CHANGELOG README making-of.txt notes.txt
+PORTDOCS=	CHANGELOG CREDITS README making-of.txt notes.txt
 OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -24,23 +23,26 @@ DESKTOP_ENTRIES="TONG!" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|GAME_DATA_DIR := .|GAME_DATA_DIR := ${DATADIR}|' \
-	-e 's|CC = g++ -O3 |CC = ${CXX} ${CXXFLAGS} |' \
+	@${REINPLACE_CMD} -e \
+		's|GAME_DATA_DIR := .|GAME_DATA_DIR := ${DATADIR}|; \
+		 s|CC = g++ -O3 |CC = ${CXX} ${CXXFLAGS} |' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.png" ${STAGEDIR}${DATADIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "*.png" ${STAGEDIR}${DATADIR})
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/media/
 .for f in *.png *.xcf *.ogg *.ico
-	@(cd ${WRKSRC}/media && ${COPYTREE_SHARE} "${f}" ${STAGEDIR}${DATADIR}/media/)
+	@(cd ${WRKSRC}/media && ${COPYTREE_SHARE} "${f}" \
+		${STAGEDIR}${DATADIR}/media/)
 .endfor
 
 	${LN} -sf ${DATADIR}/media/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${LN} -sf ${DOCSDIR}/CREDITS ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/tong/distinfo b/games/tong/distinfo
index 3bbe43d0c25d..af10a8460324 100644
--- a/games/tong/distinfo
+++ b/games/tong/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tong-1.2.tar.gz) = 7514bf0c1c1a9a8d6985d0fbe83486b83f665d9a202beed2ae91e3f45e90942b
-SIZE (tong-1.2.tar.gz) = 88028070
+SHA256 (tong-1.3.tar.gz) = 51faed9ab6f3c1e0d1858f96ae5fe2c2da58fb7638f84c520d7de714b467af00
+SIZE (tong-1.3.tar.gz) = 88022680
diff --git a/games/tong/files/patch-tong.cpp b/games/tong/files/patch-tong.cpp
deleted file mode 100644
index 004e92d6d7ba..000000000000
--- a/games/tong/files/patch-tong.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- tong.cpp.orig	2012-10-31 18:18:19.000000000 +0100
-+++ tong.cpp	2012-11-15 13:27:09.000000000 +0100
-@@ -63,6 +63,7 @@
- #define SCREEN_CREDITS      8
- 
- #define DEMO_TIME           8000
-+#define MIN_TIME            45
- 
- #define GP2X_BUTTON_UP         0
- #define GP2X_BUTTON_UPLEFT     1
-@@ -1854,6 +1855,13 @@
- 		SDL_Flip(screen);
- 		lastlastupdate=lastupdate;
- 		lastupdate=SDL_GetTicks();
-+
-+		// limit to 1000/MIN_TIME fps
-+		if (lastupdate-lastlastupdate < MIN_TIME) {
-+		    SDL_Delay(MIN_TIME - (lastupdate - lastlastupdate));
-+		}
-+		lastupdate = SDL_GetTicks();
-+		
- 	}  //main game loop
- 
- 	Mix_FreeMusic(music);
diff --git a/games/tong/pkg-plist b/games/tong/pkg-plist
index 18c1df882b76..114d2045830f 100644
--- a/games/tong/pkg-plist
+++ b/games/tong/pkg-plist
@@ -1,5 +1,6 @@
 bin/tong
 share/pixmaps/tong.png
+%%DATADIR%%/CREDITS
 %%DATADIR%%/background.png
 %%DATADIR%%/darkblot.png
 %%DATADIR%%/media/background-8bit.png