pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

golly: update to 4.0.

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Jun 13 16:24:37 2021 +0200
Changeset:	a99421b81581b464c4f7020b2e790d8dcc0acd7d

Modified Files:
	golly/Makefile
	golly/PLIST
	golly/distinfo
Added Files:
	golly/patches/patch-gui-wx_makefile-gtk

Log Message:
golly: update to 4.0.

 Changes in version 4.0 (released October 2020)

NOTE: This release coincides with the 50th anniversary of Martin
Gardner's Scientific American column that introduced John Conway's Game
of Life.

    Golly no longer supports 32-bit systems.
    Golly now requires Python 3.3+ (64-bit) to run .py scripts.
    Updated Lua to version 5.4.1.
    A new Super algorithm has been added.
    The Larger than Life algorithm now supports HROT format rules, B0
emulation and many new neighborhoods including weighted and custom
neighborhoods.
    New script create-custom-ltl.lua creates Larger than Life custom
rule strings.
    The maximum number of characters in a rule string has been increased
from 500 to 2000.
    Rule strings with more than 63 characters are displayed in the main
window's title bar using this shortened format: [first30chars ...
last30chars].
    showinviewer.lua: LifeViewer now fills the browser window and
resizes with the browser.
    New script update-viewer.lua downloads the latest version of
LifeViewer to use with showinviewer.lua.
    browse-patterns.lua can now open the current slideshow pattern in
LifeViewer.
    The new getgridtype command can be used to get the current grid type.
    Fixed a bug in g.setrule that could result in a later undo not
restoring the correct rule.

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

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

diffstat:
 golly/Makefile                          | 41 ++++++++++++++++++++++------
 golly/PLIST                             | 47 +++++++++++++++++++++------------
 golly/distinfo                          | 10 +++----
 golly/patches/patch-gui-wx_makefile-gtk | 13 +++++++++
 4 files changed, 81 insertions(+), 30 deletions(-)

diffs:
diff --git a/golly/Makefile b/golly/Makefile
index e6c30fda81..b82f76893d 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	3.4
+VERSION=	4.0
 PKGNAME=	golly-${VERSION}
 DISTNAME=	${PKGNAME_NOREV}-src
 CATEGORIES=	x11
@@ -14,15 +14,40 @@ COMMENT=	Fast Game-Of-Life (and similar automata) visualizer
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	make
-CONFIGURE_DIRS=	gui-wx/configure
-GNU_CONFIGURE=	YES
+USE_TOOLS+=	gmake
+MAKE_FILE=      makefile-gtk
+BUILD_DIRS=	gui-wx
+REPLACE_PERL+=	Help/Lexicon/modify.pl
 
-CONFIGURE_ARGS+=	"CFLAGS=--std=c99"	# for long long in luaconf.h -> limits.h
-CONFIGURE_ARGS+=	"--with-python-shlib=libpython2.7.so"
+PY3=		8	# Use python 3.8
+
+# 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 "GOLLYDIR = ${PREFIX}/share/golly" \
+	) >${WRKSRC}/gui-wx/local-gtk.mk
+
+# The new 4.0 version no longer has an install target in its "Makefile".
+do-install:
+	${MKDIR} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/golly  ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bgolly ${DESTDIR}${PREFIX}/bin/
+	#
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/golly
+	cp -p ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/golly
+	#
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/golly
+	cp -pr ${WRKSRC}/Help ${DESTDIR}${PREFIX}/share/golly
+	cp -pr ${WRKSRC}/Patterns ${DESTDIR}${PREFIX}/share/golly
+	cp -pr ${WRKSRC}/Rules ${DESTDIR}${PREFIX}/share/golly
+	cp -pr ${WRKSRC}/Scripts ${DESTDIR}${PREFIX}/share/golly
+	# Remove lots of unneeded x bits
+	find ${DESTDIR}${PREFIX}/share/golly -type f -exec chmod a-x {} +
 
 .include "../../graphics/MesaLib/buildlink3.mk"
-#.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.2
-.include "../../lang/python27/buildlink3.mk"
+#.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.4.1
+.include "../../lang/python3${PY3}/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/golly/PLIST b/golly/PLIST
index bdd0f8533d..a027bb2514 100644
--- a/golly/PLIST
+++ b/golly/PLIST
@@ -1,18 +1,32 @@
 @comment $NetBSD$
 bin/bgolly
 bin/golly
+share/doc/golly/Build.html
 share/doc/golly/License.html
 share/doc/golly/ReadMe.html
+share/doc/golly/ToDo.html
 share/golly/Help/Algorithms/Generations.html
 share/golly/Help/Algorithms/HashLife.html
 share/golly/Help/Algorithms/JvN.html
 share/golly/Help/Algorithms/Larger_than_Life.html
