diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe
index 18070480d..82e1ad1cb 100644
--- a/dev-cpp/hugen/hugen-1.recipe
+++ b/dev-cpp/hugen/hugen-1.recipe
@@ -9,8 +9,11 @@ SUMMARY="Code generator for Haiku"
 HOMEPAGE="https://github.com/aldeck/hugen"
 COPYRIGHT="2009 Alexandre Deckner"
 LICENSE="MIT"
-SOURCE_URI="git+https://github.com/aldeck/hugen.git#a5e42390e6d4435d9d81fe3670670e18a52dee9c"
 REVISION="1"
+SOURCE_URI="https://github.com/aldeck/hugen/archive/a5e42390e6d4435d9d81fe3670670e18a52dee9c.tar.gz"
+CHECKSUM_SHA256="d462579c612e03c42997e225635a8d8fa05a45669d58c0d6d789463a38abc173"
+SOURCE_DIR="hugen-a5e42390e6d4435d9d81fe3670670e18a52dee9c"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
@@ -18,10 +21,10 @@ PROVIDES="
 	hugen$secondaryArchSuffix = $portVersion
 	cmd:hugen$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	cmd:python$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	cmd:python
 	"
diff --git a/dev-embedded/arduino/arduino-1.7.7.recipe b/dev-embedded/arduino/arduino-1.7.7.recipe
index 1cb88326c..72c39a560 100644
--- a/dev-embedded/arduino/arduino-1.7.7.recipe
+++ b/dev-embedded/arduino/arduino-1.7.7.recipe
@@ -3,32 +3,34 @@ DESCRIPTION="Arduino is an open-source tool used for building electronics projec
 Arduino consists of a physical programmable circuit board (often referred to as a micro-controller) \
 and a development environment, or IDE (Integrated Development Environment) that runs on your computer, \
 used to write and upload computer code to the board."
-
 HOMEPAGE="http://arduino.org"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2015 Arduino S.r.l. - Italy"
-
-SOURCE_URI="http://download.arduino.org/IDE/1.7.7/arduino-1.7.7.org-linux32.tar.xz"
-CHECKSUM_SHA256="1640363e847f97ad640f248fc635d324b73219ec8a93147967d1dcda07db1d3c"
-SOURCE_URI_2="git+https://github.com/scream3r/java-simple-serial-connector#f5564869f8a70503c29c0d24609245321ba39b2c"
-SOURCE_URI_3="svn+https://github.com/arduino-org/Arduino/trunk/app/src/processing/app"
-SOURCE_URI_4="svn+https://github.com/arduino-org/Arduino/trunk/arduino-core/src/processing"
-
+LICENSE="GNU GPL v2"
 REVISION="1"
-
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
+SOURCE_URI="http://download.arduino.org/IDE/1.7.7/arduino-1.7.7.org-linux32.tar.xz"
+SOURCE_URI_2="https://github.com/scream3r/java-simple-serial-connector/archive/f5564869f8a70503c29c0d24609245321ba39b2c.tar.gz"
+SOURCE_URI_3="https://github.com/arduino-org/Arduino/archive/67152784328dd589ad34c9aeae54158a2b92a89d.tar.gz"
+SOURCE_URI_4="https://github.com/arduino-org/Arduino/archive/67152784328dd589ad34c9aeae54158a2b92a89d.tar.gz"
+CHECKSUM_SHA256="1640363e847f97ad640f248fc635d324b73219ec8a93147967d1dcda07db1d3c"
+CHECKSUM_SHA256_2="3d874fbf2afa60f6c21db7da6d89cc584f42e6ff01b63238bf235776699379e6"
+CHECKSUM_SHA256_3="b1010b340ee274a3cc0e3768b12098fb002a1100777d72b114f1a068df428102"
+CHECKSUM_SHA256_4="b1010b340ee274a3cc0e3768b12098fb002a1100777d72b114f1a068df428102"
+SOURCE_DIR="arduino-1.7.7-linux32"
+SOURCE_DIR_2="java-simple-serial-connector-f5564869f8a70503c29c0d24609245321ba39b2c"
+SOURCE_DIR_3="Arduino-67152784328dd589ad34c9aeae54158a2b92a89d/app/src/processing/app"
+SOURCE_DIR_4="Arduino-67152784328dd589ad34c9aeae54158a2b92a89d/arduino-core/src/processing"
 PATCHES="arduino-1.7.x.patchset"
 PATCHES_2="jssc_2.8.0.patchset"
 PATCHES_3="JFileChooser-1.7.x.patchset"
 PATCHES_4="SettingsFolder-1.7.x.patchset"
 
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	arduino$secondaryArchSuffix = $portVersion
 	app:Arduino$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	openjdk$secondaryArchSuffix
