Index: head/sysutils/u-boot-rpi/Makefile
===================================================================
--- head/sysutils/u-boot-rpi/Makefile	(revision 475122)
+++ head/sysutils/u-boot-rpi/Makefile	(revision 475123)
@@ -1,18 +1,14 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
 FAMILY=		rpi
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
-
-CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_fragment
 FRAGMENT_NAME=		rpi_fragment
+CONFIG_FRAGMENT=	${.CURDIR}/files/${FRAGMENT_NAME}
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi3/Makefile
===================================================================
--- head/sysutils/u-boot-rpi3/Makefile	(revision 475122)
+++ head/sysutils/u-boot-rpi3/Makefile	(revision 475123)
@@ -1,20 +1,15 @@
 # $FreeBSD$
 
-MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
 FAMILY=		rpi
 UBOOT_ARCH=	aarch64
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
-
-CONFIG_FRAGMENT=	${.CURDIR}/files/rpi3_fragment
-FRAGMENT_NAME=	rpi3_fragment
+FRAGMENT_NAME=		rpi3_fragment
+CONFIG_FRAGMENT=	${.CURDIR}/files/${FRAGMENT_NAME}
 
 .include "${MASTERDIR}/Makefile"