diff --git a/app-emulation/fuse/fuse-1.5.6.recipe b/app-emulation/fuse/fuse-1.5.6.recipe
index 7e480d26b..cf16b0ad8 100644
--- a/app-emulation/fuse/fuse-1.5.6.recipe
+++ b/app-emulation/fuse/fuse-1.5.6.recipe
@@ -40,8 +40,8 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
-	lib:libglib_2.0$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
diff --git a/media-sound/jack2/jack2-1.9.10~git.recipe b/media-sound/jack2/jack2-1.9.10~git.recipe
index 3cf6443f3..9f6ad045f 100644
--- a/media-sound/jack2/jack2-1.9.10~git.recipe
+++ b/media-sound/jack2/jack2-1.9.10~git.recipe
@@ -2,8 +2,8 @@ SUMMARY="Low-latency audio server"
 DESCRIPTION="jack2 is a C++ version of the JACK low-latency audio server \
 for multi-processor machines."
 HOMEPAGE="https://github.com/Barrett17/jack2-for-haiku"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2011 Paul Davis."
+LICENSE="GNU GPL v2"
 REVISION="1"
 srcGitRev="11d3d1aaf56ff5c323271db7f7e7353ba5e245c9"
 SOURCE_URI="https://github.com/Barrett17/jack2/archive/$srcGitRev.tar.gz"
diff --git a/sys-devel/llvm/llvm-6.0.1.recipe b/sys-devel/llvm/llvm-6.0.1.recipe
index 49bc64ccb..0f8e88951 100644
--- a/sys-devel/llvm/llvm-6.0.1.recipe
+++ b/sys-devel/llvm/llvm-6.0.1.recipe
@@ -107,9 +107,9 @@ PROVIDES="
 	cmd:verify_uselistorder
 	cmd:yaml2obj
 	devel:libfindAllSymbols$secondaryArchSuffix
-	devel:libLLVM_6.0.1$secondaryArchSuffix
-	devel:libLLVM_6.0$secondaryArchSuffix
 	devel:libLLVM$secondaryArchSuffix
+	devel:libLLVM_6.0$secondaryArchSuffix
+	devel:libLLVM_6.0.1$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -124,6 +124,7 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
@@ -131,7 +132,6 @@ PROVIDES="
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
 	devel:libLLVMARMUtils$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBinaryFormat$secondaryArchSuffix
@@ -161,10 +161,11 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLanaiAsmParser$secondaryArchSuffix
 	devel:libLLVMLanaiAsmPrinter$secondaryArchSuffix
 	devel:libLLVMLanaiCodeGen$secondaryArchSuffix
@@ -172,25 +173,25 @@ PROVIDES="
 	devel:libLLVMLanaiDisassembler$secondaryArchSuffix
 	devel:libLLVMLanaiInfo$secondaryArchSuffix
 	devel:libLLVMLanaiInstPrinter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -246,7 +247,6 @@ PROVIDES="
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
 	devel:libLLVMXRay$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
 	lib:BugpointPasses$secondaryArchSuffix
 	lib:LLVMHello$secondaryArchSuffix
@@ -259,10 +259,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clangd = $portVersion
-	cmd:clang_6.0 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_6.0 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_change_namespace = $portVersion
 	cmd:clang_check = $portVersion
@@ -277,16 +277,15 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_reorder_fields = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
+	cmd:clangd = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangchangenamespace$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
@@ -334,6 +333,7 @@ PROVIDES_clang="
 	devel:libclangtoolingastdiff$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix