From tkato432@yahoo.com  Mon Dec 30 21:02:35 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C1B99A3C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 30 Dec 2013 21:01:49 +0000 (UTC)
Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id 806D01F80
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 30 Dec 2013 21:01:49 +0000 (UTC)
Received: from coppermine.my.domain (ZT028061.ppp.dion.ne.jp [59.128.28.61])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 769E49800D1
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 31 Dec 2013 06:01:44 +0900 (JST)
Message-Id: <20131231054727.9c9f8f0774f39f2aca53dc19@yahoo.com>
Date: Tue, 31 Dec 2013 05:47:27 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: games/tornado: Update MASTER_SITES and WWW: line

>Number:         185341
>Category:       ports
>Synopsis:       games/tornado: Update MASTER_SITES and WWW: line
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 21:10:09 UTC 2013
>Closed-Date:    Sat Jan 25 16:58:54 UTC 2014
>Last-Modified:  Sat Jan 25 17:00:05 UTC 2014
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Support CC/CFLAGS properly
- Support ncurses USES macro

New file:
pkg-install

Remove file:
files/patch-aa
files/patch-ab
files/patch-ac

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/tornado/Makefile games/tornado/Makefile
--- /usr/ports/games/tornado/Makefile	2013-12-21 03:43:22.000000000 +0900
+++ games/tornado/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/files/patch-aa games/tornado/files/patch-aa
--- /usr/ports/games/tornado/files/patch-aa	2013-11-06 22:00:50.000000000 +0900
+++ games/tornado/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/files/patch-ab games/tornado/files/patch-ab
--- /usr/ports/games/tornado/files/patch-ab	2013-11-06 22:00:50.000000000 +0900
+++ games/tornado/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/files/patch-ac games/tornado/files/patch-ac
--- /usr/ports/games/tornado/files/patch-ac	2013-11-06 22:00:50.000000000 +0900
+++ games/tornado/files/patch-ac	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/pkg-descr games/tornado/pkg-descr
--- /usr/ports/games/tornado/pkg-descr	2013-11-06 22:00:50.000000000 +0900
+++ games/tornado/pkg-descr	2013-12-31 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/pkg-install games/tornado/pkg-install
--- /usr/ports/games/tornado/pkg-install	1970-01-01 09:00:00.000000000 +0900
+++ games/tornado/pkg-install	2013-12-31 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/tornado/pkg-plist games/tornado/pkg-plist
--- /usr/ports/games/tornado/pkg-plist	2013-11-06 22:00:50.000000000 +0900
+++ games/tornado/pkg-plist	2013-12-31 00:00:00.000000000 +0900
@@ -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 @@
 @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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jan 23 15:48:19 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185341 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jan 25 16:58:53 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185341 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185341: commit references a PR
Date: Sat, 25 Jan 2014 16:58:54 +0000 (UTC)

 Author: miwi
 Date: Sat Jan 25 16:58:46 2014
 New Revision: 341059
 URL: http://svnweb.freebsd.org/changeset/ports/341059
 QAT: https://qat.redports.org/buildarchive/r341059/
 
 Log:
   - Update MASTER_SITES and WWW: line
   - Support CC/CFLAGS properly
   - Support ncurses USES macro
   - Stage support
   
   PR:		185341
   Submitted by:	Ports Fury
 
 Added:
   head/games/tornado/pkg-install   (contents, props changed)
 Deleted:
   head/games/tornado/files/
 Modified:
   head/games/tornado/Makefile
   head/games/tornado/pkg-descr
   head/games/tornado/pkg-plist
 
 Modified: head/games/tornado/Makefile
 ==============================================================================
 --- head/games/tornado/Makefile	Sat Jan 25 16:57:05 2014	(r341058)
 +++ head/games/tornado/Makefile	Sat Jan 25 16:58:46 2014	(r341059)
 @@ -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>
 
 Modified: head/games/tornado/pkg-descr
 ==============================================================================
 --- head/games/tornado/pkg-descr	Sat Jan 25 16:57:05 2014	(r341058)
 +++ head/games/tornado/pkg-descr	Sat Jan 25 16:58:46 2014	(r341059)
 @@ -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/
 
 Added: head/games/tornado/pkg-install
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/tornado/pkg-install	Sat Jan 25 16:58:46 2014	(r341059)
 @@ -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
 
 Modified: head/games/tornado/pkg-plist
 ==============================================================================
 --- head/games/tornado/pkg-plist	Sat Jan 25 16:57:05 2014	(r341058)
 +++ head/games/tornado/pkg-plist	Sat Jan 25 16:58:46 2014	(r341059)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
