From nobody Mon Nov 15 15:21:00 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A678A180A243; Mon, 15 Nov 2021 15:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HtCZP37Flz3Jw7; Mon, 15 Nov 2021 15:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 829A81BF28; Mon, 15 Nov 2021 15:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AFFL09g008423; Mon, 15 Nov 2021 15:21:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AFFL0eq008422; Mon, 15 Nov 2021 15:21:00 GMT (envelope-from git) Date: Mon, 15 Nov 2021 15:21:00 GMT Message-Id: <202111151521.1AFFL0eq008422@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 409e26f66b53 - main - mail/notmuch-emacs: Prevent package name collision List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 409e26f66b537f17b733b31cf3c8a8c5c3cc82c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=409e26f66b537f17b733b31cf3c8a8c5c3cc82c5 commit 409e26f66b537f17b733b31cf3c8a8c5c3cc82c5 Author: Joseph Mingrone AuthorDate: 2021-11-05 03:11:28 +0000 Commit: Joseph Mingrone 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