Attachment #49799 for bug #76005

View | Details | Raw Unified | Return to bug 76005
Collapse All | Expand All

Lines 6-15 Link Here

(-)tornado/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= tornado	8	PORTNAME= tornado
9	PORTVERSION= 1.2	9	PORTVERSION= 1.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= http://home.kcore.de/~kiza/linux/tornado/download/	12	MASTER_SITES= http://kiza.kcore.de/software/tornado/download/
13		13
14	MAINTAINER= minter@lunenburg.org	14	MAINTAINER= minter@lunenburg.org
15	COMMENT= A curses-based game of weather destruction	15	COMMENT= A curses-based game of weather destruction

Lines 1-2 Link Here

(-)tornado/distinfo (-2 / +2 lines)
1	MD5 (tornado-1.2.tar.gz) = 840f85d1db54d50d50190489c8af02d3	1	MD5 (tornado-1.3.tar.gz) = 149adcac75cb052c361d175bfc6d9f0f
2	SIZE (tornado-1.2.tar.gz) = 46046	2	SIZE (tornado-1.3.tar.gz) = 52101




--- ../tornado-1.3.orig/Makefile	Thu Nov 20 08:26:22 2003
+++ Makefile	Sun Jan  9 14:21:24 2005
+++ ./Makefile	Mon Apr 21 14:06:38 2003
@@ -1,10 +1,9 @@
 CC = gcc
-MAKE = make

-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 @@

-	  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:
@@ -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

Lines 1-6 Link Here

(-)tornado/files/patch-ab (-7 / +4 lines)
1	diff -ur ../tornado-1.2.orig/Makefile.inc ./Makefile.inc	1	--- ../tornado-1.3.orig/Makefile.inc Thu Nov 20 05:55:50 2003
2	--- ../tornado-1.2.orig/Makefile.inc Fri Oct 11 15:03:56 2002	2	+++ Makefile.inc Sun Jan 9 14:22:36 2005
3	+++ ./Makefile.inc Mon Apr 21 14:06:43 2003
4	@@ -1,9 +1,8 @@	3	@@ -1,9 +1,8 @@
5	CC = gcc	4	CC = gcc
6	-MAKE = make	5	-MAKE = make
Lines 12-19 Link Here
12	-LOCALEPATH = /usr/local/share/locale	11	-LOCALEPATH = /usr/local/share/locale
13	-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""	12	-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
14	+LOCALEPATH = ${PREFIX}/share/locale	13	+LOCALEPATH = ${PREFIX}/share/locale
15	+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -I/usr/local/include	14	+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -
16	LOCALES = de	15	LOCALES = de
17	-MAN = doc/man	16	MAN = doc/man
18	\ No newline at end of file
19	+MAN = doc/man

Lines 1-6 Link Here

(-)tornado/files/patch-ac (-3 / +2 lines)
1	diff -ur ../tornado-1.2.orig/doc/man/tornado.6.in ./doc/man/tornado.6.in	1	--- ../tornado-1.3.orig/doc/man/tornado.6.in Thu Nov 20 06:00:47 2003
2	--- ../tornado-1.2.orig/doc/man/tornado.6.in Mon Sep 2 19:18:55 2002	2	+++ doc/man/tornado.6.in Sun Jan 9 14:23:34 2005
3	+++ ./doc/man/tornado.6.in Mon Apr 21 13:38:47 2003
4	@@ -90,11 +90,11 @@	3	@@ -90,11 +90,11 @@
5	.P	4	.P
6	PREFIX/man/man6/tornado.6	5	PREFIX/man/man6/tornado.6

Lines 3-9 Link Here

(-)tornado/pkg-descr (-1 / +1 lines)
3	against the computer AI, or against another player locally or over the	3	against the computer AI, or against another player locally or over the
4	network.	4	network.
5		5
6	WWW: http://home.kcore.de/~kiza/linux/tornado/	6	WWW: http://kiza.kcore.de/software/tornado/
7		7
8	--Wade	8	--Wade
9	minter@lunenburg.org	9	minter@lunenburg.org




share/locale/es/LC_MESSAGES/tornado.mo
share/locale/it/LC_MESSAGES/tornado.mo
share/locale/ru/LC_MESSAGES/tornado.mo
@dirrm share/games
@dirrm man/ru/man6
@dirrm man/ru
@dirrm man/it/man6
@dirrm man/it
@dirrm man/fr/man6
@dirrm man/fr
@dirrm man/de/man6
@dirrm man/de

Return to bug 76005

Lines 1-6 Link Here

