git: 3e5eab32850a - main - devel/libnvme: Fix port

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e5eab32850a99e051264ab160a0ee16c6f51abc

commit 3e5eab32850a99e051264ab160a0ee16c6f51abc
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-02-23 16:02:14 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-02-23 16:11:02 +0000

    devel/libnvme: Fix port
    
    * Use DISTVERSION (and consistent)
    * Fix COMMENT
    * Define LICENSE_FILE
    * Remove CXXFLAGS, project uses C
    * Simplify MAJORVER definition
    * Adjust pkg-descr
    * Rearrange Makefile so it follows Porters Handbook more closely
    
    Poudriere testport OK 14.2-RELEASE and 13.4-RELEASE
    
    PR: 284970
    Reviewed by: imp
---
 devel/libnvme/Makefile  | 26 ++++++++++++++++----------
 devel/libnvme/pkg-descr |  2 +-
 devel/libnvme/pkg-plist |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/devel/libnvme/Makefile b/devel/libnvme/Makefile
index 26cdf5c2aa20..3fcc5c54ff93 100644
--- a/devel/libnvme/Makefile
+++ b/devel/libnvme/Makefile
@@ -1,30 +1,36 @@
 PORTNAME=	libnvme
-PORTVERSION=	1.11.1
+DISTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	imp@FreeBSD.org
-COMMENT=	Port of Linux nvme cli utility
+COMMENT=	C Library for NVM Express on Linux ported to FreeBSD
 WWW=		https://github.com/linux-nvme/libnvme
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64
-
 BUILD_DEPENDS=	freebsd-nvme-shim>0:devel/freebsd-nvme-shim \
 		bash>0:shells/bash \
 		swig>0:devel/swig
 
 USES=		meson
 USE_LDCONFIG=	yes
-MESON_ARGS=	-Dopenssl=disabled -Dkeyutils=disabled -Djson-c=disabled \
-		-Dpython=disabled
-CXXFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
-CFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		MAJORVER=${PORTVERSION:C/^([0-9]+)\..*/\1/}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
-GH_TAGNAME=	freebsd-${PORTVERSION}
+GH_TAGNAME=	freebsd-${DISTVERSION}
+
+CFLAGS+=	-I${LOCALBASE}/include/freebsd-nvme-shim
+
+PLIST_SUB=	DISTVERSION=${DISTVERSION} \
+		MAJORVER=${DISTVERSION:R:R}
+
+MESON_ARGS=	-Djson-c=disabled \
+		-Dkeyutils=disabled \
+		-Dopenssl=disabled \
+		-Dpython=disabled \
+		-Dtests=false
 
 .include <bsd.port.mk>
diff --git a/devel/libnvme/pkg-descr b/devel/libnvme/pkg-descr
index 0fb992a728ae..411616635e58 100644
--- a/devel/libnvme/pkg-descr
+++ b/devel/libnvme/pkg-descr
@@ -3,4 +3,4 @@ This is the libnvme development C library.
 libnvme provides type definitions for NVMe specification structures,
 enumerations, and bit fields, helper functions to construct, dispatch,
 and decode commands and payloads, and utilities to connect, scan, and
-manage nvme devices on a Linux system.
+manage nvme devices.
diff --git a/devel/libnvme/pkg-plist b/devel/libnvme/pkg-plist
index 3e0f57a0b1b0..0786638be8f3 100644
--- a/devel/libnvme/pkg-plist
+++ b/devel/libnvme/pkg-plist
@@ -13,9 +13,9 @@ include/nvme/types.h
 include/nvme/util.h
 lib/libnvme-mi.so
 lib/libnvme-mi.so.%%MAJORVER%%
-lib/libnvme-mi.so.%%PORTVERSION%%
+lib/libnvme-mi.so.%%DISTVERSION%%
 lib/libnvme.so
 lib/libnvme.so.%%MAJORVER%%
-lib/libnvme.so.%%PORTVERSION%%
+lib/libnvme.so.%%DISTVERSION%%
 libdata/pkgconfig/libnvme-mi.pc
 libdata/pkgconfig/libnvme.pc