Date: Tue, 14 Apr 2026 10:28:47 -0300 From: Joseph Mingrone <jrm@freebsd.org> To: Rainer Hurling <rhurlin@gwdg.de> Cc: <ports-committers@FreeBSD.org>, <dev-commits-ports-all@FreeBSD.org>, <dev-commits-ports-main@FreeBSD.org> Subject: Re: git: bc45b7ec889c - main - Emacs Lisp ports framework: Overhaul Message-ID: <86se8x1xio.fsf@asn.ftfl.ca> In-Reply-To: <b0683078-ab28-4167-84ef-83b847ce5bb3@gwdg.de> References: <69da754a.21dbe.57e21951@gitrepo.freebsd.org> <b0683078-ab28-4167-84ef-83b847ce5bb3@gwdg.de>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, 2026-04-14 at 14:56, Rainer Hurling <rhurlin@gwdg.de> wrote: > Hi Joseph, > Am 11.04.2026 um 18:22 schrieb Joseph Mingrone: >> The branch main has been updated by jrm: >> URL: https://cgit.FreeBSD.org/ports/commit/?id=bc45b7ec889c7662bbbc64d26b00424db8dcb741 >> commit bc45b7ec889c7662bbbc64d26b00424db8dcb741 >> Author: Joseph Mingrone <jrm@FreeBSD.org> >> AuthorDate: 2026-03-20 04:15:55 +0000 >> Commit: Joseph Mingrone <jrm@FreeBSD.org> >> CommitDate: 2026-04-11 16:03:58 +0000 >> Emacs Lisp ports framework: Overhaul >> This overhaul introduces four key changes to the elisp ports framework: >> 1. Remove support for packaged byte-compiled elisp. >> The primary motivation is to remove a large number of flavor-specific >> packages and to simplify the ports tree. As an example, supporting >> byte-compiled elisp for devel/tablist required six packages, one for >> each flavor of editors/emacs and editors/emacs-devel. With over 100 >> elisp ports and requests for new Emacs flavors, this was >> unmanageable. >> 2. Install configuration to integrate with Emacs's native compilation >> machinery, allowing elisp from ports to be compiled into the standard >> cache under the user's home directory. >> This matches the behavior of GNU ELPA packages and generally results >> in a faster experience. Speedups vary depending on the >> characteristics of the elisp code, but are often reported to be 2.5 >> to 5 times faster than byte-compiled code. >> 3. Perform byte compilation on the target host, but only when native >> compilation is unavailable. Compilation is initiated when Emacs >> starts, and the resulting .elc files are cached under the user's >> home directory. >> 4. Load all autoload files installed by FreeBSD elisp ports. This >> mirrors what package.el does for ELPA packages, ensuring that >> autoloaded functions are available without requiring users to >> explicitly load each package. >> Users with elisp packages (*-emacs_*) installed should consult the >> 2026-04-11 UPDATING entry for instructions on handling the transition. >> Reviewed by: ashish, Benjamin Jacobs <freebsd@dev.thsi.be>, dinoex, >> mandree, mce, nobutaka, Pat Maddox <pat@patmaddox.com>, >> rhurlin >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D56001 >> --- >> Mk/Uses/emacs.mk | 147 +--- >> Mk/bsd.default-versions.mk | 4 +- >> UPDATING | 30 + >> audio/emms/Makefile | 9 +- >> audio/emms/files/patch-Makefile | 12 +- >> audio/emms/pkg-plist | 70 -- >> audio/mpg123.el/Makefile | 6 +- >> audio/mpg123.el/pkg-message | 2 +- >> cad/dinotrace/Makefile | 11 +- >> cad/dinotrace/pkg-message | 7 +- >> cad/verilog-mode.el/Makefile | 13 +- >> cad/verilog-mode.el/pkg-message | 5 +- >> comms/emacs-eat/Makefile | 8 +- >> comms/emacs-eat/pkg-plist | 1 - >> databases/bbdb/Makefile | 19 +- >> databases/bbdb/pkg-plist | 16 - >> databases/closql/Makefile | 36 +- >> databases/emacsql/Makefile | 20 +- >> databases/emacsql/pkg-plist | 26 +- >> databases/pg.el/Makefile | 14 +- >> databases/pg.el/pkg-plist | 5 - >> deskutils/howm/Makefile | 13 +- >> deskutils/howm/pkg-message | 3 +- >> deskutils/howm/pkg-plist | 22 - >> devel/cask/Makefile | 5 +- >> devel/clojure-cider/Makefile | 12 +- >> devel/coccinelle/Makefile | 1 - >> devel/cond-let/Makefile | 17 +- >> devel/dash.el/Makefile | 19 +- >> devel/distel/Makefile | 7 +- >> devel/epl.el/Makefile | 5 +- >> devel/forge/Makefile | 68 +- >> devel/forge/files/patch-docs_Makefile | 18 +- >> devel/forge/pkg-plist | 71 +- >> devel/gettext-po-mode/Makefile | 18 +- >> devel/gettext-po-mode/pkg-plist | 3 - >> devel/ghub/Makefile | 28 +- >> devel/ghub/pkg-plist | 14 +- >> devel/git-modes/Makefile | 18 +- >> devel/git-modes/pkg-plist | 4 - >> devel/go-mode.el/Makefile | 1 - >> devel/llama.el/Makefile | 24 +- >> devel/lua-mode/Makefile | 5 +- >> devel/magit/Makefile | 48 +- >> devel/magit/pkg-message | 9 - >> devel/magit/pkg-plist | 47 -- >> devel/ob-rust/Makefile | 1 - >> devel/p5-Sepia/Makefile | 9 +- >> devel/p5-Sepia/pkg-plist | 3 - >> devel/pkg-info.el/Makefile | 5 +- >> devel/psvn/Makefile | 16 +- >> devel/psvn/pkg-message | 2 +- >> devel/rust-mode/Makefile | 1 - >> devel/tablist/Makefile | 17 +- >> devel/transient/Makefile | 25 +- >> devel/treepy.el/Makefile | 20 +- >> editors/apel/Makefile | 17 +- >> editors/apel/files/patch-Makefile | 11 + >> editors/apel/pkg-plist | 84 +-- >> editors/consult.el/Makefile | 13 +- >> editors/consult.el/pkg-plist | 9 - >> editors/emacs-devel/Makefile | 10 +- >> editors/emacs-devel/files/default.el.in | 155 ++++ >> editors/emacs-devel/files/pkg-message.in | 83 +-- >> editors/emacs-devel/files/site-start.el.in | 33 + >> editors/emacs-devel/files/sources.el.in | 6 - >> editors/emacs-devel/pkg-plist | 3 +- >> editors/emacs/Makefile | 4 +- >> editors/emacs/files/default.el.in | 155 ++++ >> editors/emacs/files/pkg-message.in | 34 +- >> editors/emacs/files/site-start.el.in | 33 + >> editors/emacs/files/sources.el.in | 6 - >> editors/emacs/pkg-plist | 3 +- >> editors/flim/Makefile | 23 +- >> editors/flim/files/patch-Makefile | 11 + >> editors/flim/pkg-plist | 75 +- >> editors/marginalia.el/Makefile | 13 +- >> editors/marginalia.el/pkg-plist | 1 - >> editors/orderless.el/Makefile | 13 +- >> editors/orderless.el/pkg-plist | 2 - >> editors/paredit-mode.el/Makefile | 5 +- >> editors/paredit-mode.el/pkg-message | 2 +- >> editors/perspective.el/Makefile | 11 +- >> editors/perspective.el/pkg-plist | 1 - >> editors/psgml/Makefile | 36 +- >> editors/psgml/pkg-plist | 34 +- >> editors/semi/Makefile | 19 +- >> editors/semi/files/patch-Makefile | 11 + >> editors/semi/pkg-plist | 46 +- >> editors/slime/Makefile | 15 +- >> editors/slime/pkg-plist | 304 ++++---- >> editors/sly-asdf/Makefile | 20 +- >> editors/sly-asdf/pkg-plist | 1 - >> editors/sly-named-readtables/Makefile | 17 +- >> editors/sly-named-readtables/pkg-plist | 1 - >> editors/sly-quicklisp/Makefile | 17 +- >> editors/sly-quicklisp/pkg-plist | 2 - >> editors/sly/Makefile | 14 +- >> editors/sly/pkg-message | 3 - >> editors/sly/pkg-plist | 23 - >> editors/tamago/Makefile | 17 +- >> editors/tamago/pkg-plist | 33 - >> editors/vertico.el/Makefile | 14 +- >> editors/vertico.el/pkg-plist | 14 - >> editors/web-mode/Makefile | 27 +- >> editors/web-mode/files/Makefile | 14 - >> editors/with-editor/Makefile | 21 +- >> irc/riece/Makefile | 20 +- >> irc/riece/pkg-message | 3 +- >> irc/riece/pkg-plist | 232 +++--- >> japanese/boiled-mozc/Makefile | 23 +- >> japanese/cp5022x-el/Makefile | 20 +- >> japanese/ddskk/Makefile | 11 +- >> japanese/ddskk/files/patch-SKK-MK | 39 +- >> japanese/ddskk/pkg-plist | 43 -- >> japanese/lookup/Makefile | 19 +- >> japanese/lookup/pkg-plist | 212 ++---- >> japanese/migemo.el/Makefile | 6 +- >> japanese/mozc-el/Makefile | 4 +- >> japanese/mozc-el/pkg-message | 2 +- >> japanese/mozc-server/Makefile | 19 +- >> japanese/navi2ch/Makefile | 9 +- >> japanese/navi2ch/files/patch-Makefile.in | 11 + >> japanese/navi2ch/pkg-plist | 35 - >> japanese/yc.el/Makefile | 21 +- >> japanese/yc.el/pkg-message | 2 +- >> lang/alchemist.el/Makefile | 7 +- >> lang/clojure-mode.el/Makefile | 4 +- >> lang/clojure-mode.el/pkg-message | 4 +- >> lang/csharp-mode.el/Makefile | 4 +- >> lang/csharp-mode.el/pkg-message | 2 +- >> lang/elixir-mode.el/Makefile | 5 +- >> lang/haskell-mode.el/Makefile | 9 +- >> lang/haskell-mode.el/files/pkg-message.in | 9 +- >> lang/php-mode.el/Makefile | 28 +- >> lang/php-mode.el/pkg-message | 2 +- >> lang/php-mode.el/pkg-plist | 39 +- >> lang/tuareg-mode.el/Makefile | 16 +- >> mail/anubis/Makefile | 16 +- >> mail/anubis/pkg-plist | 1 - >> mail/c-sig/Makefile | 14 +- >> mail/c-sig/pkg-plist | 3 +- >> mail/mailest/Makefile | 9 +- >> mail/mailfromd/Makefile | 11 +- >> mail/mailfromd/pkg-plist | 2 - >> mail/mailutils/Makefile | 3 +- >> mail/mew-devel/Makefile | 14 +- >> mail/mew-devel/pkg-plist | 267 +++---- >> mail/mew/Makefile | 15 +- >> mail/mew/pkg-plist | 267 +++---- >> mail/notmuch-emacs/Makefile | 12 +- >> mail/notmuch-emacs/pkg-plist | 21 - >> mail/wanderlust/Makefile | 27 +- >> mail/wanderlust/pkg-plist | 235 ++---- >> mail/x-face-e21/Makefile | 17 +- >> mail/xcite/Makefile | 19 +- >> math/ess/Makefile | 10 +- >> math/ess/pkg-message | 12 - >> math/ess/pkg-plist | 32 - >> misc/compat.el/Makefile | 18 +- >> misc/compat.el/pkg-plist | 23 +- >> misc/elscreen/Makefile | 7 +- >> misc/elscreen/pkg-message | 2 +- >> misc/emacs-libvterm/Makefile | 4 +- >> net/gnu-radius/Makefile | 2 - >> print/a2ps/Makefile | 10 +- >> print/a2ps/pkg-plist | 2 - >> print/auctex/Makefile | 15 +- >> print/auctex/pkg-plist | 1067 ++++++++++------------------ >> print/hyperlatex/Makefile | 15 +- >> print/hyperlatex/pkg-plist | 1 - >> print/pdf-tools/Makefile | 13 +- >> print/pdf-tools/pkg-plist | 18 - >> print/yatex/Makefile | 3 +- >> security/starttls/Makefile | 12 +- >> security/starttls/pkg-plist | 1 - >> sysutils/lr/Makefile | 1 - >> sysutils/puppet-mode.el/Makefile | 5 +- >> sysutils/puppet-mode.el/pkg-message | 2 +- >> textproc/adoc-mode.el/Makefile | 17 +- >> textproc/dictem/Makefile | 16 +- >> textproc/dictem/files/patch-compile.el | 16 - >> textproc/dictionary/Makefile | 15 +- >> textproc/dictionary/pkg-plist | 11 +- >> textproc/doc-mode.el/Makefile | 8 +- >> textproc/markdown-mode.el/Makefile | 15 +- >> textproc/markdown-mode.el/pkg-message | 4 +- >> textproc/muse/Makefile | 13 +- >> textproc/muse/pkg-plist | 30 - >> textproc/ox-gfm.el/Makefile | 1 - >> textproc/uim-el/Makefile | 9 +- >> textproc/uim-el/pkg-plist | 22 +- >> textproc/xml-lite.el/Makefile | 17 +- >> textproc/xml-lite.el/pkg-message | 2 +- >> textproc/yaml-mode.el/Makefile | 15 +- >> textproc/yaml-mode.el/pkg-message | 11 - >> textproc/yaml-mode.el/pkg-plist | 3 +- >> textproc/yaml.el/Makefile | 19 +- >> www/emacs-w3m/Makefile | 20 +- >> www/emacs-w3m/pkg-message | 2 +- >> www/emacs-w3m/pkg-plist | 495 +++++-------- >> 201 files changed, 2607 insertions(+), 3801 deletions(-) >> diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk >> index 462657c4183a..6e52fa3c0d2f 100644 >> --- a/Mk/Uses/emacs.mk >> +++ b/Mk/Uses/emacs.mk >> @@ -1,49 +1,37 @@ >> -# Provide support for ports requiring Emacs. This includes flavors with proper >> -# dependencies and useful variables. >> +# Provide support for ports requiring Emacs. >> # >> # Feature: emacs >> # Usage: USES=emacs or USES=emacs:args >> -# Valid ARGS: build, run, noflavors >> +# Valid ARGS: build >> # >> # build Indicates that Emacs is required at build time. >> -# run Indicates that Emacs is required at run time. >> -# noflavors Prevents flavors. This is implied when there is no run >> -# dependency on Emacs. >> # >> -# If build and run are omitted from the argument list, Emacs will be added to >> -# BUILD_DEPENDS and RUN_DEPENDS. EMACS_NO_DEPENDS can be set to prevent both >> -# dependencies. >> +# If build is omitted from the argument list, Emacs will not be added to >> +# BUILD_DEPENDS. >> # >> # Variables, which can be set in make.conf: >> -# DEFAULT_VERSIONS+= The default flavor for ports with >> -# USES=emacs can be added to DEFAULT_VERSIONS. >> -# For example: DEFAULT_VERSIONS+= emacs=nox >> -# Valid flavors: full canna nox wayland >> -# devel_full devel_nox >> -# Flavors specified on the command line take >> -# precedence. >> -# >> -# Variables, which can be set by ports: >> -# EMACS_FLAVORS_EXCLUDE: Do NOT build these Emacs flavors. >> -# If EMACS_FLAVORS_EXCLUDE is not defined and >> -# - there is a run dependency on Emacs >> -# - the noflavors argument is not specified >> -# then all valid Emacs flavors are assumed. >> -# >> -# EMACS_NO_DEPENDS: Do NOT add build or run dependencies on Emacs. >> -# This will prevent flavors, and no byte code files >> -# will be generated as part of the package. >> +# DEFAULT_VERSIONS+=emacs= Select the Emacs port and flavor used for >> +# USES=emacs:build. >> +# Valid values: full canna nox wayland >> +# devel_full devel_nox >> +# Defaults to nox when not specified. >> +# Values prefixed with devel_ select >> +# editors/emacs-devel; others select >> +# editors/emacs. >> # >> # Variables, which can be read by ports: >> # EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-30.2) >> -# EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR}) >> -# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs) >> -# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/30.2) >> # EMACS_MAJOR_VER: Emacs major version (e.g. 30) >> -# EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors >> +# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs) >> # EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp) >> -# EMACS_VER: Emacs version (e.g. 30.2) >> -# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/30.2/site-lisp) >> +# >> +# Note: EMACS_CMD and EMACS_MAJOR_VER are only set if the build argument is >> +# supplied. >> +# >> +# Note: No Emacs runtime dependency is declared here. USES=emacs ports now >> +# install only .el source files, avoiding the combinatorial explosion of >> +# flavor-specific packages. Native compilation is handled at runtime by the >> +# site-wide configuration shipped with editors/emacs and editors/emacs-devel. >> #------------------------------------------------------------------------------- >> # >> # MAINTAINER: emacs@FreeBSD.org >> @@ -54,102 +42,35 @@ _INCLUDE_USES_EMACS_MK= yes >> # Make sure that no dependency or some other environment variable >> # pollutes the build/run dependency detection >> .undef _EMACS_BUILD_DEP >> -.undef _EMACS_RUN_DEP >> -.undef _EMACS_NOFLAVORS >> _EMACS_ARGS= ${emacs_ARGS:S/,/ /g} >> . if ${_EMACS_ARGS:Mbuild} >> _EMACS_BUILD_DEP= yes >> _EMACS_ARGS:= ${_EMACS_ARGS:Nbuild} >> . endif >> -. if ${_EMACS_ARGS:Mrun} >> -_EMACS_RUN_DEP= yes >> -_EMACS_ARGS:= ${_EMACS_ARGS:Nrun} >> -. endif >> -. if ${_EMACS_ARGS:Mnoflavors} >> -_EMACS_NOFLAVORS= yes >> -_EMACS_ARGS:= ${_EMACS_ARGS:Nnoflavors} >> -. endif >> - >> -# If the port does not specify a build or run dependency, and does not define >> -# EMACS_NO_DEPENDS, assume both dependencies are required. >> -. if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \ >> - !defined(EMACS_NO_DEPENDS) >> -_EMACS_BUILD_DEP= yes >> -_EMACS_RUN_DEP= yes >> -. endif >> - >> -# Only set FLAVORS when... >> -. if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) >> -FLAVORS= full canna nox wayland devel_full devel_nox >> -# Sort the default to be first >> -. if defined(EMACS_DEFAULT) >> -FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} >> -. endif >> -. for flavor in ${EMACS_FLAVORS_EXCLUDE} >> -FLAVORS:= ${FLAVORS:N${flavor}} >> -. endfor >> -. endif >> - >> -# Only set FLAVOR when... >> -. if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) && empty(FLAVOR) >> -. if defined(EMACS_DEFAULT) >> -FLAVOR= ${EMACS_DEFAULT} >> -. else >> -FLAVOR= ${FLAVORS:[1]} >> -. endif # defined(EMACS_DEFAULT) >> -. endif # !defined(_EMACS_NOFLAVORS) && defined(_EMACS_RUN_DEP) && empty(FLAVOR) >> -. if !empty(FLAVOR) >> -EMACS_FLAVOR= ${FLAVOR} >> -. else >> -EMACS_FLAVOR= full >> -. endif >> +EMACS_LIBDIR= share/emacs >> +EMACS_SITE_LISPDIR= ${EMACS_LIBDIR}/site-lisp >> -. if ${FLAVOR:Mdevel*} >> +. if defined(_EMACS_BUILD_DEP) >> +. if defined(EMACS_DEFAULT) && ${EMACS_DEFAULT:Mdevel*} >> EMACS_VER= 31.0.50 >> EMACS_PORTDIR= editors/emacs-devel >> -. else >> +EMACS_BUILD_FLAVOR= ${EMACS_DEFAULT:C/devel_//} >> +. else >> EMACS_VER= 30.2 >> EMACS_PORTDIR= editors/emacs >> -. endif >> - >> +EMACS_BUILD_FLAVOR= ${EMACS_DEFAULT:Unox} >> +. endif >> +EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER} >> EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//} >> -EMACS_LIBDIR= share/emacs >> -EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER} >> -EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER} >> - >> -. if ${EMACS_FLAVOR} == "devel_full" >> -EMACS_PKGNAMESUFFIX= -emacs_devel >> -. elif ${EMACS_FLAVOR} == "devel_nox" >> -EMACS_PKGNAMESUFFIX= -emacs_devel_nox >> -. elif ${EMACS_FLAVOR} == "full" >> -EMACS_PKGNAMESUFFIX= >> -. else >> -EMACS_PKGNAMESUFFIX= -emacs_${EMACS_FLAVOR} >> -. endif >> - >> -EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER} >> -EMACS_SITE_LISPDIR= ${EMACS_LIBDIR}/site-lisp >> -EMACS_VERSION_SITE_LISPDIR= ${EMACS_LIBDIR_WITH_VER}/site-lisp >> - >> -. if defined(_EMACS_BUILD_DEP) >> -BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//} >> -. endif >> -. if defined(_EMACS_RUN_DEP) >> -RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//} >> +MAKE_ARGS+= EMACS=${EMACS_CMD} >> +BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_BUILD_FLAVOR} >> . endif >> -MAKE_ARGS+= EMACS=${EMACS_CMD} >> SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} \ >> - EMACS_VER=${EMACS_VER} \ >> - EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ >> - EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ >> - EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} >> + EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} >> PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} \ >> - EMACS_VER=${EMACS_VER} \ >> - EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ >> - EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ >> - EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} >> + EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} >> .endif # _INCLUDE_USES_EMACS_MK >> diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk >> index 0ecae84f1e5b..313246180c53 100644 >> --- a/Mk/bsd.default-versions.mk >> +++ b/Mk/bsd.default-versions.mk >> @@ -44,8 +44,8 @@ EBUR128_DEFAULT?= rust >> . else >> EBUR128_DEFAULT?= legacy >> . endif >> -# Possible_values: full canna nox devel_full devel_nox >> -#EMACS_DEFAULT?= let the flavor be the default if not explicitly set >> +# Possible values: full canna nox wayland devel_full devel_nox (default: nox) >> +#EMACS_DEFAULT?= nox >> # Possible values: 3.0, 4.0 >> FIREBIRD_DEFAULT?= 3.0 >> # Possible values: gfortran >> diff --git a/UPDATING b/UPDATING >> index bf07357a41a0..3df8d6e96241 100644 >> --- a/UPDATING >> +++ b/UPDATING >> @@ -5,6 +5,36 @@ they are unavoidable. >> You should get into the habit of checking this file for changes each time >> you update your ports collection, before attempting any port upgrades. >> +20260411: >> + AFFECTS: AFFECTS: users of elisp (*-emacs_*) packages >> + AUTHOR: jrm@FreeBSD.org >> + >> + Packages for different flavors of elisp ports have been removed. For >> + example, the old and new packages for devel/tablist are: >> + |-------------------------+---------| >> + | Before | After | >> + |-------------------------+---------| >> + | tablist | tablist | >> + | tablist-emacs_canna | | >> + | tablist-emacs_devel_nox | | >> + | tablist-emacs_devel | | >> + | tablist-emacs_nox | | >> + | tablist-emacs_wayland | | >> + |-------------------------+---------| >> + >> + If you have any -emacs_* packages installed, simply running `pkg upgrade` >> + will not upgrade and replace them with the new package. Run these commands >> + under /bin/sh with superuser privileges before upgrading. >> + >> + for i in $(pkg query -g %n *-emacs_*); do >> + if [ "$i" != "notmuch-emacs_*" ]; then >> + nn=$(echo "$i" | sed -e 's/-emacs_[a-z_]*//') >> + else >> + nn=$(echo "$i" | sed -e 's/-emacs_[a-z_]*/-emacs/') >> + fi >> + pkg set -yn "$i":"$nn" >> + done >> + >> 20260401: >> AFFECTS: users of security/openvpn >> AUTHOR: mandree@FreeBSD.org >> diff --git a/audio/emms/Makefile b/audio/emms/Makefile >> index 82b2b927f0f0..6a795dad1b9b 100644 >> --- a/audio/emms/Makefile >> +++ b/audio/emms/Makefile >> @@ -1,8 +1,8 @@ >> PORTNAME= emms >> DISTVERSION= 25 >> +PORTREVISION= 1 >> CATEGORIES= audio elisp >> MASTER_SITES= https://elpa.gnu.org/packages/ >> -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> MAINTAINER= alven@FreeBSD.org >> COMMENT= GNU/Emacs Multimedia System >> @@ -16,12 +16,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING >> # do not depend on base texinfo on 10 >> BUILD_DEPENDS= texi2dvi:print/texinfo >> -USES= emacs gmake tar >> +USES= emacs:build gmake tar >> -CONFLICTS_INSTALL= emms emms-emacs_* # share/emacs/site-lisp/emms/emms-auto.el >> +CONFLICTS_INSTALL= emms-emacs_* >> NO_ARCH= yes >> INFO= emms >> +do-build: >> + ${GMAKE} -C ${WRKSRC} emms-auto.el docs >> + >> .include <bsd.port.mk> >> diff --git a/audio/emms/files/patch-Makefile b/audio/emms/files/patch-Makefile >> index fd420f3483cc..756f4fbd9796 100644 >> --- a/audio/emms/files/patch-Makefile >> +++ b/audio/emms/files/patch-Makefile >> @@ -1,6 +1,6 @@ >> --- Makefile.orig 2023-05-25 21:02:56 UTC >> +++ Makefile >> -@@ -37,7 +37,7 @@ >> +@@ -37,7 +37,7 @@ PREFIX=$(DESTDIR)/usr/local >> DESTDIR= >> PREFIX=$(DESTDIR)/usr/local >> @@ -9,7 +9,7 @@ >> MAN1DIR=$(PREFIX)/share/man/man1 >> BINDIR=$(PREFIX)/bin >> SITELISP=$(PREFIX)/share/emacs/site-lisp/emms >> -@@ -48,7 +48,7 @@ >> +@@ -48,7 +48,7 @@ GINSTALLINFO = /usr/bin/ginstall-info --info-dir=$(INF >> GINSTALLINFO = /usr/bin/ginstall-info --info-dir=$(INFODIR) >> # For systems without ginstall-info >> @@ -18,3 +18,11 @@ >> CHANGELOG_CMD = git log --pretty=medium --no-merges >> # The currently released version of EMMS (no longer in use) >> +@@ -91,7 +91,6 @@ install: >> + test -d $(SITELISP) || mkdir -p $(SITELISP) >> + test -d $(INFODIR) || install -d $(INFODIR) >> + install -m 644 $(ALLSOURCE) $(SITELISP) >> +- install -m 644 $(ALLCOMPILED) $(SITELISP) >> + install -m 0644 $(DOCDIR)emms.info $(INFODIR)/emms.info >> + for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done >> + if [ -x /usr/bin/ginstall-info ]; then \ >> diff --git a/audio/emms/pkg-plist b/audio/emms/pkg-plist >> index 21c773d54500..ec2b68471fa1 100644 >> --- a/audio/emms/pkg-plist >> +++ b/audio/emms/pkg-plist >> @@ -1,143 +1,73 @@ >> %%EMACS_SITE_LISPDIR%%/emms/emms-auto.el >> %%EMACS_SITE_LISPDIR%%/emms/emms-bookmarks.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-bookmarks.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-browser.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-browser.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-cache.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-cache.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-compat.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-compat.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-cue.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-cue.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-filters.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-filters.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-history.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-history.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-i18n.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-i18n.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-idapi-browser.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-idapi-browser.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-idapi-musicbrainz.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-idapi-musicbrainz.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-idapi.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-idapi.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-exiftool.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-exiftool.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-metaflac.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-metaflac.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-mp3info.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-mp3info.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-flac.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-flac.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-mp3.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-mp3.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-ogg.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-ogg.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-opus.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-opus.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-spc.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-spc.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native-vorbis.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native-vorbis.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-native.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-native.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-ogginfo.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-ogginfo.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-opusinfo.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-opusinfo.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info-tinytag.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info-tinytag.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-info.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-info.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-jack.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-jack.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-last-played.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-last-played.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-later-do.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-later-do.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-librefm-scrobbler.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-scrobbler.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-librefm-stream.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-stream.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-listenbrainz-scrobbler.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-listenbrainz-scrobbler.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics-lrclib.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-lyrics-lrclib.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-maint.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-maint.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-mark.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-mark.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-metaplaylist-mode.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-metaplaylist-mode.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-mode-line-icon.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-mode-line-icon.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-mode-line.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-mode-line.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-mpris.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-mpris.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-pkg.el >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-mpd.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-mpd.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-mpg321-remote.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-mpg321-remote.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-mplayer.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-mplayer.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-mpv.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-mpv.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-vlc.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-vlc.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-limit.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-playlist-limit.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-mode.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-playlist-mode.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-sort.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-playlist-sort.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-radio-browser.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-radio-browser.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-score.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-score.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-setup.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-setup.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-show-all.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-show-all.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-source-beets.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-source-beets.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-source-file.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-source-file.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-source-playlist.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-source-playlist.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-stream-info.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-stream-info.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-streams.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-streams.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-tag-editor.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-tag-editor.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-tag-tracktag.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-tag-tracktag.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-url.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-url.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume-amixer.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume-amixer.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume-mixerctl.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume-mixerctl.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume-mpv.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume-mpv.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume-pulse.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume-pulse.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume-sndioctl.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume-sndioctl.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms-volume.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms-volume.elc >> %%EMACS_SITE_LISPDIR%%/emms/emms.el >> -%%EMACS_SITE_LISPDIR%%/emms/emms.elc >> share/man/man1/emms-print-metadata.1.gz >> diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile >> index 876d611253f9..e8f96d161562 100644 >> --- a/audio/mpg123.el/Makefile >> +++ b/audio/mpg123.el/Makefile >> @@ -1,6 +1,6 @@ >> PORTNAME= mpg123.el >> PORTVERSION= 1.65 >> -PORTREVISION= 4 >> +PORTREVISION= 5 >> CATEGORIES= audio elisp >> MASTER_SITES= http://www.gentei.org/~yuuji/software/mpg123el/ >> PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> @@ -16,6 +16,8 @@ LICENSE= BSD2CLAUSE >> USES= emacs >> +CONFLICTS_INSTALL= mpg123.el-emacs_* >> + >> OPTIONS_SINGLE= PLAYER >> OPTIONS_SINGLE_PLAYER= MPG123 MPLAYER >> OPTIONS_DEFAULT= MPLAYER >> @@ -27,8 +29,6 @@ MPG123_RUN_DEPENDS= mpg123:audio/mpg123 \ >> ogg123:audio/vorbis-tools >> MPG123_EXTRA_PATCHES= ${FILESDIR}/extra-mpg123-patch-mpg123.el >> -CONFLICTS= mpg123-emacs >> - >> NO_WRKSUBDIR= yes >> NO_ARCH= yes >> NO_BUILD= yes >> diff --git a/audio/mpg123.el/pkg-message b/audio/mpg123.el/pkg-message >> index f50b93b8fdd1..e1d445f73e52 100644 >> --- a/audio/mpg123.el/pkg-message >> +++ b/audio/mpg123.el/pkg-message >> @@ -1,7 +1,7 @@ >> [ >> { type: install >> message: <<EOM >> -Put the expression below into your ~/.emacs. >> +Put the expression below into your Emacs configuration: >> (autoload 'mpg123 "mpg123" "A Front-end to mpg123" t) >> EOM >> diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile >> index 947d107ebdad..7152f3c2742c 100644 >> --- a/cad/dinotrace/Makefile >> +++ b/cad/dinotrace/Makefile >> @@ -1,9 +1,8 @@ >> PORTNAME= dinotrace >> PORTVERSION= 9.4f >> -PORTREVISION= 10 >> +PORTREVISION= 11 >> CATEGORIES= cad >> MASTER_SITES= http://www.veripool.org/ftp/ >> -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> MAINTAINER= ports@FreeBSD.org >> COMMENT= Graphical signal trace waveform viewer >> @@ -16,9 +15,9 @@ USES= gmake motif perl5 tar:tgz xorg >> USE_XORG= x11 sm ice xmu xt >> USE_PERL5= build >> -GNU_CONFIGURE= yes >> +CONFLICTS_INSTALL= dinotrace-emacs_* >> -CONFLICTS_INSTALL= dinotrace dinotrace-emacs_* >> +GNU_CONFIGURE= yes >> INFO= dinotrace >> PLIST_FILES= bin/dinotrace >> @@ -27,8 +26,8 @@ OPTIONS_DEFINE= EMACS >> OPTIONS_DEFAULT= EMACS >> EMACS_DESC= Install Emacs supplimentary files >> -EMACS_USES= emacs:run >> -EMACS_RUN_DEPENDS= verilog-mode.el${EMACS_PKGNAMESUFFIX}>0:cad/verilog-mode.el@${EMACS_FLAVOR} >> +EMACS_USES= emacs >> +EMACS_RUN_DEPENDS= verilog-mode.el>0:cad/verilog-mode.el >> EMACS_PLIST_FILES= ${EMACS_SITE_LISPDIR}/dinotrace.el ${EMACS_SITE_LISPDIR}/sim-log.el >> post-patch: >> diff --git a/cad/dinotrace/pkg-message b/cad/dinotrace/pkg-message >> index a0d53aafdc46..d81a1a1d3398 100644 >> --- a/cad/dinotrace/pkg-message >> +++ b/cad/dinotrace/pkg-message >> @@ -1,17 +1,14 @@ >> [ >> { type: install >> message: <<EOM >> -To activate dinotrace Emacs extensions add the following lines >> -to your Emacs configuration file (usually ~/.emacs): >> +To configure dinotrace Emacs extensions, add the following lines >> +to your Emacs startup configuration: >> ;; Dinotrace mode >> -(autoload 'dinotrace-update "dinotrace" "Update dinotrace annotations in this buffer" t) >> -(autoload 'dinotrace-mode "dinotrace" "Toggle dinotrace annotations in this buffer" t) >> (global-set-key "\C-x\C-aa" 'dinotrace-update) >> (global-set-key "\C-x\C-ad" 'dinotrace-mode) >> ;; Sim-Log mode >> -(autoload 'sim-log-mode "sim-log" "Mode for Simulation Log files." t) >> (setq auto-mode-alist (append (list '("\\.log$" . sim-log-mode)) auto-mode-alist)) >> EOM >> } >> diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile >> index e32a12c8f746..c951010fe274 100644 >> --- a/cad/verilog-mode.el/Makefile >> +++ b/cad/verilog-mode.el/Makefile >> @@ -1,9 +1,8 @@ >> PORTNAME= verilog-mode.el >> PORTVERSION= 801 >> -PORTREVISION= 24 >> +PORTREVISION= 25 >> CATEGORIES= cad elisp >> MASTER_SITES= http://www.veripool.org/ftp/ >> -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> DISTNAME= ${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E} >> EXTRACT_SUFX= .gz >> @@ -13,16 +12,16 @@ WWW= https://www.veripool.org/wiki/verilog-mode >> LICENSE= GPLv3+ >> +USES= emacs >> + >> +CONFLICTS_INSTALL= verilog-mode.el-emacs_* >> + >> EXTRACT_CMD= ${GZCAT} >> EXTRACT_BEFORE_ARGS= # >> EXTRACT_AFTER_ARGS= > ${PORTNAME} >> - >> -NO_WRKSUBDIR= yes >> NO_BUILD= yes >> -USES= emacs:run >> - >> -CONFLICTS_INSTALL= verilog-mode.el verilog-mode.el-emacs_* # share/emacs/site-lisp/verilog-mode.el >> +NO_WRKSUBDIR= yes >> PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME} >> diff --git a/cad/verilog-mode.el/pkg-message b/cad/verilog-mode.el/pkg-message >> index f47abf9c4d59..c7cf422df4fa 100644 >> --- a/cad/verilog-mode.el/pkg-message >> +++ b/cad/verilog-mode.el/pkg-message >> @@ -1,10 +1,9 @@ >> [ >> { type: install >> message: <<EOM >> -To use verilog-mode features in Emacs/XEmacs, add the >> -following lines to your Emacs configuration file (usually ~/.emacs): >> +To use verilog-mode features in Emacs, add the following lines to your Emacs >> +startup configuration: >> -(autoload 'verilog-mode "verilog-mode" "Verilog mode" t ) >> (add-to-list 'auto-mode-alist '("\\.[ds]?v\\'" . verilog-mode)) >> EOM >> } >> diff --git a/comms/emacs-eat/Makefile b/comms/emacs-eat/Makefile >> index 27dce0ca9c43..e41961921182 100644 >> --- a/comms/emacs-eat/Makefile >> +++ b/comms/emacs-eat/Makefile >> @@ -1,10 +1,9 @@ >> PORTNAME= emacs-eat >> DISTVERSIONPREFIX= v >> DISTVERSION= 0.9.4 >> -PORTREVISION= 1 >> +PORTREVISION= 2 >> CATEGORIES= comms elisp >> MASTER_SITES= https://codeberg.org/akib/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ >> -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> MAINTAINER= pat@patmaddox.com >> COMMENT= Emulate A Terminal, in a region, in a buffer and in Eshell >> @@ -15,6 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING >> USES= emacs gmake makeinfo >> +ALL_TARGET= terminfo info >> + >> +CONFLICTS_INSTALL= emacs-eat-emacs_* >> + >> NO_ARCH= yes >> WRKSRC= ${WRKDIR}/${PORTNAME} >> @@ -26,7 +29,6 @@ OPTIONS_DEFINE= DOCS >> do-install: >> @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} >> ${INSTALL_DATA} ${WRKSRC}/eat.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} >> - ${INSTALL_DATA} ${WRKSRC}/eat.elc ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} >> @${MKDIR} ${STAGEDIR}${PREFIX}/share/terminfo/e >> @${MKDIR} ${STAGEDIR}${PREFIX}/share/terminfo/65 >> ${INSTALL_DATA} ${WRKSRC}/terminfo/e/* ${STAGEDIR}${PREFIX}/share/terminfo/e/ >> diff --git a/comms/emacs-eat/pkg-plist b/comms/emacs-eat/pkg-plist >> index 622545878ecb..ff2c7c1b8d82 100644 >> --- a/comms/emacs-eat/pkg-plist >> +++ b/comms/emacs-eat/pkg-plist >> @@ -1,5 +1,4 @@ >> %%EMACS_SITE_LISPDIR%%/eat.el >> -%%EMACS_SITE_LISPDIR%%/eat.elc >> share/terminfo/65/eat-256color >> share/terminfo/65/eat-color >> share/terminfo/65/eat-mono >> diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile >> index 58c06d74cbaa..ad6875a67648 100644 >> --- a/databases/bbdb/Makefile >> +++ b/databases/bbdb/Makefile >> @@ -1,9 +1,8 @@ >> PORTNAME= bbdb >> DISTVERSIONPREFIX= v >> DISTVERSION= 3.2.2a >> -PORTREVISION= 12 >> +PORTREVISION= 13 >> CATEGORIES= databases elisp >> -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} >> MAINTAINER= emacs@FreeBSD.org >> COMMENT= Big Brother Database >> @@ -13,16 +12,16 @@ LICENSE= GPLv3+ >> BUILD_DEPENDS= texi2dvi:print/texinfo >> -USES= autoreconf emacs >> +USES= autoreconf emacs:build >> USE_GITHUB= yes >> GH_ACCOUNT= emacsmirror >> GH_TAGNAME= a50c89a >> +CONFLICTS_INSTALL= bbdb-emacs_* >> + >> BBDB_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} >> GNU_CONFIGURE= yes >> -CONFLICTS_INSTALL= bbdb bbdb-emacs_* # share/doc/bbdb/bbdb.pdf >> - >> # Do not install the info file. Upstream has yet to add any real content to it. >> #INFO= bbdb >> PORTDOCS= bbdb.pdf >> @@ -34,17 +33,9 @@ DOCS_USES= tex >> DOCS_USE= TEX=latex:build >> DOCS_CONFIGURE_ENABLE= docs >> -# See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html >> -.if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox >> -post-configure: >> - ${REINPLACE_CMD} -e '/[[:blank:]]*--eval '\''(setq byte-compile-dest-file-function (lambda (_) "$$@"))'\'' \\/d' \ >> - ${WRKSRC}/lisp/Makefile >> -.endif >> - >> do-install: >> @${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR} >> - ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \ >> - ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR} >> + ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR} >> # Do not install the info file. Upstream has yet to add any real content to it. >> # ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \ >> # ${STAGEDIR}${PREFIX}/${INFO_PATH} >> diff --git a/databases/bbdb/pkg-plist b/databases/bbdb/pkg-plist >> index 6c76a7c01dff..ab466874311d 100644 >> --- a/databases/bbdb/pkg-plist >> +++ b/databases/bbdb/pkg-plist >> @@ -1,38 +1,22 @@ >> %%BBDB_LISPDIR%%/bbdb-anniv.el >> -%%BBDB_LISPDIR%%/bbdb-anniv.elc >> %%BBDB_LISPDIR%%/bbdb-com.el >> -%%BBDB_LISPDIR%%/bbdb-com.elc >> %%BBDB_LISPDIR%%/bbdb-gnus-aux.el >> -%%BBDB_LISPDIR%%/bbdb-gnus-aux.elc >> %%BBDB_LISPDIR%%/bbdb-gnus.el >> -%%BBDB_LISPDIR%%/bbdb-gnus.elc >> %%BBDB_LISPDIR%%/bbdb-ispell.el >> -%%BBDB_LISPDIR%%/bbdb-ispell.elc >> *** 9771 LINES SKIPPED *** > Thanks for the update. Very nice! > Unfortunately, I'm now having a problem with Math/ess that I hadn't noticed before. > The port compiles without any issues in Poudriere, but in an unclean environment, I get the following message when running Portmaster: > ===>>> ess-26.01.0_1 >> (1) > ===>>> The following actions will be taken if you choose to proceed: > Re-install ess-26.01.0_1 > Install editors/emacs@nox > Portmaster now always attempts to install math/emacs@nox, even if math/emacs@full is already installed. > If I change USES=emacs:build to USES=emacs in the math/ess Makefile, as most other emacs-dependent ports have, I can no longer build math/ess with Poudriere: > ===> Building for ess-26.01.0_2 > /bin/sh: emacs: not found > ********************* VERSIONS ************************** > ESS 26.01.0 > ESSR 1.8 > ********************************************************* > /usr/local/bin/gmake -C lisp all > gmake[1]: Entering directory '/wrkdirs/usr/ports/math/ess/work/ess-26.01.0/lisp' > Computing dependencies > emacs -batch -Q --directory . --directory ./obsolete -f batch-byte-compile ess-custom.el > gmake[1]: emacs: No such file or directory > gmake[1]: *** [Makefile:48: ess-custom.elc] Error 127 > gmake[1]: Leaving directory '/wrkdirs/usr/ports/math/ess/work/ess-26.01.0/lisp' > gmake: *** [Makefile:32: lisp] Error 2 > *** Error code 1 > Stop. > make: stopped making "build" in /usr/ports/math/ess > Is there possibly a problem caused by the changes to Mk/emacs.mk? > Thanks in advance for any hint and help. > Best wishes, > Rainer Hello, Can you add the line below to your /etc/make.conf? DEFAULT_VERSIONS+=emacs=full Since Emacs is now only required at build time and it's typically just to generate autoloads, the nox flavor was made the default for the build dependency. Thanks for reporting. I should probably note this in the UPDATING entry for everyone building in unclean environments. Joe [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmneQQ9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnuAXEACMkfNGHqae+LX5f+RUe1yDpGKAkIX6dKxE KIOCfLDzfsJwkjX+Y4vIbfXs9/jVk+NhIEmf8VnldaNhe+NIQVOnFCZ4BsbD0jCG NI11N113EdS+ksq1J9oApo87jAGDL/N9PDfvNUItE04/LkiOlrgYnwcXeXZ5CSL1 DtAKZHzKicOMC0pcfKZ+rHo/2SBmZcVksmaD7Bgj+sVEfB4rP3MQkazeY1X2qmDs mKvt7FYEXP6lDQK4+K6Zn1cHg5/YN2WJ8orq/mDV9LlYdV7mM9Qd6jAC3hEQQ+EP 6SNnwtdU4mS+5zWUCPFJ/4AjomrbeGhcbqQxb3Hr7TEoVIePSu2YwEqGyd2XoB2X 607jM3CHbBTPnRAq3+YZhv+lgURLhFC4Q89jPxaZO0A1+VfzRo9ZFANf4hXkGEgV NEkiYzqkbze5BbHmOAxTxsY1VR3pkrc1K7iagREx+FI0CWuN1GuBnTlG+aWX0E75 XnSoAFNT4HtjmLOf2R15C7h6eP1IbPqH92FPXD3qprXkhEmwRZNYGhr8AQ0MQtpd 91DUsae4QsJB5IRcYBZ4RBF7LGlci/K+tx59gBx+iu91W/nnLXdKeF61Szp96K6S Dqt7FS/ROn0VRIUF7j9cneIgSyNP8IPFwscPnAHGwPzg/9OGnw0jBVJHOi5mKzOF X+SUEGbyKQ== =p3jb -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86se8x1xio.fsf>