From nobody Mon Feb 24 21:44:57 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z1vQz62Phz5njlJ; Mon, 24 Feb 2025 21:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1vQy2FJbz3XmS; Mon, 24 Feb 2025 21:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740433498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfzgEPGU9UhxPNBcWehADIuEahd+T8f+EJI/mrbky4=; b=dgJNcBWidzx+670x3z80hCV4PbFni44+j74oAyeIpB6eEyLRFWUoD2oblBA0LSUQchKuwO 4xvExZ8fkkZOE69M37z+okTyj0U/CQMFr4H8EOGtyxhD2VDk+XcAjGNKVX0r1ZDzyDm2bI FSFlHNJbvZU5NbtWnI/thDBTlCSmgYZJeVV9Kfkl4/2nGzZg5cQLnvqHdc6DrqcbGFHnKO GeekW3t14gztuN03vMK5cdBxXTJLwI5USp7N2rG8m3pPwdkrV+Mw/bESTly06tb5kqQsTT Nw0szma+mp4aMc0aNkAzwOCPk7VoKk5w4mOFV2pKoZrUgjPv3rXKt1q0k7MTdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740433498; a=rsa-sha256; cv=none; b=Vkh+8rd7GXNt+MB5ZBX2Yb3wkEaNHWyOpXcpbNHymOLHAG8Wf4MaUw5/iu0vkbxaEp2J90 aVywO/KqzLCQZqD7iFmhQSYMRqfKHuD9iHp/L0iXq99sYdPDsYM/XX7vAsKfKKsUnocWPt WT0XGJvDsYzQmSfe+2mN0EiIA4Zc6uUUTd/6dHPotxMdeBP9nhl4g8E5bVLmmeR0H2ZOZM 6S2mFvLRex+v2X1tms4kYkURs4uUwQDdWNODBH/DuMN1M4Fm2DIFQAjqxwgqJCuSQONCWw 6p/7gFll3iOJ0KqsIBq5+W79GKpESKohtag+VE2FFiZKakD02SOknru1cPiMcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740433498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfzgEPGU9UhxPNBcWehADIuEahd+T8f+EJI/mrbky4=; b=kPiPsMZ6HbuUgIhK7L8Iw4vr2B/MB858mfBa4bBkFxzZRu6jLufakjWnNc7ogfK+h50Fwh AfRKdZN/YIEV/pGZ6nkZbiApSSKPPeH9iBWXVTTdJHz7FXY1TpCYOVKQBeIhU76ZYbCkLP bllWVIpU4j+8fMqhBqHBZPaMyalHhEVB0pr5tTaZL93qLsN9zuPDmXdA2PsJjVcui7N9lV pybSYdiEn+YXcmYyB9yAZLBM3oIvSGYRQd/gEC6I9kHWl7HJSBXWTLhsLHIZdDIXuosnDO f81vLQgz9rY8WfkoZGyrIW35Vllo45yE23sPm6I2aSV4W9q+zN0h5ZBreYyC9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z1vQx67Wczy5k; Mon, 24 Feb 2025 21:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51OLiv9n076737; Mon, 24 Feb 2025 21:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OLivsF076734; Mon, 24 Feb 2025 21:44:57 GMT (envelope-from git) Date: Mon, 24 Feb 2025 21:44:57 GMT Message-Id: <202502242144.51OLivsF076734@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: e0799128b93a - main - editors/emacs: Update to 30.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0799128b93afb92c65fd11650ce778ab62a1969 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0799128b93afb92c65fd11650ce778ab62a1969 commit e0799128b93afb92c65fd11650ce778ab62a1969 Author: Joseph Mingrone AuthorDate: 2025-02-24 01:33:42 +0000 Commit: Joseph Mingrone CommitDate: 2025-02-24 21:44:47 +0000 editors/emacs: Update to 30.1 Release announcement: https://lists.gnu.org/archive/html/info-gnu-emacs/2025-02/msg00009.html Submitted by: HIROSE yuuji (updated canna patch) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48432 --- Mk/Uses/emacs.mk | 2 +- editors/emacs/Makefile | 38 ++++---- editors/emacs/distinfo | 10 +- editors/emacs/files/patch-tty-rgb | 34 ------- editors/emacs/files/pkg-message.in | 75 +++++++++++++++ editors/emacs/pkg-plist | 184 +++++++++++++++++++++++++++++++++++-- 6 files changed, 281 insertions(+), 62 deletions(-) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 14f03f9af922..c278e3447935 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -109,7 +109,7 @@ EMACS_FLAVOR= full 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 index 6ffe918f33c8..dee8fe54055c 100644 --- 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 @@ USES= cpe gmake localbase:ldflags ncurses pkgconfig tar:xz CPE_VENDOR= gnu GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var \ --without-gconf \ @@ -80,7 +78,9 @@ CONFLICTS_INSTALL= emacs-devel emacs-devel-nox 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_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \ 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_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz 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_LIB_DEPENDS= libm17n.so:devel/m17n-lib 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_IMPLIES= CAIRO GTK3 SCROLLBARS 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 @@ TIFF_CONFIGURE_WITH= tiff 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 @@ XWIDGETS_CONFIGURE_WITH= xwidgets .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 index 5830c821414f..6928533ab5ca 100644 --- 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 index 812edf247b57..000000000000 --- 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 index 000000000000..7d67c2378a22 --- /dev/null +++ b/editors/emacs/files/pkg-message.in @@ -0,0 +1,75 @@ +[ +%%NATIVECOMP_COMMENT_START%% +{ type: install + message: <