Attachment #27467 for bug #46586

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




#

PORTNAME=	bzflag
PORTVERSION=	1.7g.0
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org

	@(cd ${WRKSRC}/man && ${MAKE} targets)

do-install:
	${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>

Line 1 Link Here

(-)games/bzflag/distinfo (-1 / +1 lines)
1	MD5 (bzflag-1.7e6.tgz) = 0afedee9279c305c0acda563287ad0f2	1	MD5 (bzflag-1.7g0.tgz) = 689009fa98416ac1abba4677870c7b9f




--- 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();




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

+    #if 1
 	ifstream resourceStream(getConfigFileName(), ios::in);
      #else
     ifstream resourceStream(getConfigFileName(), ios::in);
@@ -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;

Lines 1-11 Link Here

(-)games/bzflag/files/patch-bzfs.cxx (-11 lines)
1	--- src/bzfs/bzfs.cxx.orig Sat Nov 23 15:03:31 2002
2	+++ src/bzfs/bzfs.cxx Sat Nov 23 15:03:45 2002
3	@@ -2805,7 +2805,7 @@
4	static WorldInfo defineWorldFromFile(const char filename)
5	{
6	// open file
7	- ifstream input(filename, ios::in \| ios::nocreate);
8	+ ifstream input(filename, ios::in);
9	if (!input) {
10	cerr << "could not find bzflag world file : " << filename << endl;
11	return NULL;




--- 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 "common.h"
 #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();

Lines 47-52 Link Here

(-)games/bzflag/pkg-plist (+3 lines)
47	share/bzflag/data/rlaser.rgb	47	share/bzflag/data/rlaser.rgb
48	share/bzflag/data/roof.rgb	48	share/bzflag/data/roof.rgb
49	share/bzflag/data/shock.wav	49	share/bzflag/data/shock.wav
		50	share/bzflag/data/teamgrab.wav
50	share/bzflag/data/teleport.wav	51	share/bzflag/data/teleport.wav
51	share/bzflag/data/timesbi.rgb	52	share/bzflag/data/timesbi.rgb
52	share/bzflag/data/timesbr.rgb	53	share/bzflag/data/timesbr.rgb
Lines 54-56 Link Here
54	share/bzflag/data/wall.rgb	55	share/bzflag/data/wall.rgb
55	share/bzflag/data/ybolt.rgb	56	share/bzflag/data/ybolt.rgb
56	share/bzflag/data/ylaser.rgb	57	share/bzflag/data/ylaser.rgb
		58	@dirrm share/bzflag/data
		59	@dirrm share/bzflag

Return to bug 46586

Lines 6-16 Link Here

(-)games/bzflag/Makefile (-7 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= bzflag	8	PORTNAME= bzflag
9	PORTVERSION= 1.7e.6	9	PORTVERSION= 1.7g.0
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= bzflag	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/e./e/}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
14	EXTRACT_SUFX= .tgz	14	EXTRACT_SUFX= .tgz
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
Lines 36-44 Link Here
36	@(cd ${WRKSRC}/man && ${MAKE} targets)	36	@(cd ${WRKSRC}/man && ${MAKE} targets)
37		37
38	do-install:	38	do-install:
39	@${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/	39	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
40	@${INSTALL_MAN} ${WRKSRC}/man/*.6 ${PREFIX}/man/man6/	40	${INSTALL_MAN} ${WRKSRC}/man/*.6 ${MANPREFIX}/man/man6/
41	@${MKDIR} ${PREFIX}/share/bzflag/data	41	@${MKDIR} ${DATADIR}/data
42	@${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/bzflag/data/	42	${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data/
43		43
44	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)games/bzflag/files/patch-BzfString.h (-13 / +6 lines)
1	--- include/BzfString.h.orig Sat Nov 23 15:04:54 2002	1	--- include/BzfString.h.orig Thu Oct 17 04:29:38 2002
2	+++ include/BzfString.h Sat Nov 23 15:05:16 2002	2	+++ include/BzfString.h Mon Dec 9 22:08:01 2002
3	@@ -39,12 +39,14 @@	3	@@ -40,6 +40,8 @@
4
5	#include "common.h"	4	#include "common.h"
6
7	-#if defined(sun) \|\| defined(__MWERKS__)
8	+#if 1
9	// solaris compiler doesn't like declaration of ostream
10	#include "bzfio.h"	5	#include "bzfio.h"
11	#else
12	class ostream;
13	#endif
14	+
15	+using std::ostream;
16		6
		7	+using std::ostream;
		8	+
17	class BzfString {	9	class BzfString {
18	public:	10	public:
		11	BzfString();

Lines 1-6 Link Here

(-)games/bzflag/files/patch-bzflag.cxx (-13 / +4 lines)
1	--- src/bzflag/bzflag.cxx.orig Sat Nov 23 15:16:44 2002	1	--- src/bzflag/bzflag.cxx.orig Fri Dec 6 02:22:44 2002
2	+++ src/bzflag/bzflag.cxx Sat Nov 23 15:17:53 2002	2	+++ src/bzflag/bzflag.cxx Mon Dec 9 22:09:36 2002
3	@@ -756,7 +756,7 @@	3	@@ -769,7 +769,7 @@
4		4
5	// read resources	5	// read resources
6	{	6	{
Lines 8-20 Link Here
8	+ #if 1	8	+ #if 1
9	ifstream resourceStream(getConfigFileName(), ios::in);	9	ifstream resourceStream(getConfigFileName(), ios::in);
10	#else	10	#else
11	ifstream resourceStream(getConfigFileName(), ios::in \| ios::nocreate);	11	ifstream resourceStream(getConfigFileName(), ios::in);
12	@@ -768,7 +768,7 @@
13
14	#if !defined(_WIN32) & !defined(macintosh)
15	else {
16	- ifstream resourceStream2(getConfigFileName2(), ios::in \| ios::nocreate);
17	+ ifstream resourceStream2(getConfigFileName2(), ios::in);
18	if (resourceStream2) {
19	startupInfo.hasConfiguration = True;
20	resourceStream2 >> db;

Lines 1-18 Link Here

(-)games/bzflag/files/patch-resources.h (-13 / +6 lines)
1	--- src/bzflag/resources.h.orig Sat Nov 23 15:18:38 2002	1	--- src/bzflag/resources.h.orig Thu Oct 17 04:38:17 2002
2	+++ src/bzflag/resources.h Sat Nov 23 15:18:59 2002	2	+++ src/bzflag/resources.h Mon Dec 9 22:11:54 2002
3	@@ -20,12 +20,13 @@	3	@@ -21,6 +21,8 @@
4	#include "common.h"
5	#include "BzfString.h"	4	#include "BzfString.h"
6
7	-#if defined(sun) \|\| defined(macintosh)
8	-// solaris compiler doesn't like declaration of istream
9	+#if 1
10	#include "bzfio.h"	5	#include "bzfio.h"
11	#else
12	class istream;
13	#endif
14	+
15	+using namespace std;
16		6
		7	+using namespace std;
		8	+
17	class ResourceDatabase {	9	class ResourceDatabase {
18	public:	10	public:
		11	ResourceDatabase();