libjxl: some cleanups

diff --git a/libjxl/Makefile b/libjxl/Makefile
index f903a9baebfd0d9fa014116043b47713e4ffcad0..48be770fb8cfcf1c18064464f74faf0f855693dd 100644 (file)
--- 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 dd9da5439a1c7ab8cee57d8f6fc698f83e95ada8..42d96f38c2440d89eaa289a70ecfeab72cdf4143 100644 (file)
--- 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