-share/golly/Help/Algorithms/NC.png
-share/golly/Help/Algorithms/NM.png
-share/golly/Help/Algorithms/NN.png
 share/golly/Help/Algorithms/QuickLife.html
 share/golly/Help/Algorithms/RuleLoader.html
+share/golly/Help/Algorithms/Super.html
 share/golly/Help/Algorithms/hensel.png
+share/golly/Help/Algorithms/images/N+.png
+share/golly/Help/Algorithms/images/N2.png
+share/golly/Help/Algorithms/images/N3.png
+share/golly/Help/Algorithms/images/NA.png
+share/golly/Help/Algorithms/images/NB.png
+share/golly/Help/Algorithms/images/NC.png
+share/golly/Help/Algorithms/images/NH.png
+share/golly/Help/Algorithms/images/NL.png
+share/golly/Help/Algorithms/images/NM.png
+share/golly/Help/Algorithms/images/NN.png
+share/golly/Help/Algorithms/images/NS.png
+share/golly/Help/Algorithms/images/NX.png
+share/golly/Help/Algorithms/images/NZ.png
+share/golly/Help/Algorithms/images/custom.png
 share/golly/Help/Lexicon/lex.htm
 share/golly/Help/Lexicon/lex_1.htm
 share/golly/Help/Lexicon/lex_a.htm
@@ -48,7 +62,6 @@ share/golly/Help/algos.html
 share/golly/Help/archives.html
 share/golly/Help/bounded.html
 share/golly/Help/changes.html
-share/golly/Help/changes.html~
 share/golly/Help/control.html
 share/golly/Help/credits.html
 share/golly/Help/edit.html
@@ -64,7 +77,6 @@ share/golly/Help/index.html
 share/golly/Help/intro.html
 share/golly/Help/layer.html
 share/golly/Help/lua.html
-share/golly/Help/lua.html~
 share/golly/Help/mouse.html
 share/golly/Help/overlay.html
 share/golly/Help/problems.html
@@ -109,6 +121,7 @@ share/golly/Patterns/HashLife/mosquito5.mc
 share/golly/Patterns/HashLife/nick-gotts-1.mc
 share/golly/Patterns/HashLife/nick-gotts-2.mc
 share/golly/Patterns/HashLife/puzzle.mc
+share/golly/Patterns/HashLife/roth.mc
 share/golly/Patterns/HashLife/ruler.mc
 share/golly/Patterns/HashLife/totalperiodic.mc
 share/golly/Patterns/HashLife/triple-Snark-wick-extruder.rle.gz
@@ -300,6 +313,7 @@ share/golly/Patterns/Life/Syntheses/make-p33.rle
 share/golly/Patterns/Life/Syntheses/oscillator-syntheses.rle
 share/golly/Patterns/Life/Syntheses/slow-salvo-MWSS-oscillator.rle.gz
 share/golly/Patterns/Life/Syntheses/slow-salvo-eater-recipes.rle
+share/golly/Patterns/Life/Syntheses/spaceship-synth-demo.rle
 share/golly/Patterns/Life/Syntheses/syntheses-of-c2-spaceships.rle.gz
 share/golly/Patterns/Life/Syntheses/two-glider-collisions.rle
 share/golly/Patterns/Loops/Byl-Loop.rle
@@ -403,6 +417,10 @@ share/golly/Patterns/Self-Rep/JvN/small-JvN-self-replicator.rle
 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/p108-2ship-gun-MirrorTLifeSuper.rle
+share/golly/Patterns/Super/pure-nonfiller-LifeHistory.rle
+share/golly/Patterns/Super/sample-wick-construction-LifeSuper.rle
 share/golly/Patterns/Turmites/AlienCounter.rle
 share/golly/Patterns/Turmites/ComputerArt.rle
 share/golly/Patterns/Turmites/Extinction.rle
@@ -453,7 +471,6 @@ share/golly/Rules/Langtons-Ant.rule
 share/golly/Rules/Langtons-Loops.rule
 share/golly/Rules/LangtonsAnt_LLRR.rule
 share/golly/Rules/Life.rule
-share/golly/Rules/LifeHistory.rule
 share/golly/Rules/LifeOnTheEdge.rule
 share/golly/Rules/LifeOnTheSlope.rule
 share/golly/Rules/Perrier.rule
@@ -491,6 +508,7 @@ share/golly/Scripts/Lua/Margolus.lua
 share/golly/Scripts/Lua/breakout.lua
 share/golly/Scripts/Lua/bricklayer.lua
 share/golly/Scripts/Lua/browse-patterns.lua
+share/golly/Scripts/Lua/create-custom-ltl.lua
 share/golly/Scripts/Lua/credits.lua
 share/golly/Scripts/Lua/density.lua
 share/golly/Scripts/Lua/draw-lines.lua
@@ -514,7 +532,6 @@ 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/init.lua~
 share/golly/Scripts/Lua/oplus/sounds/README.txt
 share/golly/Scripts/Lua/oscar.lua
 share/golly/Scripts/Lua/overlay-demo.lua
@@ -522,13 +539,15 @@ 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/shift.lua
-share/golly/Scripts/Lua/slide-show.lua
 share/golly/Scripts/Lua/showinviewer.lua
+share/golly/Scripts/Lua/slide-show.lua
 share/golly/Scripts/Lua/tile-with-clip.lua
 share/golly/Scripts/Lua/tile.lua
 share/golly/Scripts/Lua/toChangeState.lua
-share/golly/Scripts/Lua/toLife.lua
-share/golly/Scripts/Lua/toLifeHistory.lua
+share/golly/Scripts/Lua/toHistory.lua
+share/golly/Scripts/Lua/toStandard.lua
+share/golly/Scripts/Lua/toSuper.lua
+share/golly/Scripts/Lua/update-viewer.lua
 share/golly/Scripts/Python/Margolus/convert-MCell-string.py
 share/golly/Scripts/Python/Margolus/export.py
 share/golly/Scripts/Python/Margolus/import.py
@@ -549,7 +568,6 @@ share/golly/Scripts/Python/draw-lines.py
 share/golly/Scripts/Python/envelope.py
 share/golly/Scripts/Python/flood-fill.py
 share/golly/Scripts/Python/glife/BuiltinIcons.py
-share/golly/Scripts/Python/glife/BuiltinIcons.pyc
 share/golly/Scripts/Python/glife/EmulateHexagonal.py
 share/golly/Scripts/Python/glife/EmulateMargolus.py
 share/golly/Scripts/Python/glife/EmulateOneDimensional.py
@@ -559,19 +577,13 @@ share/golly/Scripts/Python/glife/RuleTree.py
 share/golly/Scripts/Python/glife/WriteBMP.py
 share/golly/Scripts/Python/glife/WriteRuleTable.py
 share/golly/Scripts/Python/glife/__init__.py
-share/golly/Scripts/Python/glife/__init__.pyc
 share/golly/Scripts/Python/glife/base.py
-share/golly/Scripts/Python/glife/base.pyc
 share/golly/Scripts/Python/glife/gun24.py
-share/golly/Scripts/Python/glife/gun24.pyc
 share/golly/Scripts/Python/glife/gun256.py
 share/golly/Scripts/Python/glife/gun30.py
-share/golly/Scripts/Python/glife/gun30.pyc
 share/golly/Scripts/Python/glife/gun46.py
-share/golly/Scripts/Python/glife/gun46.pyc
 share/golly/Scripts/Python/glife/herschel.py
 share/golly/Scripts/Python/glife/text.py
-share/golly/Scripts/Python/glife/text.pyc
 share/golly/Scripts/Python/goto.py
 share/golly/Scripts/Python/goto_expression.py
 share/golly/Scripts/Python/gun-demo.py
@@ -593,3 +605,4 @@ 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 0e5d8d6751..2ede4029c6 100644
--- a/golly/distinfo
+++ b/golly/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (golly-3.4-src.tar.gz) = cdd764f2e017cb3f5e207e7ed631e2def4ae673a
-RMD160 (golly-3.4-src.tar.gz) = 6e61ee75299386412942f034a3360acb9f177bd8
-SHA512 (golly-3.4-src.tar.gz) = bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
-Size (golly-3.4-src.tar.gz) = 5480295 bytes
+SHA1 (golly-4.0-src.tar.gz) = f0641c36fcb6406468f7b2fa06e0c2582c32e3c1
+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-configure) = b57f3815708a8456367ad9fd2c93f64d507ad37f
+SHA1 (patch-gui-wx_makefile-gtk) = 0387d2ce26fec7fc6089c93eed2b228e21352d32
diff --git a/golly/patches/patch-gui-wx_makefile-gtk b/golly/patches/patch-gui-wx_makefile-gtk
new file mode 100644
index 0000000000..2e337f4826
--- /dev/null
+++ b/golly/patches/patch-gui-wx_makefile-gtk
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- gui-wx/makefile-gtk.orig	2020-10-28 08:05: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
+ LUAFILES = $(LUADIR)/*.h $(LUADIR)/*.c $(LUADIR)/*.hpp $(LUADIR)/Makefile $(LUADIR)/ReadMe.html
+ 
+-LUALIB = $(LUADIR)/liblua.a -ldl
++LUALIB = $(LUADIR)/liblua.a
+ 
+ CXXC = g++
+ CXXFLAGS := -DVERSION=$(APP_VERSION) -DGOLLYDIR="$(GOLLYDIR)" \
Home | Main Index | Thread Index | Old Index