- Update MASTER_SITES and WWW: line

- Support CC/CFLAGS properly
- Support ncurses USES macro
- Stage support

PR:		185341
Submitted by:	Ports Fury

7 files changed, 69 insertions, 90 deletions

diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index ef0425c89cbd..d1c93061670c 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -3,18 +3,58 @@
 
 PORTNAME=	tornado
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	http://kiza.kcore.de/media/software/${PORTNAME}/
+MASTER_SITES=	https://kiza.eu/media/software/tornado/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A curses-based game of weather destruction
+COMMENT=	Ccurses-based game of weather destruction
 
-MAN6=		tornado.6
-MANLANG=	"" de fr it nl no ru
+LICENSE=	GPLv2 # (or later)
 
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake ncurses
+
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+
+post-patch:
+.for i in Makefile Makefile.inc
+	@${REINPLACE_CMD} -e \
+		'/^CC/s| =| ?=| ; \
+		 /^MAKE/s| =| ?=| ; \
+		 /^LDFLAGS/s| =| +=| ; \
+		 /^PREFIX/s| =| ?=| ; \
+		 /^LOCALEPATH/s|/usr/local|$$(PREFIX)| ; \
+		 /^CFLAGS/s| =| +=| ; \
+		 s|-O2||' ${WRKSRC}/${i}
+.endfor
+	@${REINPLACE_CMD} -e \
+		's|/usr/local|PREFIX|' ${WRKSRC}/doc/man/tornado.6.in
+.for i in de fr it nl no ru
+	@${REINPLACE_CMD} -e \
+		'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)
+.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)
+.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)
+.endfor
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} tornado.scores.init \
+		${STAGEDIR}${DATADIR})
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/games/tornado/files/patch-aa b/games/tornado/files/patch-aa
deleted file mode 100644
index b6410577fe85..000000000000
--- a/games/tornado/files/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../tornado-1.3.orig/Makefile	Thu Nov 20 08:26:22 2003
-+++ Makefile	Sun Jan  9 14:21:24 2005
-@@ -1,10 +1,9 @@
- CC = gcc
--MAKE = make
--LDFLAGS = -lncurses
-+MAKE = gmake
-+LDFLAGS = -L/usr/local/lib -lncurses -lintl
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
-+LOCALEPATH = ${PREFIX}/share/locale
-+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -I/usr/local/include
- VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- LOCALES = de
- MAN = doc/man
-@@ -50,17 +49,17 @@
- 
- 	$(MAKE) -C $(MAN) install-man
- 
--	if [ -f "/var/games/tornado.scores" ]; then \
-+	if [ -f "${PREFIX}/share/games/tornado.scores" ]; then \
- 	  echo "Skipping install of the highscores file. File exists."; \
--	  cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \
--	  mv -f score.tmp /var/games/tornado.scores; \
--	  chmod a+rw-x "/var/games/tornado.scores"; \
-+          cat ${PREFIX}/share/games/tornado.scores | ./convert-highscorefile > score.tmp; \
-+          mv -f score.tmp ${PREFIX}/share/games/tornado.scores; \
-+          chmod a+rw-x "${PREFIX}/share/games/tornado.scores"; \
- 	else \
--	  if [ ! -d "/var/games" ]; then \
--	    mkdir /var/games; \
-+          if [ ! -d "${PREFIX}/share/games" ]; then \
-+            mkdir ${PREFIX}/share/games; \
- 	  fi; \
--	  install tornado.scores /var/games; \
--	  chmod a+w-x "/var/games/tornado.scores"; \
-+          install tornado.scores ${PREFIX}/share/games; \
-+          chmod a+w-x "${PREFIX}/share/games/tornado.scores"; \
- 	fi
- 
- install-locale-data:
diff --git a/games/tornado/files/patch-ab b/games/tornado/files/patch-ab
deleted file mode 100644
index 5ee3e6975a1b..000000000000
--- a/games/tornado/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../tornado-1.3.orig/Makefile.inc	Thu Nov 20 05:55:50 2003
-+++ Makefile.inc	Sun Jan  9 14:22:36 2005
-@@ -1,9 +1,8 @@
- CC = gcc
--MAKE = make
--LDFLAGS = -lncurses
-+MAKE = gmake
-+LDFLAGS = -L/usr/local/lib -lncurses -lintl
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
-+LOCALEPATH = ${PREFIX}/share/locale
-+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -
- LOCALES = de
- MAN = doc/man
diff --git a/games/tornado/files/patch-ac b/games/tornado/files/patch-ac
deleted file mode 100644
index 5e6fe8333ecf..000000000000
--- a/games/tornado/files/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../tornado-1.3.orig/doc/man/tornado.6.in	Thu Nov 20 06:00:47 2003
-+++ doc/man/tornado.6.in	Sun Jan  9 14:23:34 2005
-@@ -90,11 +90,11 @@
- .P
- PREFIX/man/man6/tornado.6
- .P
--/var/games/tornado.scores
-+PREFIX/share/games/tornado.scores
- .P
--/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
-+PREFIX/share/locale/de/LC_MESSAGES/tornado.mo
- .P
--/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
-+PREFIX/share/locale/fr/LC_MESSAGES/tornado.mo
- .SH NOTES
- When you run the game in network mode you should have the same game versions
- on client and server side. Versions prior 1.0pre4 won't work at all due to
diff --git a/games/tornado/pkg-descr b/games/tornado/pkg-descr
index 3261fdea5bad..5d9a439b209c 100644
--- a/games/tornado/pkg-descr
+++ b/games/tornado/pkg-descr
@@ -1,6 +1,6 @@
-A clone of an old C64 game.  The object is to destroy your opponent's
-house with the power of weather, before they do the same to you.  Play
+A clone of an old C64 game. The object is to destroy your opponent's
+house with the power of weather, before they do the same to you. Play
 against the computer AI, or against another player locally or over the
 network.
 
-WWW: http://kiza.kcore.de/software/tornado/
+WWW: https://kiza.eu/software/tornado/
diff --git a/games/tornado/pkg-install b/games/tornado/pkg-install
new file mode 100644
index 000000000000..ca072dcbbcde
--- /dev/null
+++ b/games/tornado/pkg-install
@@ -0,0 +1,7 @@
+#!/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 962bf44ce358..b54fcb7846fc 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -1,14 +1,21 @@
 bin/tornado
-share/games/tornado.scores
+man/de/man6/tornado.6.gz
+man/fr/man6/tornado.6.gz
+man/it/man6/tornado.6.gz
+man/man6/tornado.6.gz
+man/nl/man6/tornado.6.gz
+man/no/man6/tornado.6.gz
+man/ru/man6/tornado.6.gz
 share/locale/de/LC_MESSAGES/tornado.mo
 share/locale/es/LC_MESSAGES/tornado.mo
 share/locale/fr/LC_MESSAGES/tornado.mo
 share/locale/it/LC_MESSAGES/tornado.mo
 share/locale/nl/LC_MESSAGES/tornado.mo
 share/locale/no/LC_MESSAGES/tornado.mo
-share/locale/ru/LC_MESSAGES/tornado.mo
 share/locale/pt/LC_MESSAGES/tornado.mo
-@dirrmtry share/games
+share/locale/ru/LC_MESSAGES/tornado.mo
+%%DATADIR%%/tornado.scores.init
+@dirrm %%DATADIR%%
 @dirrmtry man/ru/man6
 @dirrmtry man/ru
 @dirrmtry man/no/man6
@@ -21,3 +28,4 @@ share/locale/pt/LC_MESSAGES/tornado.mo
 @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