diff --git a/dev-util/acr/acr-0.9.9_git.recipe b/dev-util/acr/acr-0.9.9.recipe
similarity index 85%
rename from dev-util/acr/acr-0.9.9_git.recipe
rename to dev-util/acr/acr-0.9.9.recipe
index 79ccc825e..872357a9b 100644
--- a/dev-util/acr/acr-0.9.9_git.recipe
+++ b/dev-util/acr/acr-0.9.9.recipe
@@ -7,8 +7,8 @@ This means that ACR is faster, smaller and easy to use.
 HOMEPAGE="https://github.com/radare/acr"
 COPYRIGHT="2005-2012 pancake"
 LICENSE="GNU GPL v2"
-SOURCE_URI="git+https://github.com/radare/acr.git#e6043960ab9fc664f9e30943bd36f1b5e0904aa9"
-#CHECKSUM_SHA256=""
+SOURCE_URI="https://github.com/radare/acr/archive/0.9.9.tar.gz"
+CHECKSUM_SHA256="7785b97cabfcfde6d0b5c2eeb94be779cad23a11b046c10cff84a11a8c2dc1f5"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64 ?arm"
 
@@ -29,6 +29,7 @@ REQUIRES="
 	cmd:perl >= 5
 	cmd:sed
 	cmd:sh
+	cmd:find
 	"
 BUILD_REQUIRES="
 	"
@@ -38,6 +39,7 @@ BUILD_PREREQUIRES="
 	cmd:getopt
 	cmd:make
 	cmd:sed
+	cmd:find
 	"
 
 #BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe
index fed51e742..ae04cdaf1 100644
--- a/dev-util/app2png/app2png-1.0.0.recipe
+++ b/dev-util/app2png/app2png-1.0.0.recipe
@@ -3,12 +3,13 @@ DESCRIPTION="\
 With app2png, you can extract attribute-based bitmap icons from BeOS apps and \
 save them into PNG files. These PNG icons can then be used to recreate the \
 icon as a vector, or for use on a website."
-
 HOMEPAGE="https://github.com/HaikuArchives/app2png"
-SOURCE_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412"
-REVISION="1"
-LICENSE="MIT"
 COPYRIGHT="2015 Puck Meerburg"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/HaikuArchives/app2png/archive/17c36271a80a822ac0dfec66527e61f21230a412.tar.gz"
+CHECKSUM_SHA256="5b95076384bf7d315749a12e26f064c341389afc5552825653ea4205c9bf9b59"
+SOURCE_DIR="app2png-17c36271a80a822ac0dfec66527e61f21230a412"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -19,6 +20,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/dev-util/gyp/gyp-r1948.recipe b/dev-util/gyp/gyp-git.recipe
similarity index 79%
rename from dev-util/gyp/gyp-r1948.recipe
rename to dev-util/gyp/gyp-git.recipe
index d71c307db..f678f23af 100644
--- a/dev-util/gyp/gyp-r1948.recipe
+++ b/dev-util/gyp/gyp-git.recipe
@@ -3,15 +3,15 @@ DESCRIPTION="GYP is created by Google to generate native IDE project files \
 (such as Visual Studio and Xcode) for building the Chromium web browser and is \
 licensed as open source software using the BSD software license.
 "
-HOMEPAGE="https://code.google.com/p/gyp/"
-SOURCE_URI="svn+http://gyp.googlecode.com/svn/trunk#1948"
-LICENSE="BSD (2-clause)"
+HOMEPAGE="https://chromium.googlesource.com/external/gyp/"
 COPYRIGHT="2012 Google Inc."
+LICENSE="BSD (2-clause)"
 REVISION="2"
-ARCHITECTURES="x86 x86_gcc2 x86_64"
+SOURCE_URI="https://chromium.googlesource.com/external/gyp/+archive/2b086540aeedaf4d233766fd14fb674af1bc321d.tar.gz"
+CHECKSUM_SHA256="8eef449971dd922155cf108da5d138130e003b1a2448223d1246f4096429c4e6"
+SOURCE_DIR=""
 
