git: d8d41d3b8429 - main - pkgbase: Remove libefivar package and add a efi-tools one

[Emmanuel Vadot]

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=d8d41d3b842980e7b76c8f3081ed8b571af97e0c

commit d8d41d3b842980e7b76c8f3081ed8b571af97e0c
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-09-02 15:12:51 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-09-07 08:24:21 +0000

    pkgbase: Remove libefivar package and add a efi-tools one
    
    Put all the efi related tools into FreeBSD-efi-tools.
    
    Differential Revision:  https://reviews.freebsd.org/D31803
---
 lib/libefivar/Makefile            | 2 +-
 release/packages/Makefile.package | 2 ++
 usr.sbin/efibootmgr/Makefile      | 2 ++
 usr.sbin/efidp/Makefile           | 2 ++
 usr.sbin/efitable/Makefile        | 2 ++
 usr.sbin/efivar/Makefile          | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
index c1503f4e5b62..7b814898721f 100644
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -31,7 +31,7 @@ EDK2INC=${SRCTOP}/sys/contrib/edk2/Include
 
 .PATH:	${EFIBOOT}/libefi
 
-PACKAGE=lib${LIB}
+PACKAGE=	efi-tools
 LIB=		efivar
 SRCS=		efivar.c efichar.c efivar-dp-format.c \
 		efivar-dp-parse.c \
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index cc971617a4e0..cc75e07a8943 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -42,6 +42,8 @@ dwatch_COMMENT=		Dwatch Utilities
 dwatch_DESC=		Dwatch Utilities
 ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
+efi-tools_COMMENT=	UEFI Utilities
+efi-tools_DESC=		UEFI Utilities
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 ggate_COMMENT=		GEOM Gate Utilities
diff --git a/usr.sbin/efibootmgr/Makefile b/usr.sbin/efibootmgr/Makefile
index d485537e7515..9e98412f6f74 100644
--- a/usr.sbin/efibootmgr/Makefile
+++ b/usr.sbin/efibootmgr/Makefile
@@ -5,6 +5,8 @@ EFIVAR=${SRCTOP}/usr.sbin/efivar
 .PATH: ${EFIBOOT}/libefi ${EFIVAR}
 CFLAGS+= -I${EFIVAR} -I${EFIINCL}
 
+PACKAGE=	efi-tools
+
 PROG=efibootmgr
 MAN=	efibootmgr.8
 SRCS= efichar.c efiutil.c efibootmgr.c
diff --git a/usr.sbin/efidp/Makefile b/usr.sbin/efidp/Makefile
index 56dd2659b777..7b8bf2d1d556 100644
--- a/usr.sbin/efidp/Makefile
+++ b/usr.sbin/efidp/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efidp
 MAN=	efidp.8
 
diff --git a/usr.sbin/efitable/Makefile b/usr.sbin/efitable/Makefile
index 83db6d9f74a6..d318a5818da9 100644
--- a/usr.sbin/efitable/Makefile
+++ b/usr.sbin/efitable/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efitable
 MAN=	efitable.8
 SRCS=	efitable.c
diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile
index 3bc1868bf77b..aa00f4b79502 100644
--- a/usr.sbin/efivar/Makefile
+++ b/usr.sbin/efivar/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efivar
 MAN=	efivar.8