Attachment #174861 for bug #212753

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




# $FreeBSD$

PORTNAME=	bzflag
PORTVERSION=	2.4.6
PORTREVISION=	5
CATEGORIES=	games
MASTER_SITES=	https://download.bzflag.org/bzflag/source/${PORTVERSION}/

MAINTAINER=	kevinz5000@gmail.com
COMMENT?=	Multiplayer 3D tank battle game

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libcurl.so:ftp/curl \
		libcares.so:dns/c-ares

GNU_CONFIGURE=	yes
USES=		compiler:c++11-lib libtool localbase tar:bzip2
INSTALL_TARGET=	install-strip

.ifndef SERVER_ONLY
USE_GL=		gl glu
USE_SDL=	sdl
USE_XORG=	x11 xext xxf86vm sm ice
.endif

MAKE_JOBS_UNSAFE=	yes

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (bzflag-2.4.2.tar.bz2) = 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811	1	TIMESTAMP = 1474039909
2	SIZE (bzflag-2.4.2.tar.bz2) = 15971448	2	SHA256 (bzflag-2.4.6.tar.bz2) = a44506828d09fe26f06658aae7f579080ecbaef5bd19a938dfed604e0c8afb45
		3	SIZE (bzflag-2.4.6.tar.bz2) = 13919761




--- ./include/VotingArbiter.h.orig	2012-07-16 03:32:02.000000000 +0400
+++ ./include/VotingArbiter.h	2013-09-11 02:18:23.000000000 +0400
@@ -230,12 +230,11 @@
 
 };
 
-
-inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60,
-				    unsigned short int vetoTime=20,
-				    unsigned short int votesRequired=2,
-				    float votePercentage=50.1,
-				    unsigned short int voteRepeatTime=300)
+inline VotingArbiter::VotingArbiter(unsigned short int voteTime,
+				    unsigned short int vetoTime,
+				    unsigned short int votesRequired,
+				    float votePercentage,
+				    unsigned short int voteRepeatTime)
   : _votingBooth(NULL),
     _maxVotes(votesRequired+1),
     _voteTime(voteTime),




bin/bzadmin
%%CLIENT%%bin/bzflag
bin/bzfs
lib/bzflag/CustomZoneSample.so
lib/bzflag/HoldTheFlag.so
lib/bzflag/Phoenix.so
lib/bzflag/RogueGenocide.so

lib/bzflag/TimeLimit.so
lib/bzflag/airspawn.so
lib/bzflag/autoFlagReset.so
lib/bzflag/bzfscron.so
lib/bzflag/chathistory.so
lib/bzflag/customflagsample.so
lib/bzflag/fairCTF.so
lib/bzflag/fastmap.so
lib/bzflag/flagStay.so
lib/bzflag/hiddenAdmin.so
lib/bzflag/keepaway.so
lib/bzflag/killall.so
lib/bzflag/koth.so

lib/bzflag/recordmatch.so
lib/bzflag/regFlag.so
lib/bzflag/serverControl.so
lib/bzflag/serverSidePlayerSample.so
lib/bzflag/shockwaveDeath.so
lib/bzflag/superUser.so
lib/bzflag/teamflagreset.so
lib/bzflag/thiefControl.so
lib/bzflag/timedctf.so

%%DATADIR%%/fonts/DejaVuSansCondensedBold_24.png
%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.fmt
%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.png
%%DATADIR%%/fonts/DejaVuSansCondensedBold_48.fmt
%%DATADIR%%/fonts/DejaVuSansCondensedBold_48.png
%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.fmt
%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.png
%%DATADIR%%/fonts/DejaVuSansCondensedBold_64.fmt
%%DATADIR%%/fonts/DejaVuSansCondensedBold_64.png
%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.fmt
%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_12.fmt

