From bc45b7ec889c7662bbbc64d26b00424db8dcb741 Mon Sep 17 00:00:00 2001 From: Joseph Mingrone Date: Fri, 20 Mar 2026 01:15:55 -0300 Subject: [PATCH] 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 , dinoex, mandree, mce, nobutaka, Pat Maddox , rhurlin Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56001 --- Mk/Uses/emacs.mk | 151 +-- 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 | 66 +- 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 | 79 +- 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 | 34 +- 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 | 21 +- 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 | 19 +- 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 | 17 +- 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 | 21 +- www/emacs-w3m/Makefile | 20 +- www/emacs-w3m/pkg-message | 2 +- www/emacs-w3m/pkg-plist | 495 +++------ 201 files changed, 2609 insertions(+), 3803 deletions(-) delete mode 100644 devel/magit/pkg-message create mode 100644 editors/apel/files/patch-Makefile create mode 100644 editors/emacs-devel/files/default.el.in create mode 100644 editors/emacs-devel/files/site-start.el.in delete mode 100644 editors/emacs-devel/files/sources.el.in create mode 100644 editors/emacs/files/default.el.in create mode 100644 editors/emacs/files/site-start.el.in delete mode 100644 editors/emacs/files/sources.el.in create mode 100644 editors/flim/files/patch-Makefile create mode 100644 editors/semi/files/patch-Makefile delete mode 100644 editors/web-mode/files/Makefile create mode 100644 japanese/navi2ch/files/patch-Makefile.in delete mode 100644 math/ess/pkg-message delete mode 100644 textproc/dictem/files/patch-compile.el delete mode 100644 textproc/yaml-mode.el/pkg-message 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 - -. if ${FLAVOR:Mdevel*} -EMACS_VER= 31.0.50 -EMACS_PORTDIR= editors/emacs-devel -. else -EMACS_VER= 30.2 -EMACS_PORTDIR= editors/emacs -. endif - -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_//} +. if defined(EMACS_DEFAULT) && ${EMACS_DEFAULT:Mdevel*} +EMACS_VER= 31.0.50 +EMACS_PORTDIR= editors/emacs-devel +EMACS_BUILD_FLAVOR= ${EMACS_DEFAULT:C/devel_//} +. else +EMACS_VER= 30.2 +EMACS_PORTDIR= editors/emacs +EMACS_BUILD_FLAVOR= ${EMACS_DEFAULT:Unox} +. endif +EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER} +EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//} +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 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: <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: < ${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: <=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ - emacsql${EMACS_PKGNAMESUFFIX}>=4.3.1:databases/emacsql@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.2.1:devel/cond-let@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ - emacsql${EMACS_PKGNAMESUFFIX}>=4.3.1:databases/emacsql@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.2.1:devel/cond-let@${EMACS_FLAVOR} +BUILD_DEPENDS= compat.el>=30.0.0.0:misc/compat.el \ + cond-let>=0.2.1:devel/cond-let \ + emacsql>=4.3.1:databases/emacsql +RUN_DEPENDS= compat.el>=30.0.0.0:misc/compat.el \ + cond-let>=0.2.1:devel/cond-let \ + emacsql>=4.3.1:databases/emacsql -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= LOAD_PATH="${LOAD_PATH}" -MAKE_JOBS_UNSAFE= Opening input file: No such file or directory, /wrkdirs/usr/ports/databases/closql/work-full/closql-2.2.0/.#closql-autoloads.el +ALL_TARGET= autoloads -CONFLICTS_INSTALL= closql closql-devel* closql-emacs_* +CONFLICTS_INSTALL= closql-emacs_* NO_ARCH= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/closql-autoloads.el \ - ${EMACS_VERSION_SITE_LISPDIR}/closql.el \ - ${EMACS_VERSION_SITE_LISPDIR}/closql.elc +PLIST_FILES= ${EMACS_SITE_LISPDIR}/closql-autoloads.el \ + ${EMACS_SITE_LISPDIR}/closql.el PORTDOCS= README.org OPTIONS_DEFINE= DOCS -LOAD_PATH= -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat \ - -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql \ - -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} *.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}) + ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} *.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 3c42b3a3967a..d8dbe615e33d 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -1,8 +1,8 @@ PORTNAME= emacsql DISTVERSIONPREFIX= v DISTVERSION= 4.3.5 +PORTREVISION= 1 CATEGORIES= databases elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= High-level Emacs Lisp RDBMS front-end @@ -11,19 +11,21 @@ WWW= https://github.com/magit/emacsql LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE -BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} -RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} +BUILD_DEPENDS= pg.el>=0.39:databases/pg.el +RUN_DEPENDS= pg.el>=0.39:databases/pg.el -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" +MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR}" MAKE_JOBS_UNSAFE= yes TEST_TARGET= test -CONFLICTS_INSTALL= emacsql emacsql-devel* emacsql-emacs_* +CONFLICTS_INSTALL= emacsql-emacs_* + +NO_ARCH= yes PORTDOCS= README.md @@ -31,9 +33,9 @@ OPTIONS_DEFINE= DOCS do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist index db8d7d73c1a4..3e6bad1865c9 100644 --- a/databases/emacsql/pkg-plist +++ b/databases/emacsql/pkg-plist @@ -1,17 +1,9 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el -%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-compiler.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-mysql.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-pg.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-psql.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el +%%EMACS_SITE_LISPDIR%%/emacsql/emacsql.el diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile index 6805f841e975..02de967bf0af 100644 --- a/databases/pg.el/Makefile +++ b/databases/pg.el/Makefile @@ -1,8 +1,8 @@ PORTNAME= pg.el DISTVERSIONPREFIX= v DISTVERSION= 0.63 +PORTREVISION= 1 CATEGORIES= databases elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= PostgreSQL Elisp interface @@ -16,9 +16,10 @@ USE_GITHUB= yes GH_ACCOUNT= emarsden GH_PROJECT= pg-el -CONFLICTS_INSTALL= pg.el pg.el-emacs_* # share/doc/pg.el/README +CONFLICTS_INSTALL= pg.el-emacs_* NO_ARCH= yes +NO_BUILD= yes PLIST_SUB+= ELISPDIR=${ELISPDIR} @@ -26,16 +27,11 @@ PORTDOCS= CHANGELOG.md README.md OPTIONS_DEFINE= DOCS -ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} - -do-build: - (cd ${WRKSRC} \ - && ${EMACS_CMD} -Q -batch -L . -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ - -f batch-byte-compile *.el) +ELISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} *.el* \ + (cd ${WRKSRC} && ${INSTALL_DATA} *.el \ ${STAGEDIR}${PREFIX}/${ELISPDIR}) do-install-DOCS-on: diff --git a/databases/pg.el/pkg-plist b/databases/pg.el/pkg-plist index 342da167b203..c94ffa9396ac 100644 --- a/databases/pg.el/pkg-plist +++ b/databases/pg.el/pkg-plist @@ -1,10 +1,5 @@ %%ELISPDIR%%/pg-bm25.el -%%ELISPDIR%%/pg-bm25.elc %%ELISPDIR%%/pg-geometry.el -%%ELISPDIR%%/pg-geometry.elc %%ELISPDIR%%/pg-gis.el -%%ELISPDIR%%/pg-gis.elc %%ELISPDIR%%/pg-lo.el -%%ELISPDIR%%/pg-lo.elc %%ELISPDIR%%/pg.el -%%ELISPDIR%%/pg.elc diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index 0fd12074b856..3cb392a41624 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -1,9 +1,8 @@ PORTNAME= howm PORTVERSION= 1.4.8 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= deskutils MASTER_SITES= http://howm.sourceforge.jp/a/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Write fragmentarily and read collectively @@ -13,21 +12,19 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= emacs -EMACS_FLAVORS_EXCLUDE=devel_full devel_nox # Debugger entered--Lisp error: (wrong-type-argument stringp nil) -GNU_CONFIGURE= yes +CONFLICTS_INSTALL= howm-emacs_* -CONFLICTS_INSTALL= howm howm-emacs_* # share/doc/howm/README-j.html +NO_ARCH= yes +NO_BUILD= yes PORTDOCS= *.html *.png PORTEXAMPLES= en/0000-00-00-000000.txt ja/0000-00-00-000000.txt OPTIONS_DEFINE= DOCS EXAMPLES -NO_ARCH= yes - do-install: - cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \ + cd ${WRKSRC} && ${INSTALL_DATA} *.el \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: diff --git a/deskutils/howm/pkg-message b/deskutils/howm/pkg-message index 9f39dee983ee..41c61dc0da5d 100644 --- a/deskutils/howm/pkg-message +++ b/deskutils/howm/pkg-message @@ -1,11 +1,10 @@ [ { type: install message: <0:lang/clojure-mode.el@${EMACS_FLAVOR} \ - dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \ - epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \ - pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR} +RUN_DEPENDS= clojure-mode.el>0:lang/clojure-mode.el \ + dash.el>0:devel/dash.el \ + epl.el>0:devel/epl.el \ + pkg-info.el>0:devel/pkg-info.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= clojure-emacs GH_PROJECT= cider +CONFLICTS_INSTALL= clojure-cider-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index f013bc2be4fc..9da6ce4c813a 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -38,7 +38,6 @@ EMACS_DESC= Emacs plugin VIM_DESC= Vim plugin EMACS_USES= emacs -EMACS_NO_DEPENDS= yes post-extract: ${RM} -r ${WRKSRC}/bundles/stdcompat/stdcompat-current diff --git a/devel/cond-let/Makefile b/devel/cond-let/Makefile index 681cdf74e363..a4d5b6a7e8d5 100644 --- a/devel/cond-let/Makefile +++ b/devel/cond-let/Makefile @@ -1,8 +1,8 @@ PORTNAME= cond-let DISTVERSIONPREFIX= v DISTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= jrm@FreeBSD.org COMMENT= Additional and improved binding conditionals in Emacs Lisp @@ -11,25 +11,26 @@ WWW= https://github.com/tarsius/cond-let LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= tarsius +CONFLICTS_INSTALL= cond-let-emacs_* + NO_ARCH= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/cond-let-autoloads.el \ - ${EMACS_VERSION_SITE_LISPDIR}/cond-let.el \ - ${EMACS_VERSION_SITE_LISPDIR}/cond-let.elc +PLIST_FILES= ${EMACS_SITE_LISPDIR}/cond-let-autoloads.el \ + ${EMACS_SITE_LISPDIR}/cond-let.el PORTDOCS= README.org OPTIONS_DEFINE= DOCS -ELISP_FILES= cond-let-autoloads.el cond-let.el cond-let.elc +ELISP_FILES= cond-let-autoloads.el cond-let.el do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\//} \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile index 04c1cc1f74e6..f2772a9ae6e7 100644 --- a/devel/dash.el/Makefile +++ b/devel/dash.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= dash.el DISTVERSION= 2.20.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Modern list library for Emacs @@ -15,17 +14,15 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= magnars -NO_ARCH= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/dash.el \ - ${EMACS_VERSION_SITE_LISPDIR}/dash.elc +CONFLICTS_INSTALL= dash.el-emacs_* -do-build: - (cd ${WRKSRC} \ - && ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile dash.el) +NO_ARCH= yes +NO_BUILD= yes +PLIST_FILES= ${EMACS_SITE_LISPDIR}/dash.el do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} dash.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}) + ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} dash.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}) .include diff --git a/devel/distel/Makefile b/devel/distel/Makefile index 82b12d9fc574..bb2ebe84d725 100644 --- a/devel/distel/Makefile +++ b/devel/distel/Makefile @@ -1,8 +1,7 @@ PORTNAME= distel PORTVERSION= 4.1.1 -PORTREVISION= 20 +PORTREVISION= 22 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= erlang@FreeBSD.org COMMENT= Distel extends Emacs Lisp with Erlang-style message passing @@ -16,10 +15,12 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= massemanet -PLIST_SUB= VERSION="${PORTVERSION}" +CONFLICTS_INSTALL= distel-emacs_* NO_ARCH= yes +PLIST_SUB= VERSION="${PORTVERSION}" + DISTEL_DOCS= AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session DISTEL_ROOT= ${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION} diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile index d4ea55542a4e..e711faab2566 100644 --- a/devel/epl.el/Makefile +++ b/devel/epl.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= epl.el PORTVERSION= 0.8 -PORTREVISION= 20 +PORTREVISION= 22 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Emacs Package Library @@ -15,6 +14,8 @@ USE_GITHUB= yes GH_ACCOUNT= cask GH_PROJECT= epl +CONFLICTS_INSTALL= epl.el-emacs_* + NO_BUILD= yes PLIST_FILES= ${EMACS_SITE_LISPDIR}/epl.el diff --git a/devel/forge/Makefile b/devel/forge/Makefile index 8963c3fb9fef..dba34777c89d 100644 --- a/devel/forge/Makefile +++ b/devel/forge/Makefile @@ -1,8 +1,8 @@ PORTNAME= forge DISTVERSIONPREFIX= v DISTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Work with Git forges from the comfort of Magit @@ -11,38 +11,22 @@ WWW= https://github.com/magit/forge LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= closql${EMACS_PKGNAMESUFFIX}>=2.3:databases/closql@${EMACS_FLAVOR} \ - compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.2:devel/cond-let@${EMACS_FLAVOR} \ - emacsql${EMACS_PKGNAMESUFFIX}>=4.3.1:databases/emacsql@${EMACS_FLAVOR} \ - ghub${EMACS_PKGNAMESUFFIX}>=5.0:devel/ghub@${EMACS_FLAVOR} \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0:devel/llama.el@${EMACS_FLAVOR} \ - magit${EMACS_PKGNAMESUFFIX}>=4.4:devel/magit@${EMACS_FLAVOR} \ - markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.7:textproc/markdown-mode.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.10:devel/transient@${EMACS_FLAVOR} \ - yaml.el${EMACS_PKGNAMESUFFIX}>=1.2.0:textproc/yaml.el@${EMACS_FLAVOR} -RUN_DEPENDS= closql${EMACS_PKGNAMESUFFIX}>=2.3:databases/closql@${EMACS_FLAVOR} \ - compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.2:devel/cond-let@${EMACS_FLAVOR} \ - emacsql${EMACS_PKGNAMESUFFIX}>=4.3.1:databases/emacsql@${EMACS_FLAVOR} \ - ghub${EMACS_PKGNAMESUFFIX}>=5.0:devel/ghub@${EMACS_FLAVOR} \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0:devel/llama.el@${EMACS_FLAVOR} \ - magit${EMACS_PKGNAMESUFFIX}>=4.4:devel/magit@${EMACS_FLAVOR} \ - markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.7:textproc/markdown-mode.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.10:devel/transient@${EMACS_FLAVOR} \ - yaml.el${EMACS_PKGNAMESUFFIX}>=1.2.0:textproc/yaml.el@${EMACS_FLAVOR} +RUN_DEPENDS= closql>=2.3:databases/closql \ + compat.el>=30.1.0.0:misc/compat.el \ + cond-let>=0.2:devel/cond-let \ + emacsql>=4.3.1:databases/emacsql \ + ghub>=5.0:devel/ghub \ + llama.el>=1.0:devel/llama.el \ + magit>=4.4:devel/magit \ + markdown-mode.el>=2.7:textproc/markdown-mode.el \ + transient>=0.10:devel/transient \ + yaml.el>=1.2.0:textproc/yaml.el -USES= emacs gmake makeinfo +USES= emacs:build gmake makeinfo USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= INSTALL_INFO=install-info \ - LOAD_PATH="${LOAD_PATH}" -# Parallel build fails if Emacs is built with native compilation enabled -MAKE_JOBS_UNSAFE= yes -ALL_TARGET= lisp info - -CONFLICTS_INSTALL= forge-devel* +CONFLICTS_INSTALL= forge-emacs_* NO_ARCH= yes @@ -55,24 +39,24 @@ OPTIONS_SUB= yes PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed -DOCS_ALL_TARGET= html -DOCS_BINARY_ALIAS= sed=gsed PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build -PDF_ALL_TARGET= pdf -LOAD_PATH= -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit +do-build: + ${GMAKE} -C ${WRKSRC}/lisp autoloads + ${GMAKE} -C ${WRKSRC}/docs info + +do-build-DOCS-on: + ${GMAKE} -C ${WRKSRC}/docs html + +do-build-PDF-on: + ${GMAKE} -C ${WRKSRC}/docs pdf do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} do-install-DOCS-on: diff --git a/devel/forge/files/patch-docs_Makefile b/devel/forge/files/patch-docs_Makefile index aa21316d8c9d..4e664471eb49 100644 --- a/devel/forge/files/patch-docs_Makefile +++ b/devel/forge/files/patch-docs_Makefile @@ -1,6 +1,20 @@ ---- docs/Makefile.orig 2022-03-07 17:47:08 UTC +--- docs/Makefile.orig 2025-11-01 21:28:16 UTC +++ docs/Makefile -@@ -50,7 +50,7 @@ html-dir: $(PKG).texi +@@ -50,19 +50,19 @@ HTML_FIXUP_MENU = '/<\/body>/i
=${PORTVERSION}:devel/libtextstyle LIB_DEPENDS= libtextstyle.so:devel/libtextstyle -USES= cpe emacs:build tar:xz +USES= cpe emacs tar:xz CPE_VENDOR= gnu CPE_PRODUCT= gettext -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-emacs --without-git ac_cv_lib_rt_sched_yield=no -INSTALL_TARGET= install +NO_ARCH= yes +NO_BUILD= yes -BUILD_WRKSRC= ${WRKSRC}/emacs -INSTALL_WRKSRC= ${BUILD_WRKSRC} WRKSRC_SUBDIR= gettext-tools -PLIST_SUB= PORTVERSION=${PORTVERSION} VERSION=${PORTVERSION} +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/emacs/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/devel/gettext-po-mode/pkg-plist b/devel/gettext-po-mode/pkg-plist index d7fb3bd02c9d..1bdf0941daa2 100644 --- a/devel/gettext-po-mode/pkg-plist +++ b/devel/gettext-po-mode/pkg-plist @@ -1,6 +1,3 @@ %%EMACS_SITE_LISPDIR%%/po-compat.el -%%EMACS_SITE_LISPDIR%%/po-compat.elc %%EMACS_SITE_LISPDIR%%/po-mode.el -%%EMACS_SITE_LISPDIR%%/po-mode.elc %%EMACS_SITE_LISPDIR%%/start-po.el -%%EMACS_SITE_LISPDIR%%/start-po.elc diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile index 26d80f6d4a40..ada73c2b0730 100644 --- a/devel/ghub/Makefile +++ b/devel/ghub/Makefile @@ -1,8 +1,8 @@ PORTNAME= ghub DISTVERSIONPREFIX= v DISTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= jrm@FreeBSD.org COMMENT= Client libraries for the APIs of various Git forges @@ -11,22 +11,22 @@ WWW= https://github.com/magit/ghub LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0:devel/llama.el@${EMACS_FLAVOR} \ - treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0:devel/llama.el@${EMACS_FLAVOR} \ - treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR} +BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + llama.el>=1.0:devel/llama.el \ + treepy.el>=0.1.2:devel/treepy.el +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + llama.el>=1.0:devel/llama.el \ + treepy.el>=0.1.2:devel/treepy.el -USES= emacs gmake makeinfo +USES= emacs:build gmake makeinfo USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ARGS= LOAD_PATH=" -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ." +MAKE_ARGS= LOAD_PATH=" -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat -L ." MAKE_JOBS_UNSAFE= yes ALL_TARGET= lisp info -CONFLICTS_INSTALL= ghub-emacs* +CONFLICTS_INSTALL= ghub-emacs_* NO_ARCH= yes @@ -46,14 +46,12 @@ PDF_USE= TEX=dvipdfmx:build PDF_ALL_TARGET= pdf PDF_PLIST_FILES= ${DOCSDIR}/ghub.pdf -ELISP_FILES= ghub-autoloads.el ghub-graphql.el ghub-graphql.elc \ - ghub-legacy.el ghub-legacy.elc ghub.el ghub.elc gsexp.el \ - gsexp.elc +ELISP_FILES= ghub-autoloads.el ghub-graphql.el ghub-legacy.el ghub.el gsexp.el do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} ${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} do-install-DOCS-on: diff --git a/devel/ghub/pkg-plist b/devel/ghub/pkg-plist index 532712139f63..6492fec526cd 100644 --- a/devel/ghub/pkg-plist +++ b/devel/ghub/pkg-plist @@ -1,9 +1,5 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-autoloads.el -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-graphql.el -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-graphql.elc -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-legacy.el -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-legacy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub.el -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub.elc -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/gsexp.el -%%EMACS_VERSION_SITE_LISPDIR%%/ghub/gsexp.elc +%%EMACS_SITE_LISPDIR%%/ghub/ghub-autoloads.el +%%EMACS_SITE_LISPDIR%%/ghub/ghub-graphql.el +%%EMACS_SITE_LISPDIR%%/ghub/ghub-legacy.el +%%EMACS_SITE_LISPDIR%%/ghub/ghub.el +%%EMACS_SITE_LISPDIR%%/ghub/gsexp.el diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile index d056753f7d3e..2565a64437f3 100644 --- a/devel/git-modes/Makefile +++ b/devel/git-modes/Makefile @@ -1,9 +1,9 @@ PORTNAME= git-modes DISTVERSIONPREFIX= v DISTVERSION= 1.4.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= GNU Emacs modes for Git-related files @@ -12,16 +12,17 @@ WWW= https://github.com/magit/git-modes LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ +BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ git:devel/git -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" -MAKE_JOBS_UNSAFE= yes +ALL_TARGET= autoloads + +CONFLICTS_INSTALL= git-modes-emacs_* NO_ARCH= yes @@ -30,12 +31,11 @@ PORTDOCS= README.org OPTIONS_DEFINE= DOCS -ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +ELISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ - ${STAGEDIR}${PREFIX}/${ELISPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${ELISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/git-modes/pkg-plist b/devel/git-modes/pkg-plist index c5e0995399a5..e379c7911436 100644 --- a/devel/git-modes/pkg-plist +++ b/devel/git-modes/pkg-plist @@ -1,9 +1,5 @@ %%ELISPDIR%%/git-modes-autoloads.el %%ELISPDIR%%/git-modes.el -%%ELISPDIR%%/git-modes.elc %%ELISPDIR%%/gitattributes-mode.el -%%ELISPDIR%%/gitattributes-mode.elc %%ELISPDIR%%/gitconfig-mode.el -%%ELISPDIR%%/gitconfig-mode.elc %%ELISPDIR%%/gitignore-mode.el -%%ELISPDIR%%/gitignore-mode.elc diff --git a/devel/go-mode.el/Makefile b/devel/go-mode.el/Makefile index fe87501d29fc..d0c8aeabbeb2 100644 --- a/devel/go-mode.el/Makefile +++ b/devel/go-mode.el/Makefile @@ -11,7 +11,6 @@ WWW= https://github.com/dominikh/go-mode.el LICENSE= BSD3CLAUSE USES= emacs -EMACS_NO_DEPENDS= yes USE_GITHUB= yes GH_ACCOUNT= dominikh diff --git a/devel/llama.el/Makefile b/devel/llama.el/Makefile index ee248e849fb8..f1919fa3156f 100644 --- a/devel/llama.el/Makefile +++ b/devel/llama.el/Makefile @@ -1,8 +1,8 @@ PORTNAME= llama.el DISTVERSIONPREFIX= v DISTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= jrm@FreeBSD.org COMMENT= Compact syntax for short lambda in Emacs Lisp @@ -11,32 +11,34 @@ WWW= https://github.com/tarsius/llama LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= tarsius GH_PROJECT= llama -MAKE_ARGS= LOAD_PATH=" -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ." +MAKE_ARGS= LOAD_PATH=" -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ." MAKE_JOBS_UNSAFE= Opening input file: No such file or directory, /wrkdirs/usr/ports/devel/llama.el/work-nox/llama-0.6.0/.#llama-autoloads.el +CONFLICTS_INSTALL= llama.el-emacs_* + NO_ARCH= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/llama-autoloads.el \ - ${EMACS_VERSION_SITE_LISPDIR}/llama.el \ - ${EMACS_VERSION_SITE_LISPDIR}/llama.elc + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/llama-autoloads.el \ + ${EMACS_SITE_LISPDIR}/llama.el PORTDOCS= README.org OPTIONS_DEFINE= DOCS -ELISP_FILES= llama-autoloads.el llama.el llama.elc +ELISP_FILES= llama-autoloads.el llama.el do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\//} \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/lua-mode/Makefile b/devel/lua-mode/Makefile index a2e4e0233b24..95e833853f30 100644 --- a/devel/lua-mode/Makefile +++ b/devel/lua-mode/Makefile @@ -1,9 +1,8 @@ PORTNAME= lua-mode PORTVERSION= 20210802 -PORTREVISION= 11 DISTVERSIONPREFIX=v +PORTREVISION= 12 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= se@FreeBSD.org COMMENT= Minor mode for LUA @@ -17,6 +16,8 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= immerrr +CONFLICTS_INSTALL= lua-mode-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 0a46f2652017..6b49471a0a26 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -1,9 +1,8 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 4.5.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= jrm@FreeBSD.org COMMENT= Interface to Git for Emacs @@ -12,34 +11,34 @@ WWW= https://magit.vc/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.1:devel/cond-let@${EMACS_FLAVOR} \ +BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + cond-let>=0.1:devel/cond-let \ git:devel/git \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0.0:devel/llama.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.10.0:devel/transient@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=3.4.4:editors/with-editor@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.1:devel/cond-let@${EMACS_FLAVOR} \ + llama.el>=1.0.0:devel/llama.el \ + transient>=0.10.0:devel/transient \ + with-editor>=3.4.4:editors/with-editor +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + cond-let>=0.1:devel/cond-let \ git:devel/git \ - llama.el${EMACS_PKGNAMESUFFIX}>=1.0.0:devel/llama.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.10.0:devel/transient@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=3.4.4:editors/with-editor@${EMACS_FLAVOR} + llama.el>=1.0.0:devel/llama.el \ + transient>=0.10.0:devel/transient \ + with-editor>=3.4.4:editors/with-editor -USES= emacs gmake makeinfo +USES= emacs:build gmake makeinfo USE_GITHUB= yes MAKE_ENV+= docdir=${DOCSDIR} \ infodir=${PREFIX}/${INFO_PATH} \ INSTALL_INFO=install-info \ lispdir=${PREFIX}/${ELISPDIR} \ - LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" \ + LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat" \ VERSION=${PORTVERSION} # Parallel build fails if Emacs is built with native compilation enabled MAKE_JOBS_UNSAFE= yes -ALL_TARGET= lisp info -INSTALL_TARGET= install-lisp install-info +#ALL_TARGET= lisp info +#INSTALL_TARGET= install-lisp install-info -CONFLICTS_INSTALL= magit-devel-emacs* +CONFLICTS_INSTALL= magit-emacs_* NO_ARCH= yes @@ -60,7 +59,20 @@ PDF_USES= tex PDF_USE= TEX=dvipdfmx:build PDF_ALL_TARGET= pdf -ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +ELISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} + +do-build: + ${GMAKE} -C ${WRKSRC}/lisp autoloads versionlib + ${GMAKE} -C ${WRKSRC}/docs info + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} + ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ + ${STAGEDIR}${PREFIX}/${ELISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/info + ${INSTALL_DATA} ${WRKSRC}/docs/magit.info \ + ${WRKSRC}/docs/magit-section.info \ + ${STAGEDIR}${PREFIX}/share/info do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes diff --git a/devel/magit/pkg-message b/devel/magit/pkg-message deleted file mode 100644 index c9bce0ac8361..000000000000 --- a/devel/magit/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <=0:devel/p5-Devel-Size \ USES= emacs gmake makeinfo perl5 USE_PERL5= configure -CONFIGURE_ARGS+= --emacs ${EMACS_CMD} --lisp ${PREFIX}/${EMACS_SITE_LISPDIR}/sepia --info ${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS+= --lisp ${PREFIX}/${EMACS_SITE_LISPDIR}/sepia --info ${PREFIX}/${INFO_PATH} + +CONFLICTS_INSTALL= p5-Sepia-emacs_* + +NO_ARCH= yes INFO= sepia diff --git a/devel/p5-Sepia/pkg-plist b/devel/p5-Sepia/pkg-plist index 9f8fb54402f7..cacb1f2956b7 100644 --- a/devel/p5-Sepia/pkg-plist +++ b/devel/p5-Sepia/pkg-plist @@ -13,6 +13,3 @@ bin/sepl %%EMACS_SITE_LISPDIR%%/sepia/sepia-tree.el %%EMACS_SITE_LISPDIR%%/sepia/sepia-w3m.el %%EMACS_SITE_LISPDIR%%/sepia/sepia.el -%%EMACS_SITE_LISPDIR%%/sepia/sepia-cpan.elc -%%EMACS_SITE_LISPDIR%%/sepia/sepia-ido.elc -%%EMACS_SITE_LISPDIR%%/sepia/sepia-tree.elc diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile index 0788e820c035..71d16744cbf2 100644 --- a/devel/pkg-info.el/Makefile +++ b/devel/pkg-info.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= pkg-info.el PORTVERSION= 0.6 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Provide information about Emacs packages @@ -14,6 +13,8 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= lunaryorn +CONFLICTS_INSTALL= pkg-info.el-emacs_* + NO_ARCH= yes NO_BUILD= yes PLIST_FILES= ${EMACS_SITE_LISPDIR}/pkg-info.el diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index f6ab01bc3850..304f38738f6a 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -1,9 +1,8 @@ PORTNAME= psvn PORTVERSION= 20150720.214200 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= devel elisp MASTER_SITES= http://www.xsteve.at/prg/emacs/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= psvn.el EXTRACT_SUFX= # empty @@ -21,18 +20,19 @@ RUN_DEPENDS= svn:devel/subversion USES= emacs -NO_WRKSUBDIR= yes +CONFLICTS_INSTALL= psvn-emacs_* + EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= ${WRKSRC}/psvn.el +NO_ARCH= yes +NO_BUILD= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}/psvn.el \ - ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}/psvn.elc +NO_WRKSUBDIR= yes -ELISPDIR= ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME}/psvn.el -do-build: - (cd ${WRKSRC} && ${EMACS_CMD} -batch -q -f batch-byte-compile psvn.el) +ELISPDIR= ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} do-install: @${MKDIR} ${ELISPDIR} diff --git a/devel/psvn/pkg-message b/devel/psvn/pkg-message index 648032ace712..4e1b41366ecf 100644 --- a/devel/psvn/pkg-message +++ b/devel/psvn/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: < diff --git a/devel/transient/Makefile b/devel/transient/Makefile index 06acb3c7cfd6..a99162e78909 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -1,8 +1,8 @@ PORTNAME= transient DISTVERSIONPREFIX= v DISTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= freebsd@dev.thsi.be COMMENT= Emacs key and popup interface for complex keybindings @@ -11,25 +11,26 @@ WWW= https://github.com/magit/transient LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -_BR_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \ - cond-let${EMACS_PKGNAMESUFFIX}>=0.2:devel/cond-let@${EMACS_FLAVOR} +_BR_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + cond-let>=0.2:devel/cond-let BUILD_DEPENDS= ${_BR_DEPENDS} RUN_DEPENDS= ${_BR_DEPENDS} -USES= emacs gmake +USES= emacs:build gmake USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV= LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat \ - -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" +MAKE_ENV= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat \ + -L ${PREFIX}/${EMACS_SITE_LISPDIR}" MAKE_JOBS_UNSAFE= yes ALL_TARGET= lisp +CONFLICTS_INSTALL= transient-emacs_* + NO_ARCH= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/transient-autoloads.el \ - ${EMACS_VERSION_SITE_LISPDIR}/transient.el \ - ${EMACS_VERSION_SITE_LISPDIR}/transient.elc +PLIST_FILES= ${EMACS_SITE_LISPDIR}/transient-autoloads.el \ + ${EMACS_SITE_LISPDIR}/transient.el PORTDOCS= CHANGELOG README.org transient.html OPTIONS_DEFINE= DOCS INFO PDF @@ -56,9 +57,9 @@ PDF_BINARY_ALIAS= sed=gsed PDF_PLIST_FILES= ${DOCSDIR}/transient.pdf do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/treepy.el/Makefile b/devel/treepy.el/Makefile index accd7e3ddd27..c84934ffc5f7 100644 --- a/devel/treepy.el/Makefile +++ b/devel/treepy.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= treepy.el DISTVERSION= 0.1.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Generic tree traversing tools for Emacs Lisp @@ -15,22 +14,21 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= volrath +CONFLICTS_INSTALL= treepy.el-emacs_* + NO_ARCH= yes +NO_BUILD= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/treepy.el \ - ${EMACS_VERSION_SITE_LISPDIR}/treepy.elc - -OPTIONS_DEFINE= DOCS +PLIST_FILES= ${EMACS_SITE_LISPDIR}/treepy.el PORTDOCS= README.md -do-build: - (cd ${WRKSRC} ; ${EMACS_CMD} -batch -q -f batch-byte-compile treepy.el) +OPTIONS_DEFINE= DOCS do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/treepy.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/treepy.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/editors/apel/Makefile b/editors/apel/Makefile index d5599fa5b72e..bcc6350e9651 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -1,7 +1,7 @@ PORTNAME= apel PORTVERSION= 10.8.${SNAPDATE} +PORTREVISION= 2 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Portable Emacs Library @@ -9,21 +9,24 @@ WWW= https://github.com/wanderlust/apel LICENSE= GPLv2 -USES= emacs +USES= emacs:build USE_GITHUB= yes GH_ACCOUNT= wanderlust GH_TAGNAME= 2383abf SNAPDATE= 20250531 -NO_ARCH= yes -ALL_TARGET= elc -MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" \ - LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ - VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" +CONFLICTS_INSTALL= apel-emacs_* + +NO_ARCH= yes +NO_BUILD= yes OPTIONS_DEFINE= DOCS +MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" \ + LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \ + VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/apel/files/patch-Makefile b/editors/apel/files/patch-Makefile new file mode 100644 index 000000000000..765e8bac4d6b --- /dev/null +++ b/editors/apel/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2026-03-23 15:52:37 UTC ++++ Makefile +@@ -31,7 +31,7 @@ elc: + $(EMACS) $(FLAGS) -f compile-apel \ + $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) + +-install: elc ++install: + $(EMACS) $(FLAGS) -f install-apel \ + $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) # $(MAKE) + diff --git a/editors/apel/pkg-plist b/editors/apel/pkg-plist index 9ae7d1865fc5..4e33cc5ada64 100644 --- a/editors/apel/pkg-plist +++ b/editors/apel/pkg-plist @@ -1,58 +1,30 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el -%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc -%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el -%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc -%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el -%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc -%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el -%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc -%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el -%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-23.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-23.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el -%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc +%%EMACS_SITE_LISPDIR%%/apel/alist.el +%%EMACS_SITE_LISPDIR%%/apel/calist.el +%%EMACS_SITE_LISPDIR%%/apel/filename.el +%%EMACS_SITE_LISPDIR%%/apel/install.el +%%EMACS_SITE_LISPDIR%%/apel/path-util.el +%%EMACS_SITE_LISPDIR%%/emu/apel-ver.el +%%EMACS_SITE_LISPDIR%%/emu/broken.el +%%EMACS_SITE_LISPDIR%%/emu/emu.el +%%EMACS_SITE_LISPDIR%%/emu/inv-23.el +%%EMACS_SITE_LISPDIR%%/emu/invisible.el +%%EMACS_SITE_LISPDIR%%/emu/mcharset.el +%%EMACS_SITE_LISPDIR%%/emu/mcs-20.el +%%EMACS_SITE_LISPDIR%%/emu/mcs-e20.el +%%EMACS_SITE_LISPDIR%%/emu/mule-caesar.el +%%EMACS_SITE_LISPDIR%%/emu/pccl.el +%%EMACS_SITE_LISPDIR%%/emu/pccl-20.el +%%EMACS_SITE_LISPDIR%%/emu/pces.el +%%EMACS_SITE_LISPDIR%%/emu/pces-20.el +%%EMACS_SITE_LISPDIR%%/emu/pces-e20.el +%%EMACS_SITE_LISPDIR%%/emu/pcustom.el +%%EMACS_SITE_LISPDIR%%/emu/poe.el +%%EMACS_SITE_LISPDIR%%/emu/poem.el +%%EMACS_SITE_LISPDIR%%/emu/poem-e20.el +%%EMACS_SITE_LISPDIR%%/emu/poem-e20_3.el +%%EMACS_SITE_LISPDIR%%/emu/product.el +%%EMACS_SITE_LISPDIR%%/emu/pym.el +%%EMACS_SITE_LISPDIR%%/emu/richtext.el +%%EMACS_SITE_LISPDIR%%/emu/static.el %%PORTDOCS%%%%DOCSDIR%%/README.en %%PORTDOCS%%%%DOCSDIR%%/README.ja diff --git a/editors/consult.el/Makefile b/editors/consult.el/Makefile index 535dce7c46df..7b1ea38df7dc 100644 --- a/editors/consult.el/Makefile +++ b/editors/consult.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= consult.el DISTVERSION= 2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= pat@patmaddox.com COMMENT= Consulting completing-read @@ -11,25 +10,25 @@ WWW= https://github.com/minad/consult LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= minad GH_PROJECT= consult +CONFLICTS_INSTALL= consult.el-emacs_* + NO_ARCH= yes +NO_BUILD= yes ELISP_FILES= ${WRKSRC}/*.el OPTIONS_DEFINE= DOCS -do-build: - ${EMACS_CMD} -q --batch -L ${WRKSRC} -f batch-byte-compile ${ELISP_FILES} - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/consult - ${INSTALL_DATA} ${ELISP_FILES} ${ELISP_FILES:S/.el$$/.elc/} \ + ${INSTALL_DATA} ${ELISP_FILES} \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/consult post-install-DOCS-on: diff --git a/editors/consult.el/pkg-plist b/editors/consult.el/pkg-plist index f113d6d2e56c..2842ca03f04e 100644 --- a/editors/consult.el/pkg-plist +++ b/editors/consult.el/pkg-plist @@ -1,19 +1,10 @@ %%EMACS_SITE_LISPDIR%%/consult/consult-compile.el -%%EMACS_SITE_LISPDIR%%/consult/consult-compile.elc %%EMACS_SITE_LISPDIR%%/consult/consult-flymake.el -%%EMACS_SITE_LISPDIR%%/consult/consult-flymake.elc %%EMACS_SITE_LISPDIR%%/consult/consult-imenu.el -%%EMACS_SITE_LISPDIR%%/consult/consult-imenu.elc %%EMACS_SITE_LISPDIR%%/consult/consult-info.el -%%EMACS_SITE_LISPDIR%%/consult/consult-info.elc %%EMACS_SITE_LISPDIR%%/consult/consult-kmacro.el -%%EMACS_SITE_LISPDIR%%/consult/consult-kmacro.elc %%EMACS_SITE_LISPDIR%%/consult/consult-org.el -%%EMACS_SITE_LISPDIR%%/consult/consult-org.elc %%EMACS_SITE_LISPDIR%%/consult/consult-register.el -%%EMACS_SITE_LISPDIR%%/consult/consult-register.elc %%EMACS_SITE_LISPDIR%%/consult/consult-xref.el -%%EMACS_SITE_LISPDIR%%/consult/consult-xref.elc %%EMACS_SITE_LISPDIR%%/consult/consult.el -%%EMACS_SITE_LISPDIR%%/consult/consult.elc %%PORTDOCS%%%%DOCSDIR%%/README.org diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 61b10a9584d8..ff4c80ee2efe 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -64,7 +64,7 @@ CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no CONFLICTS_INSTALL= emacs emacs-canna emacs-nox -SUB_FILES= pkg-message sources.el +SUB_FILES= default.el pkg-message site-start.el SUB_LIST= EMACS_VER=${DISTVERSION:R} \ NATIVECOMP_COMMENT_END=${NATIVECOMP_COMMENT_END} \ NATIVECOMP_COMMENT_START=${NATIVECOMP_COMMENT_START} @@ -89,9 +89,6 @@ OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \ NATIVECOMP OSS PGTK PNG SCROLLBARS SOURCES \ SQLITE3 SVG THREADS TIFF TREESITTER WEBP XML -OPTIONS_EXCLUDE_powerpc= NATIVECOMP -OPTIONS_EXCLUDE_powerpc64= NATIVECOMP -OPTIONS_EXCLUDE_powerpc64le= NATIVECOMP OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT @@ -105,6 +102,9 @@ OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ XIM XPM XWIDGETS .endif OPTIONS_EXCLUDE_armv7= NATIVECOMP +OPTIONS_EXCLUDE_powerpc= NATIVECOMP +OPTIONS_EXCLUDE_powerpc64= NATIVECOMP +OPTIONS_EXCLUDE_powerpc64le= NATIVECOMP OPTIONS_SUB= YES ACL_DESC= Access control list support @@ -274,6 +274,7 @@ pre-configure: post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd @(cd ${STAGEDIR}${PREFIX} && ${FIND} libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}/ -name emacs-*.pdmp >> ${TMPPLIST}) + ${INSTALL_DATA} ${WRKDIR}/default.el ${WRKDIR}/site-start.el ${STAGEDIR}${DATADIR}/site-lisp/ post-install-MAILUTILS-on: ${LN} -sf ${PREFIX}/bin/movemail \ @@ -288,6 +289,5 @@ post-install-NATIVECOMP-on: post-install-SOURCES-on: @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src - ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el .include diff --git a/editors/emacs-devel/files/default.el.in b/editors/emacs-devel/files/default.el.in new file mode 100644 index 000000000000..9581262d561e --- /dev/null +++ b/editors/emacs-devel/files/default.el.in @@ -0,0 +1,155 @@ +;;; default.el --- Site-wide Initialization -*- lexical-binding: t -*- + +;; Installed by editors/emacs and editors/emacs-devel. +;; +;; This file depends on variables defined in site-start.el, and is loaded after +;; the user's init file in the Emacs initialization sequence. +;; +;; FreeBSD elisp (USES=emacs) ports only install .el source files under +;; %%PREFIX%%/share/emacs/site-lisp/. This file arranges for those files to be +;; compiled and cached per-user, following the same pattern used by ELPA. No +;; root privileges are required after package installation. +;; +;; For Emacs builds with native compilation: .eln files are cached in +;; ~/.emacs.d/eln-cache/ by Emacs's existing machinery. +;; +;; For Emacs builds without native compilation: .elc files are cached in +;; ~/.emacs.d/freebsd-elc-cache/, with the cache directory prepended to +;; load-path so compiled files take precedence over .el source. +;; +;; To disable native compilation of all third-party elisp, including FreeBSD +;; ports elisp and ELPA packages, set `native-comp-jit-compilation' to nil. +;; +;; To disable byte-compilation of ports elisp (non-native-compilation builds +;; only), set `freebsd-inhibit-byte-compile' to t. + +;;; Code: + +(defun freebsd--elc-cache-dest (el-file) + "Map EL-FILE under `freebsd-site-lisp-dir' to its cache path. +The subdirectory structure of `freebsd-site-lisp-dir' is mirrored +under `freebsd-elc-cache-dir' to avoid filename collisions across +ports and to allow per-subdirectory load-path entries." + (let* ((relative (file-relative-name el-file freebsd-site-lisp-dir)) + (dest-el (expand-file-name relative freebsd-elc-cache-dir))) + (concat (file-name-sans-extension dest-el) ".elc"))) + +(defun freebsd--elc-cache-valid-p () + "Return non-nil if the elc cache was built by the current Emacs version. +Reads a version stamp file from `freebsd-elc-cache-dir' and compares +it to `emacs-version'. If missing or mismatched, the cache is +considered stale and is cleared." + (let ((stamp (expand-file-name "emacs-version" freebsd-elc-cache-dir))) + (if (file-exists-p stamp) + (string= (with-temp-buffer + (insert-file-contents stamp) + (buffer-string)) + emacs-version) + nil))) + +(defun freebsd--elc-cache-clear () + "Remove all .elc files from `freebsd-elc-cache-dir'." + (when (file-directory-p freebsd-elc-cache-dir) + (dolist (elc (directory-files-recursively + freebsd-elc-cache-dir "\\.elc\\'")) + (delete-file elc)))) + +(defun freebsd--elc-cache-write-stamp () + "Write the current Emacs version to the cache stamp file." + (let ((stamp (expand-file-name "emacs-version" freebsd-elc-cache-dir))) + (with-temp-file stamp + (insert emacs-version)))) + +(defun freebsd--setup-byte-compile-cache () + "Set up the byte-compilation cache and prepend it to `load-path'. +Creates `freebsd-elc-cache-dir' mirroring the subdirectory structure +of `freebsd-site-lisp-dir', then prepends the cache root and all +subdirectories to `load-path' so cached .elc files take precedence +over .el source files." + (make-directory freebsd-elc-cache-dir t) + (when (file-directory-p freebsd-site-lisp-dir) + (dolist (dir (directory-files freebsd-site-lisp-dir t "^[^.]")) + (when (file-directory-p dir) + (make-directory + (expand-file-name + (file-relative-name dir freebsd-site-lisp-dir) + freebsd-elc-cache-dir) + t)))) + (add-to-list 'load-path freebsd-elc-cache-dir) + (let ((default-directory freebsd-elc-cache-dir)) + (normal-top-level-add-subdirs-to-load-path))) + +(defun freebsd--byte-compile-site-lisp () + "Byte-compile FreeBSD ports elisp into `freebsd-elc-cache-dir'. +Runs once on an idle timer to avoid blocking Emacs startup. First +removes any stale .elc files whose corresponding .el source no longer +exists in `freebsd-site-lisp-dir', then recompiles any .el files that +are newer than their cached .elc, following the same pattern used +by ELPA." + (run-with-idle-timer + 3 nil + (lambda () + (unless (freebsd--elc-cache-valid-p) + (freebsd--elc-cache-clear)) + (freebsd--elc-cache-write-stamp) + (when (file-directory-p freebsd-elc-cache-dir) + (dolist (elc (directory-files-recursively + freebsd-elc-cache-dir "\\.elc\\'")) + (let* ((relative (file-relative-name elc freebsd-elc-cache-dir)) + (el (expand-file-name + (concat (file-name-sans-extension relative) ".el") + freebsd-site-lisp-dir))) + (unless (file-exists-p el) + (delete-file elc))))) + (dolist (el (directory-files-recursively + freebsd-site-lisp-dir "\\.el\\'")) + (let ((base (file-name-nondirectory el))) + (unless (member base '("site-start.el" "subdirs.el")) + (let ((elc (freebsd--elc-cache-dest el))) + (when (or (not (file-exists-p elc)) + (file-newer-than-file-p el elc)) + (let ((byte-compile-log-level 0) + (byte-compile-dest-file-function + #'freebsd--elc-cache-dest)) + (byte-compile-file el)))))))))) + +(defun freebsd--load-autoloads () + "Load all autoloads 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." + (when (file-directory-p freebsd-site-lisp-dir) + (dolist (autoloads (directory-files-recursively + freebsd-site-lisp-dir + ".*-autoloads\\.el\\'")) + (load autoloads t t)))) + +(defun freebsd--clean-stale-eln-dirs () + "Remove eln-cache subdirectories from previous Emacs builds. +Emacs native compilation writes .eln files into a hash-named subdirectory +of eln-cache specific to the running binary. Old subdirectories from +previous builds are never cleaned up automatically. This function removes +all subdirectories that do not match `comp-native-version-dir'." + (let ((cache-dir (expand-file-name "eln-cache" user-emacs-directory)) + (current-dir comp-native-version-dir)) + (when (file-directory-p cache-dir) + (dolist (dir (directory-files cache-dir t "\\`[^.]")) + (when (and (file-directory-p dir) + (not (string= (file-name-nondirectory dir) current-dir))) + (delete-directory dir t)))))) + +;;; Entry point + +;; When running in batch mode (e.g. during port builds), skip all +;; compilation machinery to avoid interference with the build environment. +(unless noninteractive + (freebsd--load-autoloads) + (if (native-comp-available-p) + (when native-comp-jit-compilation + (freebsd--clean-stale-eln-dirs) + (native-compile-async freebsd-site-lisp-dir 'recursively)) + (unless freebsd-inhibit-byte-compile + (freebsd--setup-byte-compile-cache) + (freebsd--byte-compile-site-lisp)))) + +;;; default.el ends here diff --git a/editors/emacs-devel/files/pkg-message.in b/editors/emacs-devel/files/pkg-message.in index 7d67c2378a22..7c46aa4f0bf0 100644 --- a/editors/emacs-devel/files/pkg-message.in +++ b/editors/emacs-devel/files/pkg-message.in @@ -1,75 +1,20 @@ [ %%NATIVECOMP_COMMENT_START%% -{ type: install - message: <> ${TMPPLIST}) + ${INSTALL_DATA} ${WRKDIR}/default.el ${WRKDIR}/site-start.el ${STAGEDIR}${DATADIR}/site-lisp/ post-install-MAILUTILS-on: ${LN} -sf ${PREFIX}/bin/movemail \ @@ -310,6 +311,5 @@ post-install-NATIVECOMP-on: post-install-SOURCES-on: @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src - ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION}/site-lisp/site-start.el .include diff --git a/editors/emacs/files/default.el.in b/editors/emacs/files/default.el.in new file mode 100644 index 000000000000..9581262d561e --- /dev/null +++ b/editors/emacs/files/default.el.in @@ -0,0 +1,155 @@ +;;; default.el --- Site-wide Initialization -*- lexical-binding: t -*- + +;; Installed by editors/emacs and editors/emacs-devel. +;; +;; This file depends on variables defined in site-start.el, and is loaded after +;; the user's init file in the Emacs initialization sequence. +;; +;; FreeBSD elisp (USES=emacs) ports only install .el source files under +;; %%PREFIX%%/share/emacs/site-lisp/. This file arranges for those files to be +;; compiled and cached per-user, following the same pattern used by ELPA. No +;; root privileges are required after package installation. +;; +;; For Emacs builds with native compilation: .eln files are cached in +;; ~/.emacs.d/eln-cache/ by Emacs's existing machinery. +;; +;; For Emacs builds without native compilation: .elc files are cached in +;; ~/.emacs.d/freebsd-elc-cache/, with the cache directory prepended to +;; load-path so compiled files take precedence over .el source. +;; +;; To disable native compilation of all third-party elisp, including FreeBSD +;; ports elisp and ELPA packages, set `native-comp-jit-compilation' to nil. +;; +;; To disable byte-compilation of ports elisp (non-native-compilation builds +;; only), set `freebsd-inhibit-byte-compile' to t. + +;;; Code: + +(defun freebsd--elc-cache-dest (el-file) + "Map EL-FILE under `freebsd-site-lisp-dir' to its cache path. +The subdirectory structure of `freebsd-site-lisp-dir' is mirrored +under `freebsd-elc-cache-dir' to avoid filename collisions across +ports and to allow per-subdirectory load-path entries." + (let* ((relative (file-relative-name el-file freebsd-site-lisp-dir)) + (dest-el (expand-file-name relative freebsd-elc-cache-dir))) + (concat (file-name-sans-extension dest-el) ".elc"))) + +(defun freebsd--elc-cache-valid-p () + "Return non-nil if the elc cache was built by the current Emacs version. +Reads a version stamp file from `freebsd-elc-cache-dir' and compares +it to `emacs-version'. If missing or mismatched, the cache is +considered stale and is cleared." + (let ((stamp (expand-file-name "emacs-version" freebsd-elc-cache-dir))) + (if (file-exists-p stamp) + (string= (with-temp-buffer + (insert-file-contents stamp) + (buffer-string)) + emacs-version) + nil))) + +(defun freebsd--elc-cache-clear () + "Remove all .elc files from `freebsd-elc-cache-dir'." + (when (file-directory-p freebsd-elc-cache-dir) + (dolist (elc (directory-files-recursively + freebsd-elc-cache-dir "\\.elc\\'")) + (delete-file elc)))) + +(defun freebsd--elc-cache-write-stamp () + "Write the current Emacs version to the cache stamp file." + (let ((stamp (expand-file-name "emacs-version" freebsd-elc-cache-dir))) + (with-temp-file stamp + (insert emacs-version)))) + +(defun freebsd--setup-byte-compile-cache () + "Set up the byte-compilation cache and prepend it to `load-path'. +Creates `freebsd-elc-cache-dir' mirroring the subdirectory structure +of `freebsd-site-lisp-dir', then prepends the cache root and all +subdirectories to `load-path' so cached .elc files take precedence +over .el source files." + (make-directory freebsd-elc-cache-dir t) + (when (file-directory-p freebsd-site-lisp-dir) + (dolist (dir (directory-files freebsd-site-lisp-dir t "^[^.]")) + (when (file-directory-p dir) + (make-directory + (expand-file-name + (file-relative-name dir freebsd-site-lisp-dir) + freebsd-elc-cache-dir) + t)))) + (add-to-list 'load-path freebsd-elc-cache-dir) + (let ((default-directory freebsd-elc-cache-dir)) + (normal-top-level-add-subdirs-to-load-path))) + +(defun freebsd--byte-compile-site-lisp () + "Byte-compile FreeBSD ports elisp into `freebsd-elc-cache-dir'. +Runs once on an idle timer to avoid blocking Emacs startup. First +removes any stale .elc files whose corresponding .el source no longer +exists in `freebsd-site-lisp-dir', then recompiles any .el files that +are newer than their cached .elc, following the same pattern used +by ELPA." + (run-with-idle-timer + 3 nil + (lambda () + (unless (freebsd--elc-cache-valid-p) + (freebsd--elc-cache-clear)) + (freebsd--elc-cache-write-stamp) + (when (file-directory-p freebsd-elc-cache-dir) + (dolist (elc (directory-files-recursively + freebsd-elc-cache-dir "\\.elc\\'")) + (let* ((relative (file-relative-name elc freebsd-elc-cache-dir)) + (el (expand-file-name + (concat (file-name-sans-extension relative) ".el") + freebsd-site-lisp-dir))) + (unless (file-exists-p el) + (delete-file elc))))) + (dolist (el (directory-files-recursively + freebsd-site-lisp-dir "\\.el\\'")) + (let ((base (file-name-nondirectory el))) + (unless (member base '("site-start.el" "subdirs.el")) + (let ((elc (freebsd--elc-cache-dest el))) + (when (or (not (file-exists-p elc)) + (file-newer-than-file-p el elc)) + (let ((byte-compile-log-level 0) + (byte-compile-dest-file-function + #'freebsd--elc-cache-dest)) + (byte-compile-file el)))))))))) + +(defun freebsd--load-autoloads () + "Load all autoloads 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." + (when (file-directory-p freebsd-site-lisp-dir) + (dolist (autoloads (directory-files-recursively + freebsd-site-lisp-dir + ".*-autoloads\\.el\\'")) + (load autoloads t t)))) + +(defun freebsd--clean-stale-eln-dirs () + "Remove eln-cache subdirectories from previous Emacs builds. +Emacs native compilation writes .eln files into a hash-named subdirectory +of eln-cache specific to the running binary. Old subdirectories from +previous builds are never cleaned up automatically. This function removes +all subdirectories that do not match `comp-native-version-dir'." + (let ((cache-dir (expand-file-name "eln-cache" user-emacs-directory)) + (current-dir comp-native-version-dir)) + (when (file-directory-p cache-dir) + (dolist (dir (directory-files cache-dir t "\\`[^.]")) + (when (and (file-directory-p dir) + (not (string= (file-name-nondirectory dir) current-dir))) + (delete-directory dir t)))))) + +;;; Entry point + +;; When running in batch mode (e.g. during port builds), skip all +;; compilation machinery to avoid interference with the build environment. +(unless noninteractive + (freebsd--load-autoloads) + (if (native-comp-available-p) + (when native-comp-jit-compilation + (freebsd--clean-stale-eln-dirs) + (native-compile-async freebsd-site-lisp-dir 'recursively)) + (unless freebsd-inhibit-byte-compile + (freebsd--setup-byte-compile-cache) + (freebsd--byte-compile-site-lisp)))) + +;;; default.el ends here diff --git a/editors/emacs/files/pkg-message.in b/editors/emacs/files/pkg-message.in index 24f92908ca05..7c46aa4f0bf0 100644 --- a/editors/emacs/files/pkg-message.in +++ b/editors/emacs/files/pkg-message.in @@ -1,31 +1,19 @@ [ %%NATIVECOMP_COMMENT_START%% { type: [install, upgrade], message: <0:editors/apel@${EMACS_FLAVOR} -RUN_DEPENDS= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR} +BUILD_DEPENDS= apel>0:editors/apel +RUN_DEPENDS= apel>0:editors/apel -USES= cpe emacs iconv makeinfo +USES= cpe emacs:build iconv makeinfo +CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= wanderlust GH_TAGNAME= 392c29d SNAPDATE= 20251030 -CPE_VENDOR= gnu -NO_ARCH= yes - -ALL_TARGET= elc MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" \ - LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ - VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ + LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \ + VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \ PACKAGE_LISPDIR=NONE +CONFLICTS_INSTALL= flim-emacs_* + +NO_ARCH= yes + INFO= mime-en mime-ja OPTIONS_DEFINE= DOCS -post-build: +do-build: @(cd ${WRKSRC} ; \ for i in mime-en.texi mime-ja.texi; do \ ${MAKEINFO} --no-split --no-validate $${i} ; \ diff --git a/editors/flim/files/patch-Makefile b/editors/flim/files/patch-Makefile new file mode 100644 index 000000000000..25cf10dbd8c3 --- /dev/null +++ b/editors/flim/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2026-03-23 16:22:48 UTC ++++ Makefile +@@ -38,7 +38,7 @@ check: + $(EMACS) $(FLAGS) -f check-flim $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) + +-install: elc ++install: + $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) + diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist index 550f9302ad28..a4dc73065c2e 100644 --- a/editors/flim/pkg-plist +++ b/editors/flim/pkg-plist @@ -1,53 +1,28 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el -%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc +%%EMACS_SITE_LISPDIR%%/flim/eword-decode.el +%%EMACS_SITE_LISPDIR%%/flim/eword-encode.el +%%EMACS_SITE_LISPDIR%%/flim/hmac-sha1.el +%%EMACS_SITE_LISPDIR%%/flim/luna.el +%%EMACS_SITE_LISPDIR%%/flim/lunit.el +%%EMACS_SITE_LISPDIR%%/flim/md5.el +%%EMACS_SITE_LISPDIR%%/flim/mel-g.el +%%EMACS_SITE_LISPDIR%%/flim/mel-q-ccl.el +%%EMACS_SITE_LISPDIR%%/flim/mel-q.el +%%EMACS_SITE_LISPDIR%%/flim/mel-u.el +%%EMACS_SITE_LISPDIR%%/flim/mel.el +%%EMACS_SITE_LISPDIR%%/flim/mime-conf.el +%%EMACS_SITE_LISPDIR%%/flim/mime-def.el +%%EMACS_SITE_LISPDIR%%/flim/mime-parse.el +%%EMACS_SITE_LISPDIR%%/flim/mime.el +%%EMACS_SITE_LISPDIR%%/flim/mmbuffer.el +%%EMACS_SITE_LISPDIR%%/flim/mmcooked.el +%%EMACS_SITE_LISPDIR%%/flim/mmexternal.el +%%EMACS_SITE_LISPDIR%%/flim/mmgeneric.el +%%EMACS_SITE_LISPDIR%%/flim/qmtp.el +%%EMACS_SITE_LISPDIR%%/flim/sasl-scram.el +%%EMACS_SITE_LISPDIR%%/flim/sasl.el +%%EMACS_SITE_LISPDIR%%/flim/sha1.el +%%EMACS_SITE_LISPDIR%%/flim/smtp.el +%%EMACS_SITE_LISPDIR%%/flim/std11.el %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.en %%PORTDOCS%%%%DOCSDIR%%/README.ja diff --git a/editors/marginalia.el/Makefile b/editors/marginalia.el/Makefile index 8f779fef3850..8bb7febb108e 100644 --- a/editors/marginalia.el/Makefile +++ b/editors/marginalia.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= marginalia.el DISTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= pat@patmaddox.com COMMENT= Marginalia in the Emacs minibuffer @@ -11,23 +10,23 @@ WWW= https://github.com/minad/marginalia LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= minad GH_PROJECT= marginalia +CONFLICTS_INSTALL= marginalia.el-emacs_* + NO_ARCH= yes +NO_BUILD= yes OPTIONS_DEFINE= DOCS -do-build: - ${EMACS_CMD} -q --batch -f batch-byte-compile ${WRKSRC}/marginalia.el - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/marginalia.el ${WRKSRC}/marginalia.elc \ + ${INSTALL_DATA} ${WRKSRC}/marginalia.el \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} post-install-DOCS-on: diff --git a/editors/marginalia.el/pkg-plist b/editors/marginalia.el/pkg-plist index f054b1ca4726..934eb13d8a5b 100644 --- a/editors/marginalia.el/pkg-plist +++ b/editors/marginalia.el/pkg-plist @@ -1,3 +1,2 @@ %%EMACS_SITE_LISPDIR%%/marginalia.el -%%EMACS_SITE_LISPDIR%%/marginalia.elc %%PORTDOCS%%%%DOCSDIR%%/README.org diff --git a/editors/orderless.el/Makefile b/editors/orderless.el/Makefile index 257e8c502d7c..9a1510e43bbf 100644 --- a/editors/orderless.el/Makefile +++ b/editors/orderless.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= orderless.el DISTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= pat@patmaddox.com COMMENT= Emacs completion style that matches multiple regexps in any order @@ -11,23 +10,23 @@ WWW= https://github.com/oantolin/orderless LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= oantolin GH_PROJECT= orderless +CONFLICTS_INSTALL= orderless.el-emacs_* + NO_ARCH= yes +NO_BUILD= yes OPTIONS_DEFINE= DOCS -do-build: - ${EMACS_CMD} -q --batch -L ${WRKSRC} -f batch-byte-compile ${WRKSRC}/*.el - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/editors/orderless.el/pkg-plist b/editors/orderless.el/pkg-plist index 5e2866dbb647..758408b9ea46 100644 --- a/editors/orderless.el/pkg-plist +++ b/editors/orderless.el/pkg-plist @@ -1,5 +1,3 @@ %%EMACS_SITE_LISPDIR%%/orderless-kwd.el -%%EMACS_SITE_LISPDIR%%/orderless-kwd.elc %%EMACS_SITE_LISPDIR%%/orderless.el -%%EMACS_SITE_LISPDIR%%/orderless.elc %%PORTDOCS%%%%DOCSDIR%%/README.org diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile index 8f22555f2ae6..b94d28b2a140 100644 --- a/editors/paredit-mode.el/Makefile +++ b/editors/paredit-mode.el/Makefile @@ -1,9 +1,8 @@ PORTNAME= paredit-mode.el PORTVERSION= 24 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= editors elisp MASTER_SITES= http://mumble.net/~campbell/emacs/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= paredit-${PORTVERSION}.el EXTRACT_SUFX= EXTRACT_ONLY= @@ -16,6 +15,8 @@ LICENSE= GPLv3+ USES= emacs +CONFLICTS_INSTALL= paredit-mode.el-emacs_* + NO_BUILD= yes NO_ARCH= yes diff --git a/editors/paredit-mode.el/pkg-message b/editors/paredit-mode.el/pkg-message index 3d7c9431919e..01ff5d0ea47b 100644 --- a/editors/paredit-mode.el/pkg-message +++ b/editors/paredit-mode.el/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: < diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist index 91bcf288c6a5..62fcb197ab69 100644 --- a/editors/psgml/pkg-plist +++ b/editors/psgml/pkg-plist @@ -1,22 +1,12 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/iso88591.map -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-api.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-api.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-charent.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-charent.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-dtd.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-dtd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-edit.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-edit.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-ids.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-ids.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-info.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-info.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-parse.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-sysdep.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-sysdep.elc -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml.el.gz -%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml.elc -%%EMACS_VERSION_SITE_LISPDIR%%/%%PSGML_STARTUPEL%% +%%EMACS_SITE_LISPDIR%%/psgml/iso88591.map +%%EMACS_SITE_LISPDIR%%/psgml/psgml-api.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-charent.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-dtd.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-edit.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-ids.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-info.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-other.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-parse.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml-sysdep.el.gz +%%EMACS_SITE_LISPDIR%%/psgml/psgml.el.gz +%%EMACS_SITE_LISPDIR%%/%%PSGML_STARTUP%% diff --git a/editors/semi/Makefile b/editors/semi/Makefile index d747f22e1368..2732ec12ace1 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -1,7 +1,7 @@ PORTNAME= semi PORTVERSION= ${SEMI_VER}.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs @@ -9,33 +9,34 @@ WWW= https://github.com/wanderlust/semi LICENSE= GPLv2 -BUILD_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} -RUN_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} +BUILD_DEPENDS= flim>0:editors/flim +RUN_DEPENDS= flim>0:editors/flim -USES= emacs iconv makeinfo +USES= emacs:build iconv makeinfo USE_GITHUB= yes GH_ACCOUNT= wanderlust GH_TAGNAME= 5edbb0d SNAPDATE= 20251130 + +CONFLICTS_INSTALL= semi-emacs_* + NO_ARCH= yes FLIM_TRUNK= 1.14 SEMI_VER= ${SEMI_TRUNK}.7 SEMI_TRUNK= 1.14 -ALL_TARGET= elc - MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" \ - LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ - VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${EMACS_VERSION_SITE_LISPDIR}" \ + LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \ + VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${EMACS_SITE_LISPDIR}" \ PACKAGE_LISPDIR=NONE INFO= mime-ui-en mime-ui-ja OPTIONS_DEFINE= DOCS -post-build: +do-build: @(cd ${WRKSRC} ; \ for i in mime-ui-en.texi mime-ui-ja.texi; do \ ${MAKEINFO} --no-split --no-validate $${i} ; \ diff --git a/editors/semi/files/patch-Makefile b/editors/semi/files/patch-Makefile new file mode 100644 index 000000000000..bdf3b35081be --- /dev/null +++ b/editors/semi/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2026-03-23 22:13:54 UTC ++++ Makefile +@@ -33,7 +33,7 @@ elc: + $(EMACS) $(FLAGS) -f compile-semi $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) + +-install-elc: elc ++install-elc: + $(EMACS) $(FLAGS) -f install-semi $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) + diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist index c2144b7fa06d..e6d62866706d 100644 --- a/editors/semi/pkg-plist +++ b/editors/semi/pkg-plist @@ -1,33 +1,19 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-vcard.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc -%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el -%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc +%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.el +%%EMACS_SITE_LISPDIR%%/semi/mime-edit.el +%%EMACS_SITE_LISPDIR%%/semi/mime-image.el +%%EMACS_SITE_LISPDIR%%/semi/mime-partial.el +%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.el +%%EMACS_SITE_LISPDIR%%/semi/mime-play.el +%%EMACS_SITE_LISPDIR%%/semi/mime-setup.el +%%EMACS_SITE_LISPDIR%%/semi/mime-shr.el +%%EMACS_SITE_LISPDIR%%/semi/mime-signature.el +%%EMACS_SITE_LISPDIR%%/semi/mime-tnef.el +%%EMACS_SITE_LISPDIR%%/semi/mime-vcard.el +%%EMACS_SITE_LISPDIR%%/semi/mime-view.el +%%EMACS_SITE_LISPDIR%%/semi/mime-w3.el +%%EMACS_SITE_LISPDIR%%/semi/semi-def.el +%%EMACS_SITE_LISPDIR%%/semi/semi-setup.el +%%EMACS_SITE_LISPDIR%%/semi/signature.el %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.en %%PORTDOCS%%%%DOCSDIR%%/README.ja diff --git a/editors/slime/Makefile b/editors/slime/Makefile index f91b43d77f78..989aceee4c8d 100644 --- a/editors/slime/Makefile +++ b/editors/slime/Makefile @@ -1,10 +1,9 @@ PORTNAME= slime DISTVERSIONPREFIX= v DISTVERSION= 2.26.1-9 -PORTREVISION= 15 DISTVERSIONSUFFIX= -gf368e22a +PORTREVISION= 16 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Superior Lisp Interaction Mode for Emacs @@ -18,15 +17,21 @@ USES= emacs gmake USE_GITHUB= yes ALL_TARGET= all contrib-compile doc-slime.info -INFO= slime + +CONFLICTS_INSTALL= slime-emacs_* + NO_ARCH= yes -PORTDOCS= CONTRIBUTING.md NEWS PROBLEMS README.md +NO_BUILD= yes + SUB_FILES= pkg-message SUB_LIST= SLIME_LISPDIR="${SLIME_LISPDIR}" +INFO= slime +PORTDOCS= CONTRIBUTING.md NEWS PROBLEMS README.md + OPTIONS_DEFINE= DOCS -SLIME_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime +SLIME_LISPDIR= ${PREFIX}/${EMACS_SITE_LISPDIR}/slime do-install: @${MKDIR} ${STAGEDIR}${SLIME_LISPDIR} diff --git a/editors/slime/pkg-plist b/editors/slime/pkg-plist index b076c77480b7..9a2f3cf367cc 100644 --- a/editors/slime/pkg-plist +++ b/editors/slime/pkg-plist @@ -1,184 +1,126 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/slime/.github/workflows/ci.yml -%%EMACS_VERSION_SITE_LISPDIR%%/slime/.gitref -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/bridge.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/bridge.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/inferior-slime.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/inferior-slime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-asdf.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-asdf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-autodoc.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-autodoc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-banner.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-banner.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-buffer-streams.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-buffer-streams.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-c-p-c.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-c-p-c.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-cl-indent.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-cl-indent.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-clipboard.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-clipboard.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-compiler-notes-tree.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-compiler-notes-tree.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-editing-commands.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-editing-commands.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-enclosing-context.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-enclosing-context.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-inspector.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-inspector.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-trace.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy-trace.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fancy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fontifying-fu.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fontifying-fu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fuzzy.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-fuzzy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-highlight-edits.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-highlight-edits.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-hyperdoc.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-hyperdoc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-indentation.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-indentation.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-listener-hooks.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-listener-hooks.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-macrostep.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-macrostep.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mdot-fu.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mdot-fu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-media.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-media.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mrepl.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-mrepl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-package-fu.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-package-fu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-parse.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentation-streams.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentation-streams.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentations.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-presentations.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-quicklisp.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-quicklisp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-references.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-references.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-repl.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-repl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sbcl-exts.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sbcl-exts.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scheme.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scheme.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scratch.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-scratch.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-snapshot.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-snapshot.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sprof.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-sprof.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-trace-dialog.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-trace-dialog.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-tramp.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-tramp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-typeout-frame.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-typeout-frame.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-xref-browser.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/slime-xref-browser.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-arglists.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-asdf.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-buffer-streams.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-c-p-c.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-clipboard.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-fancy-inspector.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-fuzzy.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-goo.goo -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-hyperdoc.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-ikarus.ss -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-indentation.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-jolt.k -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-kawa.scm -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-larceny.scm -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-listener-hooks.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-macrostep.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-media.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mit-scheme.scm -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mlworks.sml -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-mrepl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-package-fu.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-presentation-streams.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-presentations.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-quicklisp.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-r6rs.scm -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-repl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-sbcl-exts.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-snapshot.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-sprof.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-trace-dialog.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank-util.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/swank.rb -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-autodoc-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-autodoc-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-c-p-c-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-c-p-c-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-cl-indent-test.txt -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-enclosing-context-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-enclosing-context-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-fontifying-fu-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-fontifying-fu-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-indentation-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-indentation-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-macrostep-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-macrostep-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-mdot-fu-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-mdot-fu-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-parse-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-parse-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-presentations-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-presentations-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-repl-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/contrib/test/slime-repl-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/.nosearch -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/cl-lib.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/cl-lib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert-x.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert-x.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/ert.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/hyperspec.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/hyperspec.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/macrostep.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/lib/macrostep.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/metering.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/nregex.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/packages.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/sbcl-pprint-patch.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-autoloads.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-tests.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime-tests.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime.el -%%EMACS_VERSION_SITE_LISPDIR%%/slime/slime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/slime/start-swank.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank-loader.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank.asd -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/abcl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/allegro.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/backend.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/ccl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/clasp.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/clisp.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/cmucl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/corman.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/ecl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/gray.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/lispworks.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/match.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/mezzano.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/mkcl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/rpc.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/sbcl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/scl.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/source-file-cache.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/swank/source-path-parser.lisp -%%EMACS_VERSION_SITE_LISPDIR%%/slime/xref.lisp +%%EMACS_SITE_LISPDIR%%/slime/.github/workflows/ci.yml +%%EMACS_SITE_LISPDIR%%/slime/.gitref +%%EMACS_SITE_LISPDIR%%/slime/contrib/bridge.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/inferior-slime.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-asdf.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-autodoc.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-banner.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-buffer-streams.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-c-p-c.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-cl-indent.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-clipboard.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-compiler-notes-tree.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-editing-commands.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-enclosing-context.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-fancy-inspector.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-fancy-trace.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-fancy.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-fontifying-fu.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-fuzzy.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-highlight-edits.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-hyperdoc.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-indentation.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-listener-hooks.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-macrostep.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-mdot-fu.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-media.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-mrepl.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-package-fu.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-parse.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-presentation-streams.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-presentations.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-quicklisp.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-references.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-repl.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-sbcl-exts.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-scheme.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-scratch.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-snapshot.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-sprof.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-trace-dialog.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-tramp.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-typeout-frame.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/slime-xref-browser.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-arglists.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-asdf.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-buffer-streams.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-c-p-c.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-clipboard.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-fancy-inspector.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-fuzzy.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-goo.goo +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-hyperdoc.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-ikarus.ss +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-indentation.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-jolt.k +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-kawa.scm +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-larceny.scm +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-listener-hooks.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-macrostep.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-media.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-mit-scheme.scm +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-mlworks.sml +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-mrepl.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-package-fu.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-presentation-streams.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-presentations.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-quicklisp.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-r6rs.scm +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-repl.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-sbcl-exts.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-snapshot.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-sprof.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-trace-dialog.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank-util.lisp +%%EMACS_SITE_LISPDIR%%/slime/contrib/swank.rb +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-autodoc-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-c-p-c-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-cl-indent-test.txt +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-enclosing-context-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-fontifying-fu-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-indentation-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-macrostep-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-mdot-fu-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-parse-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-presentations-tests.el +%%EMACS_SITE_LISPDIR%%/slime/contrib/test/slime-repl-tests.el +%%EMACS_SITE_LISPDIR%%/slime/lib/.nosearch +%%EMACS_SITE_LISPDIR%%/slime/lib/cl-lib.el +%%EMACS_SITE_LISPDIR%%/slime/lib/ert-x.el +%%EMACS_SITE_LISPDIR%%/slime/lib/ert.el +%%EMACS_SITE_LISPDIR%%/slime/lib/hyperspec.el +%%EMACS_SITE_LISPDIR%%/slime/lib/macrostep.el +%%EMACS_SITE_LISPDIR%%/slime/metering.lisp +%%EMACS_SITE_LISPDIR%%/slime/nregex.lisp +%%EMACS_SITE_LISPDIR%%/slime/packages.lisp +%%EMACS_SITE_LISPDIR%%/slime/sbcl-pprint-patch.lisp +%%EMACS_SITE_LISPDIR%%/slime/slime-autoloads.el +%%EMACS_SITE_LISPDIR%%/slime/slime-tests.el +%%EMACS_SITE_LISPDIR%%/slime/slime.el +%%EMACS_SITE_LISPDIR%%/slime/start-swank.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank-loader.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank.asd +%%EMACS_SITE_LISPDIR%%/slime/swank.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/abcl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/allegro.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/backend.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/ccl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/clasp.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/clisp.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/cmucl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/corman.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/ecl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/gray.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/lispworks.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/match.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/mezzano.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/mkcl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/rpc.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/sbcl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/scl.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/source-file-cache.lisp +%%EMACS_SITE_LISPDIR%%/slime/swank/source-path-parser.lisp +%%EMACS_SITE_LISPDIR%%/slime/xref.lisp %%PORTDOCS%%%%DOCSDIR%%/README-contrib.md %%PORTDOCS%%%%DOCSDIR%%/slime-refcard.pdf %%PORTDOCS%%%%DOCSDIR%%/slime-small.pdf diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile index 36b8b4ef7467..ed2b30038ad4 100644 --- a/editors/sly-asdf/Makefile +++ b/editors/sly-asdf/Makefile @@ -1,9 +1,8 @@ PORTNAME= sly-asdf DISTVERSION= 0.2.0-20221119 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= olce.freebsd.ports@certner.fr COMMENT= SLY support for ASDF @@ -11,7 +10,7 @@ WWW= https://github.com/mmgeorge/sly-asdf LICENSE= GPLv3 -MY_DEPENDS= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR} +MY_DEPENDS= ${PREFIX}/${EMACS_SITE_LISPDIR}/sly/sly.el:editors/sly BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -20,25 +19,22 @@ USE_GITHUB= yes GH_ACCOUNT= mmgeorge GH_TAGNAME= 6f9d751469bb82530db1673c22e7437ca6c95f45 +CONFLICTS_INSTALL= sly-asdf-emacs_* + NO_ARCH= yes +NO_BUILD= yes -EMACS_COMPILE= ${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} \ - -f batch-byte-compile - -PLIST_THIS_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +PLIST_THIS_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} THIS_LISPDIR= ${PREFIX}/${PLIST_THIS_LISPDIR} PLIST_SUB+= THIS_LISPDIR=${PLIST_THIS_LISPDIR} -OPTIONS_DEFINE= DOCS - PORTDOCS= README.md +OPTIONS_DEFINE= DOCS + post-patch: cd ${WRKSRC} && ${RM} *flymake* -do-build: - cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el - do-install: @${MKDIR} ${STAGEDIR}${THIS_LISPDIR} (cd ${WRKSRC} && \ diff --git a/editors/sly-asdf/pkg-plist b/editors/sly-asdf/pkg-plist index 606397fb233d..36dec26c53a8 100644 --- a/editors/sly-asdf/pkg-plist +++ b/editors/sly-asdf/pkg-plist @@ -1,4 +1,3 @@ %%THIS_LISPDIR%%/sly-asdf.el -%%THIS_LISPDIR%%/sly-asdf.elc %%THIS_LISPDIR%%/slynk-asdf.asd %%THIS_LISPDIR%%/slynk-asdf.lisp diff --git a/editors/sly-named-readtables/Makefile b/editors/sly-named-readtables/Makefile index 5982e1114651..ddfaed165037 100644 --- a/editors/sly-named-readtables/Makefile +++ b/editors/sly-named-readtables/Makefile @@ -1,8 +1,7 @@ PORTNAME= sly-named-readtables PORTVERSION= 20191013 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= olce.freebsd.ports@certner.fr COMMENT= Support different readtables in the same file for SLY @@ -10,7 +9,7 @@ WWW= https://github.com/joaotavora/sly-named-readtables LICENSE= PD -MY_DEPENDS= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR} +MY_DEPENDS= ${PREFIX}/${EMACS_SITE_LISPDIR}/sly/sly.el:editors/sly BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -19,24 +18,22 @@ USE_GITHUB= yes GH_ACCOUNT= joaotavora GH_TAGNAME= a5a42674ccffa97ccd5e4e9742beaf3ea719931f +CONFLICTS_INSTALL= sly-named-readtables-emacs_* + NO_ARCH= yes +NO_BUILD= yes -EMACS_COMPILE= ${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} -f batch-byte-compile - -PLIST_THIS_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +PLIST_THIS_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} THIS_LISPDIR= ${PREFIX}/${PLIST_THIS_LISPDIR} PLIST_SUB+= THIS_LISPDIR=${PLIST_THIS_LISPDIR} # File is buggy and can't be used as documented upstream EXCLUDED_FILES= ${PORTNAME}-autoloads.el -OPTIONS_DEFINE= DOCS EXAMPLES - PORTDOCS= README.md screenshot.png PORTEXAMPLES= example.lisp -do-build: - cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el +OPTIONS_DEFINE= DOCS EXAMPLES do-install: @${MKDIR} ${STAGEDIR}${THIS_LISPDIR} diff --git a/editors/sly-named-readtables/pkg-plist b/editors/sly-named-readtables/pkg-plist index 609f7b6f4f3a..5ca509b38024 100644 --- a/editors/sly-named-readtables/pkg-plist +++ b/editors/sly-named-readtables/pkg-plist @@ -1,4 +1,3 @@ %%THIS_LISPDIR%%/sly-named-readtables.el -%%THIS_LISPDIR%%/sly-named-readtables.elc %%THIS_LISPDIR%%/slynk-named-readtables.asd %%THIS_LISPDIR%%/slynk-named-readtables.lisp diff --git a/editors/sly-quicklisp/Makefile b/editors/sly-quicklisp/Makefile index 9869df16b592..959e877ef72e 100644 --- a/editors/sly-quicklisp/Makefile +++ b/editors/sly-quicklisp/Makefile @@ -1,8 +1,7 @@ PORTNAME= sly-quicklisp PORTVERSION= 20211206 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= olce.freebsd.ports@certner.fr COMMENT= Basic Quicklisp support for SLY @@ -10,7 +9,7 @@ WWW= https://github.com/joaotavora/sly-quicklisp LICENSE= PD -MY_DEPENDS= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR} +MY_DEPENDS= ${PREFIX}/${EMACS_SITE_LISPDIR}/sly/sly.el:editors/sly BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -19,23 +18,21 @@ USE_GITHUB= yes GH_ACCOUNT= joaotavora GH_TAGNAME= 34c73d43dd9066262387c626c17a9b486db07b2d +CONFLICTS_INSTALL= sly-quicklisp-emacs_* + NO_ARCH= yes +NO_BUILD= yes -EMACS_COMPILE= ${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} -f batch-byte-compile - -PLIST_THIS_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +PLIST_THIS_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} THIS_LISPDIR= ${PREFIX}/${PLIST_THIS_LISPDIR} PLIST_SUB+= THIS_LISPDIR=${PLIST_THIS_LISPDIR} # File is buggy and can't be used as documented upstream EXCLUDED_FILES= ${PORTNAME}-autoloads.el -OPTIONS_DEFINE= DOCS - PORTDOCS= README.md screenshot.png -do-build: - cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el +OPTIONS_DEFINE= DOCS do-install: @${MKDIR} ${STAGEDIR}${THIS_LISPDIR} diff --git a/editors/sly-quicklisp/pkg-plist b/editors/sly-quicklisp/pkg-plist index f456f2733181..121b313757c8 100644 --- a/editors/sly-quicklisp/pkg-plist +++ b/editors/sly-quicklisp/pkg-plist @@ -1,6 +1,4 @@ %%THIS_LISPDIR%%/sly-quicklisp-tests.el -%%THIS_LISPDIR%%/sly-quicklisp-tests.elc %%THIS_LISPDIR%%/sly-quicklisp.el -%%THIS_LISPDIR%%/sly-quicklisp.elc %%THIS_LISPDIR%%/slynk-quicklisp.asd %%THIS_LISPDIR%%/slynk-quicklisp.lisp diff --git a/editors/sly/Makefile b/editors/sly/Makefile index bd0738bab33c..40c93b9d4017 100644 --- a/editors/sly/Makefile +++ b/editors/sly/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly DISTVERSION= 1.0.43-20240809 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -15,18 +15,20 @@ USE_GITHUB= yes GH_ACCOUNT= joaotavora GH_TAGNAME= 742355f7554ab6c46e5c1c9bdb89068f55359eaa +ALL_TARGET= doc-sly.info + +CONFLICTS_INSTALL= sly-emacs_* + NO_ARCH= yes +PORTSCOUT= limit:^[0-9] + INFO= sly -ALL_TARGET= all doc-sly.info - -PLIST_THIS_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/sly +PLIST_THIS_LISPDIR= ${EMACS_SITE_LISPDIR}/sly THIS_LISPDIR= ${PREFIX}/${PLIST_THIS_LISPDIR} PLIST_SUB+= THIS_LISPDIR=${PLIST_THIS_LISPDIR} -PORTSCOUT= limit:^[0-9] - OPTIONS_DEFINE= DOCS DOCS_PDF OPTIONS_DEFAULT=DOCS DOCS_PDF diff --git a/editors/sly/pkg-message b/editors/sly/pkg-message index c77fe0225204..2908faf5668a 100644 --- a/editors/sly/pkg-message +++ b/editors/sly/pkg-message @@ -1,9 +1,6 @@ [ { type: install message: < diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist index 519b0bbc0892..ed83a836155d 100644 --- a/editors/tamago/pkg-plist +++ b/editors/tamago/pkg-plist @@ -1,70 +1,37 @@ %%ELISPDIR%%/egg/egg-cnv.el.gz -%%ELISPDIR%%/egg/egg-cnv.elc %%ELISPDIR%%/egg/egg-com.el.gz -%%ELISPDIR%%/egg/egg-com.elc %%ELISPDIR%%/egg/egg-edep.el.gz -%%ELISPDIR%%/egg/egg-edep.elc %%ELISPDIR%%/egg/egg-mlh.el.gz -%%ELISPDIR%%/egg/egg-mlh.elc %%ELISPDIR%%/egg/egg-sim.el.gz -%%ELISPDIR%%/egg/egg-sim.elc %%ELISPDIR%%/egg/egg.el.gz -%%ELISPDIR%%/egg/egg.elc %%ELISPDIR%%/egg/egg/.nosearch %%ELISPDIR%%/egg/egg/anthy.el.gz -%%ELISPDIR%%/egg/egg/anthy.elc %%ELISPDIR%%/egg/egg/anthyipc.el.gz -%%ELISPDIR%%/egg/egg/anthyipc.elc %%ELISPDIR%%/egg/egg/canna.el.gz -%%ELISPDIR%%/egg/egg/canna.elc %%ELISPDIR%%/egg/egg/cannarpc.el.gz -%%ELISPDIR%%/egg/egg/cannarpc.elc %%ELISPDIR%%/egg/egg/sj3.el.gz -%%ELISPDIR%%/egg/egg/sj3.elc %%ELISPDIR%%/egg/egg/sj3rpc.el.gz -%%ELISPDIR%%/egg/egg/sj3rpc.elc %%ELISPDIR%%/egg/egg/wnn.el.gz -%%ELISPDIR%%/egg/egg/wnn.elc %%ELISPDIR%%/egg/egg/wnnrpc.el.gz -%%ELISPDIR%%/egg/egg/wnnrpc.elc %%ELISPDIR%%/egg/eggrc %%ELISPDIR%%/egg/its-keydef.el.gz -%%ELISPDIR%%/egg/its-keydef.elc %%ELISPDIR%%/egg/its.el.gz -%%ELISPDIR%%/egg/its.elc %%ELISPDIR%%/egg/its/.nosearch %%ELISPDIR%%/egg/its/ascii.el.gz -%%ELISPDIR%%/egg/its/ascii.elc %%ELISPDIR%%/egg/its/aynu.el.gz -%%ELISPDIR%%/egg/its/aynu.elc %%ELISPDIR%%/egg/its/bixing.el.gz -%%ELISPDIR%%/egg/its/bixing.elc %%ELISPDIR%%/egg/its/erpin.el.gz -%%ELISPDIR%%/egg/its/erpin.elc %%ELISPDIR%%/egg/its/greek.el.gz -%%ELISPDIR%%/egg/its/greek.elc %%ELISPDIR%%/egg/its/hangul.el.gz -%%ELISPDIR%%/egg/its/hangul.elc %%ELISPDIR%%/egg/its/hankata.el.gz -%%ELISPDIR%%/egg/its/hankata.elc %%ELISPDIR%%/egg/its/hira.el.gz -%%ELISPDIR%%/egg/its/hira.elc %%ELISPDIR%%/egg/its/jeonkak.el.gz -%%ELISPDIR%%/egg/its/jeonkak.elc %%ELISPDIR%%/egg/its/jiskana.el.gz -%%ELISPDIR%%/egg/its/jiskana.elc %%ELISPDIR%%/egg/its/kata.el.gz -%%ELISPDIR%%/egg/its/kata.elc %%ELISPDIR%%/egg/its/pinyin.el.gz -%%ELISPDIR%%/egg/its/pinyin.elc %%ELISPDIR%%/egg/its/quanjiao.el.gz -%%ELISPDIR%%/egg/its/quanjiao.elc %%ELISPDIR%%/egg/its/thai.el.gz -%%ELISPDIR%%/egg/its/thai.elc %%ELISPDIR%%/egg/its/zenkaku.el.gz -%%ELISPDIR%%/egg/its/zenkaku.elc %%ELISPDIR%%/egg/its/zhuyin.el.gz -%%ELISPDIR%%/egg/its/zhuyin.elc %%ELISPDIR%%/egg/leim-list.el %%ELISPDIR%%/egg/menudiag.el.gz -%%ELISPDIR%%/egg/menudiag.elc diff --git a/editors/vertico.el/Makefile b/editors/vertico.el/Makefile index 90f1365b1beb..996d708aac58 100644 --- a/editors/vertico.el/Makefile +++ b/editors/vertico.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= vertico.el DISTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= pat@patmaddox.com COMMENT= VERTical Interactive COmpletion for Emacs @@ -11,26 +10,25 @@ WWW= https://github.com/minad/vertico LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= minad GH_PROJECT= vertico +CONFLICTS_INSTALL= vertico.el-emacs_* + NO_ARCH= yes +NO_BUILD= yes ELISP_FILES= ${WRKSRC}/*.el ${WRKSRC}/extensions/*.el OPTIONS_DEFINE= DOCS -do-build: - ${EMACS_CMD} -q --batch -L ${WRKSRC} -L ${WRKSRC}/extensions \ - -f batch-byte-compile ${ELISP_FILES} - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vertico - ${INSTALL_DATA} ${ELISP_FILES} ${ELISP_FILES:S/.el$$/.elc/} \ + ${INSTALL_DATA} ${ELISP_FILES} \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vertico post-install-DOCS-on: diff --git a/editors/vertico.el/pkg-plist b/editors/vertico.el/pkg-plist index 28516b17a635..cc78a1351a9f 100644 --- a/editors/vertico.el/pkg-plist +++ b/editors/vertico.el/pkg-plist @@ -1,29 +1,15 @@ %%EMACS_SITE_LISPDIR%%/vertico/vertico-buffer.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-buffer.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-directory.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-directory.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-flat.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-flat.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-grid.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-grid.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-indexed.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-indexed.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-mouse.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-mouse.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-multiform.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-multiform.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-quick.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-quick.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-repeat.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-repeat.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-reverse.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-reverse.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-sort.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-sort.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-suspend.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-suspend.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico-unobtrusive.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico-unobtrusive.elc %%EMACS_SITE_LISPDIR%%/vertico/vertico.el -%%EMACS_SITE_LISPDIR%%/vertico/vertico.elc %%PORTDOCS%%%%DOCSDIR%%/README.org diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile index 5d1132fd2716..b30558d25c78 100644 --- a/editors/web-mode/Makefile +++ b/editors/web-mode/Makefile @@ -1,9 +1,8 @@ PORTNAME= web-mode PORTVERSION= 15.1 DISTVERSIONPREFIX= v -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Autonomous Emacs major-mode for editing web templates @@ -15,17 +14,25 @@ USES= emacs USE_GITHUB= yes GH_ACCOUNT= fxbois -MAKEFILE= ${FILESDIR}/Makefile -MAKE_ENV= EMACS="${EMACS_CMD}" LISPDIR="${WEBMODE_LISPDIR}" \ - DESTDIR="${STAGEDIR}" SUB_FILES= web-mode-autoloads.el SUB_LIST= LISPDIR="${WEBMODE_LISPDIR}" -WEBMODE_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/web-mode -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/web-mode/web-mode.elc.gz \ - ${EMACS_VERSION_SITE_LISPDIR}/web-mode-autoloads.el +WEBMODE_LISPDIR= ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} +PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME}/web-mode.el.gz \ + ${EMACS_SITE_LISPDIR}/web-mode-autoloads.el + +CONFLICTS_INSTALL= web-mode-emacs_* + +NO_ARCH= yes +NO_BUILD= yes + +do-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}/ + ${INSTALL_DATA} ${WRKDIR}/web-mode-autoloads.el \ + ${STAGEDIR}/${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/web-mode.el \ + ${STAGEDIR}/${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} post-install: - ${INSTALL_DATA} ${WRKDIR}/web-mode-autoloads.el \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${GZIP_CMD} ${STAGEDIR}/${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}/*.el .include diff --git a/editors/web-mode/files/Makefile b/editors/web-mode/files/Makefile deleted file mode 100644 index 91d7d8e54c16..000000000000 --- a/editors/web-mode/files/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -SRCS= web-mode.el -OBJS= ${SRCS:C/.el$/.elc/} - -.SUFFIXES: -.SUFFIXES: .el .elc -.el.elc: - ${EMACS} -batch -q -f batch-byte-compile ${.IMPSRC} - -all: ${OBJS} - -install: ${OBJS} - mkdir -p ${DESTDIR}${LISPDIR} - ${BSD_INSTALL_DATA} ${.ALLSRC} ${DESTDIR}${LISPDIR} - cd ${DESTDIR}${LISPDIR} && gzip -9 ${.ALLSRC} diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile index 2e72816cb117..810a1c7fa447 100644 --- a/editors/with-editor/Makefile +++ b/editors/with-editor/Makefile @@ -1,8 +1,8 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v DISTVERSION= 3.4.8 +PORTREVISION= 1 CATEGORIES= editors elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= jrm@FreeBSD.org COMMENT= Use the Emacsclient as the $$EDITOR of child processes @@ -11,14 +11,14 @@ WWW= https://github.com/magit/with-editor LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} +BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el +RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el -USES= emacs gmake makeinfo +USES= emacs:build gmake makeinfo USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" +MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat" MAKE_JOBS_UNSAFE= yes ALL_TARGET= lisp info @@ -27,9 +27,8 @@ CONFLICTS_INSTALL= with-editor-devel-emacs* NO_ARCH= yes INFO= with-editor -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el \ - ${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \ - ${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc +PLIST_FILES= ${EMACS_SITE_LISPDIR}/with-editor-autoloads.el \ + ${EMACS_SITE_LISPDIR}/with-editor.el PORTDOCS= README.org with-editor.html OPTIONS_DEFINE= DOCS PDF @@ -46,9 +45,9 @@ PDF_ALL_TARGET= pdf PDF_PLIST_FILES= ${DOCSDIR}/with-editor.pdf do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} do-install-DOCS-on: diff --git a/irc/riece/Makefile b/irc/riece/Makefile index 5e2125c44f9f..bbd7a97e3293 100644 --- a/irc/riece/Makefile +++ b/irc/riece/Makefile @@ -1,10 +1,9 @@ PORTNAME= riece PORTVERSION= 9.0.0 -PORTREVISION= 28 +PORTREVISION= 29 PORTEPOCH= 1 CATEGORIES= irc elisp MASTER_SITES= SAVANNAH -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= IRC client for Emacs @@ -13,20 +12,31 @@ WWW= https://www.nongnu.org/riece/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= emacs gmake +USES= emacs:build gmake -NO_ARCH= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ - --with-lispdir=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + --with-lispdir=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + +CONFLICTS_INSTALL= riece-emacs_* + +NO_ARCH= yes + INFO= riece-en riece-ja OPTIONS_DEFINE= DOCS +# do-install: +# @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/riece +# ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ +# ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/riece + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS ChangeLog NEWS NEWS.ja README README.ja doc/HACKING doc/HACKING.ja ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/riece \ + -name "*.elc" -delete .include diff --git a/irc/riece/pkg-message b/irc/riece/pkg-message index 47697dd14e45..eb9d5da4119c 100644 --- a/irc/riece/pkg-message +++ b/irc/riece/pkg-message @@ -1,7 +1,8 @@ [ { type: install message: <0:japanese/mozc-el@${EMACS_FLAVOR} -RUN_DEPENDS= ja-mozc-el${EMACS_PKGNAMESUFFIX}>0:japanese/mozc-el@${EMACS_FLAVOR} +BUILD_DEPENDS= ja-mozc-el>0:japanese/mozc-el +RUN_DEPENDS= ja-mozc-el>0:japanese/mozc-el USES= emacs USE_GITHUB= yes GH_ACCOUNT= tadanagao -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.el \ - ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.elc +CONFLICTS_INSTALL= ja-boiled-mozc-emacs_* -do-build: - @(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ - -f batch-byte-compile ${PORTNAME}.el) +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME}.el do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.el \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.elc \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/japanese/cp5022x-el/Makefile b/japanese/cp5022x-el/Makefile index 1e8654e73c8d..ecaecb47f0fd 100644 --- a/japanese/cp5022x-el/Makefile +++ b/japanese/cp5022x-el/Makefile @@ -1,8 +1,8 @@ PORTNAME= cp5022x PORTVERSION= 0.0.20120324 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= japanese elisp -PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX} +PKGNAMESUFFIX= -el MAINTAINER= hrs@FreeBSD.org COMMENT= CP50220 and CP51932 coding system support for Emacsen @@ -15,19 +15,17 @@ GH_ACCOUNT= awasira GH_PROJECT= cp5022x.el GH_TAGNAME= ea7327d -PLIST_FILES= ${EMACS_SITE_LISPDIR}/cp5022x.el.gz \ - ${EMACS_SITE_LISPDIR}/cp5022x.elc +CONFLICTS_INSTALL= ja-cp5022x-el-emacs_* -do-build: - cd ${BUILD_WRKSRC} && \ - ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ - -f batch-byte-compile cp5022x.el && \ - ${GZIP_CMD} cp5022x.el +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/cp5022x.el.gz do-install: + ${GZIP_CMD} ${BUILD_WRKSRC}/cp5022x.el ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} && \ - cd ${INSTALL_WRKSRC} && \ - ${INSTALL_DATA} cp5022x.elc cp5022x.el.gz \ + cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} cp5022x.el.gz \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index 59da3e5be59d..2f8e1c703902 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -1,7 +1,7 @@ PORTNAME= ddskk DISTVERSION= 17.2 +PORTREVISION= 1 CATEGORIES= japanese elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= mce@FreeBSD.org COMMENT= Simple Kana to Kanji conversion program on Emacsen @@ -10,7 +10,7 @@ WWW= http://openlab.ring.gr.jp/skk/ddskk.html LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -USES= emacs +USES= emacs:build USE_GITHUB= yes GH_ACCOUNT= skk-dev @@ -19,7 +19,10 @@ GH_TAGNAME= ddskk-17.2_Mena MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" \ SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \ SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}" -ALL_TARGET= elc info +ALL_TARGET= info + +CONFLICTS_INSTALL= ja-ddskk-emacs_* + NO_ARCH= yes INFO= skk @@ -28,7 +31,7 @@ PORTDOCS= AUTHORS.ja CODENAME.ja Contributors Development.ja.org \ FAQ.ja NEWS.ja README.ccc.org history.md PORTEXAMPLES= dot.emacs dot.skk -SKK_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/skk +SKK_LISPDIR= ${EMACS_SITE_LISPDIR}/skk OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/japanese/ddskk/files/patch-SKK-MK b/japanese/ddskk/files/patch-SKK-MK index 4d95174babdc..a34ba67d09df 100644 --- a/japanese/ddskk/files/patch-SKK-MK +++ b/japanese/ddskk/files/patch-SKK-MK @@ -1,16 +1,29 @@ ---- SKK-MK.orig 2024-03-17 07:41:31 UTC +--- SKK-MK.orig 2026-03-29 13:17:07 UTC +++ SKK-MK -@@ -229,11 +229,13 @@ This version of SKK requires MULE features")) - skk-inline - skk-isearch - skk-jisx0201 +@@ -234,11 +234,13 @@ This version of SKK requires MULE features")) + skk-inline + skk-isearch + skk-jisx0201 + skk-jisx0213 - skk-jisyo-edit-mode - skk-kakasi - skk-kcode - skk-leim - skk-look + skk-jisyo-edit-mode + skk-kakasi + skk-kcode + skk-leim + skk-look + skk-lookup - skk-macs - skk-num - skk-search-web + skk-macs + skk-num + skk-search-web +@@ -409,11 +411,7 @@ This version of SKK requires MULE features")) + + (defun SKK-MK-compile () + (let (enable-local-eval) +- (SKK-MK-generate-autoloads-el) +- ;; (load (expand-file-name "skk-autoloads.el")) +- ;; (require 'skk (expand-file-name "skk.el")) +- (compile-elisp-modules SKK_MODULES +- (expand-file-name ".")))) ++ (SKK-MK-generate-autoloads-el))) + + (defun SKK-MK-compile-info () + (when (and SKK_INFO diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist index 530937fd89ab..4146d1c8b7b9 100644 --- a/japanese/ddskk/pkg-plist +++ b/japanese/ddskk/pkg-plist @@ -1,91 +1,48 @@ %%SKK_LISPDIR%%/ccc.el -%%SKK_LISPDIR%%/ccc.elc %%SKK_LISPDIR%%/cdb.el -%%SKK_LISPDIR%%/cdb.elc %%SKK_LISPDIR%%/context-skk.el -%%SKK_LISPDIR%%/context-skk.elc %%SKK_LISPDIR%%/leim-list.el %%SKK_LISPDIR%%/skk-abbrev.el -%%SKK_LISPDIR%%/skk-abbrev.elc %%SKK_LISPDIR%%/skk-act.el -%%SKK_LISPDIR%%/skk-act.elc %%SKK_LISPDIR%%/skk-annotation.el -%%SKK_LISPDIR%%/skk-annotation.elc %%SKK_LISPDIR%%/skk-auto.el -%%SKK_LISPDIR%%/skk-auto.elc %%SKK_LISPDIR%%/skk-autoloads.el -%%SKK_LISPDIR%%/skk-autoloads.elc %%SKK_LISPDIR%%/skk-azik.el -%%SKK_LISPDIR%%/skk-azik.elc %%SKK_LISPDIR%%/skk-cdb.el -%%SKK_LISPDIR%%/skk-cdb.elc %%SKK_LISPDIR%%/skk-comp.el -%%SKK_LISPDIR%%/skk-comp.elc %%SKK_LISPDIR%%/skk-cursor.el -%%SKK_LISPDIR%%/skk-cursor.elc %%SKK_LISPDIR%%/skk-cus.el -%%SKK_LISPDIR%%/skk-cus.elc %%SKK_LISPDIR%%/skk-dcomp.el -%%SKK_LISPDIR%%/skk-dcomp.elc %%SKK_LISPDIR%%/skk-decor.el -%%SKK_LISPDIR%%/skk-decor.elc %%SKK_LISPDIR%%/skk-develop.el -%%SKK_LISPDIR%%/skk-develop.elc %%SKK_LISPDIR%%/skk-emacs.el -%%SKK_LISPDIR%%/skk-emacs.elc %%SKK_LISPDIR%%/skk-gadget.el -%%SKK_LISPDIR%%/skk-gadget.elc %%SKK_LISPDIR%%/skk-hint.el -%%SKK_LISPDIR%%/skk-hint.elc %%SKK_LISPDIR%%/skk-inline.el -%%SKK_LISPDIR%%/skk-inline.elc %%SKK_LISPDIR%%/skk-isearch.el -%%SKK_LISPDIR%%/skk-isearch.elc %%SKK_LISPDIR%%/skk-jisx0201.el -%%SKK_LISPDIR%%/skk-jisx0201.elc %%SKK_LISPDIR%%/skk-jisx0213.el -%%SKK_LISPDIR%%/skk-jisx0213.elc %%SKK_LISPDIR%%/skk-jisyo-edit-mode.el -%%SKK_LISPDIR%%/skk-jisyo-edit-mode.elc %%SKK_LISPDIR%%/skk-kakasi.el -%%SKK_LISPDIR%%/skk-kakasi.elc %%SKK_LISPDIR%%/skk-kcode.el -%%SKK_LISPDIR%%/skk-kcode.elc %%SKK_LISPDIR%%/skk-leim.el -%%SKK_LISPDIR%%/skk-leim.elc %%SKK_LISPDIR%%/skk-look.el -%%SKK_LISPDIR%%/skk-look.elc %%SKK_LISPDIR%%/skk-lookup.el -%%SKK_LISPDIR%%/skk-lookup.elc %%SKK_LISPDIR%%/skk-macs.el -%%SKK_LISPDIR%%/skk-macs.elc %%SKK_LISPDIR%%/skk-num.el -%%SKK_LISPDIR%%/skk-num.elc %%SKK_LISPDIR%%/skk-search-web.el -%%SKK_LISPDIR%%/skk-search-web.elc %%SKK_LISPDIR%%/skk-server-completion.el -%%SKK_LISPDIR%%/skk-server-completion.elc %%SKK_LISPDIR%%/skk-server.el -%%SKK_LISPDIR%%/skk-server.elc %%SKK_LISPDIR%%/skk-setup.el %%SKK_LISPDIR%%/skk-show-mode.el -%%SKK_LISPDIR%%/skk-show-mode.elc %%SKK_LISPDIR%%/skk-sticky.el -%%SKK_LISPDIR%%/skk-sticky.elc %%SKK_LISPDIR%%/skk-study.el -%%SKK_LISPDIR%%/skk-study.elc %%SKK_LISPDIR%%/skk-tankan.el -%%SKK_LISPDIR%%/skk-tankan.elc %%SKK_LISPDIR%%/skk-tut.el -%%SKK_LISPDIR%%/skk-tut.elc %%SKK_LISPDIR%%/skk-vars.el -%%SKK_LISPDIR%%/skk-vars.elc %%SKK_LISPDIR%%/skk-version.el -%%SKK_LISPDIR%%/skk-version.elc %%SKK_LISPDIR%%/skk-viper.el -%%SKK_LISPDIR%%/skk-viper.elc %%SKK_LISPDIR%%/skk.el -%%SKK_LISPDIR%%/skk.elc share/skk/NICOLA-SKK.tut share/skk/SKK.tut share/skk/SKK.tut.E diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 2ef9fed25380..92a571ab1bf2 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -1,8 +1,7 @@ PORTNAME= lookup PORTVERSION= 1.99.96.20180209 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= japanese elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Emacs search interface for CD-ROM books, etc @@ -10,23 +9,27 @@ WWW= https://lookup2.github.io/ LICENSE= GPLv2+ -USES= autoreconf emacs makeinfo - +USES= autoreconf emacs:build makeinfo USE_GITHUB= yes GH_ACCOUNT= lookup2 GH_PROJECT= lookup2 GH_TAGNAME= c4f4986 - -INFO= lookup GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ - --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} + +CONFLICTS_INSTALL= ja-lookup-emacs_* + +NO_ARCH= yes + +INFO= lookup +PORTDOCS= AUTHORS ChangeLog NEWS README.md OPTIONS_DEFINE= DOCS -PORTDOCS= AUTHORS ChangeLog NEWS README.md - post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/lookup \ + -name "*.elc" -delete ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/lookup/pkg-plist b/japanese/lookup/pkg-plist index c6f2d1a16828..d047459378d7 100644 --- a/japanese/lookup/pkg-plist +++ b/japanese/lookup/pkg-plist @@ -1,141 +1,71 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/bocu.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/bocu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/hanzi-py-table.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/hanzi-py-table.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-autoloads.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-cache.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-cache.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-content.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-content.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-history.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-history.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-modules.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-modules.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-select.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-select.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-summary.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-summary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-text.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-text.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-types.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-types.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-utils.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-utils.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/lookup.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndbtonic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndbtonic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndbuffer.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndbuffer.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndcookie.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndcookie.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/nddsl.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/nddsl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb-binary.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb-binary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndeb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndest.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndest.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndict.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndict.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndjitsuu.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndjitsuu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndlatin.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndlatin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndmecab.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndmecab.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndpdic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndpdic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsary.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspell.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspell.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspotlight.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndspotlight.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsrd.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndsrd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtext.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtut.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndtut.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndwdsgrep.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndwdsgrep.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndweb-options.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndweb-options.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndweb.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndweb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndwnj.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndwnj.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndzim.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/ndzim.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/stem-english.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/stem-english.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-chinakan.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-chinakan.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-defs.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-defs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-dkw-word.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-dkw-word.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-dkw2ucs.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-dkw2ucs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-eijiro-pdic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-eijiro-pdic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-eijiro.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-eijiro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-foldoc-fpw.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-foldoc-fpw.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jargon-fpw.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jargon-fpw.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jitsuu.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jitsuu.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jmdict.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jmdict.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jtfrk.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-jtfrk.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-muller.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-muller.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-ndweb.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-ndweb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-onmusic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-onmusic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-oxford-eb.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-oxford-eb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-pdic-cj2.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-pdic-cj2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-pdic-thai.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-pdic-thai.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rangjung.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rangjung.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rfc1983.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rfc1983.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rfc4949.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-rfc4949.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-sbgy.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-sbgy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-sdic.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-sdic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-srd.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-srd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-swjz.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-swjz.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-ucd.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-ucd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-vera-fpw.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-vera-fpw.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-waseikanji.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-waseikanji.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-xszd.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-xszd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-zhongri.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-zhongri.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-zigen.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/support-zigen.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/tibet-util+.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/tibet-util+.elc -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/view-pdf.el -%%EMACS_VERSION_SITE_LISPDIR%%/lookup/view-pdf.elc +%%EMACS_SITE_LISPDIR%%/lookup/bocu.el +%%EMACS_SITE_LISPDIR%%/lookup/hanzi-py-table.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-autoloads.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-cache.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-content.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-history.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-modules.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-select.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-summary.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-text.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-types.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-utils.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup-vars.el +%%EMACS_SITE_LISPDIR%%/lookup/lookup.el +%%EMACS_SITE_LISPDIR%%/lookup/ndbtonic.el +%%EMACS_SITE_LISPDIR%%/lookup/ndbuffer.el +%%EMACS_SITE_LISPDIR%%/lookup/ndcookie.el +%%EMACS_SITE_LISPDIR%%/lookup/nddsl.el +%%EMACS_SITE_LISPDIR%%/lookup/ndeb-binary.el +%%EMACS_SITE_LISPDIR%%/lookup/ndeb.el +%%EMACS_SITE_LISPDIR%%/lookup/ndest.el +%%EMACS_SITE_LISPDIR%%/lookup/ndic.el +%%EMACS_SITE_LISPDIR%%/lookup/ndict.el +%%EMACS_SITE_LISPDIR%%/lookup/ndjitsuu.el +%%EMACS_SITE_LISPDIR%%/lookup/ndlatin.el +%%EMACS_SITE_LISPDIR%%/lookup/ndmecab.el +%%EMACS_SITE_LISPDIR%%/lookup/ndpdic.el +%%EMACS_SITE_LISPDIR%%/lookup/ndsary.el +%%EMACS_SITE_LISPDIR%%/lookup/ndspell.el +%%EMACS_SITE_LISPDIR%%/lookup/ndspotlight.el +%%EMACS_SITE_LISPDIR%%/lookup/ndsrd.el +%%EMACS_SITE_LISPDIR%%/lookup/ndtext.el +%%EMACS_SITE_LISPDIR%%/lookup/ndtut.el +%%EMACS_SITE_LISPDIR%%/lookup/ndwdsgrep.el +%%EMACS_SITE_LISPDIR%%/lookup/ndweb-options.el +%%EMACS_SITE_LISPDIR%%/lookup/ndweb.el +%%EMACS_SITE_LISPDIR%%/lookup/ndwnj.el +%%EMACS_SITE_LISPDIR%%/lookup/ndzim.el +%%EMACS_SITE_LISPDIR%%/lookup/stem-english.el +%%EMACS_SITE_LISPDIR%%/lookup/support-chinakan.el +%%EMACS_SITE_LISPDIR%%/lookup/support-defs.el +%%EMACS_SITE_LISPDIR%%/lookup/support-dkw-word.el +%%EMACS_SITE_LISPDIR%%/lookup/support-dkw2ucs.el +%%EMACS_SITE_LISPDIR%%/lookup/support-eijiro-pdic.el +%%EMACS_SITE_LISPDIR%%/lookup/support-eijiro.el +%%EMACS_SITE_LISPDIR%%/lookup/support-foldoc-fpw.el +%%EMACS_SITE_LISPDIR%%/lookup/support-jargon-fpw.el +%%EMACS_SITE_LISPDIR%%/lookup/support-jitsuu.el +%%EMACS_SITE_LISPDIR%%/lookup/support-jmdict.el +%%EMACS_SITE_LISPDIR%%/lookup/support-jtfrk.el +%%EMACS_SITE_LISPDIR%%/lookup/support-muller.el +%%EMACS_SITE_LISPDIR%%/lookup/support-ndweb.el +%%EMACS_SITE_LISPDIR%%/lookup/support-onmusic.el +%%EMACS_SITE_LISPDIR%%/lookup/support-oxford-eb.el +%%EMACS_SITE_LISPDIR%%/lookup/support-pdic-cj2.el +%%EMACS_SITE_LISPDIR%%/lookup/support-pdic-thai.el +%%EMACS_SITE_LISPDIR%%/lookup/support-rangjung.el +%%EMACS_SITE_LISPDIR%%/lookup/support-rfc1983.el +%%EMACS_SITE_LISPDIR%%/lookup/support-rfc4949.el +%%EMACS_SITE_LISPDIR%%/lookup/support-sbgy.el +%%EMACS_SITE_LISPDIR%%/lookup/support-sdic.el +%%EMACS_SITE_LISPDIR%%/lookup/support-srd.el +%%EMACS_SITE_LISPDIR%%/lookup/support-swjz.el +%%EMACS_SITE_LISPDIR%%/lookup/support-ucd.el +%%EMACS_SITE_LISPDIR%%/lookup/support-vera-fpw.el +%%EMACS_SITE_LISPDIR%%/lookup/support-waseikanji.el +%%EMACS_SITE_LISPDIR%%/lookup/support-xszd.el +%%EMACS_SITE_LISPDIR%%/lookup/support-zhongri.el +%%EMACS_SITE_LISPDIR%%/lookup/support-zigen.el +%%EMACS_SITE_LISPDIR%%/lookup/tibet-util+.el +%%EMACS_SITE_LISPDIR%%/lookup/view-pdf.el diff --git a/japanese/migemo.el/Makefile b/japanese/migemo.el/Makefile index 1a9ea10e4c0e..32a475e883c0 100644 --- a/japanese/migemo.el/Makefile +++ b/japanese/migemo.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= migemo.el PORTVERSION= 1.9.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= japanese elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Japanese incremental search tool for Emacs @@ -18,7 +17,8 @@ GH_ACCOUNT= emacs-jp GH_PROJECT= migemo GH_TAGNAME= e4744ef -CONFLICTS= ja-migemo-emacs +CONFLICTS_INSTALL= ja-migemo.el-emacs_* + NO_ARCH= yes NO_BUILD= yes PLIST_FILES= ${EMACS_SITE_LISPDIR}/migemo.el diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile index 3e60e7c75466..381082e5620d 100644 --- a/japanese/mozc-el/Makefile +++ b/japanese/mozc-el/Makefile @@ -1,10 +1,12 @@ -PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX} +PKGNAMESUFFIX= -el COMMENT= Emacs input method for Mozc MASTERDIR= ${.CURDIR}/../../japanese/mozc-server PKGMESSAGE= ${.CURDIR}/pkg-message +CONFLICTS_INSTALL= ja-mozc-el-emacs_* + BUILD_MOZC_LIST=mozc_el .include "${MASTERDIR}/Makefile" diff --git a/japanese/mozc-el/pkg-message b/japanese/mozc-el/pkg-message index a83191f74d72..436907c15637 100644 --- a/japanese/mozc-el/pkg-message +++ b/japanese/mozc-el/pkg-message @@ -2,7 +2,7 @@ { type: install message: < yc.el NO_WRKSUBDIR= yes -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/yc/yc.el \ - ${EMACS_VERSION_SITE_LISPDIR}/yc/yc.elc +PLIST_FILES= ${EMACS_SITE_LISPDIR}/yc/yc.el + +CONFLICTS_INSTALL= ja-yc.el-emacs_* + +NO_ARCH= yes +NO_BUILD= yes OPTIONS_DEFINE= ICANNA ICANNA_DESC= Enable icanna support ICANNA_RUN_DEPENDS= icanna:japanese/icanna -YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc - -do-build: - @(cd ${WRKSRC} && \ - ${EMACS_CMD} -batch -f batch-byte-compile yc.el) +YC_LISPDIR= ${PREFIX}/${EMACS_SITE_LISPDIR}/yc do-install: @${MKDIR} ${STAGEDIR}${YC_LISPDIR} - (cd ${WRKSRC} && \ - ${INSTALL_SCRIPT} yc.el yc.elc ${STAGEDIR}${YC_LISPDIR}) + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${YC_LISPDIR} .include diff --git a/japanese/yc.el/pkg-message b/japanese/yc.el/pkg-message index a907b71102ba..cb43f45f9255 100644 --- a/japanese/yc.el/pkg-message +++ b/japanese/yc.el/pkg-message @@ -3,7 +3,7 @@ message: <=0:lang/elixir-mode.el@${EMACS_FLAVOR} +RUN_DEPENDS= elixir-mode.el>=0:lang/elixir-mode.el USES= emacs USE_GITHUB= yes GH_ACCOUNT= tonini +CONFLICTS_INSTALL= alchemist.el-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile index 6b6a3dd3fbe1..c23282869b2f 100644 --- a/lang/clojure-mode.el/Makefile +++ b/lang/clojure-mode.el/Makefile @@ -1,9 +1,9 @@ PORTNAME= clojure-mode.el PORTVERSION= 5.21.0 +PORTREVISION= 1 PORTEPOCH= 1 DISTVERSIONPREFIX= v CATEGORIES= lang elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Emacs lisp module for the Clojure language @@ -16,6 +16,8 @@ USE_GITHUB= yes GH_ACCOUNT= clojure-emacs GH_PROJECT= clojure-mode +CONFLICTS_INSTALL= clojure-mode.el-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/lang/clojure-mode.el/pkg-message b/lang/clojure-mode.el/pkg-message index b3674c99336e..9caa271f2710 100644 --- a/lang/clojure-mode.el/pkg-message +++ b/lang/clojure-mode.el/pkg-message @@ -1,7 +1,9 @@ [ { type: install message: < diff --git a/lang/php-mode.el/pkg-message b/lang/php-mode.el/pkg-message index 8e2cdb769818..77a95d04ae6f 100644 --- a/lang/php-mode.el/pkg-message +++ b/lang/php-mode.el/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: <0:mail/mew@${EMACS_FLAVOR} +RUN_DEPENDS= mew>0:mail/mew -USES= emacs:run fakeroot iconv +USES= emacs fakeroot iconv USE_GITHUB= yes GH_ACCOUNT= yasuoka +CONFLICTS_INSTALL= mailest-emacs_* + MAKE_ARGS= MANDIR=${PREFIX}/share/man/man MAKE_ENV= USE_BSDMAKE=true WITH_INSTALL_AS_USER=true diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile index 8239f9cb4c68..534dcf665761 100644 --- a/mail/mailfromd/Makefile +++ b/mail/mailfromd/Makefile @@ -1,5 +1,6 @@ PORTNAME= mailfromd PORTVERSION= 9.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \ http://download.gnu.org.ua/pub/alpha/${PORTNAME}/ @@ -21,7 +22,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-syslog-async CONFIGURE_ENV= DEFAULT_STATE_DIR="${DATABASEDIR}" \ DEFAULT_SOCKET="unix:${MFD_RUN_DIR}/${PORTNAME}.sock" \ - DEFAULT_USER=mailnull + DEFAULT_USER=mailnull \ + ac_cv_prog_EMACS=no USE_RC_SUBR= calloutd ${PORTNAME} TEST_TARGET= check @@ -46,8 +48,7 @@ BDB_DESC= Berkeley DB v4.8 (last working one) support DB_DESC= Database configuration EMACS_DESC= Install Emacs Lisp *-mode files -EMACS_CONFIGURE_ENV_OFF=ac_cv_prog_EMACS=no -EMACS_USES= emacs:build +EMACS_USES= emacs NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls @@ -71,4 +72,8 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +post-install-EMACS-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/elisp/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + .include diff --git a/mail/mailfromd/pkg-plist b/mail/mailfromd/pkg-plist index a9280636bbaa..526b6992277e 100644 --- a/mail/mailfromd/pkg-plist +++ b/mail/mailfromd/pkg-plist @@ -8,9 +8,7 @@ sbin/calloutd sbin/mailfromd share/aclocal/mfmod.m4 %%EMACS%%%%EMACS_SITE_LISPDIR%%/mfl-mode.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/mfl-mode.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/obfemail-mode.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/obfemail-mode.elc %%NLS%%share/locale/da/LC_MESSAGES/mailfromd.mo %%NLS%%share/locale/fr/LC_MESSAGES/mailfromd.mo %%NLS%%share/locale/id/LC_MESSAGES/mailfromd.mo diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index 99a7a7967a83..70bbea96774e 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -56,8 +56,7 @@ GUILE_CONFIGURE_WITH= guile MH_CONFIGURE_ENV= ac_cv_prog_EMACS=no MH_CONFIGURE_ENABLE= mh -MH_USES= emacs:noflavors -MH_VARS= EMACS_NO_DEPENDS=yes +MH_USES= emacs NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile index ff111d858dc7..17e493035c79 100644 --- a/mail/mew-devel/Makefile +++ b/mail/mew-devel/Makefile @@ -1,9 +1,9 @@ PORTNAME= mew DISTVERSIONPREFIX= v +PORTREVISION= 1 DISTVERSION= 6.10-49 DISTVERSIONSUFFIX= -ge50839a CATEGORIES= mail elisp -PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Messaging in the Emacs World for emacs (Development Version) @@ -12,20 +12,20 @@ WWW= https://www.Mew.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= emacs +USES= emacs:build USE_GITHUB= yes GH_ACCOUNT= kazu-yamamoto GH_PROJECT= Mew GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew \ - --with-etcdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew/etc +CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \ + --with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc # target name for make build and install ALL_TARGET= all info jinfo INSTALL_TARGET= install install-jinfo -CONFLICTS_INSTALL= mew mew-devel-emacs_* mew-emacs_* # bin/cmew bin/incm +CONFLICTS_INSTALL= mew mew-devel-emacs_* SUB_FILES= pkg-message @@ -45,6 +45,10 @@ STUNNEL_DESC= Support TLS feature using stunnel DATABASE_RUN_DEPENDS= rubygem-sqlite3>=0:databases/rubygem-sqlite3 STUNNEL_RUN_DEPENDS= stunnel>=0:security/stunnel +post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mew \ + -name "*.elc" -delete + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/CHANGES/*.md ${STAGEDIR}${DOCSDIR} diff --git a/mail/mew-devel/pkg-plist b/mail/mew-devel/pkg-plist index e12c46bd280d..91bdef71f932 100644 --- a/mail/mew-devel/pkg-plist +++ b/mail/mew-devel/pkg-plist @@ -16,170 +16,103 @@ share/man/man1/mewencode.1.gz share/man/man1/mewest.1.gz share/man/man1/mewl.1.gz share/man/man1/smew.1.gz -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.img -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.png -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.xbm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-External.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Image.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Text.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Video.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-attach.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-cite.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-forward.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-inc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-lock.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-next.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-prev.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-queue.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-refile.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-reply.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-send.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-sep.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-show.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-write.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-yank.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-addrbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-addrbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-attach.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-attach.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-auth.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-auth.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-blvs.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-blvs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-bq.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-bq.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-cache.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-cache.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-complete.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-complete.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-config.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-config.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-const.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-const.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-darwin.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-darwin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-decode.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-decode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-demo.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-demo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-draft.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-draft.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-edit.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-edit.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-encode.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-encode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env0.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env0.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-exec.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-exec.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ext.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-fib.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-fib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-func.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-func.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-gemacs.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-gemacs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-header.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-header.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-highlight.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-highlight.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-key.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-key.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-jp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-jp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-kr.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-kr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-latin.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-latin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-local.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-local.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mark.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mark.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-message.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-message.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mime.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-minibuf.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-minibuf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-net.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-net.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-oauth2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-oauth2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-passwd.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-passwd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pgp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pgp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pick.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pick.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pop.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pop.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-refile.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-refile.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-scan.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-scan.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-search.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-search.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smime.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smtp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smtp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-sort.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-sort.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssh.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssh.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssl.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary4.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary4.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-syntax.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-syntax.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-thread.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-thread.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-unix.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-unix.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-varsx.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-varsx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-virtual.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-virtual.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-win32.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-win32.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew.elc +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-External.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Image.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Text.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Video.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-attach.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-cite.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-forward.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-inc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-lock.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-next.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-prev.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-queue.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-refile.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-reply.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-send.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-sep.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-show.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-write.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-yank.xpm +%%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.el +%%EMACS_SITE_LISPDIR%%/mew/mew-attach.el +%%EMACS_SITE_LISPDIR%%/mew/mew-auth.el +%%EMACS_SITE_LISPDIR%%/mew/mew-blvs.el +%%EMACS_SITE_LISPDIR%%/mew/mew-bq.el +%%EMACS_SITE_LISPDIR%%/mew/mew-cache.el +%%EMACS_SITE_LISPDIR%%/mew/mew-complete.el +%%EMACS_SITE_LISPDIR%%/mew/mew-config.el +%%EMACS_SITE_LISPDIR%%/mew/mew-const.el +%%EMACS_SITE_LISPDIR%%/mew/mew-darwin.el +%%EMACS_SITE_LISPDIR%%/mew/mew-decode.el +%%EMACS_SITE_LISPDIR%%/mew/mew-demo.el +%%EMACS_SITE_LISPDIR%%/mew/mew-draft.el +%%EMACS_SITE_LISPDIR%%/mew/mew-edit.el +%%EMACS_SITE_LISPDIR%%/mew/mew-encode.el +%%EMACS_SITE_LISPDIR%%/mew/mew-env.el +%%EMACS_SITE_LISPDIR%%/mew/mew-env0.el +%%EMACS_SITE_LISPDIR%%/mew/mew-exec.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ext.el +%%EMACS_SITE_LISPDIR%%/mew/mew-fib.el +%%EMACS_SITE_LISPDIR%%/mew/mew-func.el +%%EMACS_SITE_LISPDIR%%/mew/mew-gemacs.el +%%EMACS_SITE_LISPDIR%%/mew/mew-header.el +%%EMACS_SITE_LISPDIR%%/mew/mew-highlight.el +%%EMACS_SITE_LISPDIR%%/mew/mew-imap.el +%%EMACS_SITE_LISPDIR%%/mew/mew-imap2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-key.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-jp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-kr.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-latin.el +%%EMACS_SITE_LISPDIR%%/mew/mew-local.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mark.el +%%EMACS_SITE_LISPDIR%%/mew/mew-message.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mime.el +%%EMACS_SITE_LISPDIR%%/mew/mew-minibuf.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mule.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mule3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-net.el +%%EMACS_SITE_LISPDIR%%/mew/mew-nntp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-nntp2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-oauth2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-passwd.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pgp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pick.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pop.el +%%EMACS_SITE_LISPDIR%%/mew/mew-refile.el +%%EMACS_SITE_LISPDIR%%/mew/mew-scan.el +%%EMACS_SITE_LISPDIR%%/mew/mew-search.el +%%EMACS_SITE_LISPDIR%%/mew/mew-smime.el +%%EMACS_SITE_LISPDIR%%/mew/mew-smtp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-sort.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ssh.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ssl.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary4.el +%%EMACS_SITE_LISPDIR%%/mew/mew-syntax.el +%%EMACS_SITE_LISPDIR%%/mew/mew-thread.el +%%EMACS_SITE_LISPDIR%%/mew/mew-unix.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-varsx.el +%%EMACS_SITE_LISPDIR%%/mew/mew-virtual.el +%%EMACS_SITE_LISPDIR%%/mew/mew-win32.el +%%EMACS_SITE_LISPDIR%%/mew/mew.el diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 90bd775f44b6..0ea9c567f828 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,9 +1,8 @@ PORTNAME= mew DISTVERSION= 6.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail elisp MASTER_SITES= http://www.mew.org/Release/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Messaging in the Emacs World for emacs @@ -12,17 +11,17 @@ WWW= https://www.Mew.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= emacs +USES= emacs:build GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew \ - --with-etcdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew/etc +CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \ + --with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc # target name for make build and install ALL_TARGET= all info jinfo INSTALL_TARGET= install install-jinfo -CONFLICTS_INSTALL= mew-devel mew-devel-emacs_* mew-emacs_* # bin/cmew bin/incm +CONFLICTS_INSTALL= mew-devel mew-emacs_* SUB_FILES= pkg-message @@ -42,6 +41,10 @@ STUNNEL_DESC= Support TLS feature using stunnel DATABASE_RUN_DEPENDS= rubygem-sqlite3>=0:databases/rubygem-sqlite3 STUNNEL_RUN_DEPENDS= stunnel>=0:security/stunnel +post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mew \ + -name "*.elc" -delete + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/CHANGES/*.md ${STAGEDIR}${DOCSDIR} diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist index e12c46bd280d..91bdef71f932 100644 --- a/mail/mew/pkg-plist +++ b/mail/mew/pkg-plist @@ -16,170 +16,103 @@ share/man/man1/mewencode.1.gz share/man/man1/mewest.1.gz share/man/man1/mewl.1.gz share/man/man1/smew.1.gz -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.img -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.png -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.xbm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/Mew.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-External.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Image.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Text.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-Video.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-attach.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-cite.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-forward.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-inc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-lock.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-next.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-prev.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-queue.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-refile.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-reply.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-send.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-sep.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-show.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-write.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/etc/mew-yank.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-addrbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-addrbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-attach.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-attach.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-auth.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-auth.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-blvs.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-blvs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-bq.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-bq.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-cache.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-cache.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-complete.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-complete.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-config.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-config.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-const.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-const.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-darwin.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-darwin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-decode.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-decode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-demo.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-demo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-draft.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-draft.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-edit.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-edit.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-encode.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-encode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env0.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-env0.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-exec.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-exec.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ext.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-fib.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-fib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-func.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-func.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-gemacs.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-gemacs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-header.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-header.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-highlight.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-highlight.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-imap2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-key.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-key.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-jp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-jp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-kr.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-kr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-latin.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-lang-latin.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-local.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-local.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mark.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mark.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-message.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-message.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mime.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-minibuf.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-minibuf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-mule3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-net.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-net.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-nntp2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-oauth2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-oauth2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-passwd.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-passwd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pgp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pgp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pick.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pick.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pop.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-pop.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-refile.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-refile.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-scan.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-scan.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-search.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-search.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smime.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smtp.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-smtp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-sort.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-sort.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssh.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssh.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssl.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-ssl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary4.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-summary4.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-syntax.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-syntax.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-thread.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-thread.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-unix.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-unix.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars2.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars3.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-vars3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-varsx.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-varsx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-virtual.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-virtual.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-win32.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew-win32.elc -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew.el -%%EMACS_VERSION_SITE_LISPDIR%%/mew/mew.elc +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm +%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-External.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Image.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Text.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Video.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-attach.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-cite.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-forward.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-inc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-lock.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-next.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-prev.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-queue.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-refile.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-reply.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-send.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-sep.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-show.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-write.xpm +%%EMACS_SITE_LISPDIR%%/mew/etc/mew-yank.xpm +%%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.el +%%EMACS_SITE_LISPDIR%%/mew/mew-attach.el +%%EMACS_SITE_LISPDIR%%/mew/mew-auth.el +%%EMACS_SITE_LISPDIR%%/mew/mew-blvs.el +%%EMACS_SITE_LISPDIR%%/mew/mew-bq.el +%%EMACS_SITE_LISPDIR%%/mew/mew-cache.el +%%EMACS_SITE_LISPDIR%%/mew/mew-complete.el +%%EMACS_SITE_LISPDIR%%/mew/mew-config.el +%%EMACS_SITE_LISPDIR%%/mew/mew-const.el +%%EMACS_SITE_LISPDIR%%/mew/mew-darwin.el +%%EMACS_SITE_LISPDIR%%/mew/mew-decode.el +%%EMACS_SITE_LISPDIR%%/mew/mew-demo.el +%%EMACS_SITE_LISPDIR%%/mew/mew-draft.el +%%EMACS_SITE_LISPDIR%%/mew/mew-edit.el +%%EMACS_SITE_LISPDIR%%/mew/mew-encode.el +%%EMACS_SITE_LISPDIR%%/mew/mew-env.el +%%EMACS_SITE_LISPDIR%%/mew/mew-env0.el +%%EMACS_SITE_LISPDIR%%/mew/mew-exec.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ext.el +%%EMACS_SITE_LISPDIR%%/mew/mew-fib.el +%%EMACS_SITE_LISPDIR%%/mew/mew-func.el +%%EMACS_SITE_LISPDIR%%/mew/mew-gemacs.el +%%EMACS_SITE_LISPDIR%%/mew/mew-header.el +%%EMACS_SITE_LISPDIR%%/mew/mew-highlight.el +%%EMACS_SITE_LISPDIR%%/mew/mew-imap.el +%%EMACS_SITE_LISPDIR%%/mew/mew-imap2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-key.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-jp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-kr.el +%%EMACS_SITE_LISPDIR%%/mew/mew-lang-latin.el +%%EMACS_SITE_LISPDIR%%/mew/mew-local.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mark.el +%%EMACS_SITE_LISPDIR%%/mew/mew-message.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mime.el +%%EMACS_SITE_LISPDIR%%/mew/mew-minibuf.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mule.el +%%EMACS_SITE_LISPDIR%%/mew/mew-mule3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-net.el +%%EMACS_SITE_LISPDIR%%/mew/mew-nntp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-nntp2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-oauth2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-passwd.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pgp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pick.el +%%EMACS_SITE_LISPDIR%%/mew/mew-pop.el +%%EMACS_SITE_LISPDIR%%/mew/mew-refile.el +%%EMACS_SITE_LISPDIR%%/mew/mew-scan.el +%%EMACS_SITE_LISPDIR%%/mew/mew-search.el +%%EMACS_SITE_LISPDIR%%/mew/mew-smime.el +%%EMACS_SITE_LISPDIR%%/mew/mew-smtp.el +%%EMACS_SITE_LISPDIR%%/mew/mew-sort.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ssh.el +%%EMACS_SITE_LISPDIR%%/mew/mew-ssl.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-summary4.el +%%EMACS_SITE_LISPDIR%%/mew/mew-syntax.el +%%EMACS_SITE_LISPDIR%%/mew/mew-thread.el +%%EMACS_SITE_LISPDIR%%/mew/mew-unix.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars2.el +%%EMACS_SITE_LISPDIR%%/mew/mew-vars3.el +%%EMACS_SITE_LISPDIR%%/mew/mew-varsx.el +%%EMACS_SITE_LISPDIR%%/mew/mew-virtual.el +%%EMACS_SITE_LISPDIR%%/mew/mew-win32.el +%%EMACS_SITE_LISPDIR%%/mew/mew.el diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile index eea817efb088..b17014f121ad 100644 --- a/mail/notmuch-emacs/Makefile +++ b/mail/notmuch-emacs/Makefile @@ -1,6 +1,6 @@ -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX:S/^$/-emacs/} +PKGNAMESUFFIX= -emacs COMMENT= Emacs major-mode for the Notmuch email search and tagging application WWW= https://notmuchmail.org/notmuch-emacs/ @@ -8,10 +8,13 @@ LICENSE= GPLv3 RUN_DEPENDS= notmuch:mail/notmuch -USES= emacs gmake +USES= emacs:build gmake INSTALL_TARGET= install-emacs MASTERDIR= ${.CURDIR}/../notmuch + +CONFLICTS_INSTALL= notmuch-emacs_* + NO_ARCH= yes OPTIONS_DEFINE= DESKTOP DOCS MANPAGES @@ -60,6 +63,7 @@ do-configure: > ${WRKSRC}/sphinx.config post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} -name "*.elc" -delete @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el # keep poudriere testport happy @@ -70,6 +74,6 @@ post-install-MANPAGES-on: @${FIND} ${STAGEDIR}${PREFIX}/share/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete # modify what Mk/Uses/emacs.mk set -MAKE_ARGS+= EMACS+=--quick +MAKE_ARGS+= EMACS=EMACS+=--quick .include "${MASTERDIR}/Makefile" diff --git a/mail/notmuch-emacs/pkg-plist b/mail/notmuch-emacs/pkg-plist index 7680c80bbc11..03a934cfeffa 100644 --- a/mail/notmuch-emacs/pkg-plist +++ b/mail/notmuch-emacs/pkg-plist @@ -1,47 +1,26 @@ %%DESKTOP%%share/applications/notmuch-emacs-mua.desktop %%EMACS_SITE_LISPDIR%%/coolj.el.gz -%%EMACS_SITE_LISPDIR%%/coolj.elc %%EMACS_SITE_LISPDIR%%/notmuch-address.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-address.elc %%EMACS_SITE_LISPDIR%%/notmuch-autoloads.el.gz %%EMACS_SITE_LISPDIR%%/notmuch-company.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-company.elc %%EMACS_SITE_LISPDIR%%/notmuch-compat.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc %%EMACS_SITE_LISPDIR%%/notmuch-crypto.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc %%EMACS_SITE_LISPDIR%%/notmuch-draft.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-draft.elc %%EMACS_SITE_LISPDIR%%/notmuch-hello.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc %%EMACS_SITE_LISPDIR%%/notmuch-jump.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc %%EMACS_SITE_LISPDIR%%/notmuch-lib.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc %%EMACS_SITE_LISPDIR%%/notmuch-logo.svg %%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc %%EMACS_SITE_LISPDIR%%/notmuch-message.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-message.elc %%EMACS_SITE_LISPDIR%%/notmuch-mua.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc %%EMACS_SITE_LISPDIR%%/notmuch-parser.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc %%EMACS_SITE_LISPDIR%%/notmuch-print.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-print.elc %%EMACS_SITE_LISPDIR%%/notmuch-query.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-query.elc %%EMACS_SITE_LISPDIR%%/notmuch-show.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-show.elc %%EMACS_SITE_LISPDIR%%/notmuch-tag.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc %%EMACS_SITE_LISPDIR%%/notmuch-tree.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc %%EMACS_SITE_LISPDIR%%/notmuch-version.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-version.elc %%EMACS_SITE_LISPDIR%%/notmuch-wash.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc %%EMACS_SITE_LISPDIR%%/notmuch.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch.elc %%MANPAGES%%share/man/man1/notmuch-emacs-mua.1.gz bin/notmuch-emacs-mua diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index d5b6ca938629..1e2f4aea2bd8 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -1,7 +1,7 @@ PORTNAME= wanderlust PORTVERSION= 2.15.9.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= mail elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Mail and news system for Emacs @@ -10,22 +10,24 @@ WWW= https://github.com/wanderlust/wanderlust LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \ - semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \ - x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR} -RUN_DEPENDS= emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \ - semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} +BUILD_DEPENDS= emacs-w3m>0:www/emacs-w3m \ + semi>0:editors/semi \ + x-face-e21>0:mail/x-face-e21 +RUN_DEPENDS= emacs-w3m>0:www/emacs-w3m \ + semi>0:editors/semi -USES= emacs +USES= emacs:build USE_GITHUB= yes GH_TAGNAME= 06ec9fa +CONFLICTS_INSTALL= wanderlust-emacs_* + NO_ARCH= yes SNAPDATE= 20251029 MAKE_ARGS+= EMACS=${EMACS_CMD} \ FLAGS="-batch -q -no-site-file" \ - LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ + LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} \ INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \ PACKAGE_LISPDIR=NONE \ PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons @@ -41,13 +43,16 @@ post-extract: @${CP} ${FILESDIR}/WL-CFG ${WRKSRC} post-install: - ${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl \ + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl \ + -name "*.elc" -delete + + ${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl \ ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} \ ${WRKSRC}/elmo/elmo-shimbun.el \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/wl ${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${DATADIR} post-install-DOCS-on: diff --git a/mail/wanderlust/pkg-plist b/mail/wanderlust/pkg-plist index 6f10ec541f24..fed3c3418d11 100644 --- a/mail/wanderlust/pkg-plist +++ b/mail/wanderlust/pkg-plist @@ -76,159 +76,82 @@ %%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-set-flags-up.xpm %%EMACS_LIBDIR%%/etc/wl/icons/wl-summary-sync-force-update-up.xpm %%EMACS_LIBDIR%%/etc/wl/icons/wl-write-current-folder-up.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/wanderlust-startup.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/acap.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/acap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-access.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-access.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-archive.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-archive.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-cache.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-cache.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-date.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-date.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-dop.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-dop.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-file.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-file.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-filter.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-filter.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-flag.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-flag.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-imap4.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-imap4.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-internal.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-internal.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-localdir.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-localdir.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-localnews.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-localnews.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-maildir.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-maildir.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-map.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-map.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-mime.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-mime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-msgdb.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-msgdb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-multi.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-multi.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-net.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-net.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-nntp.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-nntp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-null.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-null.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-passwd.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-passwd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-pipe.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-pipe.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-pop3.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-pop3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-rss.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-rss.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-search.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-search.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-sendlog.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-sendlog.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-shimbun.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-shimbun.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-signal.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-signal.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-spam.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-spam.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-split.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-split.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-util.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-util.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-version.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo-version.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elmo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-bogofilter.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-bogofilter.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-bsfilter.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-bsfilter.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-sa.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-sa.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-spamoracle.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/elsp-spamoracle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/im-wl.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/im-wl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/mmimap.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/mmimap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-entity.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-entity.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-legacy.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-legacy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-standard.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb-standard.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/modb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/pldap.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/pldap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/rfc2368.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/rfc2368.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/slp.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/slp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/ssl.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/ssl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-acap.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-acap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-action.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-action.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-addrbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-addrbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-address.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-address.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-addrmgr.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-addrmgr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-batch.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-batch.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-complete.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-complete.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-demo.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-demo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-draft.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-draft.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-e21.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-e21.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-expire.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-expire.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-fldmgr.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-fldmgr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-folder.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-folder.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-highlight.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-highlight.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-mailto.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-mailto.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-message.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-message.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-mime.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-mime.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-news.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-qs.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-qs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-refile.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-refile.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-score.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-score.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-spam.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-spam.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-summary.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-summary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-template.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-template.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-thread.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-thread.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-util.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-util.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-version.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl-version.elc -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl.el -%%EMACS_VERSION_SITE_LISPDIR%%/wl/wl.elc +%%EMACS_SITE_LISPDIR%%/wanderlust-startup.el +%%EMACS_SITE_LISPDIR%%/wl/acap.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-access.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-archive.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-cache.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-date.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-dop.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-file.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-filter.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-flag.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-imap4.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-internal.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-localdir.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-localnews.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-maildir.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-map.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-mime.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-msgdb.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-multi.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-net.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-null.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-search.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-signal.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-spam.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-split.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-util.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-vars.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-version.el +%%EMACS_SITE_LISPDIR%%/wl/elmo.el +%%EMACS_SITE_LISPDIR%%/wl/elsp-bogofilter.el +%%EMACS_SITE_LISPDIR%%/wl/elsp-bsfilter.el +%%EMACS_SITE_LISPDIR%%/wl/elsp-sa.el +%%EMACS_SITE_LISPDIR%%/wl/elsp-spamoracle.el +%%EMACS_SITE_LISPDIR%%/wl/im-wl.el +%%EMACS_SITE_LISPDIR%%/wl/mmimap.el +%%EMACS_SITE_LISPDIR%%/wl/modb-entity.el +%%EMACS_SITE_LISPDIR%%/wl/modb-legacy.el +%%EMACS_SITE_LISPDIR%%/wl/modb-standard.el +%%EMACS_SITE_LISPDIR%%/wl/modb.el +%%EMACS_SITE_LISPDIR%%/wl/pldap.el +%%EMACS_SITE_LISPDIR%%/wl/rfc2368.el +%%EMACS_SITE_LISPDIR%%/wl/slp.el +%%EMACS_SITE_LISPDIR%%/wl/ssl.el +%%EMACS_SITE_LISPDIR%%/wl/wl-acap.el +%%EMACS_SITE_LISPDIR%%/wl/wl-action.el +%%EMACS_SITE_LISPDIR%%/wl/wl-addrbook.el +%%EMACS_SITE_LISPDIR%%/wl/wl-address.el +%%EMACS_SITE_LISPDIR%%/wl/wl-addrmgr.el +%%EMACS_SITE_LISPDIR%%/wl/wl-batch.el +%%EMACS_SITE_LISPDIR%%/wl/wl-complete.el +%%EMACS_SITE_LISPDIR%%/wl/wl-demo.el +%%EMACS_SITE_LISPDIR%%/wl/wl-draft.el +%%EMACS_SITE_LISPDIR%%/wl/wl-e21.el +%%EMACS_SITE_LISPDIR%%/wl/wl-expire.el +%%EMACS_SITE_LISPDIR%%/wl/wl-fldmgr.el +%%EMACS_SITE_LISPDIR%%/wl/wl-folder.el +%%EMACS_SITE_LISPDIR%%/wl/wl-highlight.el +%%EMACS_SITE_LISPDIR%%/wl/wl-mailto.el +%%EMACS_SITE_LISPDIR%%/wl/wl-message.el +%%EMACS_SITE_LISPDIR%%/wl/wl-mime.el +%%EMACS_SITE_LISPDIR%%/wl/wl-news.el +%%EMACS_SITE_LISPDIR%%/wl/wl-qs.el +%%EMACS_SITE_LISPDIR%%/wl/wl-refile.el +%%EMACS_SITE_LISPDIR%%/wl/wl-score.el +%%EMACS_SITE_LISPDIR%%/wl/wl-spam.el +%%EMACS_SITE_LISPDIR%%/wl/wl-summary.el +%%EMACS_SITE_LISPDIR%%/wl/wl-template.el +%%EMACS_SITE_LISPDIR%%/wl/wl-thread.el +%%EMACS_SITE_LISPDIR%%/wl/wl-util.el +%%EMACS_SITE_LISPDIR%%/wl/wl-vars.el +%%EMACS_SITE_LISPDIR%%/wl/wl-version.el +%%EMACS_SITE_LISPDIR%%/wl/wl.el diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile index 5df614649a22..f14007322f65 100644 --- a/mail/x-face-e21/Makefile +++ b/mail/x-face-e21/Makefile @@ -1,9 +1,8 @@ PORTNAME= x-face-e21 PORTVERSION= 20070306 -PORTREVISION= 34 +PORTREVISION= 35 CATEGORIES= mail elisp MASTER_SITES= http://www.jpl.org/elips/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}.el EXTRACT_SUFX= .gz @@ -20,18 +19,20 @@ EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${DISTNAME} -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ - ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c +CONFLICTS_INSTALL= x-face-e21-emacs_* + +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/${DISTNAME} do-build: @(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile ${DISTNAME}) do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile index d28621c303dc..ac5958a9cd58 100644 --- a/mail/xcite/Makefile +++ b/mail/xcite/Makefile @@ -1,9 +1,8 @@ PORTNAME= xcite PORTVERSION= 1.60 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= mail elisp MASTER_SITES= https://www.gentei.org/~yuuji/software/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}.el EXTRACT_SUFX= # empty @@ -19,18 +18,16 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= . -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ - ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c +CONFLICTS_INSTALL= xcite-emacs_* -do-build: - @(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ - -f batch-byte-compile ${DISTNAME}) +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/${DISTNAME} do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/math/ess/Makefile b/math/ess/Makefile index 0e994377db88..bd538e7f4212 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,5 +1,6 @@ PORTNAME= ess DISTVERSION= 26.01.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://ess.r-project.org/ \ https://stat.ethz.ch/ESS/downloads/ess/ \ @@ -19,9 +20,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= R:math/R -USES= emacs gmake makeinfo perl5 tar:tgz +USES= emacs:build gmake makeinfo perl5 tar:tgz USE_PERL5= build +CONFLICTS_INSTALL= ess-emacs_* + NO_ARCH= yes INFO= ess @@ -55,9 +58,8 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR} post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/ - @${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/ - @${CP} ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/ + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/ess/ + @${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/ess/ ${INSTALL_DATA} ${WRKSRC}/doc/info/ess.info ${STAGEDIR}${PREFIX}/${INFO_PATH} @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess/ (cd ${WRKSRC}/etc && ${CP} ess-julia.jl ess-sas-sh-command \ diff --git a/math/ess/pkg-message b/math/ess/pkg-message deleted file mode 100644 index d9e277ab51c7..000000000000 --- a/math/ess/pkg-message +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <0:editors/apel@${EMACS_FLAVOR} +RUN_DEPENDS= apel>0:editors/apel USES= emacs USE_GITHUB= yes @@ -19,6 +18,8 @@ GH_ACCOUNT= TakaakiFuruse GH_PROJECT= ${PORTNAME} GH_TAGNAME= 329b438 +CONFLICTS_INSTALL= elscreen-emacs_* + NO_ARCH= yes NO_BUILD= YES diff --git a/misc/elscreen/pkg-message b/misc/elscreen/pkg-message index c8a3c70b3bb2..fca5f515db6b 100644 --- a/misc/elscreen/pkg-message +++ b/misc/elscreen/pkg-message @@ -2,7 +2,7 @@ { type: install message: < -.if ! ${PORT_OPTIONS:MEMACS} CONFIGURE_ENV+= EMACS=no -.endif .if ${PORT_OPTIONS:MI18N} || make(makesum) || defined(FETCH_ALL) #DISTFILES+= ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n @@ -71,9 +69,9 @@ post-configure: post-install: .if ${PORT_OPTIONS:MEMACS} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \ + ${LN} -sf ${PREFIX}/${EMACS_SITE_LISPDIR}/a2ps-print.el \ ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps.el \ + ${LN} -sf ${PREFIX}/${EMACS_SITE_LISPDIR}/a2ps.el \ ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps.el .endif cd ${WRKSRC}/doc && \ diff --git a/print/a2ps/pkg-plist b/print/a2ps/pkg-plist index 4d6b473b9927..c8b4c9e040ca 100644 --- a/print/a2ps/pkg-plist +++ b/print/a2ps/pkg-plist @@ -356,8 +356,6 @@ share/man/man1/lp2.1.gz share/man/man1/fixps.1.gz share/man/man1/pdiff.1.gz %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc %%EMACS%%lib/xemacs/site-lisp/a2ps-print.el %%EMACS%%lib/xemacs/site-lisp/a2ps.el diff --git a/print/auctex/Makefile b/print/auctex/Makefile index e91db3e86bbe..d5e5421193cf 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -1,9 +1,8 @@ PORTNAME= auctex DISTVERSION= 13.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print elisp MASTER_SITES= GNU -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Integrated environment for writing LaTeX using GNU Emacs @@ -12,14 +11,16 @@ WWW= https://www.gnu.org/software/auctex/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= emacs ghostscript gmake tex +USES= emacs:build ghostscript gmake tex USE_TEX= latex texhash GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ - --with-auto-dir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/auctex/auto \ +CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ + --with-auto-dir=${PREFIX}/${EMACS_SITE_LISPDIR}/auctex/auto \ --with-texmf-dir=${PREFIX}/${TEXMFDIR} +CONFLICTS_INSTALL= auctex-emacs_* + NO_ARCH= yes SUB_FILES= pkg-message @@ -32,4 +33,8 @@ DOCS_CONFIGURE_OFF= WITHOUT_AUCTEX_DOCSDIR=yes TEXHASHDIRS= ${TEXMFDIR} +post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/auctex \ + -name "*.elc" -delete + .include diff --git a/print/auctex/pkg-plist b/print/auctex/pkg-plist index 95f311b8ec1f..0f07272b96b4 100644 --- a/print/auctex/pkg-plist +++ b/print/auctex/pkg-plist @@ -1,699 +1,374 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/auctex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/auto/.nosearch -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/bib-cite.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/bib-cite.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context-en.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context-en.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context-nl.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context-nl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/context.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/font-latex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/font-latex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/amstex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/bibtex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/dropdown.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/dvipdf.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/dvips.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/error.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/exec.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execbibtex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execdvips.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execerror.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execpdftex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/exectex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execviewdvi.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execviewpdf.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/execviewps.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/gv.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/jumpdvi.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/ltx-symb-turn-off.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/ltx-symb-turn-on.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/pdftex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prverr16.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prverr20.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prverr24.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvtex-cap-up.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvtex12.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvtex16.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvtex20.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvtex24.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvwrk12.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvwrk14.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvwrk16.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvwrk20.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/prvwrk24.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/pspdf.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/sep.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/spell.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/tex.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/view.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/viewdvi.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/viewpdf.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/images/viewps.xpm -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/latex-flymake.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/latex-flymake.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/latex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/latex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/multi-prompt.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/multi-prompt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/plain-tex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/plain-tex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/preview.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/preview.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/.nosearch -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/Alegreya.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/Alegreya.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/AlegreyaSans.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/AlegreyaSans.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/AnonymousPro.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/AnonymousPro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/CJK.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/CJK.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/CJKutf8.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/CJKutf8.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/FiraMono.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/FiraMono.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/FiraSans.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/FiraSans.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/MinionPro.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/MinionPro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/MyriadPro.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/MyriadPro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/XCharter.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/XCharter.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/acro.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/acro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/acronym.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/acronym.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/afterpage.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/afterpage.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algorithm.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algorithm.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algpseudocode.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algpseudocode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algpseudocodex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/algpseudocodex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/alltt.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/alltt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/alphanum.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/alphanum.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsaddr.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsaddr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsart.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsart.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsbsy.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsbsy.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsfonts.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsfonts.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsmath.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsmath.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsopn.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsopn.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amssymb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amssymb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amstex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amstex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amstext.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amstext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsthm.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/amsthm.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/appendix.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/appendix.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/arabxetex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/arabxetex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/array.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/array.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/article.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/article.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/attachfile.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/attachfile.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/australian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/australian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/austrian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/austrian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/babel.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/babel.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/backref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/backref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/baskervaldx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/baskervaldx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamer.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamer.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamerarticle.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamerarticle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamerswitch.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/beamerswitch.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/biblatex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/biblatex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bicaption.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bicaption.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bidi.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bidi.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bidibeamer.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bidibeamer.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bigdelim.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bigdelim.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bigstrut.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bigstrut.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bm.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bm.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/book.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/book.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/booktabs.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/booktabs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/brazil.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/brazil.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/brazilian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/brazilian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/breqn.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/breqn.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bulgarian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/bulgarian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/canadian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/canadian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cancel.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cancel.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/captcont.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/captcont.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/caption.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/caption.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/catchfilebetweentags.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/catchfilebetweentags.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changebar.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changebar.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changelog.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changelog.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changes.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/changes.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cleveref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cleveref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/color.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/color.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/colortbl.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/colortbl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/commath.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/commath.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/comment.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/comment.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/csquotes.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/csquotes.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/currvita.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/currvita.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cuted.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/cuted.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/czech.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/czech.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/danish.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/danish.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dashundergaps.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dashundergaps.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dcolumn.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dcolumn.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dinbrief.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dinbrief.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dk-bib.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dk-bib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dk.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dk.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/doc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/doc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dutch.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/dutch.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/emp.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/emp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/empheq.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/empheq.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/english.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/english.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/enumitem.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/enumitem.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/environ.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/environ.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/epigraph.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/epigraph.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/epsf.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/epsf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/erewhon.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/erewhon.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/eso-pic.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/eso-pic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/etoolbox.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/etoolbox.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/everysel.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/everysel.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/exam.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/exam.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/exercise.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/exercise.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/expl3.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/expl3.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/extramarks.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/extramarks.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyhdr.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyhdr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancynum.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancynum.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyvrb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fancyvrb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fbb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fbb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fbox.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fbox.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/filecontents.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/filecontents.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/flashcards.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/flashcards.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/floatpag.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/floatpag.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/floatrow.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/floatrow.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/flushend.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/flushend.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/foils.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/foils.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontaxes.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontaxes.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontenc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontenc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontspec.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fontspec.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/footmisc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/footmisc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/footnotehyper.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/footnotehyper.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/framed.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/framed.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/francais.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/francais.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/french.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/french.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/frenchb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/frenchb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fvextra.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/fvextra.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/geometry.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/geometry.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/german.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/german.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/gloss-italian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/gloss-italian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/graphics.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/graphics.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/graphicx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/graphicx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/harvard.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/harvard.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/hologo.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/hologo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/hyperref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/hyperref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/icelandic.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/icelandic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifetex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifetex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifluatex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifluatex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifpdf.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifpdf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/iftex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/iftex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifthen.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifthen.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifvtex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifvtex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifxetex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ifxetex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/imakeidx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/imakeidx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/index.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/index.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/inputenc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/inputenc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/italian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/italian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-article.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-article.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-book.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-book.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-report.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/j-report.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jarticle.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jarticle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jreport.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jreport.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsarticle.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsarticle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsreport.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jsreport.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jura.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jura.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jurabib.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/jurabib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kantlipsum.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kantlipsum.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/keyval.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/keyval.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kpfonts.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kpfonts.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kvoptions.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kvoptions.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kvsetkeys.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/kvsetkeys.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/l3doc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/l3doc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/letter.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/letter.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lettrine.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lettrine.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lipsum.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lipsum.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/listings.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/listings.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/longtable.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/longtable.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lscape.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/lscape.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltablex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltablex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltcaption.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltcaption.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltugboat.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltugboat.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltx-base.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltx-base.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxdoc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxdoc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxguide.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxguide.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxtable.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ltxtable.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/luacode.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/luacode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/luatextra.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/luatextra.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/makeidx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/makeidx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/marginnote.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/marginnote.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mathtools.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mathtools.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdframed.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdframed.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdsymbol.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdsymbol.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdwlist.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mdwlist.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/memoir.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/memoir.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/menukeys.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/menukeys.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/metalogo.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/metalogo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mflogo.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mflogo.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/microtype.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/microtype.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/midfloat.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/midfloat.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/minted.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/minted.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mn2e.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mn2e.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mnras.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/mnras.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/moodle.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/moodle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multibib.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multibib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multicol.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multicol.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multido.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multido.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multind.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multind.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multirow.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multirow.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multitoc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/multitoc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nameref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nameref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/natbib.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/natbib.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/naustrian.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/naustrian.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newfloat.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newfloat.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newpxmath.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newpxmath.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newpxtext.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newpxtext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxmath.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxmath.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxsf.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxsf.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxtext.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxtext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxttt.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newtxttt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newzealand.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/newzealand.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ngerman.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ngerman.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nicefrac.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nicefrac.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nomencl.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/nomencl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ntheorem.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ntheorem.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ocg-p.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ocg-p.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ocgx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ocgx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/overpic.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/overpic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/paracol.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/paracol.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/paralist.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/paralist.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/parskip.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/parskip.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdflscape.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdflscape.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdfpages.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdfpages.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdfsync.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pdfsync.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/physics.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/physics.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/placeins.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/placeins.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plext.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plext.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plfonts.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plfonts.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plhb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/plhb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polish.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polish.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polski.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polski.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polyglossia.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/polyglossia.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/portuges.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/portuges.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/portuguese.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/portuguese.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/preview.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/preview.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/proc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/proc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/prosper.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/prosper.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/psfig.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/psfig.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-grad.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-grad.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-node.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-node.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-plot.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-plot.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-slpe.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pst-slpe.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pstricks.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pstricks.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pythontex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/pythontex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ragged2e.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ragged2e.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/refcount.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/refcount.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/relsize.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/relsize.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/report.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/report.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/revtex4-2.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/revtex4-2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/rotating.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/rotating.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ruby.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ruby.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scholax.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scholax.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrartcl.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrartcl.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrbase.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrbase.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrlttr2.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrlttr2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrpage2.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrpage2.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrreprt.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/scrreprt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/setspace.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/setspace.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/shortvrb.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/shortvrb.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/sidecap.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/sidecap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/simpleicons.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/simpleicons.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/siunitx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/siunitx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/slides.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/slides.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/slovak.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/slovak.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/soul.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/soul.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/sourcecodepro.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/sourcecodepro.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/splitidx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/splitidx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/stabular.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/stabular.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/stfloats.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/stfloats.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subcaption.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subcaption.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subfigure.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subfigure.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subfiles.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/subfiles.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/swedish.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/swedish.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tabularx.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tabularx.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tabulary.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tabulary.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tarticle.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tarticle.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tbook.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tbook.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorbox.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorbox.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorboxlib-raster.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorboxlib-raster.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorboxlib-theorems.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tcolorboxlib-theorems.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tex-live.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tex-live.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/textcomp.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/textcomp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/textpos.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/textpos.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/theorem.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/theorem.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/thm-restate.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/thm-restate.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/thmtools.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/thmtools.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tikz.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/tikz.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titleps.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titleps.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titlesec.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titlesec.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titletoc.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/titletoc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/transparent.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/transparent.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/treport.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/treport.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/truncate.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/truncate.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ulem.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/ulem.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/unicode-math.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/unicode-math.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/unicodefonttable.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/unicodefonttable.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/units.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/units.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/url.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/url.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/varioref.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/varioref.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/verbatim.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/verbatim.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/virtex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/virtex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/vwcol.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/vwcol.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/wasysym.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/wasysym.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/wrapfig.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/wrapfig.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xcolor.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xcolor.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xkcdcolors.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xkcdcolors.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xltabular.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xltabular.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xparse.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xparse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xr-hyper.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xr-hyper.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xr.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xr.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xspace.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/xspace.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/zlmtt.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/style/zlmtt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-bar.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-bar.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-fold.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-fold.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-font.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-font.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-info.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-info.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-ispell.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-ispell.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-jp.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-jp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-mik.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-mik.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-style.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex-style.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/tex.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/texmathp.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/texmathp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/toolbar-x.el -%%EMACS_VERSION_SITE_LISPDIR%%/auctex/toolbar-x.elc -%%EMACS_VERSION_SITE_LISPDIR%%/preview-latex.el -%%EMACS_VERSION_SITE_LISPDIR%%/tex-site.el +%%EMACS_SITE_LISPDIR%%/auctex.el +%%EMACS_SITE_LISPDIR%%/auctex/auto/.nosearch +%%EMACS_SITE_LISPDIR%%/auctex/bib-cite.el +%%EMACS_SITE_LISPDIR%%/auctex/context-en.el +%%EMACS_SITE_LISPDIR%%/auctex/context-nl.el +%%EMACS_SITE_LISPDIR%%/auctex/context.el +%%EMACS_SITE_LISPDIR%%/auctex/font-latex.el +%%EMACS_SITE_LISPDIR%%/auctex/images/amstex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/bibtex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/dropdown.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/dvipdf.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/dvips.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/error.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/exec.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execbibtex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execdvips.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execerror.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execpdftex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/exectex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execviewdvi.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execviewpdf.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/execviewps.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/gv.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/jumpdvi.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/ltx-symb-turn-off.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/ltx-symb-turn-on.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/pdftex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prverr16.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prverr20.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prverr24.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvtex-cap-up.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvtex12.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvtex16.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvtex20.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvtex24.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvwrk12.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvwrk14.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvwrk16.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvwrk20.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/prvwrk24.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/pspdf.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/sep.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/spell.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/tex.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/view.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/viewdvi.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/viewpdf.xpm +%%EMACS_SITE_LISPDIR%%/auctex/images/viewps.xpm +%%EMACS_SITE_LISPDIR%%/auctex/latex-flymake.el +%%EMACS_SITE_LISPDIR%%/auctex/latex.el +%%EMACS_SITE_LISPDIR%%/auctex/multi-prompt.el +%%EMACS_SITE_LISPDIR%%/auctex/plain-tex.el +%%EMACS_SITE_LISPDIR%%/auctex/preview.el +%%EMACS_SITE_LISPDIR%%/auctex/style/.nosearch +%%EMACS_SITE_LISPDIR%%/auctex/style/Alegreya.el +%%EMACS_SITE_LISPDIR%%/auctex/style/AlegreyaSans.el +%%EMACS_SITE_LISPDIR%%/auctex/style/AnonymousPro.el +%%EMACS_SITE_LISPDIR%%/auctex/style/CJK.el +%%EMACS_SITE_LISPDIR%%/auctex/style/CJKutf8.el +%%EMACS_SITE_LISPDIR%%/auctex/style/FiraMono.el +%%EMACS_SITE_LISPDIR%%/auctex/style/FiraSans.el +%%EMACS_SITE_LISPDIR%%/auctex/style/MinionPro.el +%%EMACS_SITE_LISPDIR%%/auctex/style/MyriadPro.el +%%EMACS_SITE_LISPDIR%%/auctex/style/XCharter.el +%%EMACS_SITE_LISPDIR%%/auctex/style/acro.el +%%EMACS_SITE_LISPDIR%%/auctex/style/acronym.el +%%EMACS_SITE_LISPDIR%%/auctex/style/afterpage.el +%%EMACS_SITE_LISPDIR%%/auctex/style/algorithm.el +%%EMACS_SITE_LISPDIR%%/auctex/style/algpseudocode.el +%%EMACS_SITE_LISPDIR%%/auctex/style/algpseudocodex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/alltt.el +%%EMACS_SITE_LISPDIR%%/auctex/style/alphanum.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsaddr.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsart.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsbook.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsbsy.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsfonts.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsmath.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsopn.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amssymb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amstex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amstext.el +%%EMACS_SITE_LISPDIR%%/auctex/style/amsthm.el +%%EMACS_SITE_LISPDIR%%/auctex/style/appendix.el +%%EMACS_SITE_LISPDIR%%/auctex/style/arabxetex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/array.el +%%EMACS_SITE_LISPDIR%%/auctex/style/article.el +%%EMACS_SITE_LISPDIR%%/auctex/style/attachfile.el +%%EMACS_SITE_LISPDIR%%/auctex/style/australian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/austrian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/babel.el +%%EMACS_SITE_LISPDIR%%/auctex/style/backref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/baskervaldx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/beamer.el +%%EMACS_SITE_LISPDIR%%/auctex/style/beamerarticle.el +%%EMACS_SITE_LISPDIR%%/auctex/style/beamerswitch.el +%%EMACS_SITE_LISPDIR%%/auctex/style/biblatex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bicaption.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bidi.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bidibeamer.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bigdelim.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bigstrut.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bm.el +%%EMACS_SITE_LISPDIR%%/auctex/style/book.el +%%EMACS_SITE_LISPDIR%%/auctex/style/booktabs.el +%%EMACS_SITE_LISPDIR%%/auctex/style/brazil.el +%%EMACS_SITE_LISPDIR%%/auctex/style/brazilian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/breqn.el +%%EMACS_SITE_LISPDIR%%/auctex/style/bulgarian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/canadian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/cancel.el +%%EMACS_SITE_LISPDIR%%/auctex/style/captcont.el +%%EMACS_SITE_LISPDIR%%/auctex/style/caption.el +%%EMACS_SITE_LISPDIR%%/auctex/style/catchfilebetweentags.el +%%EMACS_SITE_LISPDIR%%/auctex/style/changebar.el +%%EMACS_SITE_LISPDIR%%/auctex/style/changelog.el +%%EMACS_SITE_LISPDIR%%/auctex/style/changes.el +%%EMACS_SITE_LISPDIR%%/auctex/style/cleveref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/color.el +%%EMACS_SITE_LISPDIR%%/auctex/style/colortbl.el +%%EMACS_SITE_LISPDIR%%/auctex/style/commath.el +%%EMACS_SITE_LISPDIR%%/auctex/style/comment.el +%%EMACS_SITE_LISPDIR%%/auctex/style/csquotes.el +%%EMACS_SITE_LISPDIR%%/auctex/style/currvita.el +%%EMACS_SITE_LISPDIR%%/auctex/style/cuted.el +%%EMACS_SITE_LISPDIR%%/auctex/style/czech.el +%%EMACS_SITE_LISPDIR%%/auctex/style/danish.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dashundergaps.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dcolumn.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dinbrief.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dk-bib.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dk.el +%%EMACS_SITE_LISPDIR%%/auctex/style/doc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/dutch.el +%%EMACS_SITE_LISPDIR%%/auctex/style/emp.el +%%EMACS_SITE_LISPDIR%%/auctex/style/empheq.el +%%EMACS_SITE_LISPDIR%%/auctex/style/english.el +%%EMACS_SITE_LISPDIR%%/auctex/style/enumitem.el +%%EMACS_SITE_LISPDIR%%/auctex/style/environ.el +%%EMACS_SITE_LISPDIR%%/auctex/style/epigraph.el +%%EMACS_SITE_LISPDIR%%/auctex/style/epsf.el +%%EMACS_SITE_LISPDIR%%/auctex/style/erewhon.el +%%EMACS_SITE_LISPDIR%%/auctex/style/eso-pic.el +%%EMACS_SITE_LISPDIR%%/auctex/style/etoolbox.el +%%EMACS_SITE_LISPDIR%%/auctex/style/everysel.el +%%EMACS_SITE_LISPDIR%%/auctex/style/exam.el +%%EMACS_SITE_LISPDIR%%/auctex/style/exercise.el +%%EMACS_SITE_LISPDIR%%/auctex/style/expl3.el +%%EMACS_SITE_LISPDIR%%/auctex/style/extramarks.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fancyhdr.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fancynum.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fancyref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fancyvrb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fbb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fbox.el +%%EMACS_SITE_LISPDIR%%/auctex/style/filecontents.el +%%EMACS_SITE_LISPDIR%%/auctex/style/flashcards.el +%%EMACS_SITE_LISPDIR%%/auctex/style/floatpag.el +%%EMACS_SITE_LISPDIR%%/auctex/style/floatrow.el +%%EMACS_SITE_LISPDIR%%/auctex/style/flushend.el +%%EMACS_SITE_LISPDIR%%/auctex/style/foils.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fontaxes.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fontenc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fontspec.el +%%EMACS_SITE_LISPDIR%%/auctex/style/footmisc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/footnotehyper.el +%%EMACS_SITE_LISPDIR%%/auctex/style/framed.el +%%EMACS_SITE_LISPDIR%%/auctex/style/francais.el +%%EMACS_SITE_LISPDIR%%/auctex/style/french.el +%%EMACS_SITE_LISPDIR%%/auctex/style/frenchb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/fvextra.el +%%EMACS_SITE_LISPDIR%%/auctex/style/geometry.el +%%EMACS_SITE_LISPDIR%%/auctex/style/german.el +%%EMACS_SITE_LISPDIR%%/auctex/style/gloss-italian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/graphics.el +%%EMACS_SITE_LISPDIR%%/auctex/style/graphicx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/harvard.el +%%EMACS_SITE_LISPDIR%%/auctex/style/hologo.el +%%EMACS_SITE_LISPDIR%%/auctex/style/hyperref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/icelandic.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifetex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifluatex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifpdf.el +%%EMACS_SITE_LISPDIR%%/auctex/style/iftex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifthen.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifvtex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ifxetex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/imakeidx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/index.el +%%EMACS_SITE_LISPDIR%%/auctex/style/inputenc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/italian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/j-article.el +%%EMACS_SITE_LISPDIR%%/auctex/style/j-book.el +%%EMACS_SITE_LISPDIR%%/auctex/style/j-report.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jarticle.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jbook.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jreport.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jsarticle.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jsbook.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jsreport.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jura.el +%%EMACS_SITE_LISPDIR%%/auctex/style/jurabib.el +%%EMACS_SITE_LISPDIR%%/auctex/style/kantlipsum.el +%%EMACS_SITE_LISPDIR%%/auctex/style/keyval.el +%%EMACS_SITE_LISPDIR%%/auctex/style/kpfonts.el +%%EMACS_SITE_LISPDIR%%/auctex/style/kvoptions.el +%%EMACS_SITE_LISPDIR%%/auctex/style/kvsetkeys.el +%%EMACS_SITE_LISPDIR%%/auctex/style/l3doc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/letter.el +%%EMACS_SITE_LISPDIR%%/auctex/style/lettrine.el +%%EMACS_SITE_LISPDIR%%/auctex/style/lipsum.el +%%EMACS_SITE_LISPDIR%%/auctex/style/listings.el +%%EMACS_SITE_LISPDIR%%/auctex/style/longtable.el +%%EMACS_SITE_LISPDIR%%/auctex/style/lscape.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltablex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltcaption.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltugboat.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltx-base.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltxdoc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltxguide.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ltxtable.el +%%EMACS_SITE_LISPDIR%%/auctex/style/luacode.el +%%EMACS_SITE_LISPDIR%%/auctex/style/luatextra.el +%%EMACS_SITE_LISPDIR%%/auctex/style/makeidx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/marginnote.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mathtools.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mdframed.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mdsymbol.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mdwlist.el +%%EMACS_SITE_LISPDIR%%/auctex/style/memoir.el +%%EMACS_SITE_LISPDIR%%/auctex/style/menukeys.el +%%EMACS_SITE_LISPDIR%%/auctex/style/metalogo.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mflogo.el +%%EMACS_SITE_LISPDIR%%/auctex/style/microtype.el +%%EMACS_SITE_LISPDIR%%/auctex/style/midfloat.el +%%EMACS_SITE_LISPDIR%%/auctex/style/minted.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mn2e.el +%%EMACS_SITE_LISPDIR%%/auctex/style/mnras.el +%%EMACS_SITE_LISPDIR%%/auctex/style/moodle.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multibib.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multicol.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multido.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multind.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multirow.el +%%EMACS_SITE_LISPDIR%%/auctex/style/multitoc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/nameref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/natbib.el +%%EMACS_SITE_LISPDIR%%/auctex/style/naustrian.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newfloat.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newpxmath.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newpxtext.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newtxmath.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newtxsf.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newtxtext.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newtxttt.el +%%EMACS_SITE_LISPDIR%%/auctex/style/newzealand.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ngerman.el +%%EMACS_SITE_LISPDIR%%/auctex/style/nicefrac.el +%%EMACS_SITE_LISPDIR%%/auctex/style/nomencl.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ntheorem.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ocg-p.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ocgx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/overpic.el +%%EMACS_SITE_LISPDIR%%/auctex/style/paracol.el +%%EMACS_SITE_LISPDIR%%/auctex/style/paralist.el +%%EMACS_SITE_LISPDIR%%/auctex/style/parskip.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pdflscape.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pdfpages.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pdfsync.el +%%EMACS_SITE_LISPDIR%%/auctex/style/physics.el +%%EMACS_SITE_LISPDIR%%/auctex/style/placeins.el +%%EMACS_SITE_LISPDIR%%/auctex/style/plext.el +%%EMACS_SITE_LISPDIR%%/auctex/style/plfonts.el +%%EMACS_SITE_LISPDIR%%/auctex/style/plhb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/polish.el +%%EMACS_SITE_LISPDIR%%/auctex/style/polski.el +%%EMACS_SITE_LISPDIR%%/auctex/style/polyglossia.el +%%EMACS_SITE_LISPDIR%%/auctex/style/portuges.el +%%EMACS_SITE_LISPDIR%%/auctex/style/portuguese.el +%%EMACS_SITE_LISPDIR%%/auctex/style/preview.el +%%EMACS_SITE_LISPDIR%%/auctex/style/proc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/prosper.el +%%EMACS_SITE_LISPDIR%%/auctex/style/psfig.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pst-grad.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pst-node.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pst-plot.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pst-slpe.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pstricks.el +%%EMACS_SITE_LISPDIR%%/auctex/style/pythontex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ragged2e.el +%%EMACS_SITE_LISPDIR%%/auctex/style/refcount.el +%%EMACS_SITE_LISPDIR%%/auctex/style/relsize.el +%%EMACS_SITE_LISPDIR%%/auctex/style/report.el +%%EMACS_SITE_LISPDIR%%/auctex/style/revtex4-2.el +%%EMACS_SITE_LISPDIR%%/auctex/style/rotating.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ruby.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scholax.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrartcl.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrbase.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrbook.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrlttr2.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrpage2.el +%%EMACS_SITE_LISPDIR%%/auctex/style/scrreprt.el +%%EMACS_SITE_LISPDIR%%/auctex/style/setspace.el +%%EMACS_SITE_LISPDIR%%/auctex/style/shortvrb.el +%%EMACS_SITE_LISPDIR%%/auctex/style/sidecap.el +%%EMACS_SITE_LISPDIR%%/auctex/style/simpleicons.el +%%EMACS_SITE_LISPDIR%%/auctex/style/siunitx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/slides.el +%%EMACS_SITE_LISPDIR%%/auctex/style/slovak.el +%%EMACS_SITE_LISPDIR%%/auctex/style/soul.el +%%EMACS_SITE_LISPDIR%%/auctex/style/sourcecodepro.el +%%EMACS_SITE_LISPDIR%%/auctex/style/splitidx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/stabular.el +%%EMACS_SITE_LISPDIR%%/auctex/style/stfloats.el +%%EMACS_SITE_LISPDIR%%/auctex/style/subcaption.el +%%EMACS_SITE_LISPDIR%%/auctex/style/subfigure.el +%%EMACS_SITE_LISPDIR%%/auctex/style/subfiles.el +%%EMACS_SITE_LISPDIR%%/auctex/style/swedish.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tabularx.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tabulary.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tarticle.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tbook.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tcolorbox.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tcolorboxlib-raster.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tcolorboxlib-theorems.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tex-live.el +%%EMACS_SITE_LISPDIR%%/auctex/style/textcomp.el +%%EMACS_SITE_LISPDIR%%/auctex/style/textpos.el +%%EMACS_SITE_LISPDIR%%/auctex/style/theorem.el +%%EMACS_SITE_LISPDIR%%/auctex/style/thm-restate.el +%%EMACS_SITE_LISPDIR%%/auctex/style/thmtools.el +%%EMACS_SITE_LISPDIR%%/auctex/style/tikz.el +%%EMACS_SITE_LISPDIR%%/auctex/style/titleps.el +%%EMACS_SITE_LISPDIR%%/auctex/style/titlesec.el +%%EMACS_SITE_LISPDIR%%/auctex/style/titletoc.el +%%EMACS_SITE_LISPDIR%%/auctex/style/transparent.el +%%EMACS_SITE_LISPDIR%%/auctex/style/treport.el +%%EMACS_SITE_LISPDIR%%/auctex/style/truncate.el +%%EMACS_SITE_LISPDIR%%/auctex/style/ulem.el +%%EMACS_SITE_LISPDIR%%/auctex/style/unicode-math.el +%%EMACS_SITE_LISPDIR%%/auctex/style/unicodefonttable.el +%%EMACS_SITE_LISPDIR%%/auctex/style/units.el +%%EMACS_SITE_LISPDIR%%/auctex/style/url.el +%%EMACS_SITE_LISPDIR%%/auctex/style/varioref.el +%%EMACS_SITE_LISPDIR%%/auctex/style/verbatim.el +%%EMACS_SITE_LISPDIR%%/auctex/style/virtex.el +%%EMACS_SITE_LISPDIR%%/auctex/style/vwcol.el +%%EMACS_SITE_LISPDIR%%/auctex/style/wasysym.el +%%EMACS_SITE_LISPDIR%%/auctex/style/wrapfig.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xcolor.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xkcdcolors.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xltabular.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xparse.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xr-hyper.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xr.el +%%EMACS_SITE_LISPDIR%%/auctex/style/xspace.el +%%EMACS_SITE_LISPDIR%%/auctex/style/zlmtt.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-bar.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-fold.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-font.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-info.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-ispell.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-jp.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-mik.el +%%EMACS_SITE_LISPDIR%%/auctex/tex-style.el +%%EMACS_SITE_LISPDIR%%/auctex/tex.el +%%EMACS_SITE_LISPDIR%%/auctex/texmathp.el +%%EMACS_SITE_LISPDIR%%/auctex/toolbar-x.el +%%EMACS_SITE_LISPDIR%%/preview-latex.el +%%EMACS_SITE_LISPDIR%%/tex-site.el %%TEXMFDIR%%/doc/latex/styles/preview.pdf %%TEXMFDIR%%/tex/latex/preview/prauctex.cfg %%TEXMFDIR%%/tex/latex/preview/prauctex.def diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile index 7b28bf5fb968..8a763be2aee2 100644 --- a/print/hyperlatex/Makefile +++ b/print/hyperlatex/Makefile @@ -1,9 +1,8 @@ PORTNAME= Hyperlatex DISTVERSION= 2.9a -PORTREVISION= 26 +PORTREVISION= 27 CATEGORIES= print MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Produce HTML and printed documents from LaTeX source @@ -14,7 +13,12 @@ RUN_DEPENDS= ppmtogif:graphics/netpbm USES= emacs tex USE_TEX= latex -CONFLICTS_INSTALL= Hyperlatex Hyperlatex-emacs_* +CONFLICTS_INSTALL= Hyperlatex-emacs_* + +NO_ARCH= yes +NO_BUILD= yes + +CONFLICTS_INSTALL= Hyperlatex-emacs_* LATEX_DIR= ${PREFIX}/share/texmf/tex/latex/hyperlatex HYPERLATEX_DIR= ${PREFIX}/share/hyperlatex @@ -25,9 +29,6 @@ do-configure: ${REINPLACE_CMD} -e 's|$$HOME/Hyperlatex/Hlx|${HYPERLATEX_DIR}|' bin/hyperlatex && \ ${REINPLACE_CMD} -e '1s|^#$$|#\!/usr/bin/awk|' bin/normalize-eps.awk) -do-build: - cd ${WRKSRC}/hlx; emacs -batch -q -no-site-file -l hyperlatex.el -f hyperlatex-compile - do-install: @${MKDIR} ${STAGEDIR}${HYPERLATEX_DIR} @${MKDIR} ${STAGEDIR}${LATEX_DIR} @@ -36,7 +37,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/normalize-eps.awk \ ${STAGEDIR}${PREFIX}/bin/normalize-eps ${INSTALL_DATA} ${WRKSRC}/etc/hyperlatex.sty ${STAGEDIR}${LATEX_DIR} - cd ${WRKSRC}/hlx; for f in *.el *.elc *.hlx *.xbm *.awk ; do \ + cd ${WRKSRC}/hlx; for f in *.el *.hlx *.xbm *.awk ; do \ if [ -f $$f ]; then ${INSTALL_DATA} $$f \ ${STAGEDIR}${HYPERLATEX_DIR}; fi; done diff --git a/print/hyperlatex/pkg-plist b/print/hyperlatex/pkg-plist index 4248f6f84224..183b7927f029 100644 --- a/print/hyperlatex/pkg-plist +++ b/print/hyperlatex/pkg-plist @@ -14,7 +14,6 @@ share/hyperlatex/frames.hlx share/hyperlatex/french.hlx share/hyperlatex/german.hlx share/hyperlatex/hyperlatex.el -share/hyperlatex/hyperlatex.elc share/hyperlatex/hyperxml.hlx share/hyperlatex/italian.hlx share/hyperlatex/longtable.hlx diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index 7d0cceff1046..4032d71ceb55 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -1,6 +1,7 @@ PORTNAME= pdf-tools DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -11,26 +12,20 @@ WWW= https://github.com/vedang/pdf-tools LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cask${EMACS_PKGNAMESUFFIX}>0:devel/cask@${EMACS_FLAVOR} \ - tablist${EMACS_PKGNAMESUFFIX}>=0.70.4:devel/tablist@${EMACS_FLAVOR} LIB_DEPENDS= libpng16.so:graphics/png \ libpoppler-glib.so:graphics/poppler-glib \ libpoppler.so:graphics/poppler -RUN_DEPENDS= tablist${EMACS_PKGNAMESUFFIX}>=0.70:devel/tablist@${EMACS_FLAVOR} +RUN_DEPENDS= tablist>=0.70:devel/tablist -USES= autoreconf:build emacs gettext-runtime gmake gnome magick:7,build,run +USES= autoreconf:build emacs:build gettext-runtime gmake gnome magick:7,build,run USE_GITHUB= yes GH_ACCOUNT= vedang USE_GNOME= cairo glib20 -EMACS_FLAVORS_EXCLUDE= devel_nox nox - -CONFLICTS_INSTALL= pdf-tools pdf-tools-emacs_* # bin/epdfinfo +CONFLICTS_INSTALL= pdf-tools-emacs_* do-build: cd ${WRKSRC}/server && ./autogen.sh && ./configure -q && make - ${EMACS_CMD} -q --batch -L ${WRKSRC}/lisp -f batch-byte-compile \ - ${WRKSRC}/lisp/*.el ${EMACS_CMD} -q --batch -f loaddefs-generate-batch \ ${WRKSRC}/lisp/${PORTNAME}-loaddefs.el ${WRKSRC}/lisp diff --git a/print/pdf-tools/pkg-plist b/print/pdf-tools/pkg-plist index 5e0eded99d5e..106827d69b26 100644 --- a/print/pdf-tools/pkg-plist +++ b/print/pdf-tools/pkg-plist @@ -1,39 +1,21 @@ %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-annot.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-annot.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-cache.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-cache.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-dev.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-dev.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-history.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-history.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-info.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-info.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-isearch.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-isearch.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-links.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-links.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-loader.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-loader.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-macs.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-macs.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-misc.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-misc.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-occur.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-occur.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-outline.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-outline.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-roll.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-roll.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-sync.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-sync.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-tools-init.el %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-tools-loaddefs.el %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-tools.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-tools.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-util.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-util.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-view.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-view.elc %%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-virtual.el -%%EMACS_SITE_LISPDIR%%/pdf-tools/pdf-virtual.elc bin/epdfinfo diff --git a/print/yatex/Makefile b/print/yatex/Makefile index 058c3a2c147f..840cd12afa63 100644 --- a/print/yatex/Makefile +++ b/print/yatex/Makefile @@ -1,9 +1,8 @@ PORTNAME= yatex DISTVERSION= 1.83 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= print elisp MASTER_SITES= https://www.yatex.org/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}${DISTVERSION} MAINTAINER= hrs@FreeBSD.org diff --git a/security/starttls/Makefile b/security/starttls/Makefile index b355d3417036..5b7d6cbbaf11 100644 --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -1,12 +1,11 @@ PORTNAME= starttls PORTVERSION= 0.10 -PORTREVISION= 36 +PORTREVISION= 37 CATEGORIES= security MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/ -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= bofh@FreeBSD.org -COMMENT= Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME} +COMMENT= Simple wrapper program for STARTTLS on Emacs LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -16,10 +15,17 @@ USES= emacs gmake ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} +MAKE_ARGS+= lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} + +CONFLICTS_INSTALL= starttls-emacs_* + .include .if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif +post-install: + @${RM} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/starttls.elc + .include diff --git a/security/starttls/pkg-plist b/security/starttls/pkg-plist index 92fc22cc0beb..61ada7c07c82 100644 --- a/security/starttls/pkg-plist +++ b/security/starttls/pkg-plist @@ -1,3 +1,2 @@ bin/starttls share/emacs/site-lisp/starttls.el -share/emacs/site-lisp/starttls.elc diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile index 8efec70d9fcd..ff5203d063a4 100644 --- a/sysutils/lr/Makefile +++ b/sysutils/lr/Makefile @@ -28,7 +28,6 @@ VIM_DESC= Vim plugin CONTRIB_RUN_DEPENDS= xe:sysutils/xe EMACS_USES= emacs -EMACS_VARS= EMACS_NO_DEPENDS=yes post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lr diff --git a/sysutils/puppet-mode.el/Makefile b/sysutils/puppet-mode.el/Makefile index 4f0b197f675b..8737a25d5dde 100644 --- a/sysutils/puppet-mode.el/Makefile +++ b/sysutils/puppet-mode.el/Makefile @@ -1,8 +1,7 @@ PORTNAME= puppet-mode.el PORTVERSION= 0.2 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= sysutils elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= demon@FreeBSD.org COMMENT= Simple mode for editing puppet manifests @@ -17,6 +16,8 @@ GH_ACCOUNT= puppetlabs GH_PROJECT= puppet-syntax-emacs GH_TAGNAME= be5d708 +CONFLICTS_INSTALL= puppet-mode.el-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/puppet-mode.el/pkg-message b/sysutils/puppet-mode.el/pkg-message index 55ddc94ad95d..c645f503e988 100644 --- a/sysutils/puppet-mode.el/pkg-message +++ b/sysutils/puppet-mode.el/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: < diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile index 2202371f2b4a..1ae85f80bcd3 100644 --- a/textproc/markdown-mode.el/Makefile +++ b/textproc/markdown-mode.el/Makefile @@ -1,9 +1,8 @@ PORTNAME= markdown-mode.el DISTVERSIONPREFIX= v DISTVERSION= 2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc elisp -PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Emacs major mode for editing Markdown-formatted text @@ -17,18 +16,20 @@ USE_GITHUB= yes GH_ACCOUNT= jrblevin GH_PROJECT= markdown-mode -NO_ARCH= yes +CONFLICTS_INSTALL= markdown-mode.el-emacs_* -PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/markdown-mode.el \ - ${EMACS_VERSION_SITE_LISPDIR}/markdown-mode.elc +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${EMACS_SITE_LISPDIR}/markdown-mode.el PORTDOCS= CHANGES.md CONTRIBUTING.md README.md OPTIONS_DEFINE= DOCS do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.el \ + ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/textproc/markdown-mode.el/pkg-message b/textproc/markdown-mode.el/pkg-message index c8314e404226..dc296c1dc590 100644 --- a/textproc/markdown-mode.el/pkg-message +++ b/textproc/markdown-mode.el/pkg-message @@ -1,8 +1,8 @@ [ { type: install message: < diff --git a/textproc/xml-lite.el/pkg-message b/textproc/xml-lite.el/pkg-message index 5bd6b971478a..8f86e52b6a6c 100644 --- a/textproc/xml-lite.el/pkg-message +++ b/textproc/xml-lite.el/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: <0:editors/flim@${EMACS_FLAVOR} -SHIMBUN_RUN_DEPENDS= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} +SHIMBUN_BUILD_DEPENDS= flim>0:editors/flim +SHIMBUN_RUN_DEPENDS= flim>0:editors/flim OCTET_VIEWER_RUN_DEPENDS=\ - semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \ + semi>0:editors/semi \ wvHtml:textproc/wv \ xlhtml:textproc/xlhtml @@ -53,8 +55,8 @@ post-patch: @${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4 post-install: - ${RM} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-shimbun.elc \ - ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-w3m.elc + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/w3m/ \ + -name "*.elc" -delete post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/emacs-w3m/pkg-message b/www/emacs-w3m/pkg-message index c2c812184e4b..5f9937ae509a 100644 --- a/www/emacs-w3m/pkg-message +++ b/www/emacs-w3m/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: <