Attachment 174861 Details for Bug 212753 – Patch

[patch] Patch

bzflag.patch (text/plain), 5.75 KB, created by Dmitry Marakasov on 2016-09-16 23:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-09-16 23:22:59 UTC

Size: 5.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422256)
>+++ Makefile	(working copy)
>@@ -1,10 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	bzflag
>-PORTVERSION=	2.4.2
>-PORTREVISION=	5
>+PORTVERSION=	2.4.6
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
>+MASTER_SITES=	https://download.bzflag.org/bzflag/source/${PORTVERSION}/
> 
> MAINTAINER=	kevinz5000@gmail.com
> COMMENT?=	Multiplayer 3D tank battle game
>@@ -12,14 +11,17 @@
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libcurl.so:ftp/curl
>+LIB_DEPENDS=	libcurl.so:ftp/curl \
>+		libcares.so:dns/c-ares
> 
> GNU_CONFIGURE=	yes
>-USES=		libtool tar:bzip2
>+USES=		compiler:c++11-lib libtool localbase tar:bzip2
>+INSTALL_TARGET=	install-strip
> 
> .ifndef SERVER_ONLY
>-USE_GL=		glew
>+USE_GL=		gl glu
> USE_SDL=	sdl
>+USE_XORG=	x11 xext xxf86vm sm ice
> .endif
> 
> MAKE_JOBS_UNSAFE=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 422256)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (bzflag-2.4.2.tar.bz2) = 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811
>-SIZE (bzflag-2.4.2.tar.bz2) = 15971448
>+TIMESTAMP = 1474039909
>+SHA256 (bzflag-2.4.6.tar.bz2) = a44506828d09fe26f06658aae7f579080ecbaef5bd19a938dfed604e0c8afb45
>+SIZE (bzflag-2.4.6.tar.bz2) = 13919761
>Index: files/patch-include_VotingArbiter.h
>===================================================================
>--- files/patch-include_VotingArbiter.h	(revision 422256)
>+++ files/patch-include_VotingArbiter.h	(nonexistent)
>@@ -1,20 +0,0 @@
>---- ./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),
>
>Property changes on: files/patch-include_VotingArbiter.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 422256)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,7 @@
> bin/bzadmin
> %%CLIENT%%bin/bzflag
> bin/bzfs
>+lib/bzflag/CustomZoneSample.so
> lib/bzflag/HoldTheFlag.so
> lib/bzflag/Phoenix.so
> lib/bzflag/RogueGenocide.so
>@@ -8,12 +9,12 @@
> 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
>@@ -25,7 +26,9 @@
> 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
>@@ -75,8 +78,12 @@
> %%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
>@@ -85,22 +92,16 @@
> %%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
>@@ -119,7 +120,6 @@
> %%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
>@@ -133,7 +133,6 @@
> %%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

Actions: View | Diff

Attachments on bug 212753: 174861