diff --git a/dev-lang/swift_lang/swift_lang-3.1.recipe b/dev-lang/swift_lang/swift_lang-3.1.recipe
index c95e61cd6..16a2144c5 100644
--- a/dev-lang/swift_lang/swift_lang-3.1.recipe
+++ b/dev-lang/swift_lang/swift_lang-3.1.recipe
@@ -7,29 +7,29 @@ and desktop apps, scaling up to cloud services. Most importantly, \
 Swift  is designed to make writing and maintaining correct programs \
 easier for the developer."
 HOMEPAGE="https://swift.org"
-LICENSE="Apache v2"
 COPYRIGHT="2017 Apple Inc"
+LICENSE="Apache v2"
 REVISION="1"
 srcGitRev="94e444f22015d32b81e6dc1a0316a8243360559b"
-srcGitRev2="2c9b458a0db83c1aecafb12cef1ccc2d479d09bd"
-srcGitRev3="be1632fd0514632ae51073e5ed109b00b68e1cfd"
-srcGitRev4="912d9d4ccbfa41ba225c37351a217b678358cc3e"
-srcGitRev5="9732781059bddc467677396562c987db4587074c"
 SOURCE_URI="https://github.com/return/swift/archive/$srcGitRev.zip"
-SOURCE_URI_2="https://github.com/return/swift-clang/archive/$srcGitRev2.zip"
-SOURCE_URI_3="https://github.com/return/swift-llvm/archive/$srcGitRev3.zip"
-SOURCE_URI_4="https://github.com/return/swift-cmark/archive/$srcGitRev4.zip"
-SOURCE_URI_5="https://github.com/return/swift-compiler-rt/archive/$srcGitRev5.zip"
 CHECKSUM_SHA256="e0d3e048e57ee0fc85b41392d5d075dc037ce5c03f13e41f15bd45d647322155"
-CHECKSUM_SHA256_2="e0aaa0a0a38e47f1306ac5ad540c0e663ecf42a4d290d93601527421cbc3da16"
-CHECKSUM_SHA256_3="49789886819989bc97ec83dc7c5cfbca768bd76aa9e507882799f52c5a222270"
-CHECKSUM_SHA256_4="cf7dae35aa844bc438cbca8f335494416c32eee3fa491eaee5a36e2625bc73be"
-CHECKSUM_SHA256_5="58b0aa642cf15b99d889b923c7624cb7c092facb86a5329449efa42a6443fc5d"
 SOURCE_DIR="swift-$srcGitRev"
-SOURCE_DIR_2="swift-clang-$srcGitRev2"
-SOURCE_DIR_3="swift-llvm-$srcGitRev3"
-SOURCE_DIR_4="swift-cmark-$srcGitRev4"
-SOURCE_DIR_5="swift-compiler-rt-$srcGitRev5"
+srcGitRev_2="2c9b458a0db83c1aecafb12cef1ccc2d479d09bd"
+SOURCE_URI_2="https://github.com/return/swift-clang/archive/$srcGitRev_2.zip"
+CHECKSUM_SHA256_2="e0aaa0a0a38e47f1306ac5ad540c0e663ecf42a4d290d93601527421cbc3da16"
+SOURCE_DIR_2="swift-clang-$srcGitRev_2"
+srcGitRev_3="be1632fd0514632ae51073e5ed109b00b68e1cfd"
+SOURCE_URI_3="https://github.com/return/swift-llvm/archive/$srcGitRev_3.zip"
+CHECKSUM_SHA256_3="49789886819989bc97ec83dc7c5cfbca768bd76aa9e507882799f52c5a222270"
+SOURCE_DIR_3="swift-llvm-$srcGitRev_3"
+srcGitRev_4="912d9d4ccbfa41ba225c37351a217b678358cc3e"
+SOURCE_URI_4="https://github.com/return/swift-cmark/archive/$srcGitRev_4.zip"
+CHECKSUM_SHA256_4="cf7dae35aa844bc438cbca8f335494416c32eee3fa491eaee5a36e2625bc73be"
+SOURCE_DIR_4="swift-cmark-$srcGitRev_4"
+srcGitRev_5="9732781059bddc467677396562c987db4587074c"
+SOURCE_URI_5="https://github.com/return/swift-compiler-rt/archive/$srcGitRev_5.zip"
+CHECKSUM_SHA256_5="58b0aa642cf15b99d889b923c7624cb7c092facb86a5329449efa42a6443fc5d"
+SOURCE_DIR_5="swift-compiler-rt-$srcGitRev_5"
 PATCHES="swift_lang-3.1.patchset"
 
 ARCHITECTURES="!x86_gcc2 !x86 x86_64"
