Index: head/sysutils/u-boot-a13-olinuxino/Makefile
===================================================================
--- head/sysutils/u-boot-a13-olinuxino/Makefile	(revision 472713)
+++ head/sysutils/u-boot-a13-olinuxino/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		a13-olinuxino
 BOARD_CONFIG=	A13-OLinuXino_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-a64-olinuxino/Makefile
===================================================================
--- head/sysutils/u-boot-a64-olinuxino/Makefile	(revision 472713)
+++ head/sysutils/u-boot-a64-olinuxino/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		a64-olinuxino
 BOARD_CONFIG=	a64-olinuxino_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-bananapi/Makefile
===================================================================
--- head/sysutils/u-boot-bananapi/Makefile	(revision 472713)
+++ head/sysutils/u-boot-bananapi/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		bananapi
 BOARD_CONFIG=	Bananapi_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-bananapim2/Makefile
===================================================================
--- head/sysutils/u-boot-bananapim2/Makefile	(revision 472713)
+++ head/sysutils/u-boot-bananapim2/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		bananapim2
 BOARD_CONFIG=	Sinovoip_BPI_M2_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-beaglebone/Makefile
===================================================================
--- head/sysutils/u-boot-beaglebone/Makefile	(revision 472713)
+++ head/sysutils/u-boot-beaglebone/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		beaglebone
 BOARD_CONFIG=	am335x_boneblack_defconfig
 FAMILY=		omap
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-chip/Makefile
===================================================================
--- head/sysutils/u-boot-chip/Makefile	(revision 472713)
+++ head/sysutils/u-boot-chip/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		chip
 BOARD_CONFIG=	CHIP_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-cubieboard/Makefile
===================================================================
--- head/sysutils/u-boot-cubieboard/Makefile	(revision 472713)
+++ head/sysutils/u-boot-cubieboard/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubieboard
 BOARD_CONFIG=	Cubieboard_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-cubieboard2/Makefile
===================================================================
--- head/sysutils/u-boot-cubieboard2/Makefile	(revision 472713)
+++ head/sysutils/u-boot-cubieboard2/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubieboard2
 BOARD_CONFIG=	Cubieboard2_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-cubox-hummingboard/Makefile
===================================================================
--- head/sysutils/u-boot-cubox-hummingboard/Makefile	(revision 472713)
+++ head/sysutils/u-boot-cubox-hummingboard/Makefile	(revision 472714)
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		cubox-hummingboard
 BOARD_CONFIG=	mx6cuboxi_defconfig
 FAMILY=		imx6
 
 IMXFILE=	u-boot.imx
 UBOOT_PLIST=	${IMXFILE}
 
 ALL_TARGET=	u-boot-with-spl.imx
 
 pre-install: .PHONY
 	@${CP} ${WRKSRC}/u-boot-with-spl.imx ${WRKSRC}/${IMXFILE}
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-duovero/Makefile
===================================================================
--- head/sysutils/u-boot-duovero/Makefile	(revision 472713)
+++ head/sysutils/u-boot-duovero/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		duovero
 BOARD_CONFIG=	duovero_defconfig
 FAMILY=		omap
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 472713)
+++ head/sysutils/u-boot-master/Makefile	(revision 472714)
@@ -1,156 +1,156 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
 
