u-boot*: fix some pkglint

48 files changed, 95 insertions, 51 deletions

diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile
index 21627e9f9ef..5fb4d304ecf 100644
--- a/sysutils/u-boot-a10-olinuxino-lime/Makefile
+++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:53 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:54 wiz Exp $
 
 UBOOT_TARGET=		a10-olinuxino-lime
 UBOOT_CONFIG=		A10-OLinuXino-Lime_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
index 55b78875489..13f58ffc402 100644
--- a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/11/04 21:28:53 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2021/08/12 07:25:54 wiz Exp $
 
 UBOOT_TARGET=		a20-olinuxino-lime2-emmc
 UBOOT_CONFIG=		A20-OLinuXino-Lime2-eMMC_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-a20-olinuxino-lime2/Makefile b/sysutils/u-boot-a20-olinuxino-lime2/Makefile
index b8b543b2245..52c36b24ce4 100644
--- a/sysutils/u-boot-a20-olinuxino-lime2/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-lime2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/11/04 21:28:53 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/12 07:25:54 wiz Exp $
 
 UBOOT_TARGET=		a20-olinuxino-lime2
 UBOOT_CONFIG=		A20-OLinuXino-Lime2_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		1
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-a20-olinuxino-micro-emmc/Makefile b/sysutils/u-boot-a20-olinuxino-micro-emmc/Makefile
index f575217c208..464b8f10b5d 100644
--- a/sysutils/u-boot-a20-olinuxino-micro-emmc/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-micro-emmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/15 00:26:11 uwe Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		a20-olinuxino-micro-emmc
 UBOOT_CONFIG=		A20-OLinuXino_MICRO-eMMC_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-a20-olinuxino-micro/Makefile b/sysutils/u-boot-a20-olinuxino-micro/Makefile
index 1dd30d07083..1e942e5c016 100644
--- a/sysutils/u-boot-a20-olinuxino-micro/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-micro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 16:21:05 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:54 wiz Exp $
 
 UBOOT_TARGET=		a20-olinuxino-micro
 UBOOT_CONFIG=		A20-OLinuXino_MICRO_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapi-m2-zero/Makefile b/sysutils/u-boot-bananapi-m2-zero/Makefile
index 39dfa41df88..f0e067dff39 100644
--- a/sysutils/u-boot-bananapi-m2-zero/Makefile
+++ b/sysutils/u-boot-bananapi-m2-zero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapi-m2-zero
 UBOOT_CONFIG=		bananapi_m2_zero_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapi-m3/Makefile b/sysutils/u-boot-bananapi-m3/Makefile
index a742ea3820a..ad0f43c1d22 100644
--- a/sysutils/u-boot-bananapi-m3/Makefile
+++ b/sysutils/u-boot-bananapi-m3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapi-m3
 UBOOT_CONFIG=		Sinovoip_BPI_M3_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapi-p2-zero/Makefile b/sysutils/u-boot-bananapi-p2-zero/Makefile
index c6ef8cb3e9c..be1e34a8c35 100644
--- a/sysutils/u-boot-bananapi-p2-zero/Makefile
+++ b/sysutils/u-boot-bananapi-p2-zero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapi-p2-zero
 UBOOT_CONFIG=		bananapi_p2_zero_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapi-r2/Makefile b/sysutils/u-boot-bananapi-r2/Makefile
index 2ed7ee3f6ad..edfd14bfc5f 100644
--- a/sysutils/u-boot-bananapi-r2/Makefile
+++ b/sysutils/u-boot-bananapi-r2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/06/20 17:42:34 thorpej Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapi-r2
 UBOOT_CONFIG=		mt7623n_bpir2_defconfig
@@ -58,3 +58,4 @@ post-build:
 	    bs=1024 seek=320 conv=sync
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index ca0a815b578..7ae26ba2417 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapi
 UBOOT_CONFIG=		Bananapi_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-bananapro/Makefile b/sysutils/u-boot-bananapro/Makefile
