From 434b2b742366713ee26282eb8890a51d50ccc2a6 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 29 Jul 2018 17:37:00 +0000
Subject: [PATCH] Minor cleanup of u-boot's patches

Move to using the 'raw' patches for those patches that are currently
in u-boot's upstream landing zone.  Move to using a u-boot directory
since the numeric names aren't very u-boot specific and might
conflict. Bump PORTREVISION out of an abundance of caution.

Differential Review: https://reviews.freebsd.org/D16409
---
 sysutils/u-boot-master/Makefile |  2 ++
 sysutils/u-boot-master/distinfo | 14 +++++++-------
 sysutils/u-boot-rpi/Makefile    |  6 +++---
 sysutils/u-boot-rpi2/Makefile   |  6 +++---
 sysutils/u-boot-rpi3/Makefile   |  8 ++++----
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index b9dafd9c1c55..8cdd2034fe7e 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -5,9 +5,11 @@
 
 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}
diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo
index f58143ae218e..7b8e50316ffa 100644
--- a/sysutils/u-boot-master/distinfo
+++ b/sysutils/u-boot-master/distinfo
@@ -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
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index da591958e53f..4056c0133e51 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -2,15 +2,15 @@
 
 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
 
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index 1df2881fb83d..d157d0a33487 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -2,15 +2,15 @@
 
 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
 
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile
index bfc68a188101..ec6676e4cbdf 100644
--- a/sysutils/u-boot-rpi3/Makefile
+++ b/sysutils/u-boot-rpi3/Makefile
@@ -2,6 +2,10 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+EXTRA_PATCHES=	${.CURDIR}/files/
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
 FAMILY=		rpi
@@ -9,10 +13,6 @@ 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