-SOURCE_DIR="gyp-$portVersion"
-PATCHES="gyp-r1948.patch"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	gyp = $portVersion
diff --git a/games-engines/eepp/eepp-hg.recipe b/games-engines/eepp/eepp-0.9.5.recipe
similarity index 90%
rename from games-engines/eepp/eepp-hg.recipe
rename to games-engines/eepp/eepp-0.9.5.recipe
index 32c12fb53..7fa8dc385 100644
--- a/games-engines/eepp/eepp-hg.recipe
+++ b/games-engines/eepp/eepp-0.9.5.recipe
@@ -2,10 +2,12 @@ SUMMARY="A C++ 2D game engine for easy cross-platform development"
 DESCRIPTION="Entropia Engine++ is a C++ 2D game engine designed for an easy \
 cross-platform game development."
 HOMEPAGE="http://bitbucket.org/SpartanJ/eepp"
-SOURCE_URI="hg+http://bitbucket.org/SpartanJ/eepp#7318464094366388344fe30e58f521c6b46781b6"
-REVISION="1"
-LICENSE="MIT"
 COPYRIGHT="2011-2014 Martín Lucas Golini"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://bitbucket.org/SpartanJ/eepp/get/release-0.9.5.tar.gz"
+CHECKSUM_SHA256="b4094be1b29361c66ab15cae166576d3600f7b6d914b339af857878559156b48"
+SOURCE_DIR="SpartanJ-eepp-b44ee6ad7704"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -44,8 +46,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:hg
 	"