index 9a3a8231007..2a8957b3220 100644
--- a/sysutils/u-boot-bananapro/Makefile
+++ b/sysutils/u-boot-bananapro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		bananapro
 UBOOT_CONFIG=		Bananapro_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-beagleboard/Makefile b/sysutils/u-boot-beagleboard/Makefile
index dfd768f61cb..28d9319fc39 100644
--- a/sysutils/u-boot-beagleboard/Makefile
+++ b/sysutils/u-boot-beagleboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		beagleboard
 UBOOT_CONFIG=		omap3_beagle_defconfig
@@ -10,3 +10,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-beagleboneblack/Makefile b/sysutils/u-boot-beagleboneblack/Makefile
index 2b6ee0a3ce5..a50fffd3c08 100644
--- a/sysutils/u-boot-beagleboneblack/Makefile
+++ b/sysutils/u-boot-beagleboneblack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/12 07:25:55 wiz Exp $
 
 UBOOT_TARGET=		beagleboneblack
 UBOOT_CONFIG=		am335x_boneblack_defconfig
@@ -10,3 +10,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-beaglebonewhite/Makefile b/sysutils/u-boot-beaglebonewhite/Makefile
index 045cfe1cfc2..1fb5d313590 100644
--- a/sysutils/u-boot-beaglebonewhite/Makefile
+++ b/sysutils/u-boot-beaglebonewhite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		beaglebonewhite
 UBOOT_CONFIG=		am335x_evm_defconfig
@@ -10,3 +10,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-chip-pro/Makefile b/sysutils/u-boot-chip-pro/Makefile
index 86bbd2ed436..8cf933356ae 100644
--- a/sysutils/u-boot-chip-pro/Makefile
+++ b/sysutils/u-boot-chip-pro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		chip-pro
 UBOOT_CONFIG=		CHIP_pro_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile
index a7494a81855..cf8a2224435 100644
--- a/sysutils/u-boot-chip/Makefile
+++ b/sysutils/u-boot-chip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		chip
 UBOOT_CONFIG=		CHIP_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile
index 292ebdbbe62..4dc05e9649f 100644
--- a/sysutils/u-boot-cubieboard2/Makefile
+++ b/sysutils/u-boot-cubieboard2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		cubieboard2
 UBOOT_CONFIG=		Cubieboard2_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile
index 5ae81cf9cc8..454c564403e 100644
--- a/sysutils/u-boot-cubieboard4/Makefile
+++ b/sysutils/u-boot-cubieboard4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		cubieboard4
 UBOOT_CONFIG=		Cubieboard4_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-cubietruck-plus/Makefile b/sysutils/u-boot-cubietruck-plus/Makefile
index a4c3d148caf..213085b5e15 100644
--- a/sysutils/u-boot-cubietruck-plus/Makefile
+++ b/sysutils/u-boot-cubietruck-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		cubietruck-plus
 UBOOT_CONFIG=		Cubietruck_plus_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		2
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile
index 578422c76f9..8d9082ec814 100644
--- a/sysutils/u-boot-cubietruck/Makefile
+++ b/sysutils/u-boot-cubietruck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		cubietruck
 UBOOT_CONFIG=		Cubietruck_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-de0-nanosoc/Makefile b/sysutils/u-boot-de0-nanosoc/Makefile
index 0abb725aa54..eeaa6767d6c 100644
--- a/sysutils/u-boot-de0-nanosoc/Makefile
+++ b/sysutils/u-boot-de0-nanosoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/12 07:25:56 wiz Exp $
 
 UBOOT_TARGET=		de0-nanosoc
 UBOOT_CONFIG=		socfpga_de0_nano_soc_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-with-spl.sfp
 PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-hummingbird-a31/Makefile b/sysutils/u-boot-hummingbird-a31/Makefile
