From nobody Mon Nov 15 15:20:56 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 4DDA4180A0BE; Mon, 15 Nov 2021 15:20:57 +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 4HtCZK1WDQz3Jgf; Mon, 15 Nov 2021 15:20:57 +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 0EBF31BD49; Mon, 15 Nov 2021 15:20:57 +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 1AFFKuU4008347; Mon, 15 Nov 2021 15:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AFFKu0K008346; Mon, 15 Nov 2021 15:20:56 GMT (envelope-from git) Date: Mon, 15 Nov 2021 15:20:56 GMT Message-Id: <202111151520.1AFFKu0K008346@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: f32475f3a44f - main - Mk/Uses/emacs.mk: Do not use Emacs major version in package names 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: f32475f3a44fe79191e6063066459c82a7a43986 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f32475f3a44fe79191e6063066459c82a7a43986 commit f32475f3a44fe79191e6063066459c82a7a43986 Author: Yasuhiro KIMURA AuthorDate: 2021-10-21 15:05:29 +0000 Commit: Joseph Mingrone CommitDate: 2021-11-15 15:06:15 +0000 Mk/Uses/emacs.mk: Do not use Emacs major version in package names PR: 259259 Differential Revision: https://reviews.freebsd.org/D32613 --- Mk/Uses/emacs.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 31f9935351ec..6cc2a98dcc13 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -101,7 +101,7 @@ EMACS_FLAVOR= full .endif .if ${FLAVOR:Mdevel*} -EMACS_VER= 29.0.50 +EMACS_VER= 29.0.50 EMACS_PORTDIR= editors/emacs-devel .else EMACS_VER= 27.2 @@ -113,12 +113,14 @@ EMACS_LIBDIR= share/emacs EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER} EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER} -.if ${FLAVOR:M*nox} -EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_nox -.elif ${FLAVOR:Mcanna} -EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_canna +.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_PORT_NAME} +EMACS_PKGNAMESUFFIX= -emacs_${EMACS_FLAVOR} .endif EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER}