12 files changed, 11 insertions, 10 deletions

diff --git a/MOVED b/MOVED
index d401aa54903f..25c7cdd91852 100644
--- a/MOVED
+++ b/MOVED
@@ -15801,3 +15801,4 @@ devel/vulkan-headers|graphics/vulkan-headers|2020-12-23|Moved to a better catego
 devel/vulkan-tools|graphics/vulkan-tools|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/vulkan-vulkan-validation-layers|graphics/vulkan-vulkan-validation-layers|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/glslang|graphics/glslang|2020-12-23|Moved to a better category, aligning with shaderc
+devel/spirv-tools|graphics/spirv-tools|2020-12-25|Moved to a better category, aligning with glslang and shaderc
diff --git a/devel/Makefile b/devel/Makefile
index d8c7761fc55f..392fc63b82b9 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6730,7 +6730,6 @@
     SUBDIR += spice-protocol
     SUBDIR += spin
     SUBDIR += spirv-llvm-translator
-    SUBDIR += spirv-tools
     SUBDIR += splint
     SUBDIR += spread-sheet-widget
     SUBDIR += srecord
diff --git a/graphics/Makefile b/graphics/Makefile
index 621b49907bff..ab4ae18a3348 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1019,6 +1019,7 @@
     SUBDIR += sk1libs
     SUBDIR += skanlite
     SUBDIR += spectacle
+    SUBDIR += spirv-tools
     SUBDIR += springgraph
     SUBDIR += squish
     SUBDIR += ssocr
diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
index 6a17d37301a3..abca8cc9580c 100644
--- a/graphics/shaderc/Makefile
+++ b/graphics/shaderc/Makefile
@@ -10,8 +10,8 @@ COMMENT=	GLSL/HLSL to SPIR-V shader compiler
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libSPIRV-Tools-opt.a:devel/spirv-tools \
-		${LOCALBASE}/lib/libHLSL.a:graphics/glslang
+BUILD_DEPENDS=	${LOCALBASE}/lib/libHLSL.a:graphics/glslang \
+		${LOCALBASE}/lib/libSPIRV-Tools-opt.a:graphics/spirv-tools
 
 USES=		cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build
 USE_LDCONFIG=	yes
diff --git a/devel/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index b6a02f1a4d3c..7a4e5bf402fa 100644
--- a/devel/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2020.6
-CATEGORIES=	devel graphics
+CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools for processing SPIR-V intermediate shader language modules
diff --git a/devel/spirv-tools/distinfo b/graphics/spirv-tools/distinfo
index 1f51a6bc3838..1f51a6bc3838 100644
--- a/devel/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
diff --git a/devel/spirv-tools/pkg-descr b/graphics/spirv-tools/pkg-descr
index 069e3fc4ed73..069e3fc4ed73 100644
--- a/devel/spirv-tools/pkg-descr
+++ b/graphics/spirv-tools/pkg-descr
diff --git a/devel/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist
index e54a5ec428f1..e54a5ec428f1 100644
--- a/devel/spirv-tools/pkg-plist
+++ b/graphics/spirv-tools/pkg-plist
diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile
index 913ece5f69a6..0895c7e72ef9 100644
--- a/graphics/vkd3d/Makefile
+++ b/graphics/vkd3d/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Direct3D 12 to Vulkan translation
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
+BUILD_DEPENDS=	${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
-LIB_DEPENDS=	libSPIRV-Tools-shared.so:devel/spirv-tools \
+LIB_DEPENDS=	libSPIRV-Tools-shared.so:graphics/spirv-tools \
 		libvulkan.so:graphics/vulkan-loader
 RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--with-spirv-tools
 TEST_TARGET=	check
 
 # XXX Move to a separate port (a la graphics/vulkan-headers) and maybe make
-#     devel/spirv-tools depend on it as well
+#     graphics/spirv-tools depend on it as well
 USE_GITHUB=	nodefault
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
 CPPFLAGS+=	-isystem${WRKSRC}/external/spirv-headers/include
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 7153362db5d6..af50ace18650 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -12,7 +12,7 @@ LICENSE=	APACHE20
 
 # NOTE: keep spirv-tools and glslang up to date when updating Vulkan
 BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
-		${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
+		${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \
 		${LOCALBASE}/include/glslang/SPIRV/spirv.hpp:graphics/glslang
 
 USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6e54b58a39e0..dc824526ab82 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -249,7 +249,7 @@ GCRYPT_CONFIGURE_ENABLE=	gcrypt
 
 # glslang
 GLSLANG_BUILD_DEPENDS=	glslang>0:graphics/glslang \
-			spirv-tools>0:devel/spirv-tools
+			spirv-tools>0:graphics/spirv-tools
 GLSLANG_CONFIGURE_ENABLE=	libglslang
 GLSLANG_LDFLAGS=	-lm
 
diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile
index bb9d2ae90ac9..1e9475ab5df3 100644
--- a/x11-wm/chamfer/Makefile
+++ b/x11-wm/chamfer/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tiling X11 window manager with Vulkan compositor
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	spirv-opt:devel/spirv-tools \
+BUILD_DEPENDS=	spirv-opt:graphics/spirv-tools \
 		vulkan-headers>0:graphics/vulkan-headers \
 		glslc:graphics/shaderc \
 		glm>0:math/glm