From cb1a4417434fd6891b8875e015882c8d90a29c50 Mon Sep 17 00:00:00 2001
From: manu <manu@FreeBSD.org>
Date: Fri, 19 Jul 2019 15:07:30 +0000
Subject: [PATCH] pkgbase: Add a FreeBSD-wpa package

Move the wpa related files from FreeBSD-runtime to a new package named
FreeBSD-wpa
The FreeBSD runtime is only intended to have everything for a working
FreeBSD installation and wpa isn't needed for that.

Reviewed by:    bapt, gjb
Differential Revision:  https://reviews.freebsd.org/D20957
---
 release/packages/Makefile.package    |  2 ++
 release/packages/wpa.ucl             | 24 ++++++++++++++++++++++++
 usr.sbin/wpa/wpa_cli/Makefile        |  1 +
 usr.sbin/wpa/wpa_passphrase/Makefile |  1 +
 usr.sbin/wpa/wpa_priv/Makefile       |  1 +
 usr.sbin/wpa/wpa_supplicant/Makefile |  1 +
 6 files changed, 30 insertions(+)
 create mode 100644 release/packages/wpa.ucl

diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index c027141f4a7..67206387fd9 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -78,3 +78,5 @@ unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
+wpa_COMMENT=		802.11 Supplicant
+wpa_DESC=		802.11 Supplicant
diff --git a/release/packages/wpa.ucl b/release/packages/wpa.ucl
new file mode 100644
index 00000000000..753c26bc502
--- /dev/null
+++ b/release/packages/wpa.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index f6db85ee989..504b0883f52 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -9,6 +9,7 @@
 	${WPA_DISTDIR}/src/eap_peer \
 	${WPA_DISTDIR}/src/drivers
 
+PACKAGE=	wpa
 PROG=	wpa_cli
 SRCS=	base64.c bitfield.c blacklist.c bss.c cli.c common.c config.c \
 	config_file.c \
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index c42ea4afd8c..9a929c07b6f 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -4,6 +4,7 @@
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
+PACKAGE=	wpa
 PROG=	wpa_passphrase
 SRCS=	common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c \
 	sha1.c wpa_passphrase.c
diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile
index fc897dfcc4d..9fd4e3ca98a 100644
--- a/usr.sbin/wpa/wpa_priv/Makefile
+++ b/usr.sbin/wpa/wpa_priv/Makefile
@@ -5,6 +5,7 @@
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/drivers
 
+PACKAGE=	wpa
 PROG=	wpa_priv
 SRCS=	drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \
 	driver_common.c l2_packet_freebsd.c
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 673e45bec20..6559a0609f2 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -8,6 +8,7 @@
 	${WPA_DISTDIR}/src/eap_peer \
 	${WPA_DISTDIR}/src/drivers
 
+PACKAGE=	wpa
 PROG=	wpa_supplicant
 
 SRCS=	base64.c bitfield.c blacklist.c bss.c cli.c common.c \
-- 
2.45.0