-# intentionally empty
-SOURCE_DIR=""
 
 BUILD()
 {
diff --git a/games-engines/klystron/klystron-0.0.0.recipe b/games-engines/klystron/klystron-0.0.0.recipe
index b6faf329c..8c6f79516 100644
--- a/games-engines/klystron/klystron-0.0.0.recipe
+++ b/games-engines/klystron/klystron-0.0.0.recipe
@@ -1,4 +1,3 @@
-HOMEPAGE="https://github.com/kometbomb/klystron/"
 SUMMARY="Framework designed for remaking Thrust"
 DESCRIPTION="This is a simple framework designed for remaking Thrust, the best \
 game that was ever created.
@@ -21,11 +20,13 @@ video game console circa 1991. The API is relatively simple, yet uses some \
 is a very important feature for a thrustlike game. The synth and the music \
 routine are thrown in just for fun.
 "
-
-SOURCE_URI="git+https://github.com/kometbomb/klystron.git#2ba7342c1a0a5af36e027bc0f9019d347040edcf"
+HOMEPAGE="https://github.com/kometbomb/klystron/"
+SOURCE_URI="https://github.com/kometbomb/klystron/archive/89b1214fde74b755f24b69673a2ca1f6b721d775.tar.gz"
+CHECKSUM_SHA256="fbafcc75f8e7a39f2d95dfac9c0ae3b4fe28a3d6e543289fd90125b98a2e5e54"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2009-2015 Tero Lindeman (kometbomb)"
+SOURCE_DIR="klystron-89b1214fde74b755f24b69673a2ca1f6b721d775"
 
 ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/games-puzzle/dynamate/dynamate-1.0.0.recipe b/games-puzzle/dynamate/dynamate-1.0.0.recipe
index 753e1a2f4..684a27f74 100644
--- a/games-puzzle/dynamate/dynamate-1.0.0.recipe
+++ b/games-puzzle/dynamate/dynamate-1.0.0.recipe
@@ -8,8 +8,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Dynamate"
 COPYRIGHT="2014 Adrien Destugues
 	1995 Jonas Norberg, Signe Norberg and Bjorn Kalzen"
 LICENSE="MIT"
-SOURCE_URI="git+https://github.com/HaikuArchives/Dynamate.git#e870f3c3026739831b749318d58826b0e4d874d7"
-REVISION="1"
+SOURCE_URI="https://github.com/HaikuArchives/Dynamate/archive/eb56bbc37ba85494ac91229be59cf992414b4449.tar.gz"
+CHECKSUM_SHA256="f6bb390ad824ae58e4727b68204e88a02a610289aaccbed9867c41b254a3e794"
+REVISION="2"
+SOURCE_DIR="Dynamate-eb56bbc37ba85494ac91229be59cf992414b4449"
 
 ARCHITECTURES="?x86 x86_gcc2 ?x86_64"
 
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe
index db69f4d8a..bf600c455 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe
+++ b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe
@@ -1,30 +1,59 @@
-DESCRIPTION="
-Numpty Physics is a drawing puzzle game in the spirit of Crayon Physics.
-"
+SUMMARY="A drawing puzzle game in the spirit (and style?) of Crayon Physics"
+DESCRIPTION="Harness gravity with your crayon and set about creating blocks, ramps, \
+levers, pulleys and whatever else you fancy to get the little red thing to \
+the little yellow thing."
 HOMEPAGE="http://numptyphysics.garage.maemo.org"
-SOURCE_URI="svn+https://vcs.maemo.org/svn/numptyphysics/trunk/#157"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="unstable"
-DEPEND="media-libs/libsdl >= 1.2.14
-	dev-games/box2d >= 2.1.2"
+SOURCE_URI="https://github.com/thp/numptyphysics/archive/08697dc48f0a58d69728856264856700dc567e4f.tar.gz"
+CHECKSUM_SHA256="e76c961ba242572d452084e31251781b99e875d685ece393afbca40a2f135303"
+REVISION="2"
+LICENSE="GNU GPL v3"
+COPYRIGHT="2008 Tim Edmonds"
+SOURCE_DIR="numptyphysics-08697dc48f0a58d69728856264856700dc567e4f"
+
+ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
+
+PROVIDES="
+	numptyphysics = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libsdl
+	lib:libSDL_image
+	lib:libSDL_ttf
+	#box2d
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libsdl
+	devel:libSDL_image
+	devel:libSDL_ttf
+	#box2d
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	"
+
 BUILD()
 {
-	cd numptyphysics-0.2-157
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--bindir=`finddir B_APPS_DIRECTORY`/numptyphysics \
-		--datarootdir=`finddir B_APPS_DIRECTORY`
+	./configure --prefix=$prefix \
+		--bindir=$appsDir/numptyphysics \
+		--datarootdir=$appsDir
 # TODO: figure out how to move the ~/.numptyphysics directory to ~/config/settings/numptyphysics
 	make
 }
 
 INSTALL()
 {
-	cd numptyphysics-0.2-157
 	make install
 }
-LICENSE="GNU GPL v3"
-COPYRIGHT="2008 Tim Edmonds"
+
+
diff --git a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
index 5cf4f7a1c..b7c4d83ec 100644
--- a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
+++ b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
@@ -3,12 +3,15 @@ DESCRIPTION="Homeworld is a real-time strategy computer game, set and played \
 in a 3D space environment. Developed by Relic Entertainment, it was released \
 for the PC in 1998 to worldwide acclaim, winning multiple awards for its \
 novel gameplay and strong single-player story. Relic Entertainment later \
-released the source code to the public under license. "
+released the source code to the public under license."
 HOMEPAGE="http://www.homeworldsdl.org/"
 COPYRIGHT="1999-2000 Sierra On-Line, Inc."
 LICENSE="RE-INC-EULA"
-SOURCE_URI="git+https://bitbucket.org/extrowerk/homeworld-sdl-haiku.git"
-REVISION="1"
+SOURCE_URI="https://bitbucket.org/extrowerk/homeworld-sdl-haiku/get/e80d5e8c7a73.tar.gz"
+CHECKSUM_SHA256="f098c3f713eca5718433ffb4bc9a7ad71eb7d584cbf9fe9eb3a1266363843bd1"
+REVISION="2"
+SOURCE_DIR="extrowerk-homeworld-sdl-haiku-e80d5e8c7a73"
+
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -23,6 +26,7 @@ REQUIRES="
 	lib:libglu$secondaryArchSuffix
 	#lib:mesa_swrast
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
@@ -39,8 +43,6 @@ BUILD_PREREQUIRES="
 	cmd:flex
 	"
 
-SOURCE_DIR="homeworld-sdl-haiku"
-
 BUILD()
 {
 	cd Haiku
diff --git a/gnome-base/gnome_common/gnome_common-2.28.recipe b/gnome-base/gnome_common/gnome_common-2.28.recipe
deleted file mode 100644
index 7492f3e20..000000000
--- a/gnome-base/gnome_common/gnome_common-2.28.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="
-A module that is required only when building GNOME from the repository.
-"
-HOMEPAGE="http://git.gnome.org/browse/gnome-common/"
-SOURCE_URI="git+git://git.gnome.org/gnome-common"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-        cd gnome-common-2.28
-		./autogen.sh
-        ./configure --prefix=`finddir B_COMMON_DIRECTORY`
-        make
-}
-
-INSTALL()
-{
-        cd gnome-common-2.28
-        make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1999-2010 Martin Baulig"
diff --git a/gnome-base/gnome_common/gnome_common-3.18.0.recipe b/gnome-base/gnome_common/gnome_common-3.18.0.recipe
new file mode 100644
index 000000000..6e5cdc77c
--- /dev/null
+++ b/gnome-base/gnome_common/gnome_common-3.18.0.recipe
@@ -0,0 +1,45 @@
+SUMMARY="A module that is required only when building GNOME from the repository"
+DESCRIPTION="This module contains various files needed to bootstrap GNOME \
+modules built from git."
+HOMEPAGE="http://git.gnome.org/browse/gnome-common/"
+COPYRIGHT="1999-2010 Martin Baulig"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz"
+CHECKSUM_SHA256="22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"
+SOURCE_DIR="gnome-common-3.18.0"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	gnome_common$secondaryArchSuffix = $portVersion
+	cmd:gnome_autogen.sh$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:automake
+	cmd:autoconf
+	cmd:autoreconf
+	"
+
+BUILD()
+{
+		./autogen.sh
+        runConfigure ./configure
+        make
+}
+
+INSTALL()
+{
+        make install
+}
+
+
diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe
index 830a7000c..06c011150 100644
--- a/haiku-apps/a_book/a_book-1.1.recipe
+++ b/haiku-apps/a_book/a_book-1.1.recipe
@@ -5,8 +5,10 @@ particular times for them."
 HOMEPAGE="https://github.com/HaikuArchives/A-Book"
 COPYRIGHT="2002 Maurice Michalski"
 LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="git+https://github.com/HaikuArchives/A-Book.git#b52be13bbf3f2"
+REVISION="4"
+SOURCE_URI="https://github.com/HaikuArchives/A-Book/archive/b52be13bbf3f236fd10c5053b8ecf11c8211ce7e.tar.gz"
+CHECKSUM_SHA256="fa2ee3f6a7fe08f8a67c3d9ce0574e54def68d0bbc7e9950c4826bd50f4dd46a"
+SOURCE_DIR="A-Book-b52be13bbf3f236fd10c5053b8ecf11c8211ce7e"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
diff --git a/haiku-apps/album/album-0.9.4.recipe b/haiku-apps/album/album-0.9.4.recipe
index e486c91c5..ce763467b 100644
--- a/haiku-apps/album/album-0.9.4.recipe
+++ b/haiku-apps/album/album-0.9.4.recipe
@@ -1,15 +1,17 @@
 SUMMARY="An image viewer/organiser designed for BeOS-compatible systems"
 DESCRIPTION="Album is a file browsing and tagging utility for BeOS/Haiku. \
 The idea is to have a work pad for pictures from different locations so they \
-may be viewed and tagged.
+may be viewed and tagged. \
 The program is not limited to pictures and BFS (Be File System) volumes, \
 although that makes most sense since some of the functionality has to do with \
 file attributes."
 HOMEPAGE="http://users.volja.net/mkovac1/proj/album/"
 COPYRIGHT="2006-2015 by Matjaž Kovač"
 LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="git+https://github.com/HaikuArchives/Album#5506328"
+REVISION="3"
+SOURCE_URI="https://github.com/HaikuArchives/Album/archive/550632886979080247db552f38990690f77ee054.tar.gz"
+CHECKSUM_SHA256="ee1811b47bbb1178c88b66ef103bf8aba0ba551cfed70ce8a318842c4729c89e"
+SOURCE_DIR="Album-550632886979080247db552f38990690f77ee054"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"