%%DATADIR%%/fonts/DejaVuSansMonoBold_16.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_24.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_24.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_32.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_32.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_48.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_48.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_6.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_6.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_64.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_64.png
%%DATADIR%%/fonts/DejaVuSansMonoBold_8.fmt
%%DATADIR%%/fonts/DejaVuSansMonoBold_8.png
%%DATADIR%%/fonts/DejaVuSerifBold_12.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_12.png
%%DATADIR%%/fonts/DejaVuSerifBold_16.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_16.png
%%DATADIR%%/fonts/DejaVuSerifBold_24.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_24.png
%%DATADIR%%/fonts/DejaVuSerifBold_32.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_32.png
%%DATADIR%%/fonts/DejaVuSerifBold_6.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_6.png
%%DATADIR%%/fonts/DejaVuSerifBold_8.fmt
%%DATADIR%%/fonts/DejaVuSerifBold_8.png
%%DATADIR%%/fonts/readme
%%DATADIR%%/frog.png
%%DATADIR%%/green_basetop.png

%%DATADIR%%/jump.wav
%%DATADIR%%/jumpjets.png
%%DATADIR%%/killteam.wav
%%DATADIR%%/l10n/ISO-639-2_values_8bits.txt
%%DATADIR%%/l10n/bzflag_cs_CZ.po
%%DATADIR%%/l10n/bzflag_da.po
%%DATADIR%%/l10n/bzflag_de.po

%%DATADIR%%/l10n/bzflag_nl.po
%%DATADIR%%/l10n/bzflag_pt.po
%%DATADIR%%/l10n/bzflag_sv.po
%%DATADIR%%/l10n/bzflag_xx.po
%%DATADIR%%/land.wav
%%DATADIR%%/laser.wav
%%DATADIR%%/lock.wav

Return to bug 212753

Lines 1-10 Link Here

(-)Makefile (-6 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= bzflag	3	PORTNAME= bzflag
4	PORTVERSION= 2.4.2	4	PORTVERSION= 2.4.6
5	PORTREVISION= 5
6	CATEGORIES= games	5	CATEGORIES= games
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}	6	MASTER_SITES= https://download.bzflag.org/bzflag/source/${PORTVERSION}/
8		7
9	MAINTAINER= kevinz5000@gmail.com	8	MAINTAINER= kevinz5000@gmail.com
10	COMMENT?= Multiplayer 3D tank battle game	9	COMMENT?= Multiplayer 3D tank battle game
Lines 12-25 Link Here
12	LICENSE= LGPL21	11	LICENSE= LGPL21
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	LIB_DEPENDS= libcurl.so:ftp/curl	14	LIB_DEPENDS= libcurl.so:ftp/curl \
		15	libcares.so:dns/c-ares
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	USES= libtool tar:bzip2	18	USES= compiler:c++11-lib libtool localbase tar:bzip2
		19	INSTALL_TARGET= install-strip
19		20
20	.ifndef SERVER_ONLY	21	.ifndef SERVER_ONLY
21	USE_GL= glew	22	USE_GL= gl glu
22	USE_SDL= sdl	23	USE_SDL= sdl
		24	USE_XORG= x11 xext xxf86vm sm ice
23	.endif	25	.endif
24		26
25	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes

Lines 1-20 Link Here

(-)files/patch-include_VotingArbiter.h (-20 lines)
1	--- ./include/VotingArbiter.h.orig 2012-07-16 03:32:02.000000000 +0400
2	+++ ./include/VotingArbiter.h 2013-09-11 02:18:23.000000000 +0400
3	@@ -230,12 +230,11 @@
4
5	};
6
7	-
8	-inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60,
9	- unsigned short int vetoTime=20,
10	- unsigned short int votesRequired=2,
11	- float votePercentage=50.1,
12	- unsigned short int voteRepeatTime=300)
13	+inline VotingArbiter::VotingArbiter(unsigned short int voteTime,
14	+ unsigned short int vetoTime,
15	+ unsigned short int votesRequired,
16	+ float votePercentage,
17	+ unsigned short int voteRepeatTime)
18	: _votingBooth(NULL),
19	_maxVotes(votesRequired+1),
20	_voteTime(voteTime),

Lines 1-6 Link Here

(-)pkg-plist (-15 / +14 lines)
1	bin/bzadmin	1	bin/bzadmin
2	%%CLIENT%%bin/bzflag	2	%%CLIENT%%bin/bzflag
3	bin/bzfs	3	bin/bzfs
		4	lib/bzflag/CustomZoneSample.so
4	lib/bzflag/HoldTheFlag.so	5	lib/bzflag/HoldTheFlag.so
5	lib/bzflag/Phoenix.so	6	lib/bzflag/Phoenix.so
6	lib/bzflag/RogueGenocide.so	7	lib/bzflag/RogueGenocide.so
Lines 8-19 Link Here
8	lib/bzflag/TimeLimit.so	9	lib/bzflag/TimeLimit.so
9	lib/bzflag/airspawn.so	10	lib/bzflag/airspawn.so
10	lib/bzflag/autoFlagReset.so	11	lib/bzflag/autoFlagReset.so
		12	lib/bzflag/bzfscron.so
11	lib/bzflag/chathistory.so	13	lib/bzflag/chathistory.so
12	lib/bzflag/customflagsample.so	14	lib/bzflag/customflagsample.so
13	lib/bzflag/fairCTF.so	15	lib/bzflag/fairCTF.so
14	lib/bzflag/fastmap.so	16	lib/bzflag/fastmap.so
15	lib/bzflag/flagStay.so	17	lib/bzflag/flagStay.so
16	lib/bzflag/hiddenAdmin.so
17	lib/bzflag/keepaway.so	18	lib/bzflag/keepaway.so
18	lib/bzflag/killall.so	19	lib/bzflag/killall.so
19	lib/bzflag/koth.so	20	lib/bzflag/koth.so
Lines 25-31 Link Here
25	lib/bzflag/recordmatch.so	26	lib/bzflag/recordmatch.so
26	lib/bzflag/regFlag.so	27	lib/bzflag/regFlag.so
27	lib/bzflag/serverControl.so	28	lib/bzflag/serverControl.so
		29	lib/bzflag/serverSidePlayerSample.so
28	lib/bzflag/shockwaveDeath.so	30	lib/bzflag/shockwaveDeath.so
		31	lib/bzflag/superUser.so
29	lib/bzflag/teamflagreset.so	32	lib/bzflag/teamflagreset.so
30	lib/bzflag/thiefControl.so	33	lib/bzflag/thiefControl.so
31	lib/bzflag/timedctf.so	34	lib/bzflag/timedctf.so
Lines 75-82 Link Here
75	%%DATADIR%%/fonts/DejaVuSansCondensedBold_24.png	78	%%DATADIR%%/fonts/DejaVuSansCondensedBold_24.png
76	%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.fmt	79	%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.fmt
77	%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.png	80	%%DATADIR%%/fonts/DejaVuSansCondensedBold_32.png
		81	%%DATADIR%%/fonts/DejaVuSansCondensedBold_48.fmt
		82	%%DATADIR%%/fonts/DejaVuSansCondensedBold_48.png
78	%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.fmt	83	%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.fmt
79	%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.png	84	%%DATADIR%%/fonts/DejaVuSansCondensedBold_6.png
		85	%%DATADIR%%/fonts/DejaVuSansCondensedBold_64.fmt
		86	%%DATADIR%%/fonts/DejaVuSansCondensedBold_64.png
80	%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.fmt	87	%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.fmt
81	%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.png	88	%%DATADIR%%/fonts/DejaVuSansCondensedBold_8.png
82	%%DATADIR%%/fonts/DejaVuSansMonoBold_12.fmt	89	%%DATADIR%%/fonts/DejaVuSansMonoBold_12.fmt
Lines 85-106 Link Here
85	%%DATADIR%%/fonts/DejaVuSansMonoBold_16.png	92	%%DATADIR%%/fonts/DejaVuSansMonoBold_16.png
86	%%DATADIR%%/fonts/DejaVuSansMonoBold_24.fmt	93	%%DATADIR%%/fonts/DejaVuSansMonoBold_24.fmt
87	%%DATADIR%%/fonts/DejaVuSansMonoBold_24.png	94	%%DATADIR%%/fonts/DejaVuSansMonoBold_24.png
		95	%%DATADIR%%/fonts/DejaVuSansMonoBold_32.fmt
		96	%%DATADIR%%/fonts/DejaVuSansMonoBold_32.png
		97	%%DATADIR%%/fonts/DejaVuSansMonoBold_48.fmt
		98	%%DATADIR%%/fonts/DejaVuSansMonoBold_48.png
