editors/emacs-devel: Update to 2022-01-01 commit, 4d1968b

This commit introduces a new OPTION, pgtk, which builds a pure GTK
implementation of Emacs.

Sponsored by:	The FreeBSD Foundation

3 files changed, 34 insertions, 14 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index e14f540a2b98..3b2750799092 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
 
 PORTNAME=	emacs
-DISTVERSION=	29.0.50.20211215
+DISTVERSION=	29.0.50.20220101
 PORTEPOCH=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -25,7 +25,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	5a057f6
+GH_TAGNAME=	4d1968b
 
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
@@ -83,11 +83,12 @@ PLIST_SUB=	EMACS_VER=${DISTVERSION:R} \
 
 OPTIONS_DEFINE=			ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \
 				LCMS2 M17N MAILUTILS MODULES NATIVECOMP OTF \
-				SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM XML XWIDGETS
+				PGTK SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM \
+				XML XWIDGETS
 OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
 				HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
-				MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 SVG \
-				THREADS TIFF WEBP XFT XIM XML XPM
+				MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 \
+				SVG THREADS TIFF WEBP XFT XIM XML XPM
 OPTIONS_GROUP=			GRAPHICS
 OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
@@ -97,8 +98,8 @@ OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 XAW XAW3D
 .if ${FLAVOR:U} == nox
 OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
 				GTK3 HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF \
-				PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT XIM \
-				XPM XWIDGETS
+				PNG PGTK SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
+				XIM XPM XWIDGETS
 .endif
 OPTIONS_SUB=			YES
 
@@ -116,6 +117,7 @@ MAILUTILS_DESC=		Mail framework via GNU Mailutils
 MODULES_DESC=		Dynamic modules support
 NATIVECOMP_DESC=	Emacs Lisp native compiler support
 OTF_DESC=		Opentype fonts [implies XFT]
+PGTK_DESC=		Pure GTK GUI [implies CAIRO, GTK3]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=		Install sources
 SVG_DESC=		Scalable vector graphics support [implies PNG]
@@ -177,6 +179,8 @@ OSS_CONFIGURE_ON=		--with-sound=oss
 OTF_IMPLIES=			XFT
 OTF_LIB_DEPENDS=		libotf.so:print/libotf
 OTF_CONFIGURE_WITH=		libotf
+PGTK_IMPLIES=			CAIRO GTK3
+PGTK_CONFIGURE_WITH=		pgtk
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_WITH=		png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
@@ -211,6 +215,7 @@ XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
 				libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
@@ -221,8 +226,8 @@ _GCC_PORT!=	${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
 USE_GCC=	yes
 .endif
 
-.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && \
-	!${PORT_OPTIONS:MXAW3D}
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && \
+	!${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
 CONFIGURE_ARGS+=	--with-x-toolkit=no
 .endif
 
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 7a0cf05577c3..20a75ef91245 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639580430
-SHA256 (emacs-mirror-emacs-29.0.50.20211215-5a057f6_GH0.tar.gz) = dd8303bad13c46396bb78079f46dd859143bf762994f76e3c3855a2d61e9aa20
-SIZE (emacs-mirror-emacs-29.0.50.20211215-5a057f6_GH0.tar.gz) = 44572491
+TIMESTAMP = 1641004289
+SHA256 (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = b4a8cfaee14298cfeb4fe1abc04724cbb9d3a20d0cdf2907d7b0802b5e1ae4a0
+SIZE (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = 44706883
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index ede743cf1f26..ec8b8260a4d2 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -779,6 +779,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml
+%%PGTK%%%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.valid
+%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/README
@@ -1585,8 +1587,6 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.el.gz
@@ -1646,6 +1646,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/multisession.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/multisession.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.el.gz
@@ -2023,6 +2025,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rmail.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
@@ -3665,6 +3669,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/ns-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/pgtk-win.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/pgtk-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.el.gz
@@ -4149,6 +4155,14 @@ share/applications/emacsclient-mail.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsxwidget.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkfns.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkgui.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkim.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkmenu.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkselect.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkselect.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkterm.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkterm.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/print.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.h
@@ -4249,6 +4263,7 @@ share/applications/emacsclient-mail.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 include/emacs-module.h
+%%PGTK%%share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png
 share/icons/hicolor/24x24/apps/emacs.png