7 files changed, 39 insertions, 64 deletions

diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index 351b16c2029f..40dd812244a0 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	tornado
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	http://home.kcore.de/~kiza/linux/tornado/download/
+MASTER_SITES=	http://kiza.kcore.de/software/tornado/download/
 
 MAINTAINER=	minter@lunenburg.org
 COMMENT=	A curses-based game of weather destruction
 
 MAN6=		tornado.6
-MANLANG=	"" de fr it ru
+MANLANG=	"" de fr it nl no ru
 
 USE_GETTEXT=	yes
 USE_GMAKE=      yes
diff --git a/games/tornado/distinfo b/games/tornado/distinfo
index 8012a753379b..bb71137c9c2b 100644
--- a/games/tornado/distinfo
+++ b/games/tornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (tornado-1.2.tar.gz) = 840f85d1db54d50d50190489c8af02d3
-SIZE (tornado-1.2.tar.gz) = 46046
+MD5 (tornado-1.3.tar.gz) = 149adcac75cb052c361d175bfc6d9f0f
+SIZE (tornado-1.3.tar.gz) = 52101
diff --git a/games/tornado/files/patch-aa b/games/tornado/files/patch-aa
index be474bc594e1..b6410577fe85 100644
--- a/games/tornado/files/patch-aa
+++ b/games/tornado/files/patch-aa
@@ -1,6 +1,5 @@
-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
+--- ../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
@@ -13,7 +12,7 @@ diff -ur ../tornado-1.2.orig/Makefile ./Makefile
 -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 '^$$'`
+ VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
  LOCALES = de
  MAN = doc/man
 @@ -50,17 +49,17 @@
@@ -26,54 +25,19 @@ diff -ur ../tornado-1.2.orig/Makefile ./Makefile
 -	  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"; \
++          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; \
++          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"; \
++          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 /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 93e44e5c8029..5ee3e6975a1b 100644
--- a/games/tornado/files/patch-ab
+++ b/games/tornado/files/patch-ab
@@ -1,6 +1,5 @@
-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
+--- ../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
@@ -12,8 +11,6 @@ diff -ur ../tornado-1.2.orig/Makefile.inc ./Makefile.inc
 -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 
++CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -
  LOCALES = de
--MAN = doc/man
-\ No newline at end of file
-+MAN = doc/man
+ MAN = doc/man
diff --git a/games/tornado/files/patch-ac b/games/tornado/files/patch-ac
index 9af1a24f0d3f..5e6fe8333ecf 100644
--- a/games/tornado/files/patch-ac
+++ b/games/tornado/files/patch-ac
@@ -1,6 +1,5 @@
-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
+--- ../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
diff --git a/games/tornado/pkg-descr b/games/tornado/pkg-descr
index 9030852ff0cb..29f1d28db601 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://home.kcore.de/~kiza/linux/tornado/
+WWW: http://kiza.kcore.de/software/tornado/
 
 --Wade
 minter@lunenburg.org
diff --git a/games/tornado/pkg-plist b/games/tornado/pkg-plist
index 53fef7caab60..3ef04beb4087 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -2,8 +2,23 @@ bin/tornado
 @unexec rmdir %D/share/games 2>/dev/null || true
 share/games/tornado.scores
 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/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
+@dirrm share/games
+@dirrm man/de/man6
+@dirrm man/de
+@dirrm man/fr/man6
+@dirrm man/fr
+@dirrm man/it/man6
+@dirrm man/it
+@dirrm man/nl/man6
+@dirrm man/nl
+@dirrm man/no/man6
+@dirrm man/no
+@dirrm man/ru/man6
+@dirrm man/ru