From 6faf08fabd2458433d435cee7aca982b30a4d331 Mon Sep 17 00:00:00 2001
From: jca <jca@openbsd.org>
Date: Thu, 22 Sep 2022 07:16:16 +0000
Subject: [PATCH] Bugfix update to emacs-28.2

Test reports from krw@ namn@ and gkoehler@, thanks!
ok krw@
---
 editors/emacs/Makefile                    | 6 +++---
 editors/emacs/distinfo                    | 4 ++--
 editors/emacs/patches/patch-lisp_files_el | 2 +-
 editors/emacs/patches/patch-src_emacs_c   | 2 +-
 editors/emacs/pkg/PLIST                   | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 0e98a6ae435..1afb8c84eee 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,6 @@
 COMMENT=		GNU editor: extensible, customizable, self-documenting
 
-VERSION=		28.1
+VERSION=		28.2
 DISTNAME=		emacs-${VERSION}
 
 CATEGORIES=		editors
@@ -78,7 +78,7 @@ WANTLIB += xcb
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk2
 LIB_DEPENDS+=		x11/gtk+2
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xft Xi Xinerama Xpm Xrandr Xrender atk-1.0 cairo
+WANTLIB += Xfixes Xi Xinerama Xpm Xrandr Xrender atk-1.0 cairo
 WANTLIB += dbus-1 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz
 WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf pango-1.0 pangocairo-1.0
@@ -86,7 +86,7 @@ WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
 . elif ${FLAVOR} == "gtk3"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
 LIB_DEPENDS+=		x11/gtk+3
-WANTLIB += ICE SM X11 X11-xcb Xext Xfixes Xft Xinerama Xpm Xrandr
+WANTLIB += ICE SM X11 X11-xcb Xext Xfixes Xinerama Xpm Xrandr
 WANTLIB += Xrender atk-1.0 cairo cairo-gobject dbus-1 fontconfig
 WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
 WANTLIB += gobject-2.0 gtk-3 harfbuzz intl jpeg lcms2 m17n-core
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index f0f4496ccf6..f69c33c9890 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
-SIZE (emacs-28.1.tar.xz) = 47699512
+SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
+SIZE (emacs-28.2.tar.xz) = 47722600
diff --git a/editors/emacs/patches/patch-lisp_files_el b/editors/emacs/patches/patch-lisp_files_el
index ecfec6ea57f..722eda99f59 100644
--- a/editors/emacs/patches/patch-lisp_files_el
+++ b/editors/emacs/patches/patch-lisp_files_el
@@ -3,7 +3,7 @@
 Index: lisp/files.el
 --- lisp/files.el.orig
 +++ lisp/files.el
-@@ -2918,6 +2918,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
+@@ -2925,6 +2925,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
       ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
       ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
       ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
diff --git a/editors/emacs/patches/patch-src_emacs_c b/editors/emacs/patches/patch-src_emacs_c
index ffe5d789b53..f08cdc37081 100644
--- a/editors/emacs/patches/patch-src_emacs_c
+++ b/editors/emacs/patches/patch-src_emacs_c
@@ -3,7 +3,7 @@ Don't use printf %n.
 Index: src/emacs.c
 --- src/emacs.c.orig
 +++ src/emacs.c
-@@ -2742,21 +2742,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
+@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
        reset_all_sys_modes ();
        if (sig && sig != SIGTERM)
  	{
diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index e9cfe21585d..e9a0fdbd8d1 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -3810,6 +3810,8 @@ share/emacs/${VERSION}/lisp/term/common-win.el.gz
 share/emacs/${VERSION}/lisp/term/common-win.elc
 share/emacs/${VERSION}/lisp/term/cygwin.el.gz
 share/emacs/${VERSION}/lisp/term/cygwin.elc
+share/emacs/${VERSION}/lisp/term/fbterm.el.gz
+share/emacs/${VERSION}/lisp/term/fbterm.elc
 share/emacs/${VERSION}/lisp/term/internal.el.gz
 share/emacs/${VERSION}/lisp/term/internal.elc
 share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz