Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 475664)
+++ head/sysutils/u-boot-master/Makefile	(revision 475665)
@@ -1,193 +1,195 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
+DIST_SUBDIR=	u-boot
 
 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=		bison gmake python:2.7,build shebangfix tar:bz2
 BINARY_ALIAS=	bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0
 
 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} PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Use upstreamed patches not yet mainlined
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=	http://patchwork.ozlabs.org/patch/
 
 # 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
 UBOOT_METADATA_OMAP_FILES=	${UBOOT_PLIST_OMAP}
 UBOOT_METADATA_OMAP_METHOD=	file
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot-sunxi-with-spl.bin
 UBOOT_METADATA_ALLWINNER_FILES=		${UBOOT_PLIST_ALLWINNER}
 UBOOT_METADATA_ALLWINNER_METHOD=	raw
 UBOOT_METADATA_ALLWINNER_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER_RAW_BS=	1k
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=u-boot-sunxi-with-spl.bin
 UBOOT_ARCH_ALLWINNER64=aarch64
 UBOOT_METADATA_ALLWINNER64_FILES=	${UBOOT_PLIST_ALLWINNER}
 UBOOT_METADATA_ALLWINNER64_METHOD=	raw
 UBOOT_METADATA_ALLWINNER64_RAW_OFFSET=	8
 UBOOT_METADATA_ALLWINNER64_RAW_BS=	1k
 
 # 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_METADATA_RPI_FILES=	${UBOOT_PLIST_RPI}
 UBOOT_METADATA_RPI_METHOD=	file
 
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2018.07
 
 .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
 
 .if defined(UBOOT_METADATA_${FAMILY:tu}_METHOD)
 METADATA_METHOD=${UBOOT_METADATA_${FAMILY:tu}_METHOD}
 METADATA_FILES=${UBOOT_METADATA_${FAMILY:tu}_FILES}
 PLIST_FILES+=	${UBOOT_DIR}/metadata
 UBOOT_PLIST+=	metadata
 .if ${METADATA_METHOD} == "raw"
 METADATA_OFFSET=${UBOOT_METADATA_${FAMILY:tu}_RAW_OFFSET}
 METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS}
 .elif ${METADATA_METHOD} == "file"
 .else
 .error "Unsupported METADATA_METHOD"
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh
 	${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/
 .if defined(METADATA_METHOD)
 	@echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata
 	@echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata
 .if ${METADATA_METHOD} == "raw"
 	@echo "OFFSET=${METADATA_OFFSET}" >> ${WRKSRC}/metadata
 	@echo "BS=${METADATA_BS}" >> ${WRKSRC}/metadata
 .elif ${METADATA_METHOD} == "file"
 .endif
 .endif
 
 .if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT)
 # For armv6/v7 we want CONFIG_API
 # Use a KConfig fragment for that
 FRAGMENT_NAME=		FreeBSD_Fragment
 CONFIG_FRAGMENT=	${FILESDIR}/${FRAGMENT_NAME}
 .endif
 
 .if defined(CONFIG_FRAGMENT)
 do-configure:
 	${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME})
 .else
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 .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-master/distinfo
===================================================================
--- head/sysutils/u-boot-master/distinfo	(revision 475664)
+++ head/sysutils/u-boot-master/distinfo	(revision 475665)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1532285141
-SHA256 (u-boot-2018.07.tar.bz2) = 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4
-SIZE (u-boot-2018.07.tar.bz2) = 12586212
-SHA256 (937869/mbox/?) = 24fbed0558cc51d22741f72c5676eee1109af59db60c845437db19143322454d
-SIZE (937869/mbox/?) = 1238
-SHA256 (939129/mbox/?) = bc389b925af88f0e49fe459eefa6de3eb950537457b333958d758c38976210d0
-SIZE (939129/mbox/?) = 1112
+TIMESTAMP = 1532365662
+SHA256 (u-boot/u-boot-2018.07.tar.bz2) = 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4
+SIZE (u-boot/u-boot-2018.07.tar.bz2) = 12586212
+SHA256 (u-boot/937869/raw) = 5959afb53dc744d9548a2d05a2a98d7c76e66570156353fc4f1220a648b8ac05
+SIZE (u-boot/937869/raw) = 322
+SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
+SIZE (u-boot/939129/raw) = 310
Index: head/sysutils/u-boot-rpi/Makefile
===================================================================
--- head/sysutils/u-boot-rpi/Makefile	(revision 475664)
+++ head/sysutils/u-boot-rpi/Makefile	(revision 475665)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 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
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi2/Makefile
===================================================================
--- head/sysutils/u-boot-rpi2/Makefile	(revision 475664)
+++ head/sysutils/u-boot-rpi2/Makefile	(revision 475665)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
 FAMILY=		rpi
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
-
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
 
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi2_fragment
 FRAGMENT_NAME=	rpi2_fragment
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/u-boot-rpi3/Makefile
===================================================================
--- head/sysutils/u-boot-rpi3/Makefile	(revision 475664)
+++ head/sysutils/u-boot-rpi3/Makefile	(revision 475665)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+EXTRA_PATCHES=	${.CURDIR}/files/
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 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
 
 .include "${MASTERDIR}/Makefile"