diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -109,7 +109,7 @@ EMACS_VER= 31.0.50 EMACS_PORTDIR= editors/emacs-devel . else -EMACS_VER= 29.4 +EMACS_VER= 30.1 EMACS_PORTDIR= editors/emacs . endif diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,13 +1,12 @@ PORTNAME= emacs -DISTVERSION= 29.4 -PORTREVISION= 2 +DISTVERSION= 30.1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU .if ${FLAVOR:U} == canna -PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs29canna/:canna -PATCHFILES+= emacs29.1-canna-20230730.diff.xz:-p1:canna +PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs30canna/:canna +PATCHFILES+= emacs30.1-canna-20250224.diff.gz:-p1:canna .endif MAINTAINER= emacs@FreeBSD.org @@ -37,7 +36,6 @@ CPE_VENDOR= gnu GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var \ --without-gconf \ @@ -80,7 +78,9 @@ BINARY_ALIAS= makeinfo=true SUB_FILES= sources.el -SUB_LIST= EMACS_VER=${DISTVERSION} +SUB_LIST= EMACS_VER=${DISTVERSION} \ + NATIVECOMP_COMMENT_END=${NATIVECOMP_COMMENT_END} \ + NATIVECOMP_COMMENT_START=${NATIVECOMP_COMMENT_START} INFO= auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ ediff edt efaq eglot eieio eintr elisp emacs emacs-gnutls \ @@ -100,14 +100,14 @@ PLIST_SUB= EMACS_VER=${DISTVERSION} \ GNU_HOST=${CONFIGURE_TARGET} -OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \ - M17N MAILUTILS MODULES NATIVECOMP OTF PGTK \ +OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \ + MAILUTILS MODULES NATIVECOMP OTF PGTK \ SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \ XFT XIM XML XWIDGETS OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ - HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \ - MODULES OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \ - THREADS TIFF TREESITTER WEBP XIM XML XPM + HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \ + NATIVECOMP OSS PNG SCROLLBARS SOURCES SQLITE3 \ + SVG THREADS TIFF TREESITTER WEBP XIM XML XPM OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT @@ -183,8 +183,6 @@ HARFBUZZ_CONFIGURE_WITH= harfbuzz JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg -JSON_LIB_DEPENDS= libjansson.so:devel/jansson -JSON_CONFIGURE_WITH= json KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_CONFIGURE_WITH= lcms2 @@ -194,7 +192,7 @@ M17N_CONFIGURE_WITH= m17n-flt MAGICK_USES= magick:7 MAGICK_CONFIGURE_WITH= imagemagick -MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils +MAILUTILS_RUN_DEPENDS= mailutils:mail/mailutils MAILUTILS_CONFIGURE_WITH= mailutils MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_lib_lockfile_maillock=no \ ac_cv_prog_liblockfile=no @@ -210,7 +208,7 @@ PGTK_PREVENTS= M17N XFT XPM PGTK_CATEGORIES= wayland PGTK_CONFIGURE_WITH= pgtk -PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_LIB_DEPENDS= libpng16.so:graphics/png PNG_CONFIGURE_WITH= png SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars .if ${FLAVOR:U} == canna @@ -227,7 +225,7 @@ TREESITTER_IMPLIES= MODULES TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter TREESITTER_CONFIGURE_WITH= tree-sitter -WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_CONFIGURE_WITH= webp XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena @@ -253,6 +251,14 @@ .include +.if ${PORT_OPTIONS:MNATIVECOMP} +NATIVECOMP_COMMENT_END= +NATIVECOMP_COMMENT_START= +.else +NATIVECOMP_COMMENT_END= '*/' +NATIVECOMP_COMMENT_START= '/*' +.endif + .if ${FLAVOR:U} != nox USES+= desktop-file-utils gnome .if !${PORT_OPTIONS:MPGTK} diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1719179787 -SHA256 (emacs-29.4.tar.xz) = ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235 -SIZE (emacs-29.4.tar.xz) = 52210344 -SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125 -SIZE (emacs29.1-canna-20230730.diff.xz) = 26852 +TIMESTAMP = 1740416719 +SHA256 (emacs-30.1.tar.xz) = 6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f +SIZE (emacs-30.1.tar.xz) = 54978160 +SHA256 (emacs30.1-canna-20250224.diff.gz) = b93296ae41037e6457317fd1113f8c3f659f32d4310c28a6a5bf633f6fcd31e5 +SIZE (emacs30.1-canna-20250224.diff.gz) = 30488 diff --git a/editors/emacs/files/patch-tty-rgb b/editors/emacs/files/patch-tty-rgb deleted file mode 100644 --- a/editors/emacs/files/patch-tty-rgb +++ /dev/null @@ -1,34 +0,0 @@ -Add RGB fallback if environment has COLORTERM=truecolor -https://github.com/emacs-mirror/emacs/commit/50f489b5dc59 - ---- doc/misc/efaq.texi.orig 2019-01-07 14:26:06 UTC -+++ doc/misc/efaq.texi -@@ -1603,6 +1603,10 @@ Currently there's no standard way to determine whether - supports direct color mode. If such standard arises later on, support - for @samp{setb24} and @samp{setf24} may be removed. - -+If Terminfo database is not available, but 24-bit direct color mode is -+supported, it can still be enabled by defining the environment -+variable @env{COLORTERM} to @samp{truecolor}. -+ - @node Debugging a customization file - @section How do I debug a @file{.emacs} file? - @cindex Debugging @file{.emacs} file ---- src/term.c.orig 2019-01-07 14:26:07 UTC -+++ src/term.c -@@ -4157,6 +4157,15 @@ use the Bourne shell command 'TERM=...; export TERM' ( - tty->TS_set_background = bg; - tty->TN_max_colors = 16777216; - } -+ /* Fall back to xterm+direct (semicolon version) if requested -+ by the COLORTERM environment variable. */ -+ else if ((bg = getenv("COLORTERM")) != NULL -+ && strcasecmp(bg, "truecolor") == 0) -+ { -+ tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TN_max_colors = 16777216; -+ } - } - #endif - diff --git a/editors/emacs/files/pkg-message.in b/editors/emacs/files/pkg-message.in new file mode 100644 --- /dev/null +++ b/editors/emacs/files/pkg-message.in @@ -0,0 +1,75 @@ +[ +%%NATIVECOMP_COMMENT_START%% +{ type: install + message: <