Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
+PORTREVISION=	1
 DISTVERSIONPREFIX=	ports-v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
@@ -97,6 +98,12 @@
 UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 .endif
 
+# Per family dependancies
+.if ${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}
@@ -106,6 +113,13 @@
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 
+# U-Boot for Allwinner 64bits SoCs is splited in two parts
+# Generate a single binary to ease deployement on sdcard
+.if ${FAMILY} == allwinner64
+post-build:
+	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
+.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)
Index: sysutils/u-boot-pine64/Makefile
===================================================================
--- sysutils/u-boot-pine64/Makefile
+++ sysutils/u-boot-pine64/Makefile
@@ -1,16 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
+MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		pine64
 BOARD_CONFIG=	pine64_plus_defconfig
 FAMILY=		allwinner64
 
-BUILD_DEPENDS=	${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner
-MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin
-
-post-build:
-	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
-
 .include "${MASTERDIR}/Makefile"
Index: sysutils/u-boot-sopine/Makefile
===================================================================
--- sysutils/u-boot-sopine/Makefile
+++ sysutils/u-boot-sopine/Makefile
@@ -1,16 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=	manu@FreeBSD.org
+MAINTAINER=	uboot@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
 MODEL=		sopine
 BOARD_CONFIG=	sopine_baseboard_defconfig
 FAMILY=		allwinner64
 
-BUILD_DEPENDS=	${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner
-MAKE_ENV+=	BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin
-
-post-build:
-	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
-
 .include "${MASTERDIR}/Makefile"