Hi!
The diff below updates bzflag to 2.4.12.
OK to commit?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 21 Nov 2017 00:13:00 -0000 1.43
+++ Makefile 2 Dec 2017 12:26:22 -0000
@@ -2,32 +2,34 @@
COMMENT= graphical multiplayer 3D tank war game
-DISTNAME= bzflag-2.4.2
+V= 2.4.12
+DISTNAME= bzflag-${V}
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/}
+MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/
EXTRACT_SUFX= .tar.bz2
-REVISION= 6
-HOMEPAGE= http://www.bzflag.org/
+HOMEPAGE= https://www.bzflag.org/
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += GL GLEW GLU ICE SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi Xmu
-WANTLIB += Xt Xxf86vm c cares crypto curl drm expat glapi iconv intl m ncurses
-WANTLIB += nghttp2 pthread sndio ssl ${COMPILER_LIBCXX} usbhid xcb xcb-dri2
xcb-glx
-WANTLIB += z
+WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
+WANTLIB += c cares crypto curl drm expat glapi m ncurses
+WANTLIB += nghttp2 pthread sndio ssl usbhid xcb xcb-dri2
+WANTLIB += xcb-glx z ${COMPILER_LIBCXX}
-LIB_DEPENDS= devel/sdl \
- graphics/glew \
+# c++0x
+COMPILER= base-clang ports-gcc
+
+LIB_DEPENDS= devel/sdl2 \
net/curl \
net/libcares
RUN_DEPENDS= devel/desktop-file-utils
-USE_GMAKE= Yes
+SEPARATE_BUILD= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.68
+AUTOCONF_VERSION= 2.69
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
ac_cv_lib_bind_gethostent=no
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 3 Sep 2012 07:19:34 -0000 1.11
+++ distinfo 2 Dec 2017 12:26:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (bzflag-2.4.2.tar.bz2) = T3vFIoTMSzn8NShV5VWysGTB3moY90dOJJBzBwdiyBE=
-SIZE (bzflag-2.4.2.tar.bz2) = 15971448
+SHA256 (bzflag-2.4.12.tar.bz2) = qKE6WGSHmKb2+WmikRzyE3f+RZZPLt9GoyfRNw/xAA0=
+SIZE (bzflag-2.4.12.tar.bz2) = 14042357
Index: patches/patch-include_VotingArbiter_h
===================================================================
RCS file: patches/patch-include_VotingArbiter_h
diff -N patches/patch-include_VotingArbiter_h
--- patches/patch-include_VotingArbiter_h 4 May 2017 21:38:05 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-include_VotingArbiter_h,v 1.1 2017/05/04 21:38:05 espie Exp $
-C++ Defect Report Core Issue 1344.
-Deducing basic properties of class, such as the presence of a default
-constructor should not require full program knowledge. Thus, the default
-parameters should be in the class declaration.
-
-clang flags this as an error.
-
-Index: include/VotingArbiter.h
---- include/VotingArbiter.h.orig
-+++ include/VotingArbiter.h
-@@ -86,9 +86,11 @@ class VotingArbiter (protected)
- public:
-
- /* default constructor */
-- VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime,
-- unsigned short int votesRequired, float votePercentage,
-- unsigned short int voteRepeatTime);
-+ 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);
- /* default copy constructor */
- VotingArbiter(const VotingArbiter& arbiter);
- ~VotingArbiter(void);
-@@ -231,11 +233,11 @@ class VotingArbiter (protected)
- };
-
-
--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),
Index: patches/patch-src_bzfs_VotingArbiter_h
===================================================================
RCS file: patches/patch-src_bzfs_VotingArbiter_h
diff -N patches/patch-src_bzfs_VotingArbiter_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_bzfs_VotingArbiter_h 2 Dec 2017 12:26:22 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+C++ Defect Report Core Issue 1344.
+Deducing basic properties of class, such as the presence of a default
+constructor should not require full program knowledge. Thus, the default
+parameters should be in the class declaration.
+
+clang flags this as an error.
+
+Index: src/bzfs/VotingArbiter.h
+--- src/bzfs/VotingArbiter.h.orig
++++ src/bzfs/VotingArbiter.h
+@@ -89,9 +89,11 @@ class VotingArbiter (protected)
+ public:
+
+ /* default constructor */
+- VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime,
+- unsigned short int votesRequired, float votePercentage,
+- unsigned short int voteRepeatTime);
++ 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);
+ /* default copy constructor */
+ VotingArbiter(const VotingArbiter& arbiter);
+ ~VotingArbiter(void);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 3 Sep 2012 07:19:34 -0000 1.12
+++ pkg/PLIST 2 Dec 2017 12:26:22 -0000
@@ -3,6 +3,7 @@
@bin bin/bzflag
@bin bin/bzfs
lib/bzflag/
+lib/bzflag/CustomZoneSample.so
lib/bzflag/HoldTheFlag.so
lib/bzflag/Phoenix.so
lib/bzflag/RogueGenocide.so
@@ -10,12 +11,13 @@ lib/bzflag/SAMPLE_PLUGIN.so
lib/bzflag/TimeLimit.so
lib/bzflag/airspawn.so
lib/bzflag/autoFlagReset.so
+lib/bzflag/bzfscron.so
lib/bzflag/chathistory.so
+lib/bzflag/customPollTypeSample.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
@@ -27,7 +29,9 @@ lib/bzflag/rabidRabbit.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
@@ -79,8 +83,12 @@ share/bzflag/fonts/DejaVuSansCondensedBo
share/bzflag/fonts/DejaVuSansCondensedBold_24.png
share/bzflag/fonts/DejaVuSansCondensedBold_32.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_32.png
+share/bzflag/fonts/DejaVuSansCondensedBold_48.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_48.png
share/bzflag/fonts/DejaVuSansCondensedBold_6.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_6.png
+share/bzflag/fonts/DejaVuSansCondensedBold_64.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_64.png
share/bzflag/fonts/DejaVuSansCondensedBold_8.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_8.png
share/bzflag/fonts/DejaVuSansMonoBold_12.fmt
@@ -89,22 +97,16 @@ share/bzflag/fonts/DejaVuSansMonoBold_16
share/bzflag/fonts/DejaVuSansMonoBold_16.png
share/bzflag/fonts/DejaVuSansMonoBold_24.fmt
share/bzflag/fonts/DejaVuSansMonoBold_24.png
+share/bzflag/fonts/DejaVuSansMonoBold_32.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_32.png
+share/bzflag/fonts/DejaVuSansMonoBold_48.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_48.png
share/bzflag/fonts/DejaVuSansMonoBold_6.fmt
share/bzflag/fonts/DejaVuSansMonoBold_6.png
+share/bzflag/fonts/DejaVuSansMonoBold_64.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_64.png
share/bzflag/fonts/DejaVuSansMonoBold_8.fmt
share/bzflag/fonts/DejaVuSansMonoBold_8.png
-share/bzflag/fonts/DejaVuSerifBold_12.fmt
-share/bzflag/fonts/DejaVuSerifBold_12.png
-share/bzflag/fonts/DejaVuSerifBold_16.fmt
-share/bzflag/fonts/DejaVuSerifBold_16.png
-share/bzflag/fonts/DejaVuSerifBold_24.fmt
-share/bzflag/fonts/DejaVuSerifBold_24.png
-share/bzflag/fonts/DejaVuSerifBold_32.fmt
-share/bzflag/fonts/DejaVuSerifBold_32.png
-share/bzflag/fonts/DejaVuSerifBold_6.fmt
-share/bzflag/fonts/DejaVuSerifBold_6.png
-share/bzflag/fonts/DejaVuSerifBold_8.fmt
-share/bzflag/fonts/DejaVuSerifBold_8.png
share/bzflag/fonts/readme
share/bzflag/frog.png
share/bzflag/green_basetop.png
@@ -124,7 +126,6 @@ share/bzflag/jump.wav
share/bzflag/jumpjets.png
share/bzflag/killteam.wav
share/bzflag/l10n/
-share/bzflag/l10n/ISO-639-2_values_8bits.txt
share/bzflag/l10n/bzflag_cs_CZ.po
share/bzflag/l10n/bzflag_da.po
share/bzflag/l10n/bzflag_de.po
@@ -137,8 +138,8 @@ share/bzflag/l10n/bzflag_kg.po
share/bzflag/l10n/bzflag_lt.po
share/bzflag/l10n/bzflag_nl.po
share/bzflag/l10n/bzflag_pt.po
+share/bzflag/l10n/bzflag_ru.po
share/bzflag/l10n/bzflag_sv.po
-share/bzflag/l10n/bzflag_xx.po
share/bzflag/land.wav
share/bzflag/laser.wav
share/bzflag/lock.wav