88	%%DATADIR%%/fonts/DejaVuSansMonoBold_6.fmt	99	%%DATADIR%%/fonts/DejaVuSansMonoBold_6.fmt
89	%%DATADIR%%/fonts/DejaVuSansMonoBold_6.png	100	%%DATADIR%%/fonts/DejaVuSansMonoBold_6.png
		101	%%DATADIR%%/fonts/DejaVuSansMonoBold_64.fmt
		102	%%DATADIR%%/fonts/DejaVuSansMonoBold_64.png
90	%%DATADIR%%/fonts/DejaVuSansMonoBold_8.fmt	103	%%DATADIR%%/fonts/DejaVuSansMonoBold_8.fmt
91	%%DATADIR%%/fonts/DejaVuSansMonoBold_8.png	104	%%DATADIR%%/fonts/DejaVuSansMonoBold_8.png
92	%%DATADIR%%/fonts/DejaVuSerifBold_12.fmt
93	%%DATADIR%%/fonts/DejaVuSerifBold_12.png
94	%%DATADIR%%/fonts/DejaVuSerifBold_16.fmt
95	%%DATADIR%%/fonts/DejaVuSerifBold_16.png
96	%%DATADIR%%/fonts/DejaVuSerifBold_24.fmt
97	%%DATADIR%%/fonts/DejaVuSerifBold_24.png
98	%%DATADIR%%/fonts/DejaVuSerifBold_32.fmt
99	%%DATADIR%%/fonts/DejaVuSerifBold_32.png
100	%%DATADIR%%/fonts/DejaVuSerifBold_6.fmt
101	%%DATADIR%%/fonts/DejaVuSerifBold_6.png
102	%%DATADIR%%/fonts/DejaVuSerifBold_8.fmt
103	%%DATADIR%%/fonts/DejaVuSerifBold_8.png
104	%%DATADIR%%/fonts/readme	105	%%DATADIR%%/fonts/readme
105	%%DATADIR%%/frog.png	106	%%DATADIR%%/frog.png
106	%%DATADIR%%/green_basetop.png	107	%%DATADIR%%/green_basetop.png
Lines 119-125 Link Here
119	%%DATADIR%%/jump.wav	120	%%DATADIR%%/jump.wav
120	%%DATADIR%%/jumpjets.png	121	%%DATADIR%%/jumpjets.png
121	%%DATADIR%%/killteam.wav	122	%%DATADIR%%/killteam.wav
122	%%DATADIR%%/l10n/ISO-639-2_values_8bits.txt
123	%%DATADIR%%/l10n/bzflag_cs_CZ.po	123	%%DATADIR%%/l10n/bzflag_cs_CZ.po
124	%%DATADIR%%/l10n/bzflag_da.po	124	%%DATADIR%%/l10n/bzflag_da.po
125	%%DATADIR%%/l10n/bzflag_de.po	125	%%DATADIR%%/l10n/bzflag_de.po
Lines 133-139 Link Here
133	%%DATADIR%%/l10n/bzflag_nl.po	133	%%DATADIR%%/l10n/bzflag_nl.po
134	%%DATADIR%%/l10n/bzflag_pt.po	134	%%DATADIR%%/l10n/bzflag_pt.po
135	%%DATADIR%%/l10n/bzflag_sv.po	135	%%DATADIR%%/l10n/bzflag_sv.po
136	%%DATADIR%%/l10n/bzflag_xx.po
137	%%DATADIR%%/land.wav	136	%%DATADIR%%/land.wav
138	%%DATADIR%%/laser.wav	137	%%DATADIR%%/laser.wav
139	%%DATADIR%%/lock.wav	138	%%DATADIR%%/lock.wav