@@ -37,6 +39,7 @@ REQUIRES="
 	avr_gcc$secondaryArchSuffix
 	avr_binutils$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	openjdk$secondaryArchSuffix
@@ -50,8 +53,6 @@ BUILD_PREREQUIRES="
 	cmd:jar
 	"
 
-SOURCE_DIR="arduino-1.7.7-linux32"
-
 DISABLE_SOURCE_PACKAGE=yes
 
 BUILD()
@@ -142,9 +143,11 @@ INSTALL()
 	#	$arduinoDir/hardware/arduino/samd/platform.txt
 
 	#Disable check for update
-	sed -i 's|^update.check.*|update.check = false|g' $arduinoDir/lib/preferences.txt
+	sed -i 's|^update.check.*|update.check = false|g' \
+		$arduinoDir/lib/preferences.txt
 	#Set default serial port
-	sed -i 's|^serial.port=.*|serial.port=/dev/ports/usb0|g' $arduinoDir/lib/preferences.txt
+	sed -i 's|^serial.port=.*|serial.port=/dev/ports/usb0|g' \
+		$arduinoDir/lib/preferences.txt
 	#Add command for opening
 	echo "browser = /bin/open" >> $arduinoDir/lib/preferences.txt
 	echo "launcher = /bin/open" >> $arduinoDir/lib/preferences.txt
diff --git a/dev-embedded/cpcsdk/cpctools-0.3.0.recipe b/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
index b5f2a974e..0757dfb8b 100644
--- a/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
+++ b/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
@@ -15,9 +15,11 @@ LICENSE="
 	GNU GPL v2
 "
 REVISION="2"
-ARCHITECTURES="x86_gcc2"
+SOURCE_URI="https://github.com/cpcsdk/cpctools/archive/ac9ebe65c7eb49bc1175050d4a6d912bbf5856f5.tar.gz"
+CHECKSUM_SHA256="a4bb951fb5866e2db4a87a4104187bb5265f3de089f3ed500b132d6cd0dd9942"
+SOURCE_DIR="cpctools-ac9ebe65c7eb49bc1175050d4a6d912bbf5856f5"
 
-SOURCE_URI="git+https://github.com/cpcsdk/cpctools.git#ac9ebe65c7eb49bc1175050d4a6d912bbf5856f5"
+ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
 	cpctools = $portVersion
@@ -32,7 +34,6 @@ PROVIDES="
 	cmd:raw2crtc
 	lib:libcpc
 "
-
 REQUIRES="
 	haiku
 	lib:libdsk
@@ -46,7 +47,6 @@ BUILD_REQUIRES="
 	devel:libpng
 	devel:libz
 "
-
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc
diff --git a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
index 1d2d29729..28dd48c0f 100644
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
@@ -3,17 +3,18 @@ DESCRIPTION="Some tools which enable multi-platform development on the TI \
 Stellaris Launchpad boards. The Stellaris Launchpad is a low cost development \
 board created by Texas Instruments that comes with an ARM Cortex-M4F processor."
 HOMEPAGE="https://github.com/utzig/lm4tools"
-LICENSE="GNU GPL v2"
-REVISION="1"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-SOURCE_URI="git+https://github.com/utzig/lm4tools.git#1cfd813779b9eb717b15b0a1814bde8338899ff9"
 COPYRIGHT="
 	2012 Fabio Utzig
 	2012 Peter Stuge
 	"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://github.com/utzig/lm4tools/archive/1cfd813779b9eb717b15b0a1814bde8338899ff9.tar.gz"
+CHECKSUM_SHA256="cd28b701384f00affe6aad2f3addcd54ca167737004c4f8926304627816c42d6"
+SOURCE_DIR="lm4tools-1cfd813779b9eb717b15b0a1814bde8338899ff9"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	lm4tools = $portVersion
@@ -23,6 +24,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libusb_1.0$secondaryArchSuffix
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.recipe b/dev-java/rxtx/rxtx-2.2_pre2.recipe
index acf1b17c1..c4c70d4a4 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2.recipe
+++ b/dev-java/rxtx/rxtx-2.2_pre2.recipe
@@ -11,7 +11,9 @@ HOMEPAGE="http://rxtx.qbang.org"
 COPYRIGHT="1998-2006 Keane Jarvi"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="git+https://github.com/arduino/RXTX#84a009c"
