- Bump PORTREVISION

- Change master sites, icon, use GitHub=yes
- USES gmake instead of USE_GMAKE
- Use pkg-plist instead of PLIST_FILES and PORTDATA
- Use SUB_FILES=${PORTNAME} instead of ${PORTNAME}.sh
- Add DOCS Option
- Support STAGEDIR
- Add Desktop entry file
- Remove obsolete REINPLACE_CMD
- Use REINPLACE_CMD instead of simple patches
- Break lines around 80 characters
- Simplify Makefile
- Use patapizza-tetris.in instead of patapizza-tetris.sh.in

Approved by:	pawel / wg (mentors, implicit)

6 files changed, 90 insertions, 53 deletions

diff --git a/games/patapizza-tetris/Makefile b/games/patapizza-tetris/Makefile
index ec11df3962c9..d7fb9463b67d 100644
--- a/games/patapizza-tetris/Makefile
+++ b/games/patapizza-tetris/Makefile
@@ -1,59 +1,56 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	patapizza-tetris
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/patapizza/tetris/downloads/
-DISTNAME=	${PORTNAME:S/patapizza-//}-${DISTVERSION}
+MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=      ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Unofficial clone of the original Tetris game
 
 LICENSE=	GPLv3
 
-FETCH_ARGS?=	-Fpr
-USE_GMAKE=	yes
-USE_SDL=	sdl image gfx ttf
+USE_GITHUB=	yes
+GH_ACCOUNT=	patapizza
+GH_PROJECT=	tetris
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	e6f1a41
 
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png
+USES=		gmake
+USE_SDL=	sdl image gfx ttf
 
-PORTDATA=	*
 PORTDOCS=	README.md
 
-SUB_FILES=	${PORTNAME}.sh
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+SUB_FILES=	${PORTNAME}
+
+DESKTOP_ENTRIES="Patapizza Tetris" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;LogicGame;" ""
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|CC = gcc|CC = ${CC}| ; \
+	s|/usr|${PREFIX}|' ${WRKSRC}/Makefile
 
 do-build:
 	cd ${WRKSRC} && ${CC} -o ${PORTNAME} ${CFLAGS} \
 		-DDATA_PREFIX=\"${DATADIR}/\" \
-		-lm `${SDL_CONFIG} --cflags --libs` -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lm tetris.c
+		-lm `${SDL_CONFIG} --cflags --libs` -lSDL -lSDL_image \
+		-lSDL_gfx -lSDL_ttf -lm tetris.c
 
 do-install:
-# Scripts
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
-
-# Executable
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
-
-# Data
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} images ${DATADIR})
-
-# Pixmaps
-	${INSTALL_DATA} ${WRKSRC}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-# Documentation
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} images ${STAGEDIR}${DATADIR})
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/patapizza-tetris/distinfo b/games/patapizza-tetris/distinfo
index 170641d5a41b..1ca1855fb2cc 100644
--- a/games/patapizza-tetris/distinfo
+++ b/games/patapizza-tetris/distinfo
@@ -1,2 +1,4 @@
-SHA256 (tetris-1.0.tar.gz) = 06945705ca0b5242f4c3e7c86c1e6111e452a47a11919a549e0fb19bbb78210e
-SIZE (tetris-1.0.tar.gz) = 47115
+SHA256 (patapizza-tetris-1.0.tar.gz) = 3bbfcd00aa24e0e4ee453c6cf68f55fb807aef90faa8b144ecea93fa8ad04b9f
+SIZE (patapizza-tetris-1.0.tar.gz) = 47805
+SHA256 (patapizza-tetris.png) = e3bd889d4be73d676d268c3899e3f686a512fe5c73a8570f314c71e2d9b932d1
+SIZE (patapizza-tetris.png) = 2887
diff --git a/games/patapizza-tetris/files/patapizza-tetris.in b/games/patapizza-tetris/files/patapizza-tetris.in
new file mode 100644
index 000000000000..0e5aec3925f4
--- /dev/null
+++ b/games/patapizza-tetris/files/patapizza-tetris.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+cd "%%DATADIR%%"
+exec ./patapizza-tetris "${@}"
diff --git a/games/patapizza-tetris/files/patapizza-tetris.sh.in b/games/patapizza-tetris/files/patapizza-tetris.sh.in
deleted file mode 100644
index 008fc6d10fd5..000000000000
--- a/games/patapizza-tetris/files/patapizza-tetris.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-echo "patapizza Tetris: Starting up..."
-cd "%%DATADIR%%"
-./patapizza-tetris
diff --git a/games/patapizza-tetris/files/patch-Makefile b/games/patapizza-tetris/files/patch-Makefile
deleted file mode 100644
index 727cd0ea5e30..000000000000
--- a/games/patapizza-tetris/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2012-04-09 13:32:21.000000000 +0200
-+++ Makefile	2012-08-17 00:24:43.000000000 +0200
-@@ -1,6 +1,6 @@
- SHELL = /bin/sh
--CC = gcc
--prefix = /usr
-+CC = g++
-+prefix = %%PREFIX%%
- includedir = $(prefix)/include
- tetris: tetris.c
- 	$(CC) -Wall -I$(includedir)/SDL $< -o $@ -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lm
diff --git a/games/patapizza-tetris/pkg-plist b/games/patapizza-tetris/pkg-plist
new file mode 100644
index 000000000000..ce16f2f492f2
--- /dev/null
+++ b/games/patapizza-tetris/pkg-plist
@@ -0,0 +1,49 @@
+bin/patapizza-tetris
+%%DATADIR%%/images/0.jpg
+%%DATADIR%%/images/1.jpg
+%%DATADIR%%/images/2.jpg
+%%DATADIR%%/images/3.jpg
+%%DATADIR%%/images/4.jpg
+%%DATADIR%%/images/5.jpg
+%%DATADIR%%/images/6.jpg
+%%DATADIR%%/images/7.jpg
+%%DATADIR%%/images/8.jpg
+%%DATADIR%%/images/9.jpg
+%%DATADIR%%/images/A.jpg
+%%DATADIR%%/images/B.jpg
+%%DATADIR%%/images/C.jpg
+%%DATADIR%%/images/D.jpg
+%%DATADIR%%/images/E.jpg
+%%DATADIR%%/images/F.jpg
+%%DATADIR%%/images/G.jpg
+%%DATADIR%%/images/H.jpg
+%%DATADIR%%/images/I.jpg
+%%DATADIR%%/images/J.jpg
+%%DATADIR%%/images/K.jpg
+%%DATADIR%%/images/L.jpg
+%%DATADIR%%/images/M.jpg
+%%DATADIR%%/images/N.jpg
+%%DATADIR%%/images/O.jpg
+%%DATADIR%%/images/P.jpg
+%%DATADIR%%/images/Q.jpg
+%%DATADIR%%/images/R.jpg
+%%DATADIR%%/images/S.jpg
+%%DATADIR%%/images/T.jpg
+%%DATADIR%%/images/U.jpg
+%%DATADIR%%/images/V.jpg
+%%DATADIR%%/images/W.jpg
+%%DATADIR%%/images/X.jpg
+%%DATADIR%%/images/Y.jpg
+%%DATADIR%%/images/Z.jpg
+%%DATADIR%%/images/g.jpg
+%%DATADIR%%/images/i.jpg
+%%DATADIR%%/images/l.jpg
+%%DATADIR%%/images/logo.png
+%%DATADIR%%/images/o.jpg
+%%DATADIR%%/images/s.jpg
+%%DATADIR%%/images/t.jpg
+%%DATADIR%%/images/z.jpg
+%%DATADIR%%/patapizza-tetris
+share/pixmaps/patapizza-tetris.png
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%