git: 409e26f66b53 - main - mail/notmuch-emacs: Prevent package name collision

From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Mon, 15 Nov 2021 15:21:00 UTC 
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=409e26f66b537f17b733b31cf3c8a8c5c3cc82c5

commit 409e26f66b537f17b733b31cf3c8a8c5c3cc82c5
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2021-11-05 03:11:28 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-11-15 15:20:10 +0000

    mail/notmuch-emacs: Prevent package name collision
    
    With the default emacs flavor, EMACS_PKGNAMESUFFIX is no longer appended
    to package names.  This means the default package name for
    mail/notmuch-emacs conflicts with the package name for mail/notmuch.
    Fix this by directly adding the PKGNAMESUFFIX '-emacs' here.
---
 mail/notmuch-emacs/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index 01444bfe874c..eb8809c50d57 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,7 +1,6 @@
 PORTREVISION=	1
 CATEGORIES=	mail elisp
-PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
 
 LICENSE=	GPLv3