+SOURCE_URI="https://github.com/arduino/RXTX/archive/84a009cbb5fe2d56f828aa1e0b1301c065ea5409.tar.gz"
+CHECKSUM_SHA256="71430dd8c36082db719f723adbf51f36f8f7060a6cbdbc4b6fe5f28da830bda6"
+SOURCE_DIR="RXTX-84a009cbb5fe2d56f828aa1e0b1301c065ea5409"
 PATCHES="rxtx-2.2_haiku-support.patch"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
index 14be4273f..b75003ecf 100644
--- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
+++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Open-source implementation of the Java Platform, SE"
+SUMMARY="An open-source implementation of the Java Platform, SE"
 DESCRIPTION="OpenJDK (Open Java Development Kit) is a free and open source \
 implementation of the Java Platform, Standard Edition (Java SE). It is the \
 result of an effort Sun Microsystems began in 2006. The implementation is \
@@ -10,16 +10,30 @@ HOMEPAGE="http://openjdk.java.net/"
 COPYRIGHT="2015 Oracle and/or its affiliates."
 LICENSE="GNU GPL v2"
 REVISION="2"
-SOURCE_URI="hg+http://bitbucket.org/hamishm/haiku-jdk8u#6e3a7c2"
-SOURCE_URI_2="hg+http://bitbucket.org/hamishm/haiku-jdk8u-hotspot#e5ab6f7"
-SOURCE_URI_3="hg+http://bitbucket.org/hamishm/haiku-jdk8u-jdk#9b3967c"
-SOURCE_URI_4="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/langtools#jdk8u40-b27"
-SOURCE_URI_5="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/corba#jdk8u40-b27"
-SOURCE_URI_6="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp#jdk8u40-b27"
-SOURCE_URI_7="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws#jdk8u40-b27"
-SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
-SOURCE_DIR="jdk"
-
+SOURCE_URI="https://bitbucket.org/hamishm/haiku-jdk8u/get/6e3a7c2446ea.zip"
+CHECKSUM_SHA256="68cb8171d84b1a0c12e20b2ecc968a12ed8f64d39858a6e3af9e287877c2245e"
+SOURCE_DIR="hamishm-haiku-jdk8u-6e3a7c2446ea"
+SOURCE_URI_2="https://bitbucket.org/hamishm/haiku-jdk8u-hotspot/get/e5ab6f7ff241.zip"
+CHECKSUM_SHA256_2="241b78f84c7d39a1b93c78e5bf0e02414aae92574450fd043fa6771a9bf18103"
+SOURCE_DIR_2="hamishm-haiku-jdk8u-hotspot-e5ab6f7ff241"
+SOURCE_URI_3="https://bitbucket.org/hamishm/haiku-jdk8u-jdk/get/9b3967c76020.zip"
+CHECKSUM_SHA256_3="a64e0109b51f4bf9e5902a7053ea69fe3caa58df03146c2dc0d3c586e389ee86"
+SOURCE_DIR_3="hamishm-haiku-jdk8u-jdk-9b3967c76020"
+SOURCE_URI_4="http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u40-b27.tar.bz2"
+CHECKSUM_SHA256_4="5a9ee52b24bd3bf42ff7e0fa355ac4bc9327d1da3d60499897300129ca984366"
+SOURCE_DIR_4="langtools-jdk8u40-b27"
+SOURCE_URI_5="http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u40-b27.tar.bz2"
+CHECKSUM_SHA256_5="4e9b83d2716d41d5af3b86ddae9302c6516a6c9ba96c8724c84a32b6c2bc8e87"
+SOURCE_DIR_5="corba-jdk8u40-b27"
+SOURCE_URI_6="http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u40-b27.tar.bz2"
+CHECKSUM_SHA256_6="408880924559130f714dbd5fc5ac6d3ec9b060490f20d3886490f92f6c0067b8"
+SOURCE_DIR_6="jaxp-jdk8u40-b27"
+SOURCE_URI_7="http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u40-b27.tar.bz2"
+CHECKSUM_SHA256_7="31a95d3e6ed051e58d919c7d800e396cfbd48d43389dc955e10574d0e50151f9"
+SOURCE_DIR_7="jaxws-jdk8u40-b27"
+SOURCE_URI_8="http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u40-b27.tar.bz2"
+CHECKSUM_SHA256_8="07fc791ea33a06b949a63d438479cb401762c4fd3334beecc77e4bf7ed4e2389"
+SOURCE_DIR_8="nashorn-jdk8u40-b27"
 ADDITIONAL_FILES="
 	elf.h
 	jexec.rdef
