git: 1e73295538b0 - main - mail/notmuch-emacs: Reorganize installation layout
Joseph Mingrone <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e73295538b079e277173cc56a3a735f93f51a5f commit 1e73295538b079e277173cc56a3a735f93f51a5f Author: Joseph Mingrone <[email protected]> AuthorDate: 2026-08-06 23:12:14 +0000 Commit: Joseph Mingrone <[email protected]> CommitDate: 2026-08-13 14:34:48 +0000 mail/notmuch-emacs: Reorganize installation layout Install elisp to a port-specific subdirectory of ${EMACS_SITE_LISPDIR} rather than directly into it, avoiding filename collisions with other elisp ports. Sponsored by: The FreeBSD Foundation --- mail/notmuch-emacs/Makefile | 10 +++++----- mail/notmuch-emacs/pkg-plist | 46 ++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile index b17014f121ad..6c30047d8f8f 100644 --- a/mail/notmuch-emacs/Makefile +++ b/mail/notmuch-emacs/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail elisp PKGNAMESUFFIX= -emacs COMMENT= Emacs major-mode for the Notmuch email search and tagging application @@ -46,8 +46,8 @@ do-configure: '%s\n' \ BASH_ABSOLUTE=/bin/sh \ desktop_dir=${PREFIX}/share/applications \ - emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ - emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ + emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch \ + emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch \ HAVE_BASH=1 \ HAVE_EMACS=1 \ infodir=${PREFIX}/${INFO_PATH} \ @@ -63,8 +63,8 @@ do-configure: > ${WRKSRC}/sphinx.config post-install: - @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} -name "*.elc" -delete - @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el + @${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch -name "*.elc" -delete + @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch/*.el # keep poudriere testport happy post-install-DOCS-on: diff --git a/mail/notmuch-emacs/pkg-plist b/mail/notmuch-emacs/pkg-plist index 03a934cfeffa..99104b78336c 100644 --- a/mail/notmuch-emacs/pkg-plist +++ b/mail/notmuch-emacs/pkg-plist @@ -1,26 +1,26 @@ %%DESKTOP%%share/applications/notmuch-emacs-mua.desktop -%%EMACS_SITE_LISPDIR%%/coolj.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-address.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-autoloads.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-company.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-compat.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-draft.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-hello.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-jump.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-lib.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-logo.svg -%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-message.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-mua.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-parser.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-print.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-query.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-show.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-tag.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-tree.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-version.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch-wash.el.gz -%%EMACS_SITE_LISPDIR%%/notmuch.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/coolj.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-address.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-autoloads.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-company.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-compat.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-crypto.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-draft.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-hello.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-jump.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-lib.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-logo.svg +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-maildir-fcc.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-message.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-mua.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-parser.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-print.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-query.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-show.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-tag.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-tree.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-version.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-wash.el.gz +%%EMACS_SITE_LISPDIR%%/notmuch/notmuch.el.gz %%MANPAGES%%share/man/man1/notmuch-emacs-mua.1.gz bin/notmuch-emacs-mua