<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e17f1653ea242b07fd6b883ad8ac4e832af65072">https://github.com/macports/macports-ports/commit/e17f1653ea242b07fd6b883ad8ac4e832af65072</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e17f1653ea2 angband: update to 4.2.5
</span>e17f1653ea2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e17f1653ea242b07fd6b883ad8ac4e832af65072
</span>Author: contextnerror <contextnerror@outlook.com>
AuthorDate: Wed Oct 25 15:56:09 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> angband: update to 4.2.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Move to github. Keep old livecheck, too many pre-releases so
</span><span style='display:block; white-space:pre;color:#404040;'> github livecheck fails to match when excluding them
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove OBJ_CFLAGS override now in source from patch
</span>---
games/angband/Portfile | 18 ++++++++----------
games/angband/files/patch-makefile-osx.diff | 20 +++++---------------
2 files changed, 13 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/angband/Portfile b/games/angband/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d57062696b7..a39a83ce03e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/angband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/angband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name angband
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee9563a318770a3f81d71839ddcbb201a7588826 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 acd735c9d46bf86ee14337c71c56f743ad13ec2a95d62e7115604621e7560d0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24938593
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup angband angband 4.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3c667f7b154d0b510083ceb66e809bf68809238e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2a27ce296310c4cbf960e2eb41ef55d383e546f24533446cf224119498a99651 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25801900
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories games
license Noncommercial
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,7 @@ based (loosely) on the books of J.R.R.Tolkien. You explore a very deep \
</span> dungeon, kill monsters, try to equip yourself with the best weapons and \
armor you can find, and finally face Morgoth - The Dark Enemy.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://rephial.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}downloads/${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://rephial.org/
</span>
patchfiles-append patch-makefile-osx.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,5 +83,5 @@ if {![variant_exists aqua] || ![variant_isset aqua]} {
</span> --without-x
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}
</span> livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/angband/files/patch-makefile-osx.diff b/games/angband/files/patch-makefile-osx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f49817d768..ad4c3d859f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/angband/files/patch-makefile-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/angband/files/patch-makefile-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.osx.orig 2020-12-29 13:17:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.osx 2020-12-29 13:30:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WARNINGS = -W -Wall -Wno-unused-parameter -Wno-missing-field-initializers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wunused-macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JUST_C = -std=c99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OBJ_CFLAGS = -std=c99 -x objective-c -fobjc-arc -mmacosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OBJ_CFLAGS = -std=c99 -x objective-c -fobjc-arc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -g -I. $(WARNINGS) $(OPT) -DMACH_O_CARBON -DHAVE_MKSTEMP \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -fno-stack-protector $(ARCHFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = -framework Cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.osx.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,14 +73,13 @@ OSX_OBJS = main-cocoa.o
</span>
$(EXE).o: $(OBJS)
@for A in $(ARCHS); do \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +8,7 @@
</span> $(LD) -r -arch $$A -o $@.$$A $(OBJS); \
LIPO_ARGS="$$LIPO_ARGS -arch $$A $@.$$A"; \
done; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- izzywizzy: $(OBJS) izzywizzy.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lipo $$LIPO_ARGS -create -output $@
</span>
$(EXE): $(EXE).o $(OSX_OBJS)
- $(DEPLOYMENT_TARGET) $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(EXE).o $(OSX_OBJS) $(LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +16,7 @@
</span>
#
# Clean up old junk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,11 +86,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,11 +94,9 @@ clean:
</span> #
%.o : %.m
</pre><pre style='margin:0'>
</pre>