editors/emacs-devel: Update to 2023-08-20 snapshot

* Update regular expressions used to modify lisp/loadup.el at
  pre-configure target

Changes:	https://github.com/emacs-mirror/emacs/compare/18e7bc8...fd1479a
Reviewed by:	ashish, jrm
Differential Revision:	https://reviews.freebsd.org/D41514

3 files changed, 38 insertions, 8 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index f9b64d65e431..2fc4c57371cc 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	emacs
-DISTVERSION=	30.0.50.20230806
+DISTVERSION=	30.0.50.20230820
 PORTEPOCH=	3
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -24,7 +24,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	18e7bc8
+GH_TAGNAME=	fd1479a
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-build-details \
@@ -269,8 +269,8 @@ post-patch:
 pre-configure:
 	@(cd ${WRKSRC} && ./autogen.sh all)
 	@${REINPLACE_CMD} \
-	  -e '/emacs-repository-version/s/^.*$$/(setq emacs-repository-version "${GH_TAGNAME}")/' \
-	  -e '/emacs-repository-branch/s/^.*$$/(setq emacs-repository-branch "master")/' \
+	  -e 's/(ignore-errors (emacs-repository-get-version))/"${GH_TAGNAME}"/' \
+	  -e 's/(ignore-errors (emacs-repository-get-branch))/"master"/' \
 	  ${WRKSRC}/lisp/loadup.el
 
 post-install:
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index bb8b962b6ef9..292a39edaa0b 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691351545
-SHA256 (emacs-mirror-emacs-30.0.50.20230806-18e7bc8_GH0.tar.gz) = 7ee7265aa3975e15c1994c7edd9964e5217ed58783df53539172aaf3a33dd49d
-SIZE (emacs-mirror-emacs-30.0.50.20230806-18e7bc8_GH0.tar.gz) = 48447257
+TIMESTAMP = 1692513250
+SHA256 (emacs-mirror-emacs-30.0.50.20230820-fd1479a_GH0.tar.gz) = cfa57d5083cf4adce23002037d0e31475035125b35b0dc31c21862c63adddd3c
+SIZE (emacs-mirror-emacs-30.0.50.20230820-fd1479a_GH0.tar.gz) = 49228292
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index dc24fb112e53..aff465dd37be 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -211,6 +211,7 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/gnus/news-server.ast
 %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/images/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/alt.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
@@ -232,6 +233,7 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ctrl.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.xpm
@@ -396,6 +398,7 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/help.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/hyper.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.xpm
@@ -466,6 +469,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/info.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left.svg
@@ -537,6 +542,7 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/meta.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README
@@ -609,6 +615,7 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/search.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/shift.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/README
@@ -681,8 +688,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/super.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/README
-
 %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_down_16.pbm
@@ -2290,6 +2297,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/image/wallpaper.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/info-look.el.gz
@@ -3781,6 +3790,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/README
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.el.gz
@@ -3964,6 +3975,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/touch-screen.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/touch-screen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/transient.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/transient.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.el.gz
@@ -4182,6 +4195,18 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/site-lisp/subdirs.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-asset.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-emacs.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfns.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfont.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidgui.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidmenu.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidselect.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidvfs.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bidi.c
@@ -4336,6 +4361,11 @@ share/applications/emacsclient-mail.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/region-cache.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont-android.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sort.c