@@ -133,7 +147,8 @@ BUILD()
 
 	# Verify that we can allocate a large enough heap before starting.
 	maxHeapSize=960M
-	java -XX:ThreadStackSize=1536 -XX:MaxPermSize=160m -Xmx${maxHeapSize} -version
+	java -XX:ThreadStackSize=1536 -XX:MaxPermSize=160m \
+		-Xmx${maxHeapSize} -version
 
 	freeTypeHeaders=$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/freetype2
 	freeTypeLib=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib$secondaryArchSubDir
@@ -188,7 +203,7 @@ INSTALL()
 		$libDir/openjdk/demo
 }
 
-SUMMARY_sources="OpenJDK Development Kit (JDK) source files, demos and examples"
+SUMMARY_sources="The OpenJDK Development Kit (JDK) source files, demos and examples"
 PROVIDES_sources="
 	openjdk${secondaryArchSuffix}_sources = $portVersion compat >= 1.8
 	"
diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe
index 525f6dc0a..13222e510 100644
--- a/dev-lang/v8/v8-3.16.1.recipe
+++ b/dev-lang/v8/v8-3.16.1.recipe
@@ -9,10 +9,11 @@ HOMEPAGE="https://code.google.com/p/v8/"
 COPYRIGHT="2006-2012 The V8 Project Authors"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-SOURCE_URI="git+https://github.com/hamishm/v8.git#5698a30"
-SOURCE_URI_2="svn+http://gyp.googlecode.com/svn/trunk#1773"
-SOURCE_DIR="v8"
-SOURCE_DIR_2="gyp"
+SOURCE_URI="https://github.com/hamishm/v8/archive/5698a306a855321cf95c7f7436a6f46a6b7c44ca.tar.gz"
+SOURCE_URI_2="https://chromium.googlesource.com/external/gyp/+archive/072660db6ec1fafc1e0997439b5015913f0b9aa5.tar.gz"
+CHECKSUM_SHA256="ffc02157cc9bdbae483b126aaeb33aa5af24f104a3fc7980a99e9ea81724f545"
+CHECKSUM_SHA256_2="7ee42deb9aca4093ed723f6f4e951bb90dac08f7a14ccf2d33e32c9ce42e4682"
+SOURCE_DIR="v8-5698a306a855321cf95c7f7436a6f46a6b7c44ca"
 PATCHES="v8-3.16.1.patch"
 
 ARCHITECTURES="!x86_gcc2 ?x86"
diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe
index f9a7efe84..70175f918 100644
--- a/dev-libs/gnulib/gnulib-2013_12_17.recipe
+++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe
@@ -10,24 +10,24 @@ projects, Gnulib does not normally generate a source tarball distribution; \
 instead, developers grab modules directly from the source repository.
 "
 HOMEPAGE="http://www.gnu.org/software/gnulib"
-SOURCE_URI="git+git://git.savannah.gnu.org/gnulib.git"
+COPYRIGHT="1985-2013 Free Software Foundation."
+LICENSE="GNULIB"
 REVISION="1"
+SOURCE_URI="https://github.com/coreutils/gnulib/archive/6cc32c63e80bc1a30c521b2f07f2b54909b59892.tar.gz"
+CHECKSUM_SHA256="fa9f4b8756b303e45703b7b62f552ea02d97fe4b38c197fa115f4133bb777ca7"
+SOURCE_DIR="gnulib-6cc32c63e80bc1a30c521b2f07f2b54909b59892"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-LICENSE="GNULIB"
-COPYRIGHT="1985-2013 Free Software Foundation."
 
 PROVIDES="
 	gnulib = $portVersion
 	cmd:gnulib_tool$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="" # No build, no requirements
-
 BUILD_PREREQUIRES="" # No build, no requirements
 
 BUILD()
