- Add LICENSE_FILE

- Fix highscore handling
- Simplify installation
- Modernize plist

3 files changed, 15 insertions, 38 deletions

diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index d1c93061670c..b50811cb2469 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tornado
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	https://kiza.eu/media/software/tornado/
 
@@ -11,6 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ccurses-based game of weather destruction
 
 LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gettext gmake ncurses
 
@@ -35,26 +36,23 @@ post-patch:
 		's|/usr/local|PREFIX|' ${WRKSRC}/doc/man/${i}/tornado.6.${i}.in
 .endfor
 
-post-build:
-	@${LN} -sf tornado.scores ${WRKSRC}/tornado.scores.init
-
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} tornado \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/doc/man && ${INSTALL_MAN} tornado.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6)
+	${INSTALL_PROGRAM} ${WRKSRC}/tornado \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/man/tornado.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6
 .for i in de fr it nl no ru
 	@${MKDIR} ${STAGEDIR}${MAN6PREFIX}/man/${i}/man6
-	(cd ${WRKSRC}/doc/man/${i} && ${INSTALL_MAN} tornado.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/${i}/man6)
+	${INSTALL_MAN} ${WRKSRC}/doc/man/${i}/tornado.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/${i}/man6
 .endfor
 .for i in de es fr it nl no pt ru
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
-	(cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.mo \
-		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/tornado.mo)
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/tornado.mo
 .endfor
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} tornado.scores.init \
-		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}/var/games
+	${INSTALL_DATA} ${WRKSRC}/tornado.scores \
+		${STAGEDIR}/var/games/tornado.scores.sample
 
 .include <bsd.port.mk>
diff --git a/games/tornado/pkg-install b/games/tornado/pkg-install
deleted file mode 100644
index ca072dcbbcde..000000000000
--- a/games/tornado/pkg-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-FILE=/var/games/tornado.scores
-[ "$2" != "POST-INSTALL" -o -f "$FILE" ] && exit 0
-
-echo "===>   Creating initial high score file $FILE"
-install -o root -g games -m 664 ${PKG_PREFIX}/share/tornado/tornado.scores.init $FILE
diff --git a/games/tornado/pkg-plist b/games/tornado/pkg-plist
index b54fcb7846fc..93e2d010d0d9 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -1,4 +1,4 @@
-bin/tornado
+@(,games,2755) bin/tornado
 man/de/man6/tornado.6.gz
 man/fr/man6/tornado.6.gz
 man/it/man6/tornado.6.gz
@@ -14,18 +14,4 @@ share/locale/nl/LC_MESSAGES/tornado.mo
 share/locale/no/LC_MESSAGES/tornado.mo
 share/locale/pt/LC_MESSAGES/tornado.mo
 share/locale/ru/LC_MESSAGES/tornado.mo
-%%DATADIR%%/tornado.scores.init
-@dirrm %%DATADIR%%
-@dirrmtry man/ru/man6
-@dirrmtry man/ru
-@dirrmtry man/no/man6
-@dirrmtry man/no
-@dirrmtry man/nl/man6
-@dirrmtry man/nl
-@dirrmtry man/it/man6
-@dirrmtry man/it
-@dirrmtry man/fr/man6
-@dirrmtry man/fr
-@dirrmtry man/de/man6
-@dirrmtry man/de
-@unexec if cmp -s %D/%%DATADIR%%/tornado.scores.init /var/games/tornado.scores; then rm -f /var/games/tornado.scores; else true; fi
+@sample(,games,664) /var/games/tornado.scores.sample