Brad Smith wrote:
> On 12/23/2021 5:27 PM, Stefan Hagen wrote:
>
> > Tom Murphy wrote:
> > > Just pinging the list about an update to games/bzflag.
> > > I posted this on the 28th of November originally.
> > >
> > > * Updates to v2.4.22
> > > * graphics/glew added as dependency
> > >
> > > OK?
> > Hi Tom,
> >
> > lib-depends-check reports:
> > Extra: Xdamage.4
> > WANTLIB += ICE SM Xau Xcursor Xdmcp Xi Xinerama Xmu Xrandr Xrender
> > WANTLIB += Xss Xt xcb-shm xcb-xfixes
> >
> > I adjusted WANTLIB accordingly in the patch below:
> >
> > ok sdk@
>
> If you're going to update WANTLIB can you please regen the whole block
> so they're sorted?
I think it was sorted system libs first. But not 100% accurate.
WANTLIB block fully sorted below.
Index: games/bzflag/Makefile
===================================================================
RCS file: /home/cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- games/bzflag/Makefile 20 Mar 2020 16:44:23 -0000 1.49
+++ games/bzflag/Makefile 23 Dec 2021 22:50:03 -0000
@@ -2,7 +2,7 @@
COMMENT= graphical multiplayer 3D tank war game
-V= 2.4.14
+V= 2.4.22
DISTNAME= bzflag-${V}
CATEGORIES= games x11
MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/
@@ -13,16 +13,19 @@ HOMEPAGE= https://www.bzflag.org/
# LGPLv2.1 only or MPL 2.0
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
-WANTLIB += c cares crypto curl curses drm expat glapi m
-WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb
-WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
-WANTLIB += xshmfence z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11
+WANTLIB += X11-xcb Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xss Xt Xxf86vm c cares crypto
+WANTLIB += curl curses drm expat glapi m nghttp2 pthread
+WANTLIB += samplerate sndio ssl usbhid xcb xcb-dri2 xcb-dri3
+WANTLIB += xcb-glx xcb-present xcb-shm xcb-sync xcb-xfixes
+WANTLIB += xshmfence z
# C++11
COMPILER= base-clang ports-gcc
LIB_DEPENDS= devel/sdl2 \
+ graphics/glew \
net/curl \
net/libcares
RUN_DEPENDS= devel/desktop-file-utils
Index: games/bzflag/distinfo
===================================================================
RCS file: /home/cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- games/bzflag/distinfo 15 Sep 2018 19:26:50 -0000 1.13
+++ games/bzflag/distinfo 23 Dec 2021 17:09:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U=
-SIZE (bzflag-2.4.14.tar.bz2) = 14065461
+SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=
+SIZE (bzflag-2.4.22.tar.bz2) = 14169079
Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx
===================================================================
RCS file: /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx
--- games/bzflag/patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012
07:19:34 -0000 1.4
+++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx 23 Dec 2021
17:09:27 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot
Exp $
---- src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012
-+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012
-@@ -109,8 +109,7 @@ bool SDLMedia::openAudio()
+Index: src/platform/SDLMedia.cxx
+--- src/platform/SDLMedia.cxx.orig
++++ src/platform/SDLMedia.cxx
+@@ -130,7 +130,7 @@ bool SDLMedia::openAudio()
+ // how big a fragment to use? we want to hold at around 1/10th of
+ // a second.
+ // probably SDL is using multiple buffering, make it a 3rd
+- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
++ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
+ int n;
- // how big a fragment to use? we want to hold at around 1/10th of
- // a second.
-- // probably SDL is using multiple buffering, make it a 3rd
-- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
-+ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
- int n;
-
- n = 0;
+ n = 0;
Index: games/bzflag/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/bzflag/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 PLIST
--- games/bzflag/pkg/PLIST 4 Sep 2018 12:46:12 -0000 1.15
+++ games/bzflag/pkg/PLIST 23 Dec 2021 17:09:27 -0000
@@ -3,39 +3,39 @@
@bin bin/bzflag
@bin bin/bzfs
lib/bzflag/
-lib/bzflag/CustomZoneSample.so
-lib/bzflag/HoldTheFlag.so
-lib/bzflag/Phoenix.so
-lib/bzflag/RogueGenocide.so
-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/keepaway.so
-lib/bzflag/killall.so
-lib/bzflag/koth.so
-lib/bzflag/logDetail.so
-lib/bzflag/nagware.so
-lib/bzflag/playHistoryTracker.so
-lib/bzflag/rabbitTimer.so
-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
-lib/bzflag/wwzones.so
+@so lib/bzflag/CustomZoneSample.so
+@so lib/bzflag/HoldTheFlag.so
+@so lib/bzflag/Phoenix.so
+@so lib/bzflag/RogueGenocide.so
+@so lib/bzflag/SAMPLE_PLUGIN.so
+@so lib/bzflag/TimeLimit.so
+@so lib/bzflag/airspawn.so
+@so lib/bzflag/autoFlagReset.so
+@so lib/bzflag/bzfscron.so
+@so lib/bzflag/chathistory.so
+@so lib/bzflag/customPollTypeSample.so
+@so lib/bzflag/customflagsample.so
+@so lib/bzflag/fairCTF.so
+@so lib/bzflag/fastmap.so
+@so lib/bzflag/flagStay.so
+@so lib/bzflag/keepaway.so
+@so lib/bzflag/killall.so
+@so lib/bzflag/koth.so
+@so lib/bzflag/logDetail.so
+@so lib/bzflag/nagware.so
+@so lib/bzflag/playHistoryTracker.so
+@so lib/bzflag/rabbitTimer.so
+@so lib/bzflag/rabidRabbit.so
+@so lib/bzflag/recordmatch.so
+@so lib/bzflag/regFlag.so
+@so lib/bzflag/serverControl.so
+@so lib/bzflag/serverSidePlayerSample.so
+@so lib/bzflag/shockwaveDeath.so
+@so lib/bzflag/superUser.so
+@so lib/bzflag/teamflagreset.so
+@so lib/bzflag/thiefControl.so
+@so lib/bzflag/timedctf.so
+@so lib/bzflag/wwzones.so
@man man/man5/bzw.5
@man man/man6/bzadmin.6
@man man/man6/bzflag.6
@@ -75,6 +75,8 @@ share/bzflag/flag_won.wav
share/bzflag/flap.wav
share/bzflag/fonts/
share/bzflag/fonts/DejaVu.License
+share/bzflag/fonts/DejaVuSansCondensedBold_10.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_10.png
share/bzflag/fonts/DejaVuSansCondensedBold_12.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_12.png
share/bzflag/fonts/DejaVuSansCondensedBold_16.fmt
@@ -91,6 +93,8 @@ share/bzflag/fonts/DejaVuSansCondensedBo
share/bzflag/fonts/DejaVuSansCondensedBold_64.png
share/bzflag/fonts/DejaVuSansCondensedBold_8.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_8.png
+share/bzflag/fonts/DejaVuSansMonoBold_10.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_10.png
share/bzflag/fonts/DejaVuSansMonoBold_12.fmt
share/bzflag/fonts/DejaVuSansMonoBold_12.png
share/bzflag/fonts/DejaVuSansMonoBold_16.fmt
@@ -139,6 +143,7 @@ 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_sk.po
share/bzflag/l10n/bzflag_sv.po
share/bzflag/land.wav
share/bzflag/laser.wav