@@ -43,7 +43,8 @@ INSTALL()
 	mkdir -p $dataDir/gnulib $binDir
 
 	cp gnulib-tool $dataDir/gnulib/gnulib_tool # Fix binary name in help
-	cp -R check-copyright check-module posix-modules build-aux config doc lib m4 modules tests top $dataDir/gnulib
+	cp -R check-copyright check-module posix-modules build-aux config doc \
+		lib m4 modules tests top $dataDir/gnulib
 	ln -s $dataDir/gnulib/gnulib_tool $binDir/gnulib_tool
 }
 
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
index 5b58e59ca..1a1ca9eb4 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
@@ -1,10 +1,13 @@
 SUMMARY="Library for solving packages and reading repositories"
 DESCRIPTION="Library for solving packages and reading repositories."
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2007-2013, Novell Inc."
 HOMEPAGE="http://github.com/openSUSE/libsolv"
-SOURCE_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3"
+COPYRIGHT="2007-2013, Novell Inc."
+LICENSE="BSD (3-clause)"
 REVISION="3"
+SOURCE_URI="https://github.com/weinhold/libsolv/archive/ef4a8778ef567224feb35019b711507ae1d6e7c3.tar.gz"
+CHECKSUM_SHA256="b3014e0d4b7b32e19f1fff53814f0630207163362f3059fdbf5f8a1fc1fc3118"
+SOURCE_DIR="libsolv-ef4a8778ef567224feb35019b711507ae1d6e7c3"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -18,6 +21,16 @@ REQUIRES="
 	lib:libexpat$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libsolv${secondaryArchSuffix}_devel = $portVersion