index 34270307744..3ffbf50a290 100644
--- a/sysutils/u-boot-hummingbird-a31/Makefile
+++ b/sysutils/u-boot-hummingbird-a31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		hummingbird-a31
 UBOOT_CONFIG=		Hummingbird_A31_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-jetson-tk1/Makefile b/sysutils/u-boot-jetson-tk1/Makefile
index ed110bb2535..8ec247a1ad9 100644
--- a/sysutils/u-boot-jetson-tk1/Makefile
+++ b/sysutils/u-boot-jetson-tk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		jetson-tk1
 UBOOT_CONFIG=		jetson-tk1_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot u-boot-dtb.bin
 PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-lamobo-r1/Makefile b/sysutils/u-boot-lamobo-r1/Makefile
index 5c5f79c9ec8..8e62ff0bc44 100644
--- a/sysutils/u-boot-lamobo-r1/Makefile
+++ b/sysutils/u-boot-lamobo-r1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		lamobo-r1
 UBOOT_CONFIG=		Lamobo_R1_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-libretech-all-h3-cc-h2-plus/Makefile b/sysutils/u-boot-libretech-all-h3-cc-h2-plus/Makefile
index 8991f887e74..50e87d04c4a 100644
--- a/sysutils/u-boot-libretech-all-h3-cc-h2-plus/Makefile
+++ b/sysutils/u-boot-libretech-all-h3-cc-h2-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 19:43:02 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		libretech-all-h3-cc-h2-plus
 UBOOT_CONFIG=		libretech_all_h3_cc_h2_plus_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-libretech-all-h3-cc-h3/Makefile b/sysutils/u-boot-libretech-all-h3-cc-h3/Makefile
index 67120b520c2..44216add686 100644
--- a/sysutils/u-boot-libretech-all-h3-cc-h3/Makefile
+++ b/sysutils/u-boot-libretech-all-h3-cc-h3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 19:43:30 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		libretech-all-h3-cc-h3
 UBOOT_CONFIG=		libretech_all_h3_cc_h3_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-licheepi-zero/Makefile b/sysutils/u-boot-licheepi-zero/Makefile
index a1552e2cee0..16dc63d0b59 100644
--- a/sysutils/u-boot-licheepi-zero/Makefile
+++ b/sysutils/u-boot-licheepi-zero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/04/05 12:11:47 rxg Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		licheepi-zero
 UBOOT_CONFIG=		LicheePi_Zero_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-duo2/Makefile b/sysutils/u-boot-nanopi-duo2/Makefile
index 770ced4dede..718164546b3 100644
--- a/sysutils/u-boot-nanopi-duo2/Makefile
+++ b/sysutils/u-boot-nanopi-duo2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:57 wiz Exp $
 
 UBOOT_TARGET=		nanopi-duo2
 UBOOT_CONFIG=		nanopi_duo2_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-m1/Makefile b/sysutils/u-boot-nanopi-m1/Makefile
index b4173ea3ed1..cfd650f7b35 100644
--- a/sysutils/u-boot-nanopi-m1/Makefile
+++ b/sysutils/u-boot-nanopi-m1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		nanopi-m1
 UBOOT_CONFIG=		nanopi_m1_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile
index 7342a0d21f0..d3954ebfbe1 100644
--- a/sysutils/u-boot-nanopi-neo/Makefile
+++ b/sysutils/u-boot-nanopi-neo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		nanopi-neo
 UBOOT_CONFIG=		nanopi_neo_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-r1/Makefile b/sysutils/u-boot-nanopi-r1/Makefile
