u-boot-tools: fix and update to v2023.07.

[Brook Milligan <brook%nmsu.edu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Brook Milligan <brook%nmsu.edu@localhost>
Pushed By:	brook
Date:		Tue Aug 29 15:48:52 2023 -0600
Changeset:	0ae539364447f407cd6ba0986b741fccfe6b5a17

Modified Files:
	u-boot-tools/Makefile
	u-boot-tools/PLIST
	u-boot-tools/distinfo
Removed Files:
	u-boot-tools/patches/patch-tools_Makefile

Log Message:
u-boot-tools: fix and update to v2023.07.

The previous version of this package did not build correctly, because
it would not link against the SSL library.  Add the buildlink3.mk file
and -L to the definition of HOSTLDLIBS.  While at it, update to
v2023.07 and clean up the package (e.g., align with the contents of
sysutils/u-boot/u-boot.mk, add man pages, add a test).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0ae539364447f407cd6ba0986b741fccfe6b5a17

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 u-boot-tools/Makefile                     | 33 ++++++++++++++++---------------
 u-boot-tools/PLIST                        |  2 ++
 u-boot-tools/distinfo                     |  7 +++----
 u-boot-tools/patches/patch-tools_Makefile | 15 --------------
 4 files changed, 22 insertions(+), 35 deletions(-)

diffs:
diff --git a/u-boot-tools/Makefile b/u-boot-tools/Makefile
index 6c06a8345c..fbc623a5d2 100644
--- a/u-boot-tools/Makefile
+++ b/u-boot-tools/Makefile
@@ -1,35 +1,36 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	u-boot
-GITHUB_TAG=	refs/tags/v2023.04
-DISTNAME=	v2023.04
-PKGNAME=	${GITHUB_PROJECT}-tools-${DISTNAME:S,^v,,}
+UBOOT_VERSION=	2023.07
+DISTNAME=	u-boot-${UBOOT_VERSION}
+PKGNAME=	u-boot-tools-${UBOOT_VERSION:S/-/./}
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GITHUB:=u-boot/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+MASTER_SITES?=	ftp://ftp.denx.de/pub/u-boot/
+EXTRACT_SUFX?=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/u-boot/u-boot/
-COMMENT=	U-Boot tools
+HOMEPAGE=	https://www.denx.de/wiki/U-Boot
+COMMENT=	Das U-Boot, the Universal Boot Loader (tools)
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
 USE_LANGUAGES=	c
 USE_TOOLS+=	gmake
 
-BUILD_TARGET=	defconfig oldconfig tools-only
+BUILD_TARGET=	defconfig tools-only
+MAKE_ENV+=	HOSTLDLIBS=-L${PREFIX}/lib
 
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	pre-configure
-SUBST_FILES.prefix=	tools/Makefile
-SUBST_VARS.prefix=	PREFIX
-
-INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL} ${WRKSRC}/tools/dumpimage ${DESTDIR}${PREFIX}/bin
 	${INSTALL} ${WRKSRC}/tools/mkimage ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/dumpimage.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/mkimage.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+do-test:
+	${WRKSRC}/tools/dumpimage -h
+	${WRKSRC}/tools/mkimage -h
 
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/u-boot-tools/PLIST b/u-boot-tools/PLIST
index 002218209c..1bc5eedc07 100644
--- a/u-boot-tools/PLIST
+++ b/u-boot-tools/PLIST
@@ -1,3 +1,5 @@
 @comment $NetBSD$
 bin/dumpimage
 bin/mkimage
+man/man1/dumpimage.1
+man/man1/mkimage.1
diff --git a/u-boot-tools/distinfo b/u-boot-tools/distinfo
index cce640051f..273d1a21f7 100644
--- a/u-boot-tools/distinfo
+++ b/u-boot-tools/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-BLAKE2s (u-boot/v2023.04.tar.gz) = 130772dcba462b4e649c951379468ba092c87b1e7e1e3c1e9196eb961f999cd3
-SHA512 (u-boot/v2023.04.tar.gz) = e2a6819228b98066d5c01c7b6b89ff9033d1f3805232bab2ce0d46edde3cd0b8f255d0ed4826bd9df3041b77d6f836ace7116ab2a99946080770869d51612021
-Size (u-boot/v2023.04.tar.gz) = 24620730 bytes
+BLAKE2s (u-boot-2023.07.tar.bz2) = fb4ba00071c37cc150b580c671650863f61f7d94c72e754e9cf7247571a965c8
+SHA512 (u-boot-2023.07.tar.bz2) = c11c2dd8e44babf7d5c15c28587139f0fa7e73833bf6d4902b46780a6ed2199d007db4fec579f10b041da478dfa8c6c21e6cee76cfd65ec6cc6860c116bbc0fb
+Size (u-boot-2023.07.tar.bz2) = 19447450 bytes
 SHA1 (patch-Makefile) = 50c286a95110a5c69d450720f7540ba3024c4ce3
-SHA1 (patch-tools_Makefile) = dd49cdfd40ce047f39446f42a92e9e009d5d2963
diff --git a/u-boot-tools/patches/patch-tools_Makefile b/u-boot-tools/patches/patch-tools_Makefile
deleted file mode 100644
index 801d79e54d..0000000000
--- a/u-boot-tools/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add linker flags for building with native compiler.
-
---- tools/Makefile.orig	2023-04-03 20:38:50.000000000 +0000
-+++ tools/Makefile
-@@ -242,7 +242,7 @@ HOSTCFLAGS_mkeficapsule.o += \
- HOSTCFLAGS_mkeficapsule.o += \
- 	$(shell pkg-config --cflags uuid 2> /dev/null || echo "")
- HOSTLDLIBS_mkeficapsule += \
--	$(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
-+	$(shell pkg-config --libs gnutls 2> /dev/null || echo "-L@PREFIX@/lib -Wl,-rpath,@PREFIX@/lib -lgnutls")
- HOSTLDLIBS_mkeficapsule += \
- 	$(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
- hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule