libjxl: some cleanups

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sun Jul 17 21:39:46 2022 +0200
Changeset:	335fea103daf5a351b0d0645cabb32763e2fbae3

Modified Files:
	libjxl/Makefile
	libjxl/buildlink3.mk

Log Message:
libjxl: some cleanups

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

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

diffstat:
 libjxl/Makefile      | 7 +++----
 libjxl/buildlink3.mk | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs:
diff --git a/libjxl/Makefile b/libjxl/Makefile
index f903a9baeb..48be770fb8 100644
--- a/libjxl/Makefile
+++ b/libjxl/Makefile
@@ -3,7 +3,9 @@
 .include "../../wip/libjxl/Makefile.common"
 COMMENT=	JpegXL reference codec
 
-USE_TOOLS+=	bash pkg-config
+TOOL_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+
+USE_TOOLS+=	bash pkg-config realpath
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
@@ -21,9 +23,6 @@ PKGCONFIG_OVERRIDE+=	lib/threads/libjxl_threads.pc.in
 pre-configure:
 	cd ${WRKSRC} && ./deps.sh
 
-TOOL_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-TOOL_DEPENDS+=	realpath-[0-9]*:../../wip/realpath
-
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
diff --git a/libjxl/buildlink3.mk b/libjxl/buildlink3.mk
index dd9da5439a..42d96f38c2 100644
--- a/libjxl/buildlink3.mk
+++ b/libjxl/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libjxl+=	libjxl>=0.6
 BUILDLINK_PKGSRCDIR.libjxl?=	../../wip/libjxl
 
 .include "../../archivers/brotli/buildlink3.mk"
-.include "../../wip/libhighway/buildlink3.mk"
+.include "../../graphics/libhighway/buildlink3.mk"
 .endif	# LIBJXL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libjxl