<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a711a91c2eb788691e83ccbd5be01db8cb4dafc9">https://github.com/macports/macports-ports/commit/a711a91c2eb788691e83ccbd5be01db8cb4dafc9</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 a711a91c2eb eggdrop: update to 1.9.5
</span>a711a91c2eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a711a91c2eb788691e83ccbd5be01db8cb4dafc9
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Tue Jul 30 14:00:45 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> eggdrop: update to 1.9.5
</span>---
irc/eggdrop/Portfile | 18 +++++----
irc/eggdrop/files/patch-Makefile.in-LDFLAGS.diff | 48 ------------------------
irc/eggdrop/files/patch-unbreak-linking.diff | 23 ++++++++++++
3 files changed, 33 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/eggdrop/Portfile b/irc/eggdrop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e45ff891c0..328aad5d885 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/eggdrop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/eggdrop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup eggheads eggdrop 1.8.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3ebf6c6260dfb21f8684b7dfe26be03f167cab21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a4b8957e39fd342e862dae3c305523e4c8aab628d3dfafa148be40ab41259ef4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1756536
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup eggheads eggdrop 1.9.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 463624131c92038bd65a6ae86d4fa15cc886da03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e26918ea8a64d9857579c5b60c661a337f20773edd83086b356525beb581736a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2109996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +16,6 @@ categories irc
</span> maintainers nomaintainer
description Eggdrop is the world's most popular Internet Relay Chat (IRC) bot.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
homepage https://www.eggheads.org
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,6 @@ depends_lib path:lib/libssl.dylib:openssl \
</span> port:tcl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in-LDFLAGS.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --enable-tls \
--with-sslinc=${prefix}/include \
--with-ssllib=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +34,10 @@ post-configure {
</span> system -W ${worksrcpath} "${build.cmd} config"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ld: duplicate symbol dyld_stub_binding_helper in /usr/lib/bundle1.o and /usr/lib/dylib1.10.5.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/eggheads/eggdrop/issues/1662
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unbreak-linking.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target eggdrop
set eggdest libexec/eggdrop
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/eggdrop/files/patch-Makefile.in-LDFLAGS.diff b/irc/eggdrop/files/patch-Makefile.in-LDFLAGS.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3a0ffe4e0ef..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/eggdrop/files/patch-Makefile.in-LDFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use LDFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2018-02-04 10:08:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2018-10-07 19:08:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRIP = @STRIP@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS = @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;'>- eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch mod/mod.xlibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linkfinish:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @$(STRIP) ../$(EGGEXEC) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main.o:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) $(CPPFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '-DLDFLAGS="$(LD)"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '-DLDFLAGS="$(LD) $(LDFLAGS)"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compatibility:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod/Makefile.in.orig 2018-02-04 10:08:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod/Makefile.in 2018-10-09 03:21:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRIP = @STRIP@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS = @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I$(MOD_UPDIR)$(top_srcdir)/src/mod @SSL_INCLUDES@ @DEFS@ $(CFLGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOD_CPPFLAGS = @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --top_srcdir=$(top_srcdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- egg_ac_parameters = @egg_ac_parameters@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) $(LDFLAGS)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'STRIP=$(STRIP)' 'CFLAGS=$(MOD_CFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' 'SHELL=$(SHELL)' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'MODULE_XLIBS=$(MODULE_XLIBS)'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/eggdrop/files/patch-unbreak-linking.diff b/irc/eggdrop/files/patch-unbreak-linking.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a7e8488b288
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/eggdrop/files/patch-unbreak-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-03-12 04:38:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-07-30 13:55:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6021,9 +6021,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$BUNDLE" != x; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$MODULE_XLIBS" = x; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MODULE_XLIBS="$BUNDLE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MODULE_XLIBS=" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MODULE_XLIBS="$MODULE_XLIBS $BUNDLE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MODULE_XLIBS="$MODULE_XLIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6241,7 +6241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_CC="$CC -fPIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHLIB_LD="ld -bundle -undefined error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD="ld -shared -undefined error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "#define BIND_8_COMPAT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>