(-)tornado/files/patch-aa (-46 / +10 lines)
1	diff -ur ../tornado-1.2.orig/Makefile ./Makefile	1	--- ../tornado-1.3.orig/Makefile Thu Nov 20 08:26:22 2003
2	--- ../tornado-1.2.orig/Makefile Thu Nov 7 12:45:59 2002	2	+++ Makefile Sun Jan 9 14:21:24 2005
3	+++ ./Makefile Mon Apr 21 14:06:38 2003
4	@@ -1,10 +1,9 @@	3	@@ -1,10 +1,9 @@
5	CC = gcc	4	CC = gcc
6	-MAKE = make	5	-MAKE = make
Lines 13-19 Link Here
13	-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""	12	-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
14	+LOCALEPATH = ${PREFIX}/share/locale	13	+LOCALEPATH = ${PREFIX}/share/locale
15	+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -I/usr/local/include	14	+CFLAGS += -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -I/usr/local/include
16	VERSION = `echo VERSION \| cpp -P -include version.h \| tr -d '" ' \| grep -v '^$$'`	15	VERSION = `grep " VERSION" version.h \| sed s/\"//g \| sed s/\#define\ VERSION\ //`
17	LOCALES = de	16	LOCALES = de
18	MAN = doc/man	17	MAN = doc/man
19	@@ -50,17 +49,17 @@	18	@@ -50,17 +49,17 @@
Lines 26-79 Link Here
26	- cat /var/games/tornado.scores \| ./convert-highscorefile > score.tmp; \	25	- cat /var/games/tornado.scores \| ./convert-highscorefile > score.tmp; \
27	- mv -f score.tmp /var/games/tornado.scores; \	26	- mv -f score.tmp /var/games/tornado.scores; \
28	- chmod a+rw-x "/var/games/tornado.scores"; \	27	- chmod a+rw-x "/var/games/tornado.scores"; \
29	+ cat ${PREFIX}/share/games/tornado.scores \| ./convert-highscorefile > score.tmp; \	28	+ cat ${PREFIX}/share/games/tornado.scores \| ./convert-highscorefile > score.tmp; \
30	+ mv -f score.tmp ${PREFIX}/share/games/tornado.scores; \	29	+ mv -f score.tmp ${PREFIX}/share/games/tornado.scores; \
31	+ chmod a+rw-x "${PREFIX}/share/games/tornado.scores"; \	30	+ chmod a+rw-x "${PREFIX}/share/games/tornado.scores"; \
32	else \	31	else \
33	- if [ ! -d "/var/games" ]; then \	32	- if [ ! -d "/var/games" ]; then \
34	- mkdir /var/games; \	33	- mkdir /var/games; \
35	+ if [ ! -d "${PREFIX}/share/games" ]; then \	34	+ if [ ! -d "${PREFIX}/share/games" ]; then \
36	+ mkdir ${PREFIX}/share/games; \	35	+ mkdir ${PREFIX}/share/games; \
37	fi; \	36	fi; \
38	- install tornado.scores /var/games; \	37	- install tornado.scores /var/games; \
39	- chmod a+w-x "/var/games/tornado.scores"; \	38	- chmod a+w-x "/var/games/tornado.scores"; \
40	+ install tornado.scores ${PREFIX}/share/games/; \	39	+ install tornado.scores ${PREFIX}/share/games; \
41	+ chmod a+w-x "${PREFIX}/share/games/tornado.scores"; \	40	+ chmod a+w-x "${PREFIX}/share/games/tornado.scores"; \
42	fi	41	fi
43		42
44	install-locale-data:	43	install-locale-data:
45	@@ -68,7 +67,7 @@
46
47	uninstall:
48	rm -f $(PREFIX)/bin/tornado
49	- rm -f /var/games/tornado.scores
50	+ rm -f ${PREFIX}/share/games/tornado.scores
51	$(MAKE) -C $(MAN) uninstall
52	$(MAKE) -C po uninstall
53
54	@@ -84,17 +83,17 @@
55	fi
56	install -m 0644 tornado.6 $(PREFIX)/man/man6
57
58	- if [ -f "/var/games/tornado.scores" ]; then \
59	+ if [ -f "${PREFIX}/share/games/tornado.scores" ]; then \
60	echo "Skipping install of the highscores file. File exists."; \
61	- cat /var/games/tornado.scores \| ./convert-highscorefile > score.tmp; \
62	- mv -f score.tmp /var/games/tornado.scores; \
63	- chmod a+rw-x "/var/games/tornado.scores"; \
64	+ cat ${PREFIX}/share/games/tornado.scores \| ./convert-highscorefile > score.tmp; \
65	+ mv -f score.tmp ${PREFIX}/share/games/tornado.scores; \
66	+ chmod a+rw-x "${PREFIX}/share/games/tornado.scores"; \
67	else \
68	- if [ ! -d "/var/games" ]; then \
69	- mkdir /var/games; \
70	+ if [ ! -d "${PREFIX}/share/games" ]; then \
71	+ mkdir ${PREFIX}/share/games; \
72	fi; \
73	- install tornado.scores /var/games; \
74	- chmod a+w-x "/var/games/tornado.scores"; \
75	+ install tornado.scores ${PREFIX}/share/games; \
76	+ chmod a+w-x "${PREFIX}/share/games/tornado.scores"; \
77	fi
78
79	dist: clean

Lines 7-9 Link Here

(-)tornado/pkg-plist (+9 lines)
7	share/locale/es/LC_MESSAGES/tornado.mo	7	share/locale/es/LC_MESSAGES/tornado.mo
8	share/locale/it/LC_MESSAGES/tornado.mo	8	share/locale/it/LC_MESSAGES/tornado.mo
9	share/locale/ru/LC_MESSAGES/tornado.mo	9	share/locale/ru/LC_MESSAGES/tornado.mo
		10	@dirrm share/games
		11	@dirrm man/ru/man6
		12	@dirrm man/ru
		13	@dirrm man/it/man6
		14	@dirrm man/it
		15	@dirrm man/fr/man6
		16	@dirrm man/fr
		17	@dirrm man/de/man6
		18	@dirrm man/de