index ac0af9f786e..5045d3783f6 100644
--- a/sysutils/u-boot-nanopi-r1/Makefile
+++ b/sysutils/u-boot-nanopi-r1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		nanopi-r1
 UBOOT_CONFIG=		nanopi_r1_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=	1
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-odroid-xu3/Makefile b/sysutils/u-boot-odroid-xu3/Makefile
index d1200309c81..114817590f9 100644
--- a/sysutils/u-boot-odroid-xu3/Makefile
+++ b/sysutils/u-boot-odroid-xu3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		odroid-xu3
 UBOOT_CONFIG=		odroid-xu3_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot u-boot-dtb.bin
 PKGREVISION=		3
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-2/Makefile b/sysutils/u-boot-orangepi-2/Makefile
index 39ba1ca01c3..6d2154cad2f 100644
--- a/sysutils/u-boot-orangepi-2/Makefile
+++ b/sysutils/u-boot-orangepi-2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		orangepi-2
 UBOOT_CONFIG=		orangepi_2_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-lite/Makefile b/sysutils/u-boot-orangepi-lite/Makefile
index b65ee8e8fda..467ffeb6690 100644
--- a/sysutils/u-boot-orangepi-lite/Makefile
+++ b/sysutils/u-boot-orangepi-lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/11/29 15:09:39 jakllsch Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		orangepi-lite
 UBOOT_CONFIG=		orangepi_lite_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile
index f27ef83b15f..a324ad133bb 100644
--- a/sysutils/u-boot-orangepi-one/Makefile
+++ b/sysutils/u-boot-orangepi-one/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		orangepi-one
 UBOOT_CONFIG=		orangepi_one_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-pc/Makefile b/sysutils/u-boot-orangepi-pc/Makefile
index 91945b0d987..6cc0164068c 100644
--- a/sysutils/u-boot-orangepi-pc/Makefile
+++ b/sysutils/u-boot-orangepi-pc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/10/13 03:52:29 maya Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		orangepi-pc
 UBOOT_CONFIG=		orangepi_pc_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-plus2e/Makefile b/sysutils/u-boot-orangepi-plus2e/Makefile
index dc656a40503..389f21d4257 100644
--- a/sysutils/u-boot-orangepi-plus2e/Makefile
+++ b/sysutils/u-boot-orangepi-plus2e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/12 07:25:58 wiz Exp $
 
 UBOOT_TARGET=		orangepi-plus2e
 UBOOT_CONFIG=		orangepi_plus2e_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile
index ffcb5d7fbf4..cebd3b7eefc 100644
--- a/sysutils/u-boot-orangepi-zero/Makefile
+++ b/sysutils/u-boot-orangepi-zero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		orangepi-zero
 UBOOT_CONFIG=		orangepi_zero_defconfig
@@ -9,3 +9,4 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 PKGREVISION=		4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index c19bcad4110..27841fd959e 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 03:27:58 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		pandaboard
 UBOOT_CONFIG=		omap4_panda_defconfig
@@ -8,3 +8,4 @@ UBOOT_BIN+=		MLO
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pico-pi-imx7d/Makefile b/sysutils/u-boot-pico-pi-imx7d/Makefile
index 9ac429b02d4..33aa2882f01 100644
--- a/sysutils/u-boot-pico-pi-imx7d/Makefile
+++ b/sysutils/u-boot-pico-pi-imx7d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/03/09 16:50:38 martin Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		pico-pi-imx7d
 UBOOT_CONFIG=		pico-pi-imx7d_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot.img SPL
 UBOOT_VERSION=		2021.01
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pocketchip/Makefile b/sysutils/u-boot-pocketchip/Makefile
index 2790c2b5514..f622c14009d 100644
--- a/sysutils/u-boot-pocketchip/Makefile
+++ b/sysutils/u-boot-pocketchip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		pocketchip
 UBOOT_CONFIG=		CHIP_defconfig