+	devel:libsolv${secondaryArchSuffix} = $portVersion
+	devel:libsolvext${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES_devel="
+	libsolv${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	devel:libexpat$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -70,12 +83,3 @@ INSTALL()
 }
 
 # ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsolv${secondaryArchSuffix}_devel = $portVersion
-	devel:libsolv${secondaryArchSuffix} = $portVersion
-	devel:libsolvext${secondaryArchSuffix} = $portVersion
-	"
-REQUIRES_devel="
-	libsolv${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
index 2c1dcd10b..bd0f5a764 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
@@ -6,17 +6,18 @@ LuaFileSystem offers a portable way to access the underlying directory \
 structure and file attributes.
 "
 HOMEPAGE="http://keplerproject.github.io/luafilesystem/"
-SOURCE_URI="git+https://github.com/keplerproject/luafilesystem.git#2fd989cd6c777583be1c93616018c55b2cbb1bcf"
 COPYRIGHT="2004-2012 Kepler Project"
 LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="https://github.com/keplerproject/luafilesystem/archive/2fd989cd6c777583be1c93616018c55b2cbb1bcf.tar.gz"
+CHECKSUM_SHA256="7e9e0b591bcceae44ed6891f9c47407be60e14abf241b485c0543bce5dc873bb"
+SOURCE_DIR="luafilesystem-2fd989cd6c777583be1c93616018c55b2cbb1bcf"
+
 ARCHITECTURES="x86 x86_gcc2"
-SOURCE_DIR=""
 
 PROVIDES="
 	luafilesystem = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	lua >= 5.2
@@ -25,7 +26,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	lua_devel
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:make
diff --git a/dev-qt/automoc/automoc-0.9.88.recipe b/dev-qt/automoc/automoc-0.9.88.recipe
index b93c8646d..6468bc64e 100644
--- a/dev-qt/automoc/automoc-0.9.88.recipe
+++ b/dev-qt/automoc/automoc-0.9.88.recipe
@@ -3,14 +3,15 @@ DESCRIPTION="Developed by KDE, automoc is a tool designed for use with \
 CMake that generates lists of files to run MOC on. It's required for \
 building KDE."
 HOMEPAGE="https://techbase.kde.org/Development/Tools/Automoc4"
-SOURCE_URI="git+git://anongit.kde.org/automoc.git#afddb64aa0"
-REVISION="3"
-LICENSE="BSD (2-clause)"
 COPYRIGHT="2007 Matthias Kretz"
+LICENSE="BSD (2-clause)"
+REVISION="3"
+SOURCE_URI="https://github.com/KDE/automoc/archive/afddb64aa0d6272cbae52fb8d8fa9355a0350e21.tar.gz"
+CHECKSUM_SHA256="bd24981daaa037f3e680427a7670cac18502e7ce3f548560fad0b3605b0ae85f"
+SOURCE_DIR="automoc-afddb64aa0d6272cbae52fb8d8fa9355a0350e21"
 PATCHES="automoc-$portVersion.patch"
 
 ARCHITECTURES="!x86_gcc2 x86"
-
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -21,6 +22,7 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	"
+
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:make
diff --git a/dev-qt/qsystray/qsystray-0.1.recipe b/dev-qt/qsystray/qsystray-0.1.recipe
index 43e3633c6..47df679ae 100644
--- a/dev-qt/qsystray/qsystray-0.1.recipe
+++ b/dev-qt/qsystray/qsystray-0.1.recipe
@@ -1,18 +1,19 @@
 SUMMARY="Deskbar shelf helper for Qt 4/5 applications"
 DESCRIPTION="Qt system tray manager for interaction with Deskbar shelf"
 HOMEPAGE="http://github.com/qt-haiku/qt4"
-SOURCE_URI="svn+https://github.com/qt-haiku/qt4/trunk/src/3rdparty/haiku-tools/qsystray"
-SOURCE_DIR="qsystray"
-LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2012-2015 Gerasim Troeglazov (3dEyes**)"
+LICENSE="GNU LGPL v2.1"
 REVISION="3"
+SOURCE_URI="https://github.com/qt-haiku/qt4/archive/0cf073098fa1e4b34d5be1391214b5515606833d.tar.gz"
+CHECKSUM_SHA256="92c8cd3749ac91c8af22d1e962fdfdc7a5ba9d763678a0904b6d05ed29753931"
+SOURCE_DIR="qt4-0cf073098fa1e4b34d5be1391214b5515606833d/src/3rdparty/haiku-tools/qsystray"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	qsystray${secondaryArchSuffix} = $portVersion
 	cmd:qsystray = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
@@ -20,7 +21,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:g++
diff --git a/dev-qt/qt5/qt5base-5.5.0.recipe b/dev-qt/qt5/qt5base-5.5.0.recipe
index a27d5fcad..fa38f304d 100644
--- a/dev-qt/qt5/qt5base-5.5.0.recipe
+++ b/dev-qt/qt5/qt5base-5.5.0.recipe
@@ -6,24 +6,21 @@ servers."
 HOMEPAGE="https://qt.io/"
 COPYRIGHT="2015 The Qt Company Ltd."
 LICENSE="GNU LGPL v2"
-
+REVISION="2"
 SOURCE_URI="https://download.qt.io/official_releases/qt/5.5/$portVersion/submodules/qtbase-opensource-src-$portVersion.tar.gz"
 CHECKSUM_SHA256="7e82b1318f88e56a2a9376e069aa608d4fd96b48cb0e1b880ae658b0a1af0561"
 SOURCE_DIR="qtbase-opensource-src-$portVersion"
-PATCHES="qt5base-5.5.patchset"
-
 SOURCE_URI_2="https://download.qt.io/official_releases/qt/5.5/$portVersion/submodules/qttools-opensource-src-$portVersion.tar.gz"
 CHECKSUM_SHA256_2="d9e06bd19ecc86afba5e95d45a906d1bc1ad579aa70001e36143c1aaf695bdd6"
 SOURCE_DIR_2="qttools-opensource-src-$portVersion"
-
 SOURCE_URI_3="https://download.qt.io/official_releases/qt/5.5/$portVersion/submodules/qttranslations-opensource-src-$portVersion.tar.gz"
 CHECKSUM_SHA256_3="c4bd6db6e426965c6f8824c54e81f68bbd61e2bae1bcadc328c6e81c45902a0d"
 SOURCE_DIR_3="qttranslations-opensource-src-$portVersion"
+SOURCE_URI_4="https://github.com/threedeyes/QPAHaikuExp/archive/dd88f691e399f238b62cfef0d9ff872af34af77b.tar.gz"
+CHECKSUM_SHA256_4="434b0d5eb400074a173d291b151374e8b28690b6844e68702e5569aa35d41360"
+SOURCE_DIR_4="QPAHaikuExp-dd88f691e399f238b62cfef0d9ff872af34af77b"
+PATCHES="qt5base-5.5.patchset"
 
-SOURCE_URI_4="git+https://github.com/threedeyes/QPAHaikuExp#dd88f691e399f238b62cfef0d9ff872af34af77b"
-
-
-REVISION="2"
 ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"