<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05f55ff84347623a9056a2f9ed1681fa5746b519">https://github.com/macports/macports-ports/commit/05f55ff84347623a9056a2f9ed1681fa5746b519</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 05f55ff8434 bahamut: Update to 2.2.3
</span>05f55ff8434 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05f55ff84347623a9056a2f9ed1681fa5746b519
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 11 01:09:52 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> bahamut: Update to 2.2.3
</span>---
irc/bahamut/Portfile | 18 +++++++++---------
irc/bahamut/files/implicit.patch | 21 ---------------------
irc/bahamut/files/patch-CPPFLAGS.diff | 26 --------------------------
irc/bahamut/files/zlib.patch | 13 +++++++++++++
4 files changed, 22 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/Portfile b/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d93a3e59df3..a383ea6999d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup DALnet bahamut 2.2.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup DALnet bahamut 2.2.3 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22c5022130dbdb3fe5671891c4855916c5dacb13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 825a5fb8b6ceefbada76ad9f9c66d6aa44f8432304a647467a1294088e284f63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 809222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 07edc109cb78c882ccbb534e0677858c69493dd4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 792ec5fcc483823147b37ab39848536398f439363257ee56d21042c98f4fda3c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 901521
</span>
conflicts expect whois
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,8 @@ github.tarball_from releases
</span> depends_lib path:lib/libssl.dylib:openssl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CPPFLAGS.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles zlib.patch \
</span> externs.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch \
</span> make-cert.patch
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +40,7 @@ post-patch {
</span> }
set sources [glob ${worksrcpath}/include/*.h ${worksrcpath}/src/*.c]
reinplace -E -q -locale C [join ${regexps} {;}] {*}${sources}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure
</span> }
# The code uses the HEADER struct and maybe other old stuff.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,9 +95,9 @@ platform darwin {
</span> # https://github.com/DALnet/bahamut/issues/229
configure.args-append \
ac_cv_func___res_mkquery=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_func_res_mkquery=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_lib_resolv___res_mkquery=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_lib_resolv_res_mkquery=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_func_res_mkquery=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_search___res_mkquery=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_search_res_mkquery=-lresolv
</span> }
startupitem.create yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/implicit.patch b/irc/bahamut/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03f6f6b343c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/DALnet/bahamut/pull/220
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-08-16 10:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-07-03 08:48:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5548,10 +5548,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *s = sys_errlist[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</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;'>- _ACEOF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/patch-CPPFLAGS.diff b/irc/bahamut/files/patch-CPPFLAGS.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 13ccd250a1e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/files/patch-CPPFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add the project's own -I flags before those that might be in $CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes build failure when nds2-client is installed, for example.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/DALnet/bahamut/pull/223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2022-08-16 10:40:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2023-07-03 07:46:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_BIN=@INSTALL_PROGRAM@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DIR=@INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=@CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS=@CPPFLAGS@ -I../include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS=-I../include @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=@LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RES_SRC =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/Makefile.in.orig 2012-11-25 16:51:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/Makefile.in 2012-11-27 18:43:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_BIN=@INSTALL_PROGRAM@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DIR=@INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=@CFLAGS@ -fno-strict-aliasing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS=@CPPFLAGS@ -I../include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS=-I../include @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=@LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkpasswd_SOURCES = mkpasswd.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/zlib.patch b/irc/bahamut/files/zlib.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..97336af7f02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/files/zlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix misleading message from configure saying it is checking for zlib in /usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when it isn't.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-12-02 20:22:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-12-11 00:10:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6104,7 +6104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # zlib test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ripped from http://autoconf-archive.cryp.to/check_zlib.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ZLIB_HOME=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZLIB_HOME=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ! -f "${ZLIB_HOME}/include/zlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZLIB_HOME=/usr
</span></pre><pre style='margin:0'>
</pre>