golly: update to 4.1.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Dec 27 16:00:45 2021 +0100
Changeset:	763c97dca2c93a6ad71ef415b60d255435fd2903

Modified Files:
	golly/Makefile
	golly/PLIST
	golly/distinfo
	golly/patches/patch-cmdline_bgolly.cpp
	golly/patches/patch-gui-wx_makefile-gtk
Added Files:
	golly/patches/patch-sound_cute__sound.h

Log Message:
golly: update to 4.1.

 Changes in version 4.1 (released November 2021)

    Golly's audio support is now enabled by default. The overlay's "sound" command has been removed and replaced by an equivalent sound command with a nicer syntax (for Lua or Python). Note that you no longer have to create an overlay to play sounds. See pop-sounds.lua or pop-sounds.py for simple examples. Other scripts that play sounds are breakout.lua and credits.lua.
    The Mac app is a universal binary that runs natively on Intel or Silicon and requires macOS 10.11+.
    The cell population inside and outside of a selection can now be displayed in the status bar. Use Edit Preference: "Show selection population" to enable (default is disabled). To prevent lag the population is only displayed if the calculation takes less than 5ms while selecting or less than 500ms when the selection is complete.
    Lua's sleep command now has a resolution of about 1ms on Windows (previously it was about 15ms).
    The setoption command now recognizes "showcellborders" for showing or hiding cell borders when zoomed in > 2x.
    If the "Save Extended RLE" option is ticked then the store command now ensures a non-zero generation count is included in the saved file's #CXRLE comment line.
    Fixed a bug in Mac app when drawing while a pattern is generating (only on Retina screens).
    Fixed a bug in Larger than Life weighted neighborhoods with negative counts.
    Fixed some problems in hexgrid.lua.
    The performance of the QuickLife algorithm on patterns in bounded grids has been significantly improved (and a problem fixed that could cause a gradual slowing down of patterns in partially bounded grids).
    Updated Lua to version 5.4.3.
    New patterns, primarily in OCA (non-Conway's Life) rules: b3-s23-g3-spaceship-breeder.rle, isotropic-rule-wire-construction-gun.rle, 52513m.rle, oscillator-stamp-collection-24Nov2021.rle, crystallizing-dirty-superstring.rle, liquid-methuseblob-soup.rle, r50-unknown-fate-bug.rle, binary-counter-and-iterated-log-gun.rle, drylife-p480-rake-gun.rle, highlife-c98o-spaceship-p1728-gun.rle, lfod-flying-rule110-simulator.rle, pedestrian-life-oblique-rake-gun.rle, 52513m.rle, conga-line-switch-engine-extender.rle, ordovician-radiation.rle, sawtooth177.rle, 1d-turing-machine.rle, checkerboard-spaceships-and-growth.rle, elastic-growth.rle, moving-crystallographic-defects.rle, five-margolus-media.rle, justfriends-p8256-c4-rake.rle, loopability-104-rro.rle, oblique-frontend-rro.rle, whitespace-puffer.rle, wickstretcher-explosion.rle, leaplife-p361-glider-gun.rle, myrtlelife-rake-gun.rle, ripples-p1366-gun.rle, glitter2-p312-2c12d-gun.rle, fractal-making-replicator.rle, rulerish-replic
ator.rle, triangular-replicator.rle, irregular-triangular-replicator.rle, pascal-mod-3-generator.rle, replicator-blooming-spaceships.rle, rule-110-replicator.rle, sierpinski-like-log5-12.rle, weird-replicator-generator.rle, c2-p146808-orthogonal-spaceship.rle, 16engine-74,46c378-spaceship.rle, adjustable-slope-spaceships.rle, hive-spaceship-collection.rle, omosso-p79576-spaceship.rle, spaghetti2-spaceship-collection.rle. tlife-8c282-spaceship.rle, tubular-geminoid.rle, whitespace-1176c4704o-spaceship-predecessor.rle, whitespace-17c2415-spaceship.rle, crystal-cathedral-09-novelty.rle, exploratorium.rle.gz.
    Updated 2c5-orthogonal.rle, c4-orthogonal.rle, honey-farm-hasslers.rle, phase-shift.rle, pure-nonfiller-LifeHistory.rle, short-thin.rle, spaceship-types.rle, traffic-light-hasslers.rle.
    Moved/renamed patterns b2ein-spaceships-and-rakes.rle, horiship-guns.rle, intergalactic-cruise-ship-factory.rle, rr14gun.rle, justfriends-p137loop.rle, justfriends-oscillators.rle, justfriends-p384drifter.rle, justfriends-spaceships.rle, p42-knightship.rle, , unit-fraction-orthogonal-spaceships.zip, calcyman-primer.zip, and cambrian-explosion.rle.
    Removed patterns DRH-oscillators.rle, p8256c4dirtyrake.rle, and sawtooth6b.rle.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=763c97dca2c93a6ad71ef415b60d255435fd2903

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 golly/Makefile                          |  12 +--
 golly/PLIST                             | 143 ++++++++++++++++++++++++++++----
 golly/distinfo                          |  11 +--
 golly/patches/patch-cmdline_bgolly.cpp  |   2 +-
 golly/patches/patch-gui-wx_makefile-gtk |   6 +-
 golly/patches/patch-sound_cute__sound.h |  20 +++++
 6 files changed, 162 insertions(+), 32 deletions(-)

diffs:
diff --git a/golly/Makefile b/golly/Makefile
index 1e6209ee80..8b2da062f7 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	4.0
+VERSION=	4.1
 PKGNAME=	golly-${VERSION}
 DISTNAME=	${PKGNAME_NOREV}-src
 CATEGORIES=	x11
@@ -23,13 +23,13 @@ INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share/doc/golly
 INSTALLATION_DIRS+=	share/golly
 
-PY3=		8	# Use python 3.8
+PYTHON_VERSIONS_INCOMPATIBLE = 27
 
 # The new 4.0 version no longer has a configure script,
 # but you need to edit a file by hand...
 do-configure:
 	( ${ECHO} "WX_CONFIG = wx-config-3.0"; \
-	  ${ECHO} "PYTHON = python3.${PY3}"; \
+	  ${ECHO} "PYTHON = python${PYVERSSUFFIX}"; \
 	  ${ECHO} "GOLLYDIR = ${PREFIX}/share/golly" \
 	) >${WRKSRC}/gui-wx/local-gtk.mk
 
@@ -46,8 +46,10 @@ do-install:
 	# Remove lots of unneeded x bits
 	find ${DESTDIR}${PREFIX}/share/golly -type f -exec chmod a-x {} +
 
+.include "../../lang/python/pyversion.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-#.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.4.1
-.include "../../lang/python3${PY3}/buildlink3.mk"
+#.include "../../lang/lua/buildlink3.mk" # uses a vendored version 5.4.3
+.include "../../lang/${PYPACKAGE}/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/golly/PLIST b/golly/PLIST
index a027bb2514..d987a7340b 100644
--- a/golly/PLIST
+++ b/golly/PLIST
@@ -101,6 +101,8 @@ share/golly/Patterns/Generations/SediMental.mcl
 share/golly/Patterns/Generations/Steeplechase.mcl
 share/golly/Patterns/Generations/Transers.mcl
 share/golly/Patterns/Generations/What-a-mess.mcl
+share/golly/Patterns/Generations/b3-s23-g3-spaceship-breeder.rle
+share/golly/Patterns/Generations/isotropic-rule-wire-construction-gun.rle
 share/golly/Patterns/HashLife/broken-lines.mc
 share/golly/Patterns/HashLife/catacryst.mc
 share/golly/Patterns/HashLife/demonoid-c512-hashlife-friendly.mc.gz
@@ -146,15 +148,22 @@ share/golly/Patterns/Larger-than-Life/R500-alien-bug.rle
 share/golly/Patterns/Larger-than-Life/SlowShip.rle
 share/golly/Patterns/Larger-than-Life/SoldierBugs.rle
 share/golly/Patterns/Larger-than-Life/Waffle.mcl
+share/golly/Patterns/Larger-than-Life/liquid-methuseblob-soup.rle
+share/golly/Patterns/Larger-than-Life/r50-unknown-fate-bug.rle
 share/golly/Patterns/Life-Like/Day-and-Night-gun-and-antigun.rle
 share/golly/Patterns/Life-Like/HighLife-replicator-spaceship.rle
 share/golly/Patterns/Life-Like/Morley/breeder2.rle
 share/golly/Patterns/Life-Like/Morley/enterprise-gun.rle
 share/golly/Patterns/Life-Like/Morley/growing-ship.rle
 share/golly/Patterns/Life-Like/alt-wicks.lua
+share/golly/Patterns/Life-Like/binary-counter-and-iterated-log-gun.rle
 share/golly/Patterns/Life-Like/coral.rle
+share/golly/Patterns/Life-Like/drylife-p480-rake-gun.rle
+share/golly/Patterns/Life-Like/highlife-c98o-spaceship-p1728-gun.rle
 share/golly/Patterns/Life-Like/ice-nine.rle
+share/golly/Patterns/Life-Like/lfod-flying-rule110-simulator.rle
 share/golly/Patterns/Life-Like/p168-knightship.rle
+share/golly/Patterns/Life-Like/pedestrian-life-oblique-rake-gun.rle
 share/golly/Patterns/Life-Like/persian-rugs.lif
 share/golly/Patterns/Life-Like/replicator.rle
 share/golly/Patterns/Life-Like/spiral-growth.rle
@@ -162,6 +171,7 @@ share/golly/Patterns/Life-Like/white-whale.rle
 share/golly/Patterns/Life/Bounded-Grids/Klein-bottle.rle
 share/golly/Patterns/Life/Bounded-Grids/agar-p3.rle
 share/golly/Patterns/Life/Bounded-Grids/cross-surface.rle
+share/golly/Patterns/Life/Bounded-Grids/crystallizing-dirty-superstring.rle
 share/golly/Patterns/Life/Bounded-Grids/herringbone-agar-p14.rle
 share/golly/Patterns/Life/Bounded-Grids/lightspeed-bubble.rle
 share/golly/Patterns/Life/Bounded-Grids/pulsars-in-tube.rle
@@ -195,6 +205,7 @@ share/golly/Patterns/Life/Guns/p690-PT-Cordership-gun.rle
 share/golly/Patterns/Life/Guns/period-52-glider-gun.rle
 share/golly/Patterns/Life/Guns/pseudo-p34-gun.rle
 share/golly/Patterns/Life/Guns/vacuum-cleaner.rle
+share/golly/Patterns/Life/Methuselahs/52513m.rle
 share/golly/Patterns/Life/Methuselahs/acorn.lif
 share/golly/Patterns/Life/Methuselahs/ark1.rle
 share/golly/Patterns/Life/Methuselahs/ark2.rle
@@ -207,9 +218,9 @@ share/golly/Patterns/Life/Methuselahs/rabbits-relation-17423.rle
 share/golly/Patterns/Life/Methuselahs/rabbits-relation-17465.rle
 share/golly/Patterns/Life/Methuselahs/rabbits.lif
 share/golly/Patterns/Life/Methuselahs/temp-pulsars-big-s.rle
-share/golly/Patterns/Life/Miscellaneous/Calcyman-primer.zip
-share/golly/Patterns/Life/Miscellaneous/Cambrian-Explosion.rle
 share/golly/Patterns/Life/Miscellaneous/blockstacker.rle
+share/golly/Patterns/Life/Miscellaneous/cambrian-explosion.rle
+share/golly/Patterns/Life/Miscellaneous/conga-line-switch-engine-extender.rle
 share/golly/Patterns/Life/Miscellaneous/diagfuse1.rle
 share/golly/Patterns/Life/Miscellaneous/die658.rle
 share/golly/Patterns/Life/Miscellaneous/elbow-ladders.rle
@@ -221,16 +232,17 @@ share/golly/Patterns/Life/Miscellaneous/infinity-hotel2.rle
 share/golly/Patterns/Life/Miscellaneous/infinity-hotel3.rle
 share/golly/Patterns/Life/Miscellaneous/lightspeed.rle
 share/golly/Patterns/Life/Miscellaneous/loggrow-corder.rle
-share/golly/Patterns/Life/Miscellaneous/sawtooth6b.rle
+share/golly/Patterns/Life/Miscellaneous/ordovician-radiation.rle
+share/golly/Patterns/Life/Miscellaneous/sawtooth177.rle
 share/golly/Patterns/Life/Miscellaneous/tubstretch-c124b.rle
 share/golly/Patterns/Life/Miscellaneous/twinprimes.rle
 share/golly/Patterns/Life/Miscellaneous/wicks-DRH-2002.rle
-share/golly/Patterns/Life/Oscillators/DRH-oscillators.rle
 share/golly/Patterns/Life/Oscillators/billiard-table.rle
 share/golly/Patterns/Life/Oscillators/extensible-low-period.rle
 share/golly/Patterns/Life/Oscillators/glider-stream-crystal.rle
 share/golly/Patterns/Life/Oscillators/honey-farm-hasslers.rle
 share/golly/Patterns/Life/Oscillators/low-period.rle
+share/golly/Patterns/Life/Oscillators/oscillator-stamp-collection-24Nov2021.rle
 share/golly/Patterns/Life/Oscillators/p103079214841.rle
 share/golly/Patterns/Life/Oscillators/p138.rle
 share/golly/Patterns/Life/Oscillators/p59-glider-loop.lua
@@ -338,28 +350,62 @@ share/golly/Patterns/Margolus/TMGas.rle
 share/golly/Patterns/Margolus/TMGas_largeWithHole.rle
 share/golly/Patterns/Margolus/TripATron.rle
 share/golly/Patterns/Margolus/TripATron_BlockAligned.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/oscillators.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p137loop.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p384drifter.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p8256c4dirtyrake.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/spaceships.rle
+share/golly/Patterns/Non-Totalistic/1d-turing-machine.rle
+share/golly/Patterns/Non-Totalistic/Guns/glitter2-p312-2c12d-gun.rle
+share/golly/Patterns/Non-Totalistic/Guns/horiship-guns.rle
+share/golly/Patterns/Non-Totalistic/Guns/intergalactic-cruise-ship-factory.rle
+share/golly/Patterns/Non-Totalistic/Guns/leaplife-p361-glider-gun.rle
+share/golly/Patterns/Non-Totalistic/Guns/myrtlelife-rake-gun.rle
+share/golly/Patterns/Non-Totalistic/Guns/ripples-p1366-gun.rle
+share/golly/Patterns/Non-Totalistic/Guns/rr14gun.rle
+share/golly/Patterns/Non-Totalistic/Replicators/fractal-making-replicator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/irregular-triangular-replicator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/pascal-mod-3-generator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/replicator-blooming-spaceships.rle
+share/golly/Patterns/Non-Totalistic/Replicators/rule-110-replicator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/rulerish-replicator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/sierpinski-like-log5-12.rle
+share/golly/Patterns/Non-Totalistic/Replicators/triangular-replicator.rle
+share/golly/Patterns/Non-Totalistic/Replicators/weird-replicator-generator.rle
 share/golly/Patterns/Non-Totalistic/Sierpinski-builder.rle
-share/golly/Patterns/Non-Totalistic/horiship-guns.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/16engine-74,46c378-spaceship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/adjustable-slope-spaceships.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/b2ein-spaceships-and-rakes.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/c2-p146808-orthogonal-spaceship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/hive-spaceship-collection.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/justfriends-spaceships.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/omosso-p79576-spaceship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/p42-knightship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/pondpuffer-spaceship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/spaghetti2-spaceship-collection.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/tlife-8c282-spaceship.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/tubular-geminoid.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/unit-fraction-orthogonal-spaceships.zip
+share/golly/Patterns/Non-Totalistic/Spaceships/whitespace-1176c4704o-spaceship-predecessor.rle
+share/golly/Patterns/Non-Totalistic/Spaceships/whitespace-17c2415-spaceship.rle
+share/golly/Patterns/Non-Totalistic/checkerboard-spaceships-and-growth.rle
+share/golly/Patterns/Non-Totalistic/elastic-growth.rle
+share/golly/Patterns/Non-Totalistic/five-margolus-media.rle
 share/golly/Patterns/Non-Totalistic/infinite-binary-ruler-generator.rle
-share/golly/Patterns/Non-Totalistic/intergalactic-cruise-ship-factory.rle
+share/golly/Patterns/Non-Totalistic/justfriends-oscillators.rle
+share/golly/Patterns/Non-Totalistic/justfriends-p137loop.rle
+share/golly/Patterns/Non-Totalistic/justfriends-p384drifter.rle
+share/golly/Patterns/Non-Totalistic/justfriends-p8256-c4-rake.rle
 share/golly/Patterns/Non-Totalistic/limited-spacefiller.rle
-share/golly/Patterns/Non-Totalistic/p42-knightship.rle
-share/golly/Patterns/Non-Totalistic/pondpuffer-spaceship.rle
+share/golly/Patterns/Non-Totalistic/loopability-104-rro.rle
+share/golly/Patterns/Non-Totalistic/moving-crystallographic-defects.rle
+share/golly/Patterns/Non-Totalistic/oblique-frontend-rro.rle
 share/golly/Patterns/Non-Totalistic/reflectorless-rotating-oscillator-puffer.rle
-share/golly/Patterns/Non-Totalistic/rr14gun.rle
-share/golly/Patterns/Non-Totalistic/unit-fraction-orthogonal-spaceships.zip
+share/golly/Patterns/Non-Totalistic/smos-predecessor.rle
+share/golly/Patterns/Non-Totalistic/whitespace-puffer.rle
+share/golly/Patterns/Non-Totalistic/wickstretcher-explosion.rle
 share/golly/Patterns/Other-Rules/Ed-rep.rle
 share/golly/Patterns/Other-Rules/HPP-demo-small.rle
 share/golly/Patterns/Other-Rules/HPP-demo.rle
 share/golly/Patterns/Other-Rules/Langtons-Ant.rle
 share/golly/Patterns/Other-Rules/NoTimeAtAll-demo.zip
 share/golly/Patterns/Other-Rules/animated-pixel-art-sample.zip
-share/golly/Patterns/Other-Rules/b2ein-spaceships-and-rakes.rle
+share/golly/Patterns/Other-Rules/calcyman-primer.zip
 share/golly/Patterns/Other-Rules/dragon-curve-generator.zip
 share/golly/Patterns/Other-Rules/factorize-84.zip
 share/golly/Patterns/Other-Rules/golly-ants.rle
@@ -418,6 +464,8 @@ share/golly/Patterns/Self-Rep/JvN/sphinx-midpoint.mc.gz
 share/golly/Patterns/Self-Rep/JvN/sphinx-spark.mc.gz
 share/golly/Patterns/Self-Rep/JvN/sphinx.mc.gz
 share/golly/Patterns/Super/art-on-a-torus-LifeSuper.rle
+share/golly/Patterns/Super/crystal-cathedral-09-novelty.rle
+share/golly/Patterns/Super/exploratorium.rle.gz
 share/golly/Patterns/Super/p108-2ship-gun-MirrorTLifeSuper.rle
 share/golly/Patterns/Super/pure-nonfiller-LifeHistory.rle
 share/golly/Patterns/Super/sample-wick-construction-LifeSuper.rle
@@ -519,6 +567,7 @@ share/golly/Scripts/Lua/goto.lua
 share/golly/Scripts/Lua/gplus/NewCA.lua
 share/golly/Scripts/Lua/gplus/guns.lua
 share/golly/Scripts/Lua/gplus/init.lua
+share/golly/Scripts/Lua/gplus/lifeviewer.lua
 share/golly/Scripts/Lua/gplus/objects.lua
 share/golly/Scripts/Lua/gplus/strict.lua
 share/golly/Scripts/Lua/gplus/text.lua
@@ -532,15 +581,73 @@ share/golly/Scripts/Lua/metafier.lua
 share/golly/Scripts/Lua/move-object.lua
 share/golly/Scripts/Lua/move-selection.lua
 share/golly/Scripts/Lua/oplus/init.lua
-share/golly/Scripts/Lua/oplus/sounds/README.txt
 share/golly/Scripts/Lua/oscar.lua
 share/golly/Scripts/Lua/overlay-demo.lua
 share/golly/Scripts/Lua/p1100-MWSS-gun.lua
 share/golly/Scripts/Lua/pd-glider.lua
 share/golly/Scripts/Lua/pop-plot.lua
+share/golly/Scripts/Lua/pop-sounds.lua
 share/golly/Scripts/Lua/shift.lua
 share/golly/Scripts/Lua/showinviewer.lua
 share/golly/Scripts/Lua/slide-show.lua
+share/golly/Scripts/Lua/sounds/breakout/bat.ogg
+share/golly/Scripts/Lua/sounds/breakout/bonusloop.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick1.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick2.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick3.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick4.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick5.ogg
+share/golly/Scripts/Lua/sounds/breakout/brick6.ogg
+share/golly/Scripts/Lua/sounds/breakout/edge.ogg
+share/golly/Scripts/Lua/sounds/breakout/gameloop.ogg
+share/golly/Scripts/Lua/sounds/breakout/gamelostloop.ogg
+share/golly/Scripts/Lua/sounds/breakout/gamestart.ogg
+share/golly/Scripts/Lua/sounds/breakout/levelcompleteloop.ogg
+share/golly/Scripts/Lua/sounds/breakout/lostball.ogg
+share/golly/Scripts/Lua/sounds/breakout/top.ogg
+share/golly/Scripts/Lua/sounds/credits.ogg
+share/golly/Scripts/Lua/sounds/piano/A3.ogg
+share/golly/Scripts/Lua/sounds/piano/A4.ogg
+share/golly/Scripts/Lua/sounds/piano/A5.ogg
+share/golly/Scripts/Lua/sounds/piano/Ab4.ogg
+share/golly/Scripts/Lua/sounds/piano/B3.ogg
+share/golly/Scripts/Lua/sounds/piano/B4.ogg
+share/golly/Scripts/Lua/sounds/piano/B5.ogg
+share/golly/Scripts/Lua/sounds/piano/Bb3.ogg
+share/golly/Scripts/Lua/sounds/piano/Bb4.ogg
+share/golly/Scripts/Lua/sounds/piano/Bb5.ogg
+share/golly/Scripts/Lua/sounds/piano/C3.ogg
+share/golly/Scripts/Lua/sounds/piano/C4.ogg
+share/golly/Scripts/Lua/sounds/piano/C5.ogg
+share/golly/Scripts/Lua/sounds/piano/C6.ogg
+share/golly/Scripts/Lua/sounds/piano/D3.ogg
+share/golly/Scripts/Lua/sounds/piano/D4.ogg
+share/golly/Scripts/Lua/sounds/piano/D5.ogg
+share/golly/Scripts/Lua/sounds/piano/D6.ogg
+share/golly/Scripts/Lua/sounds/piano/Db3.ogg
+share/golly/Scripts/Lua/sounds/piano/Db4.ogg
+share/golly/Scripts/Lua/sounds/piano/Db5.ogg
+share/golly/Scripts/Lua/sounds/piano/Db6.ogg
+share/golly/Scripts/Lua/sounds/piano/E3.ogg
+share/golly/Scripts/Lua/sounds/piano/E4.ogg
+share/golly/Scripts/Lua/sounds/piano/E5.ogg
+share/golly/Scripts/Lua/sounds/piano/E6.ogg
+share/golly/Scripts/Lua/sounds/piano/Eb3.ogg
+share/golly/Scripts/Lua/sounds/piano/Eb4.ogg
+share/golly/Scripts/Lua/sounds/piano/Eb5.ogg
+share/golly/Scripts/Lua/sounds/piano/Eb6.ogg
+share/golly/Scripts/Lua/sounds/piano/F#3.ogg
+share/golly/Scripts/Lua/sounds/piano/F#4.ogg
+share/golly/Scripts/Lua/sounds/piano/F#5.ogg
+share/golly/Scripts/Lua/sounds/piano/F3.ogg
+share/golly/Scripts/Lua/sounds/piano/F4.ogg
+share/golly/Scripts/Lua/sounds/piano/F5.ogg
+share/golly/Scripts/Lua/sounds/piano/G#3.ogg
+share/golly/Scripts/Lua/sounds/piano/G#4.ogg
+share/golly/Scripts/Lua/sounds/piano/G#5.ogg
+share/golly/Scripts/Lua/sounds/piano/G3.ogg
+share/golly/Scripts/Lua/sounds/piano/G4.ogg
+share/golly/Scripts/Lua/sounds/piano/G5.ogg
 share/golly/Scripts/Lua/tile-with-clip.lua
 share/golly/Scripts/Lua/tile.lua
 share/golly/Scripts/Lua/toChangeState.lua
@@ -601,8 +708,8 @@ share/golly/Scripts/Python/oscar.py
 share/golly/Scripts/Python/p1100-MWSS-gun.py
 share/golly/Scripts/Python/pd-glider.py
 share/golly/Scripts/Python/pop-plot.py
+share/golly/Scripts/Python/pop-sounds.py
 share/golly/Scripts/Python/shift.py
 share/golly/Scripts/Python/slide-show.py
 share/golly/Scripts/Python/tile-with-clip.py
 share/golly/Scripts/Python/tile.py
-@pkgdir share/golly/Scripts/Python/glife/__pycache__
diff --git a/golly/distinfo b/golly/distinfo
index 827fd77b74..7a895f779f 100644
--- a/golly/distinfo
+++ b/golly/distinfo
@@ -1,7 +1,8 @@
 $NetBSD$
 
-RMD160 (golly-4.0-src.tar.gz) = 08e02803fc6737d3dc38b6319a3993cf0f46fffa
-SHA512 (golly-4.0-src.tar.gz) = 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
-Size (golly-4.0-src.tar.gz) = 5579026 bytes
-SHA1 (patch-cmdline_bgolly.cpp) = 3b1fa67e7fedfcab1e4a4dab8ee1335c2c18458f
-SHA1 (patch-gui-wx_makefile-gtk) = 1e31c3c0a9e56bb6246271e5abb8280e06240d94
+BLAKE2s (golly-4.1-src.tar.gz) = 39720aafb34ccdb4764d54d909683db187e060aff89131147939c2e1ac474b54
+SHA512 (golly-4.1-src.tar.gz) = bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
+Size (golly-4.1-src.tar.gz) = 14877727 bytes
+SHA1 (patch-cmdline_bgolly.cpp) = 32266c2befcb059a3fde5944d55c4809aafbe8a4
+SHA1 (patch-gui-wx_makefile-gtk) = fb37c843b99276b5457a464faac15e39dc6ba5bd
+SHA1 (patch-sound_cute__sound.h) = 60a365f7c85fbca58e034dba007eb6941fac5093
diff --git a/golly/patches/patch-cmdline_bgolly.cpp b/golly/patches/patch-cmdline_bgolly.cpp
index 82206fff21..a6818f2f28 100644
--- a/golly/patches/patch-cmdline_bgolly.cpp
+++ b/golly/patches/patch-cmdline_bgolly.cpp
@@ -18,7 +18,7 @@ popcount() is declared in <strings.h> included from <string.h>.
    { "",   "--render", "Render (benchmarking)", 'b', &render },
    { "",   "--progress", "Render during progress dialog (debugging)", 'b', &progress },
 -  { "",   "--popcount", "Popcount (benchmarking)", 'b', &popcount },
-+  { "",   "--xpopcount", "Popcount (benchmarking)", 'b', &xpopcount },
++  { "",   "--popcount", "Popcount (benchmarking)", 'b', &xpopcount },
    { "",   "--scale", "Rendering scale", 's', &renderscale },
  //{ "",   "--stepthreshold", "Stepsize >= gencount/this (default 1)",
  //                                                          'i', &stepthresh },
diff --git a/golly/patches/patch-gui-wx_makefile-gtk b/golly/patches/patch-gui-wx_makefile-gtk
index b34a6ec08e..bc663ad6db 100644
--- a/golly/patches/patch-gui-wx_makefile-gtk
+++ b/golly/patches/patch-gui-wx_makefile-gtk
@@ -2,11 +2,11 @@ $NetBSD$
 
 We have dl* functions in libc, no need for -ldl.
 
---- gui-wx/makefile-gtk.orig	2020-10-28 08:05:22.000000000 +0000
+--- gui-wx/makefile-gtk.orig	2021-11-26 23:39:22.000000000 +0000
 +++ gui-wx/makefile-gtk
-@@ -41,7 +41,7 @@ GUIFILES = makefile-gtk makefile-mac mak
-     golly.rc Info.plist.in wx*.h wx*.cpp bitmaps icons
+@@ -43,7 +43,7 @@ GUIFILES = makefile-gtk makefile-mac mak
  LUAFILES = $(LUADIR)/*.h $(LUADIR)/*.c $(LUADIR)/*.hpp $(LUADIR)/Makefile $(LUADIR)/ReadMe.html
+ SOUNDFILES = $(SOUNDDIR)/*.h $(SOUNDDIR)/*.c
  
 -LUALIB = $(LUADIR)/liblua.a -ldl
 +LUALIB = $(LUADIR)/liblua.a
diff --git a/golly/patches/patch-sound_cute__sound.h b/golly/patches/patch-sound_cute__sound.h
new file mode 100644
index 0000000000..8e0721c2df
--- /dev/null
+++ b/golly/patches/patch-sound_cute__sound.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- sound/cute_sound.h.orig	2021-10-29 21:32:39.000000000 +0000
++++ sound/cute_sound.h
+@@ -618,15 +618,11 @@ cs_plugin_id_t cs_add_plugin(cs_context_
+ 	#define timespec // Avoids duplicate definitions.
+ 	#undef timespec // You must compile with POSIX features enabled.
+ 	#include <pthread.h>
+-	#include <alloca.h>
+ 	#include <assert.h>
+ 
+ #elif CUTE_SOUND_PLATFORM == CUTE_SOUND_SDL
+ 
+ 	#include <SDL2/SDL.h>
+-	#ifndef _WIN32
+-		#include <alloca.h>
+-	#endif
+ 
+ #else
+