From nobody Wed Apr 20 01:50:18 2022 X-Original-To: dev-commits-ports-all@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 A4BC611CCBE7; Wed, 20 Apr 2022 01:50:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjkBy4FBVz4WfZ; Wed, 20 Apr 2022 01:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650419418; 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=gAY5t3dCVNpnEqNjcBGKrkrzq4svFIR0oEhJTwWdoyM=; b=pMJzPLHe6Gwdz61Jt2Ysz8/BqF10OLs8zNWsupAjneEjrG+CGb2yKAmAheePjPcIQTUjsN OqCTby7Kh87vmb9u8aOINkCUX25IN7b0jorDjefOGXtOv4XDmE6IbthUTY41MXU7gh5kh7 NttXKoXE5A31ecMTpZnx+9Jm80xEV41tMzJebXQEu9aHIbF+PeejY9CKvBdsj/jhyeeay0 78DCKmL07FfyJl/E8ZjYsUzNavC7xMwnnunCrvzOjiXmJL1Ccf0Wz0kz0XAaZ/tt9otnpg Auy1tXHVcP6ObWaoAyGdcyoB+GBdVycnxhiPoJuBO9XyDT3TeXgzJSlLSrO2dQ== 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 6D90822E6; Wed, 20 Apr 2022 01:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23K1oIfv093043; Wed, 20 Apr 2022 01:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23K1oIMu093037; Wed, 20 Apr 2022 01:50:18 GMT (envelope-from git) Date: Wed, 20 Apr 2022 01:50:18 GMT Message-Id: <202204200150.23K1oIMu093037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: d04f04b14c72 - main - editors/emacs-devel: Update to 2022-04-16 snapshot List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d04f04b14c72c042e0efed9bd0da9e5ea24e963b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650419418; 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=gAY5t3dCVNpnEqNjcBGKrkrzq4svFIR0oEhJTwWdoyM=; b=C5+hqAftha7o0jVMdvQtNE9g37VHBeAyyD+H8IHnSPbJIFqBmwTztHAr+uwfZjPXvZ9FdE D4eBIZowjrXAKHW9k2U8VSA4R+vunIc3Co+tBooj+mf41HDo0ML1Xbvc8ggcUjeXexMHz3 Fm1BVm0ZMU4n/Uj88MlpcdwtpqF5jvz5LBZTCVxBhG7VaAe6VbCaZ8KsuHU9fpGunCaazZ G9I1trKfIyfZLSgBCIdt38Z2QtunQY+unbwIitZn0qjVClMZZ1RgTft8SD1/vHte/KFXK7 EfK3qwSyIUT/suqNWbDYiBQ7IOwncddgpldYb/NhWDCU2CEqB2XK4Uq4raSUrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650419418; a=rsa-sha256; cv=none; b=Cx3pgElKT0wuDXyNfjiXJMCXyLX2S/Ceo0mIVsaMr2A9RCsHCopZfVSiV7GVjWiw7gUF4E B98u8M5gMqzr0EL+fr4IF90Vu1JQNw/1rjrPTwcwFDPmf9/1OtAsinzGwh/x5YRi6w60Oh B9mr/KtS1NwyFRk5g9Yu2rNK7IdeS2PnqkAozVNNljtgVR/SArrRcfL70jD0sv3WfQesm7 vtF1NJ/DyMrfOCoIQc7r1kIaMPwunSifpLtUuoPTRinedViwBjWEEj4EKAWaXp5i90Q1Xx yuMAmnzfiWFTUDtfVsJrlYPsYYUwl3d+pcnI5OMly2RSY8HxoGZ+erYey9XNcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=d04f04b14c72c042e0efed9bd0da9e5ea24e963b commit d04f04b14c72c042e0efed9bd0da9e5ea24e963b Author: Yasuhiro Kimura AuthorDate: 2022-04-16 07:39:03 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-20 01:49:24 +0000 editors/emacs-devel: Update to 2022-04-16 snapshot * Enable NATIVECOMP option by default [1] * If Emacs is build with NATIVECOMP enabled, display message as following at installation and upgrading time [2] - There are some elisp applications that don't work collectly if it is native compiled - If user uses such applications there is workaround to disable nativecompilation by user configuration [3] - Native compilation often results in high CPU - It is also possible to throttle it by user configuration * Tidy up Makefile with portfmt Discussed with: ashish, jrm [1],[2] Reference: https://lists.gnu.org/archive/html/help-gnu-emacs/2022-04/msg00129.html [3] Reviewed by: ashish, jrm Differential Revision: https://reviews.freebsd.org/D34935 --- editors/emacs-devel/Makefile | 25 +++++++---- editors/emacs-devel/distinfo | 6 +-- editors/emacs-devel/files/pkg-message.in | 73 ++++++++++++++++++++++++++++++++ editors/emacs-devel/pkg-message | 15 ------- editors/emacs-devel/pkg-plist | 1 + 5 files changed, 94 insertions(+), 26 deletions(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 63d97d9930cd..cdf7e4d5a992 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Kenneth Vestergaard Schmidt PORTNAME= emacs -DISTVERSION= 29.0.50.20220331 -PORTREVISION= 1 +DISTVERSION= 29.0.50.20220416 PORTEPOCH= 2 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -26,7 +25,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= c5af19c +GH_TAGNAME= 1fed6e7 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-build-details \ @@ -64,8 +63,10 @@ CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no CONFLICTS_INSTALL= emacs emacs-canna emacs-nox -SUB_FILES= sources.el -SUB_LIST= EMACS_VER=${DISTVERSION:R} +SUB_FILES= pkg-message sources.el +SUB_LIST= EMACS_VER=${DISTVERSION:R} \ + 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 eieio eintr elisp emacs emacs-gnutls emacs-mime \ @@ -85,8 +86,8 @@ OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \ XML XWIDGETS OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \ - MODULES OSS PGTK PNG SCROLLBARS SOURCES SQLITE3 \ - SVG THREADS TIFF WEBP XML + MODULES NATIVECOMP OSS PGTK PNG SCROLLBARS \ + SOURCES SQLITE3 SVG THREADS TIFF WEBP XML OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT @@ -223,6 +224,14 @@ XWIDGETS_CONFIGURE_WITH= xwidgets USE_GCC= yes .endif +.if ${PORT_OPTIONS:MNATIVECOMP} +NATIVECOMP_COMMENT_END= +NATIVECOMP_COMMENT_START= +.else +NATIVECOMP_COMMENT_END= '*/' +NATIVECOMP_COMMENT_START= '/*' +.endif + .if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN) _GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes .endif @@ -243,7 +252,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=no # Schema generation is dependent on both PGTK, and GSETTINGS options # as per https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=183936ee8e5 .if ${PORT_OPTIONS:MGSETTINGS} && ${PORT_OPTIONS:MPGTK} -GLIB_SCHEMAS+= org.gnu.emacs.defaults.gschema.xml +GLIB_SCHEMAS+= org.gnu.emacs.defaults.gschema.xml .endif .if ${FLAVOR} == nox diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index 175afeb50790..8c4b1cd648a9 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648744019 -SHA256 (emacs-mirror-emacs-29.0.50.20220331-c5af19c_GH0.tar.gz) = 6caccc85ea3c4446f4ae0878d8ae2c70209e37064fc6ee02b7294698a12de1a7 -SIZE (emacs-mirror-emacs-29.0.50.20220331-c5af19c_GH0.tar.gz) = 45440509 +TIMESTAMP = 1650071980 +SHA256 (emacs-mirror-emacs-29.0.50.20220416-1fed6e7_GH0.tar.gz) = a44463477213111797b8b0a090334c3f3b3801d2f3b4162038ffb181f142a079 +SIZE (emacs-mirror-emacs-29.0.50.20220416-1fed6e7_GH0.tar.gz) = 45503871 diff --git a/editors/emacs-devel/files/pkg-message.in b/editors/emacs-devel/files/pkg-message.in new file mode 100644 index 000000000000..24db8aefacdf --- /dev/null +++ b/editors/emacs-devel/files/pkg-message.in @@ -0,0 +1,73 @@ +[ +%%NATIVECOMP_COMMENT_START%% +{ type: install + message: <