@@ -20,3 +20,4 @@ UBOOT_OPTIONS+=		CONFIG_VIDEO_CHRONTEL_CH7033=y
 UBOOT_OPTIONS+=		CONFIG_VIDEO_CHRONTEL_CH7033_I2C_BUS=1
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-rpi3-32/Makefile b/sysutils/u-boot-rpi3-32/Makefile
index 4cb1a00dc15..32c72aa211b 100644
--- a/sysutils/u-boot-rpi3-32/Makefile
+++ b/sysutils/u-boot-rpi3-32/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/12/14 10:22:30 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		rpi3-32
 UBOOT_CONFIG=		rpi_3_32b_defconfig
 UBOOT_BIN=		u-boot.bin
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-tinker/Makefile b/sysutils/u-boot-tinker/Makefile
index 174529c526e..0ebf6694e83 100644
--- a/sysutils/u-boot-tinker/Makefile
+++ b/sysutils/u-boot-tinker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/07 18:27:46 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		tinker
 UBOOT_CONFIG=		tinker-rk3288_defconfig
@@ -9,3 +9,4 @@ post-build:
 	cd ${WRKSRC} && cat ./u-boot-dtb.bin >> u-boot-tinker-sd.bin
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-zynq-zybo-z7/Makefile b/sysutils/u-boot-zynq-zybo-z7/Makefile
index d4bc9991fde..dda710c3a63 100644
--- a/sysutils/u-boot-zynq-zybo-z7/Makefile
+++ b/sysutils/u-boot-zynq-zybo-z7/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2019/05/16 22:37:16 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		zynq-zybo-z7
 UBOOT_CONFIG=		zynq_zybo_z7_defconfig
 UBOOT_BIN=		u-boot u-boot.img spl/boot.bin
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-zynq-zybo/Makefile b/sysutils/u-boot-zynq-zybo/Makefile
index b8254ee8c00..68d88dd5242 100644
--- a/sysutils/u-boot-zynq-zybo/Makefile
+++ b/sysutils/u-boot-zynq-zybo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 16:47:59 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:25:59 wiz Exp $
 
 UBOOT_TARGET=		zynq-zybo
 UBOOT_CONFIG=		zynq_zybo_defconfig
 UBOOT_BIN=		u-boot u-boot.img spl/boot.bin
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
index d5264850c87..804a7542987 100644
--- a/sysutils/u-boot/Makefile
+++ b/sysutils/u-boot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2021/03/06 20:19:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.33 2021/08/12 07:25:54 wiz Exp $
 #
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
 DISTNAME=	u-boot-${UBOOT_VERSION}
 PKGREVISION=	11
-CATEGORIES=	meta-pkgs sysutils u-boot
+CATEGORIES=	sysutils meta-pkgs
 MASTER_SITES=	# empty
 
 MAINTAINER=	jmcneill@NetBSD.org
diff --git a/sysutils/u-boot/u-boot-arm.mk b/sysutils/u-boot/u-boot-arm.mk
index 4f629905b83..18ddffe5daa 100644
--- a/sysutils/u-boot/u-boot-arm.mk
+++ b/sysutils/u-boot/u-boot-arm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-arm.mk,v 1.2 2018/06/06 21:58:28 wiz Exp $
+# $NetBSD: u-boot-arm.mk,v 1.3 2021/08/12 07:25:54 wiz Exp $
 
 MAINTAINER=	port-arm@NetBSD.org
 BUILD_DEPENDS+=	cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
@@ -6,4 +6,3 @@ BUILD_DEPENDS+=	cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
 UBOOT_ENV+=	CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
 
 .include "u-boot.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot/u-boot.mk b/sysutils/u-boot/u-boot.mk
index 66fa40acd54..a451948b748 100644
--- a/sysutils/u-boot/u-boot.mk
+++ b/sysutils/u-boot/u-boot.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.32 2021/05/14 11:21:07 nia Exp $
+# $NetBSD: u-boot.mk,v 1.33 2021/08/12 07:25:54 wiz Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -39,7 +39,7 @@ ALL_ENV+= 		PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 .else
 ALL_ENV+= 		PYTHON3=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 .endif
-ALL_ENV+=		PYTHONLIBPATH=-L$(LOCALBASE)/lib
+ALL_ENV+=		PYTHONLIBPATH=-L${LOCALBASE}/lib
 
 .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
 UBOOT_ENV+=	UBOOT_PKGREVISION=nb${PKGREVISION}