Date: Tue, 10 Dec 2002 00:26:06 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46137: Update port: games/bzflag to 1.7g.0 Message-ID: <20021210002606.68ea9724.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46137
>Category: ports
>Synopsis: Update port: games/bzflag to 1.7g.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 09 07:40:13 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.7g0
Remove file:
files/patch-bzfs.cxx
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/bzflag/Makefile games/bzflag/Makefile
--- /usr/ports/games/bzflag/Makefile Mon Nov 11 18:59:34 2002
+++ games/bzflag/Makefile Mon Dec 9 22:05:10 2002
@@ -6,11 +6,11 @@
#
PORTNAME= bzflag
-PORTVERSION= 1.7e.6
+PORTVERSION= 1.7g.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bzflag
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/e./e/}
+MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -36,9 +36,9 @@
@(cd ${WRKSRC}/man && ${MAKE} targets)
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
- @${INSTALL_MAN} ${WRKSRC}/man/*.6 ${PREFIX}/man/man6/
- @${MKDIR} ${PREFIX}/share/bzflag/data
- @${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/bzflag/data/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/man/*.6 ${MANPREFIX}/man/man6/
+ @${MKDIR} ${DATADIR}/data
+ ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data/
.include <bsd.port.mk>
diff -urN /usr/ports/games/bzflag/distinfo games/bzflag/distinfo
--- /usr/ports/games/bzflag/distinfo Tue Sep 10 20:10:41 2002
+++ games/bzflag/distinfo Mon Dec 9 22:05:16 2002
@@ -1 +1 @@
-MD5 (bzflag-1.7e6.tgz) = 0afedee9279c305c0acda563287ad0f2
+MD5 (bzflag-1.7g0.tgz) = 689009fa98416ac1abba4677870c7b9f
diff -urN /usr/ports/games/bzflag/files/patch-BzfString.h games/bzflag/files/patch-BzfString.h
--- /usr/ports/games/bzflag/files/patch-BzfString.h Sun Nov 24 22:59:21 2002
+++ games/bzflag/files/patch-BzfString.h Mon Dec 9 22:08:21 2002
@@ -1,18 +1,11 @@
---- include/BzfString.h.orig Sat Nov 23 15:04:54 2002
-+++ include/BzfString.h Sat Nov 23 15:05:16 2002
-@@ -39,12 +39,14 @@
-
+--- include/BzfString.h.orig Thu Oct 17 04:29:38 2002
++++ include/BzfString.h Mon Dec 9 22:08:01 2002
+@@ -40,6 +40,8 @@
#include "common.h"
-
--#if defined(sun) || defined(__MWERKS__)
-+#if 1
- // solaris compiler doesn't like declaration of ostream
#include "bzfio.h"
- #else
- class ostream;
- #endif
-+
-+using std::ostream;
++using std::ostream;
++
class BzfString {
public:
+ BzfString();
diff -urN /usr/ports/games/bzflag/files/patch-bzflag.cxx games/bzflag/files/patch-bzflag.cxx
--- /usr/ports/games/bzflag/files/patch-bzflag.cxx Sun Nov 24 22:59:21 2002
+++ games/bzflag/files/patch-bzflag.cxx Mon Dec 9 22:10:11 2002
@@ -1,6 +1,6 @@
---- src/bzflag/bzflag.cxx.orig Sat Nov 23 15:16:44 2002
-+++ src/bzflag/bzflag.cxx Sat Nov 23 15:17:53 2002
-@@ -756,7 +756,7 @@
+--- src/bzflag/bzflag.cxx.orig Fri Dec 6 02:22:44 2002
++++ src/bzflag/bzflag.cxx Mon Dec 9 22:09:36 2002
+@@ -769,7 +769,7 @@
// read resources
{
@@ -8,13 +8,4 @@
+ #if 1
ifstream resourceStream(getConfigFileName(), ios::in);
#else
- ifstream resourceStream(getConfigFileName(), ios::in | ios::nocreate);
-@@ -768,7 +768,7 @@
-
- #if !defined(_WIN32) & !defined(macintosh)
- else {
-- ifstream resourceStream2(getConfigFileName2(), ios::in | ios::nocreate);
-+ ifstream resourceStream2(getConfigFileName2(), ios::in);
- if (resourceStream2) {
- startupInfo.hasConfiguration = True;
- resourceStream2 >> db;
+ ifstream resourceStream(getConfigFileName(), ios::in);
diff -urN /usr/ports/games/bzflag/files/patch-bzfs.cxx games/bzflag/files/patch-bzfs.cxx
--- /usr/ports/games/bzflag/files/patch-bzfs.cxx Sun Nov 24 22:59:21 2002
+++ games/bzflag/files/patch-bzfs.cxx Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/bzfs/bzfs.cxx.orig Sat Nov 23 15:03:31 2002
-+++ src/bzfs/bzfs.cxx Sat Nov 23 15:03:45 2002
-@@ -2805,7 +2805,7 @@
- static WorldInfo *defineWorldFromFile(const char *filename)
- {
- // open file
-- ifstream input(filename, ios::in | ios::nocreate);
-+ ifstream input(filename, ios::in);
- if (!input) {
- cerr << "could not find bzflag world file : " << filename << endl;
- return NULL;
diff -urN /usr/ports/games/bzflag/files/patch-resources.h games/bzflag/files/patch-resources.h
--- /usr/ports/games/bzflag/files/patch-resources.h Sun Nov 24 22:59:21 2002
+++ games/bzflag/files/patch-resources.h Mon Dec 9 22:12:19 2002
@@ -1,18 +1,11 @@
---- src/bzflag/resources.h.orig Sat Nov 23 15:18:38 2002
-+++ src/bzflag/resources.h Sat Nov 23 15:18:59 2002
-@@ -20,12 +20,13 @@
- #include "common.h"
+--- src/bzflag/resources.h.orig Thu Oct 17 04:38:17 2002
++++ src/bzflag/resources.h Mon Dec 9 22:11:54 2002
+@@ -21,6 +21,8 @@
#include "BzfString.h"
-
--#if defined(sun) || defined(macintosh)
--// solaris compiler doesn't like declaration of istream
-+#if 1
#include "bzfio.h"
- #else
- class istream;
- #endif
-+
-+using namespace std;
++using namespace std;
++
class ResourceDatabase {
public:
+ ResourceDatabase();
diff -urN /usr/ports/games/bzflag/pkg-plist games/bzflag/pkg-plist
--- /usr/ports/games/bzflag/pkg-plist Tue Sep 10 20:10:42 2002
+++ games/bzflag/pkg-plist Mon Dec 9 22:16:16 2002
@@ -47,6 +47,7 @@
share/bzflag/data/rlaser.rgb
share/bzflag/data/roof.rgb
share/bzflag/data/shock.wav
+share/bzflag/data/teamgrab.wav
share/bzflag/data/teleport.wav
share/bzflag/data/timesbi.rgb
share/bzflag/data/timesbr.rgb
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021210002606.68ea9724.tkato>