<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/21f2af5aff9e18b23885b0766dcca0aa4ebefac4">https://github.com/macports/macports-ports/commit/21f2af5aff9e18b23885b0766dcca0aa4ebefac4</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 21f2af5aff9 libevent1: fix build on 12.3 and later
</span>21f2af5aff9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 21f2af5aff9e18b23885b0766dcca0aa4ebefac4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 18 18:17:29 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> libevent1: fix build on 12.3 and later
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix implicit declaration error in configure.
</span>---
devel/libevent1/Portfile | 19 ++++++++++++-------
devel/libevent1/files/implicit.patch | 11 +++++++++++
devel/libevent1/files/python.patch | 19 +++++++++++++++++++
3 files changed, 42 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libevent1/Portfile b/devel/libevent1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae18a6a2e7d..2699c591870 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libevent1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libevent1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span> name libevent1
github.setup libevent libevent 1.4.15-stable release-
version [lindex [split ${version} -] 0]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,16 +32,20 @@ post-extract {
</span> move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-test__test.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-test__test.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sierra-kqueue.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-sierra-kqueue.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No /usr/bin/python, use python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append python.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "/usr/bin/python3 -m lib2to3 --write --nobackups --no-diffs ./event_rpcgen.py"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
configure.args --program-suffix=-1.4 \
--includedir=${prefix}/include/${name} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libevent1/files/implicit.patch b/devel/libevent1/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f67ddb30129
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libevent1/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2015-01-06 01:34:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-01-18 17:56:37.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,6 +226,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(int argc, char **argv)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libevent1/files/python.patch b/devel/libevent1/files/python.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..70913834156
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libevent1/files/python.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/Makefile.am.orig 2015-01-06 01:34:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/Makefile.am 2023-01-18 17:49:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bench_LDADD = ../libevent.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regress.gen.c regress.gen.h: regress.rpc $(top_srcdir)/event_rpcgen.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_srcdir)/event_rpcgen.py $(srcdir)/regress.rpc || echo "No Python installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/bin/python3 $(top_srcdir)/event_rpcgen.py $(srcdir)/regress.rpc || echo "No Python installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISTCLEANFILES = *~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- event_rpcgen.py.orig 2015-01-06 01:34:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ event_rpcgen.py 2023-01-18 18:14:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # All rights reserved.
</span></pre><pre style='margin:0'>
</pre>