7 files changed, 101 insertions, 39 deletions

diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index e80313ed07b8..f409365c34d5 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -6,13 +6,18 @@
 #
 
 PORTNAME=	tornado
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.lionking.org/~kiza/linux/tornado/
+MASTER_SITES=	http://home.kcore.de/~kiza/linux/tornado/download/
 
 MAINTAINER=	minter@lunenburg.org
 COMMENT=	A curses-based game of weather destruction
 
+LIB_DEPENDS=    intl:${PORTSDIR}/devel/gettext
+
 MAN6=		tornado.6
+MANLANG=	"" de fr it ru
+
+USE_GMAKE=      yes
 
 .include <bsd.port.mk>
diff --git a/games/tornado/distinfo b/games/tornado/distinfo
index f59f62e1b5d8..88818db05a6f 100644
--- a/games/tornado/distinfo
+++ b/games/tornado/distinfo
@@ -1 +1 @@
-MD5 (tornado-1.0.3.tar.gz) = 72e302d87b54b2870ade48968842049a
+MD5 (tornado-1.2.tar.gz) = 840f85d1db54d50d50190489c8af02d3
diff --git a/games/tornado/files/patch-aa b/games/tornado/files/patch-aa
index 105d584fb3e2..be474bc594e1 100644
--- a/games/tornado/files/patch-aa
+++ b/games/tornado/files/patch-aa
@@ -1,17 +1,24 @@
-diff -ur ../tornado-1.0.3.orig/Makefile ./Makefile
---- ../tornado-1.0.3.orig/Makefile	Fri Dec  1 09:00:11 2000
-+++ ./Makefile	Sun Jul  1 17:29:21 2001
-@@ -30,26 +30,26 @@
- 	if [ ! -d "$(PREFIX)/bin" ]; then \
- 	  mkdir -p $(PREFIX)/bin; \
- 	fi
--	install -s tornado $(PREFIX)/bin
-+	install -c -s tornado $(PREFIX)/bin
- 	if [ ! -d "$(PREFIX)/man/man6" ]; then \
- 	  mkdir -p $(PREFIX)/man/man6; \
- 	fi
--	install -m 0644 tornado.6 $(PREFIX)/man/man6
-+	install -c -m 0644 tornado.6 $(PREFIX)/man/man6
+diff -ur ../tornado-1.2.orig/Makefile ./Makefile
+--- ../tornado-1.2.orig/Makefile	Thu Nov  7 12:45:59 2002
++++ ./Makefile	Mon Apr 21 14:06:38 2003
+@@ -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 = `echo VERSION | cpp -P -include version.h | tr -d '" ' | grep -v '^$$'`
+ 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 \
@@ -26,16 +33,47 @@ diff -ur ../tornado-1.0.3.orig/Makefile ./Makefile
 -	  if [ ! -d "/var/games" ]; then \
 -	    mkdir /var/games; \
 +	  if [ ! -d "${PREFIX}/share/games" ]; then \
-+	    mkdir -p ${PREFIX}/share/games; \
++	    mkdir ${PREFIX}/share/games; \
  	  fi; \
 -	  install tornado.scores /var/games; \
 -	  chmod a+w-x "/var/games/tornado.scores"; \
-+	  install -c tornado.scores ${PREFIX}/share/games; \
++	  install tornado.scores ${PREFIX}/share/games/; \
 +	  chmod a+w-x "${PREFIX}/share/games/tornado.scores"; \
  	fi
  
+ install-locale-data:
+@@ -68,7 +67,7 @@
+ 
  uninstall:
  	rm -f $(PREFIX)/bin/tornado
- 	rm -f $(PREFIX)/man/man6/tornado.6
 -	rm -f /var/games/tornado.scores
 +	rm -f ${PREFIX}/share/games/tornado.scores
+ 	$(MAKE) -C $(MAN) uninstall
+ 	$(MAKE) -C po uninstall
+ 
+@@ -84,17 +83,17 @@
+ 	fi
+ 	install -m 0644 tornado.6 $(PREFIX)/man/man6
+ 
+-	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
+ 
+ dist: clean
diff --git a/games/tornado/files/patch-ab b/games/tornado/files/patch-ab
index fda965d44fe2..93e44e5c8029 100644
--- a/games/tornado/files/patch-ab
+++ b/games/tornado/files/patch-ab
@@ -1,12 +1,19 @@
-diff -ur ../tornado-1.0.3.orig/scores.h ./scores.h
---- ../tornado-1.0.3.orig/scores.h	Fri Dec  1 08:59:55 2000
-+++ ./scores.h	Sun Jul  1 16:35:36 2001
-@@ -1,7 +1,7 @@
- /* scores.h -- highscore functions */
- 
- /* score file name */
--#define SCOREFILE_NAME "/var/games/tornado.scores"
-+#define SCOREFILE_NAME "/usr/local/share/games/tornado.scores"
- 
- /* maximum length for a player name (includes \0) */
- #define MAX_PLAYER_LEN 22
+diff -ur ../tornado-1.2.orig/Makefile.inc ./Makefile.inc
+--- ../tornado-1.2.orig/Makefile.inc	Fri Oct 11 15:03:56 2002
++++ ./Makefile.inc	Mon Apr 21 14:06:43 2003
+@@ -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)\"" -I/usr/local/include 
+ LOCALES = de
+-MAN = doc/man
+\ No newline at end of file
++MAN = doc/man
diff --git a/games/tornado/files/patch-ac b/games/tornado/files/patch-ac
index 757e4c8f09ae..9af1a24f0d3f 100644
--- a/games/tornado/files/patch-ac
+++ b/games/tornado/files/patch-ac
@@ -1,12 +1,18 @@
-diff -ur ../tornado-1.0.3.orig/tornado.6.in ./tornado.6.in
---- ../tornado-1.0.3.orig/tornado.6.in	Fri Dec  1 08:59:55 2000
-+++ ./tornado.6.in	Sun Jul  1 16:35:53 2001
-@@ -90,7 +90,7 @@
+diff -ur ../tornado-1.2.orig/doc/man/tornado.6.in ./doc/man/tornado.6.in
+--- ../tornado-1.2.orig/doc/man/tornado.6.in	Mon Sep  2 19:18:55 2002
++++ ./doc/man/tornado.6.in	Mon Apr 21 13:38:47 2003
+@@ -90,11 +90,11 @@
  .P
  PREFIX/man/man6/tornado.6
  .P
 -/var/games/tornado.scores
-+/usr/local/share/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 3f7168b9cfb3..9030852ff0cb 100644
--- a/games/tornado/pkg-descr
+++ b/games/tornado/pkg-descr
@@ -3,7 +3,7 @@ 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://www.lionking.org/~kiza/linux/tornado/
+WWW: http://home.kcore.de/~kiza/linux/tornado/
 
 --Wade
 minter@lunenburg.org
diff --git a/games/tornado/pkg-plist b/games/tornado/pkg-plist
index 28c5b4a3cda5..53fef7caab60 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -1,3 +1,9 @@
 bin/tornado
+@unexec rmdir %D/share/games 2>/dev/null || true
 share/games/tornado.scores
-@dirrm share/games
+share/locale/de/LC_MESSAGES/tornado.mo
+share/locale/fr/LC_MESSAGES/tornado.mo
+share/locale/pt/LC_MESSAGES/tornado.mo
+share/locale/es/LC_MESSAGES/tornado.mo
+share/locale/it/LC_MESSAGES/tornado.mo
+share/locale/ru/LC_MESSAGES/tornado.mo