@@ -69,6 +69,7 @@ REQUIRES="
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcharset$secondaryArchSuffix
diff --git a/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe b/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe
index 9b29095cc..8f32d1004 100644
--- a/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe
+++ b/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe
@@ -7,29 +7,29 @@ and desktop apps, scaling up to cloud services. Most importantly, \
 Swift  is designed to make writing and maintaining correct programs \
 easier for the developer."
 HOMEPAGE="https://swift.org"
-LICENSE="Apache v2"
 COPYRIGHT="2017 Apple Inc"
+LICENSE="Apache v2"
 REVISION="1"
 srcGitRev="2ee9fdff636f17aa6ee749050ce373a3ecdc7b78"
-srcGitRev2="81aea9ea0d003bfa139cc800e0ba4eeb720580f2"
-srcGitRev3="b6505f158283ca5d1ed0409243132b0667d79b7e"
-srcGitRev4="d875488a6a95d5487b7c675f79a8dafef210a65f"
-srcGitRev5="31635ece3ab71eecbcbc795275cb267d55c38040"
 SOURCE_URI="https://github.com/apple/swift/archive/$srcGitRev.tar.gz"
-SOURCE_URI_2="https://github.com/apple/swift-clang/archive/$srcGitRev2.tar.gz"
-SOURCE_URI_3="https://github.com/apple/swift-llvm/archive/$srcGitRev3.tar.gz"
-SOURCE_URI_4="https://github.com/apple/swift-cmark/archive/$srcGitRev4.tar.gz"
-SOURCE_URI_5="https://github.com/apple/swift-compiler-rt/archive/$srcGitRev5.tar.gz"
 CHECKSUM_SHA256="fcbe48372b783d30b3de30b184d5e70103edcf11c92579dd7451a00279413b97"
-CHECKSUM_SHA256_2="c99f546cb15d62193fa266212793e2585e676a372d66fb6d8615d94944af6e4a"
-CHECKSUM_SHA256_3="48f4d2a79a0fed160decc00c0826900aefd08621205c078e76e89f483aa26c6a"
-CHECKSUM_SHA256_4="19247cd75daacb77937a480aa6b552d47b4735f93b659a429a0e1d854579d05d"
-CHECKSUM_SHA256_5="6e9a2c9e240ec96fc28a5085b48a8a8ee0e426e57af067cf15f714002b996ebd"
 SOURCE_DIR="swift-$srcGitRev"
-SOURCE_DIR_2="swift-clang-$srcGitRev2"
-SOURCE_DIR_3="swift-llvm-$srcGitRev3"
-SOURCE_DIR_4="swift-cmark-$srcGitRev4"
-SOURCE_DIR_5="swift-compiler-rt-$srcGitRev5"
+srcGitRev_2="81aea9ea0d003bfa139cc800e0ba4eeb720580f2"
+SOURCE_URI_2="https://github.com/apple/swift-clang/archive/$srcGitRev_2.tar.gz"
+CHECKSUM_SHA256_2="c99f546cb15d62193fa266212793e2585e676a372d66fb6d8615d94944af6e4a"
+SOURCE_DIR_2="swift-clang-$srcGitRev_2"
+srcGitRev_3="b6505f158283ca5d1ed0409243132b0667d79b7e"
+SOURCE_URI_3="https://github.com/apple/swift-llvm/archive/$srcGitRev_3.tar.gz"
+CHECKSUM_SHA256_3="48f4d2a79a0fed160decc00c0826900aefd08621205c078e76e89f483aa26c6a"
+SOURCE_DIR_3="swift-llvm-$srcGitRev_3"
+srcGitRev_4="d875488a6a95d5487b7c675f79a8dafef210a65f"
+SOURCE_URI_4="https://github.com/apple/swift-cmark/archive/$srcGitRev_4.tar.gz"
+CHECKSUM_SHA256_4="19247cd75daacb77937a480aa6b552d47b4735f93b659a429a0e1d854579d05d"
+SOURCE_DIR_4="swift-cmark-$srcGitRev_4"
+srcGitRev_5="31635ece3ab71eecbcbc795275cb267d55c38040"
+SOURCE_URI_5="https://github.com/apple/swift-compiler-rt/archive/$srcGitRev_5.tar.gz"
+CHECKSUM_SHA256_5="6e9a2c9e240ec96fc28a5085b48a8a8ee0e426e57af067cf15f714002b996ebd"
+SOURCE_DIR_5="swift-compiler-rt-$srcGitRev_5"
 PATCHES="swift_lang-$portVersion.patchset"
 PATCHES_2="swift_clang-$portVersion.patchset"
 PATCHES_3="swift_llvm-$portVersion.patchset"
@@ -77,6 +77,7 @@ REQUIRES="
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcharset$secondaryArchSuffix