<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/85c552f77258642555ae3786a52688bba53d6d58">https://github.com/macports/macports-ports/commit/85c552f77258642555ae3786a52688bba53d6d58</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 85c552f7725 pennmush: update to 187p0
</span>85c552f7725 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 85c552f77258642555ae3786a52688bba53d6d58
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sat Oct 26 17:15:40 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> pennmush: update to 187p0
</span>---
games/pennmush/Portfile | 49 ++++++++++++----------------
games/pennmush/files/patch-game_txt_Makefile | 10 ------
games/pennmush/files/patch-getentropy.diff | 12 +++++++
3 files changed, 33 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/pennmush/Portfile b/games/pennmush/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c6c1c61d83..152f74fc410 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/pennmush/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/pennmush/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 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 pennmush
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.3p9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pennmush pennmush 187p0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories games
license Artistic-1 BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,26 +18,22 @@ long_description \
</span> little disk space. From a user standpoint they offer many similar features \
and a very similar command parser.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.pennmush.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.pennmush.org/Source/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.pennmush.org/Source/oldsrc/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.pennmush.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 88dc8ec2c07171831d9d0959549d82e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 a06f18221a40ed847bba7e30935c38937309fabe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 de5777b8b2c592fecc23ade2c5cceccfee17086b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9ef170502af9b7e4e640360f80f83d6fa3744d6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 674057a3abd7d8ae331a67339e43608b3cf35576e7cd90020944069b02fc35ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4343410
</span>
depends_lib path:lib/libssl.dylib:openssl port:pcre path:bin/perl:perl5 port:gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-game_txt_Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-getentropy.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-mysql --without-postgresql --without-sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-perl=${prefix}/bin/perl --with-ssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# work around some autoconf deficiencies and force some cflags in explicitly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PERL=${prefix}/bin/perl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURL_CONFIG=${prefix}/bin/curl-config CURL_CFLAGS=-I${prefix}/include CURL_LIBS=-L${prefix}/lib\ -lcurl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --without-mysql --without-postgresql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl=${prefix} \
</span> --with-pcre=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/options.h.dist ${worksrcpath}/options.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-build {
system "cd ${worksrcpath}/game/txt && make clean all"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +54,7 @@ destroot {
</span> xinstall -m 755 ${worksrcpath}/utils/ln-dir.sh \
${destroot}${pennmush_install_dir}
reinplace "s|GAMEDIR=|GAMEDIR=${pennmush_install_dir}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${pennmush_install_dir}/restart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${pennmush_install_dir}/restart.dst
</span> delete ${destroot}${pennmush_install_dir}/mush.cnf
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,14 +71,10 @@ variant mysql5 description {Use MySQL for database} {
</span> configure.args-append --with-mysql=${prefix}/bin/mysql_config5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql83 description {Use PostGreSQL for database} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql16 description {Use PostgreSQL for database} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql16
</span> configure.args-delete --without-postgresql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-postgresql=${prefix}/lib/postgresql83/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sqlite3 description {Use SQLite3 for database} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite3=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgresql=${prefix}/lib/postgresql16/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append POSTGRESQL_CPPFLAGS=-I${prefix}/include/postgresql16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRESQL_LDFLAGS=-L${prefix}/lib/postgresql16
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/pennmush/files/patch-game_txt_Makefile b/games/pennmush/files/patch-game_txt_Makefile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 716f24582d2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/pennmush/files/patch-game_txt_Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- game/txt/Makefile.orig 2007-05-16 22:26:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ game/txt/Makefile 2009-05-17 15:07:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -rm -f $(IDX) $(TXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm -f compose.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -rm -f hlp/*.orig hlp/*.rej hlp/\#* hlp/*~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/pennmush/files/patch-getentropy.diff b/games/pennmush/files/patch-getentropy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..256c4d8297e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/pennmush/files/patch-getentropy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/myssl.c.orig 2024-10-26 16:38:56.933517351 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/myssl.c 2024-10-26 16:39:23.761263058 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_GETENTROPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/bn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/err.h>
</span></pre><pre style='margin:0'>
</pre>