git: 3517dea254f9 - main - sysutils/nvme-cli: Fix port

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3517dea254f951d5fbc9aa12d9b73c2581636c07

commit 3517dea254f951d5fbc9aa12d9b73c2581636c07
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-02-23 16:06:08 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-02-23 16:11:02 +0000

    sysutils/nvme-cli: Fix port
    
    * Use DISTVERSION (and consistent)
    * Define LICENSE_FILE
    * Remove CXXFLAGS, project uses C
    * Patch meson.build instead of abusing pkg-plist
    * Fix pkg-descr
    * Rearrange Makefile so it follows Porters Handbook more closely
    
    Poudriere testport OK 14.2-RELEASE and 13.4-RELEASE
    
    PR: 284971
    Reviewed by: imp
---
 sysutils/nvme-cli/Makefile          | 16 +++++++++-------
 sysutils/nvme-cli/patch-meson.build | 38 +++++++++++++++++++++++++++++++++++++
 sysutils/nvme-cli/pkg-descr         |  5 +++--
 sysutils/nvme-cli/pkg-plist         | 11 -----------
 4 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/sysutils/nvme-cli/Makefile b/sysutils/nvme-cli/Makefile
index 0a00604e9973..bd61026b89ac 100644
--- a/sysutils/nvme-cli/Makefile
+++ b/sysutils/nvme-cli/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvme-cli
-PORTVERSION=	2.11
+DISTVERSION=	2.11
 CATEGORIES=	sysutils
 
 MAINTAINER=	imp@FreeBSD.org
@@ -7,8 +7,7 @@ COMMENT=	Port of Linux nvme cli utility
 WWW=		https://github.com/linux-nvme/nvme-cli
 
 LICENSE=	GPLv2
-
-ONLY_FOR_ARCHS=	aarch64 amd64
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash>0:shells/bash \
 		freebsd-nvme-shim>0:devel/freebsd-nvme-shim \
@@ -17,12 +16,15 @@ LIB_DEPENDS=	libnvme.so:devel/libnvme
 
 USES=		meson pkgconfig
 
-MESON_ARGS=	-Ddocs=man -Djson-c=disabled
-CXXFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
-CFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
+ONLY_FOR_ARCHS=	aarch64 amd64
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
-GH_TAGNAME=	freebsd-${PORTVERSION}
+GH_TAGNAME=	freebsd-${DISTVERSION}
+
+CFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
+
+MESON_ARGS=	-Ddocs=man \
+		-Djson-c=disabled
 
 .include <bsd.port.mk>
diff --git a/sysutils/nvme-cli/patch-meson.build b/sysutils/nvme-cli/patch-meson.build
new file mode 100644
index 000000000000..988746c12ec1
--- /dev/null
+++ b/sysutils/nvme-cli/patch-meson.build
@@ -0,0 +1,38 @@
+--- meson.build.orig	2025-02-21 01:05:06 UTC
++++ meson.build
+@@ -223,7 +223,7 @@ configure_file(
+   output:        'nvme.spec',
+   configuration: substs,
+ )
+-
++'''
+ disc = configure_file(
+   input: 'etc/discovery.conf.in',
+   output: 'discovery.conf',
+@@ -272,7 +272,7 @@ endforeach
+     configuration: substs,
+   )
+ endforeach
+-
++'''
+ ################################################################################
+ add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE',
+                        '-include', 'config.h'], language : 'c')
+@@ -332,7 +332,7 @@ install_data('completions/_nvme',
+              install_dir: datadir + '/bash-completion/completions')
+ install_data('completions/_nvme',
+              install_dir: datadir + '/zsh/site-functions')
+-
++'''
+ foreach file : dracut_files
+   install_data(meson.current_build_dir() + '/' + file,
+                install_dir: dracutrulesdir)
+@@ -350,7 +350,7 @@ install_data(disc,
+ 
+ install_data(disc,
+              install_dir: join_paths(sysconfdir, 'nvme'))
+-
++'''
+ ################################################################################
+ if meson.version().version_compare('>=0.53.0')
+     path_dict = {
diff --git a/sysutils/nvme-cli/pkg-descr b/sysutils/nvme-cli/pkg-descr
index ab90eb8ef976..dd3b3d89e2c2 100644
--- a/sysutils/nvme-cli/pkg-descr
+++ b/sysutils/nvme-cli/pkg-descr
@@ -1,2 +1,3 @@
-Library for NVM-Express user space tooling from Linux, ported to FreeBSD for
-sysutils/nvme-cli.
+NVMe management command line interface
+
+A user space utility to provide standards compliant tooling for NVM-Express drives.
diff --git a/sysutils/nvme-cli/pkg-plist b/sysutils/nvme-cli/pkg-plist
index b4c30ea180c9..451ec51ab43d 100644
--- a/sysutils/nvme-cli/pkg-plist
+++ b/sysutils/nvme-cli/pkg-plist
@@ -1,14 +1,3 @@
-@comment etc/nvme/discovery.conf
-@comment lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
-@comment lib/systemd/system/nvmefc-boot-connections.service
-@comment lib/systemd/system/nvmf-autoconnect.service
-@comment lib/systemd/system/nvmf-connect-nbft.service
-@comment lib/systemd/system/nvmf-connect.target
-@comment lib/systemd/system/nvmf-connect@.service
-@comment lib/udev/rules.d/65-persistent-net-nbft.rules
-@comment lib/udev/rules.d/70-nvmf-autoconnect.rules
-@comment lib/udev/rules.d/70-nvmf-keys.rules
-@comment lib/udev/rules.d/71-nvmf-netapp.rules
 sbin/nvme
 share/bash-completion/completions/nvme
 share/man/man1/nvme-admin-passthru.1.gz