<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/76a2a7b6d186486a7bf32c919f17b04bc627209e">https://github.com/macports/macports-ports/commit/76a2a7b6d186486a7bf32c919f17b04bc627209e</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 76a2a7b6d18 emacs: update to 28.2
</span>76a2a7b6d18 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76a2a7b6d186486a7bf32c919f17b04bc627209e
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Wed Sep 14 16:28:59 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs: update to 28.2
</span>---
editors/emacs/Portfile | 15 +++----
editors/emacs/files/patch-lib_verify.h.diff | 11 ------
editors/emacs/files/patch-src_sysdep.c.diff | 61 -----------------------------
3 files changed, 5 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fb41144af2..6b2baa9a02b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,11 +61,6 @@ depends_lib-append port:gmp \
</span> port:libxml2 \
port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq "emacs" || $subport eq "emacs-app"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-lib_verify.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_sysdep.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
xinstall -d ${destroot}${prefix}/share/emacs/${version}/leim
delete ${destroot}${prefix}/bin/ctags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,12 +92,12 @@ platform darwin {
</span> }
if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 28.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 28.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 989dc9e81924efb940434d5843616d1e70424a3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1439bf7f24e5769f35601dbf332e74dfc07634da6b1e9500af67188a92340a28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 71292728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4690d9ab3e7878cbb25eb19c2931c587f971b3bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6912b14ef4abb1edab7f88191bfd61c3edd7085e084de960a4f86485cb7cad8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 71332149
</span> }
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-lib_verify.h.diff b/editors/emacs/files/patch-lib_verify.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fe96f116adb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-lib_verify.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/verify.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/verify.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@ #define _GL_VERIFY_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if (201112L <= __STDC_VERSION__ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (!defined __STRICT_ANSI__ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 4 <= __clang_major__)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define _GL_HAVE__STATIC_ASSERT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if (202000L <= __STDC_VERSION__ \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-src_sysdep.c.diff b/editors/emacs/files/patch-src_sysdep.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index baf90dee83d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-src_sysdep.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/sysdep.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/sysdep.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4027,6 +4027,9 @@ system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined DARWIN_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_RUSAGE_INFO_CURRENT (MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_PROC_PIDINFO (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lisp_Object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4130,6 +4133,7 @@ system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qtpgid, INT_TO_INTEGER (proc.kp_eproc.e_tpgid)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_RUSAGE_INFO_CURRENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rusage_info_current ri;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (proc_pid_rusage(proc_id, RUSAGE_INFO_CURRENT, (rusage_info_t *) &ri) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4143,6 +4147,24 @@ system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qmajflt, INT_TO_INTEGER (ri.ri_pageins)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* !HAVE_RUSAGE_INFO_CURRENT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct rusage *rusage = proc.kp_proc.p_ru;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (rusage)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs = Fcons (Fcons (Qminflt, INT_TO_INTEGER (rusage->ru_minflt)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs = Fcons (Fcons (Qmajflt, INT_TO_INTEGER (rusage->ru_majflt)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs = Fcons (Fcons (Qutime, make_lisp_timeval (rusage->ru_utime)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs = Fcons (Fcons (Qstime, make_lisp_timeval (rusage->ru_stime)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct timespec t = timespec_add (timeval_to_timespec (rusage->ru_utime),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timeval_to_timespec (rusage->ru_stime));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs = Fcons (Fcons (Qtime, make_lisp_time (t)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !HAVE_RUSAGE_INFO_CURRENT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- starttime = proc.kp_proc.p_starttime;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qnice, make_fixnum (proc.kp_proc.p_nice)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4152,6 +4174,7 @@ system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- t = timespec_sub (now, timeval_to_timespec (starttime));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qetime, make_lisp_time (t)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_PROC_PIDINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct proc_taskinfo taskinfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (proc_pidinfo (proc_id, PROC_PIDTASKINFO, 0, &taskinfo, sizeof (taskinfo)) > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4159,6 +4182,7 @@ system_process_attributes (Lisp_Object pid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qrss, make_fixnum (taskinfo.pti_resident_size / 1024)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- attrs = Fcons (Fcons (Qthcount, make_fixnum (taskinfo.pti_threadnum)), attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* HAVE_PROC_PIDINFO */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef KERN_PROCARGS2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char args[ARG_MAX];
</span></pre><pre style='margin:0'>
</pre>