-MAINTAINER=	uboot@FreeBSD.org
+MAINTAINER?=	uboot@FreeBSD.org
 COMMENT=	Cross-build das u-boot for model ${MODEL}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig3.0:devel/swig30 \
 		dtc>=1.4.1:sysutils/dtc \
 		mkimage:sysutils/u-boot-tools
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
 USES=		tar:bz2 gmake python:2.7,build shebangfix
 BINARY_ALIAS=	swig=swig3.0 sed=gsed dtc=${LOCALBASE}/bin/dtc
 
 SHEBANG_FILES=	tools/binman/binman.py
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
 MAKE_ARGS+=	V=1 CROSS_COMPILE=${CROSS_COMPILE} DTC=${LOCALBASE}/bin/dtc PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Sanity checks
 .if !defined(MODEL) && !defined(BOARD_CONFIG) && !defined(FAMILY)
 MODEL=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .else
 .if !defined(MODEL)
 IGNORE+=	MODEL is not defined
 .endif
 .if !defined(BOARD_CONFIG)
 IGNORE+=	BOARD_CONFIG is not defined
 .endif
 .if !defined(FAMILY)
 IGNORE+=	FAMILY is not defined
 .endif
 .endif
 
 # Overrides for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=u-boot-sunxi-with-spl.bin
 UBOOT_ARCH_ALLWINNER64=aarch64
 
 # Overrides for Zynq 7000 family
 UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt
 UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt
 
 # Overrides for RPI family
 UBOOT_PLIST_RPI=	u-boot.bin
 
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2018.03
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
 .endif
 UBOOT_PLIST?=u-boot.img
 
 .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu})
 UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}}
 .endif
 UBOOT_ARCH?=	arm
 
 .if ${UBOOT_ARCH} == arm
 CROSS_COMPILE=arm-none-eabi-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 UBOOT_PLIST+=	boot.scr
 .elif ${UBOOT_ARCH} == aarch64
 CROSS_COMPILE=aarch64-none-elf-
 ARCHFLAGS=ARCH=arm
 .else
 # Best guess for other architectures
 CROSS_COMPILE=${UBOOT_ARCH}-none-elf-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .endif
 COMPILER?=${CROSS_COMPILE}gcc
 
 .if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu})
 UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 .endif
 
 # Per family dependancies
 .if defined(FAMILY) && ${FAMILY} == allwinner64
 BUILD_DEPENDS+=	${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner
 MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin
 .endif
 
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
 PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
 PLIST_FILES+=	${UBOOT_DIR}/README
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh
 	${CP} ${FILESDIR}/FreeBSD_Fragment ${WRKSRC}/configs/
 	${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/
 
 .if ${UBOOT_ARCH} == arm
 # For armv6/v7 we want CONFIG_API
 # Use a KConfig fragment for that
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/FreeBSD_Fragment)
 .else
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 .endif
 
 # U-Boot for Allwinner 64bits SoCs is splited in two parts
 # Generate a single binary to ease deployement on sdcard
 .if defined(FAMILY) && ${FAMILY} == allwinner64
 post-build:
 	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 .endif
 
 .if ${UBOOT_ARCH} == arm
 post-build:
 	mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr
 .endif
 
 # If we need to put anything into WRKSRC, do so now so we can build the PLIST
 # in do-install
 .if defined(UBOOT_MOVE)
 pre-install:
 	${CP} ${UBOOT_MOVE} ${WRKSRC}
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INST}
 .for i in ${UBOOT_PLIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/sysutils/u-boot-nanopi-m1plus/Makefile
===================================================================
--- head/sysutils/u-boot-nanopi-m1plus/Makefile	(revision 472713)
+++ head/sysutils/u-boot-nanopi-m1plus/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_m1plus
 BOARD_CONFIG=	nanopi_m1_plus_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-nanopi-neo/Makefile
===================================================================
--- head/sysutils/u-boot-nanopi-neo/Makefile	(revision 472713)
+++ head/sysutils/u-boot-nanopi-neo/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_neo
 BOARD_CONFIG=	nanopi_neo_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-nanopi-neo-air/Makefile
===================================================================
--- head/sysutils/u-boot-nanopi-neo-air/Makefile	(revision 472713)
+++ head/sysutils/u-boot-nanopi-neo-air/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		nanopi_neo_air
 BOARD_CONFIG=	nanopi_neo_air_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-olimex-a20-som-evb/Makefile
===================================================================
--- head/sysutils/u-boot-olimex-a20-som-evb/Makefile	(revision 472713)
+++ head/sysutils/u-boot-olimex-a20-som-evb/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olimex-a20-som-evb
 BOARD_CONFIG=	A20-Olimex-SOM-EVB_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-olinuxino-lime/Makefile
===================================================================
--- head/sysutils/u-boot-olinuxino-lime/Makefile	(revision 472713)
+++ head/sysutils/u-boot-olinuxino-lime/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		olinuxino-lime
 BOARD_CONFIG=	A10-OLinuXino-Lime_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-orangepi-one/Makefile
===================================================================
--- head/sysutils/u-boot-orangepi-one/Makefile	(revision 472713)
+++ head/sysutils/u-boot-orangepi-one/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-one
 BOARD_CONFIG=	orangepi_one_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-orangepi-pc/Makefile
===================================================================
--- head/sysutils/u-boot-orangepi-pc/Makefile	(revision 472713)
+++ head/sysutils/u-boot-orangepi-pc/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-pc
 BOARD_CONFIG=	orangepi_pc_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-orangepi-pc2/Makefile
===================================================================
--- head/sysutils/u-boot-orangepi-pc2/Makefile	(revision 472713)
+++ head/sysutils/u-boot-orangepi-pc2/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		orangepi-pc2
 BOARD_CONFIG=	orangepi_pc2_defconfig
 FAMILY=		allwinner64
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-pandaboard/Makefile
===================================================================
--- head/sysutils/u-boot-pandaboard/Makefile	(revision 472713)
+++ head/sysutils/u-boot-pandaboard/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pandaboard
 BOARD_CONFIG=	omap4_panda_defconfig
 FAMILY=		omap
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-pcduino3/Makefile
===================================================================
--- head/sysutils/u-boot-pcduino3/Makefile	(revision 472713)
+++ head/sysutils/u-boot-pcduino3/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pcduino3
 BOARD_CONFIG=	Linksprite_pcDuino3_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-sinovoip-bpi-m3/Makefile
===================================================================
--- head/sysutils/u-boot-sinovoip-bpi-m3/Makefile	(revision 472713)
+++ head/sysutils/u-boot-sinovoip-bpi-m3/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		sinovoip-bpi-m3
 BOARD_CONFIG=	Sinovoip_BPI_M3_defconfig
 FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-wandboard/Makefile
===================================================================
--- head/sysutils/u-boot-wandboard/Makefile	(revision 472713)
+++ head/sysutils/u-boot-wandboard/Makefile	(revision 472714)
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		wandboard
 BOARD_CONFIG=	wandboard_defconfig
 FAMILY=		imx6
 
 IMXFILE=	u-boot.imx
 UBOOT_PLIST=	${IMXFILE}
 
 ALL_TARGET=	u-boot-with-spl.imx
 
 pre-install: .PHONY
 	@${CP} ${WRKSRC}/u-boot-with-spl.imx ${WRKSRC}/${IMXFILE}
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-zedboard/Makefile
===================================================================
--- head/sysutils/u-boot-zedboard/Makefile	(revision 472713)
+++ head/sysutils/u-boot-zedboard/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		zedboard
 BOARD_CONFIG=	zynq_zed_defconfig
 FAMILY=		zynq_7000
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-zybo/Makefile
===================================================================
--- head/sysutils/u-boot-zybo/Makefile	(revision 472713)
+++ head/sysutils/u-boot-zybo/Makefile	(revision 472714)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	imp@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		zybo
 BOARD_CONFIG=	zynq_zybo_defconfig
 FAMILY=		zynq_7000
 
 .include "${MASTERDIR}/Makefile"