diff --git a/app-admin/pwgen/pwgen-2.06.bep b/app-admin/pwgen/pwgen-2.06.bep
index 821f84b00..05bb863ae 100644
--- a/app-admin/pwgen/pwgen-2.06.bep
+++ b/app-admin/pwgen/pwgen-2.06.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://sourceforge.net/projects/pwgen"
 SRC_URI="http://voxel.dl.sourceforge.net/sourceforge/pwgen/pwgen-2.06.tar.gz"
 CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
@@ -16,4 +14,4 @@ BUILD {
 INSTALL {
 	cd pwgen-2.06
 	make install
-}
\ No newline at end of file
+}
diff --git a/app-arch/gzip/gzip-1.2.4a.bep b/app-arch/gzip/gzip-1.2.4a.bep
index ad3ab495c..92592902e 100644
--- a/app-arch/gzip/gzip-1.2.4a.bep
+++ b/app-arch/gzip/gzip-1.2.4a.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.gzip.org/"
 SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
 CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="stable"
 STATUS_HAIKU="untested"
 DEPEND=""
 BUILD {
diff --git a/app-arch/gzip/gzip-1.3.12.bep b/app-arch/gzip/gzip-1.3.12.bep
index fb810914e..69f0b4c3f 100644
--- a/app-arch/gzip/gzip-1.3.12.bep
+++ b/app-arch/gzip/gzip-1.3.12.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.gzip.org/"
 SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz"
 CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="stable"
 STATUS_HAIKU="untested"
 DEPEND=""
 BUILD {
diff --git a/app-arch/sharutils/sharutils-4.6.3.bep b/app-arch/sharutils/sharutils-4.6.3.bep
index acf415114..e940d99d5 100644
--- a/app-arch/sharutils/sharutils-4.6.3.bep
+++ b/app-arch/sharutils/sharutils-4.6.3.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.gnu.org/software/sharutils/"
 SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/REL-4.6.3/sharutils-4.6.3.tar.gz"
 CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.bep
index a4b3a810c..433d2b7de 100644
--- a/dev-games/flatzebra/flatzebra-0.1.3.bep
+++ b/dev-games/flatzebra/flatzebra-0.1.3.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://sarrazip.com/dev/burgerspace.html"
 SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/flatzebra-0.1.3.tar.gz"
 CHECKSUM_MD5="4f595c64e4ef2c82a2da4d420eacea1a"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.4
 	media-libs/libsdl_image >= 1.2.2
diff --git a/dev-libs/libevent/libevent-1.4.11.bep b/dev-libs/libevent/libevent-1.4.11.bep
index fec02ca57..56061005e 100644
--- a/dev-libs/libevent/libevent-1.4.11.bep
+++ b/dev-libs/libevent/libevent-1.4.11.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://monkey.org/~provos/libevent/"
 SRC_URI="http://monkey.org/~provos/libevent-1.4.11-stable.tar.gz"
 CHECKSUM_MD5="3d2dfe659a84441dd27e4587b5ffe0fe"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 
diff --git a/dev-libs/libiconv/libiconv-1.12.bep b/dev-libs/libiconv/libiconv-1.12.bep
index 6f121514d..0bee0e74a 100644
--- a/dev-libs/libiconv/libiconv-1.12.bep
+++ b/dev-libs/libiconv/libiconv-1.12.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.gnu.org/software/libiconv/"
 SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz"
 CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.bep b/games-puzzle/flobopuyo/flobopuyo-0.20.bep
index 689ccd3b8..5c3743bed 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20.bep
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20.bep
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29&lg=AN"
 SRC_URI="http://www.ios-software.com/download.php3?what=20151&lg=AN"
 CHECKSUM_MD5="88961898c9dd48b60464f6f10f695b8b"
 REVISION="1"
-STATUS_HAIKU="tested"
+STATUS_HAIKU="stable"
 DEPEND="media-lib/libsdl >= 1.2.14
 	media-lib/sdl-mixer >= 1.2.11"
 BUILD {
diff --git a/media-libs/jbigkit/jbigkit-1.6.bep b/media-libs/jbigkit/jbigkit-1.6.bep
index 3f4b320a6..a2219b351 100644
--- a/media-libs/jbigkit/jbigkit-1.6.bep
+++ b/media-libs/jbigkit/jbigkit-1.6.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-1.6.tar.gz"
 CHECKSUM_MD5="ce196e45f293d40ba76af3dc981ccfd7"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/jbigkit/jbigkit-2.0.bep b/media-libs/jbigkit/jbigkit-2.0.bep
index bc13988ba..ec96ef2a2 100644
--- a/media-libs/jbigkit/jbigkit-2.0.bep
+++ b/media-libs/jbigkit/jbigkit-2.0.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz"
 CHECKSUM_MD5="3dd87f605abb1a97a22dc79d8b3e8f6c"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/libpng/libpng-1.2.29.bep b/media-libs/libpng/libpng-1.2.29.bep
index 80f524afe..62b7f3104 100644
--- a/media-libs/libpng/libpng-1.2.29.bep
+++ b/media-libs/libpng/libpng-1.2.29.bep
@@ -2,8 +2,6 @@ DESCRIPTION="libpng"
 HOMEPAGE="http://www.libpng.org" 
 SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29.tar.gz"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/libpng/libpng-1.2.30.bep b/media-libs/libpng/libpng-1.2.30.bep
index 8e005c969..2f1eb8b47 100644
--- a/media-libs/libpng/libpng-1.2.30.bep
+++ b/media-libs/libpng/libpng-1.2.30.bep
@@ -2,8 +2,6 @@ DESCRIPTION="libpng"
 HOMEPAGE="http://www.libpng.org" 
 SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.30.tar.gz"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/libsdl/libsdl-1.2.12.bep b/media-libs/libsdl/libsdl-1.2.12.bep
index d4d4000e9..9a88db52d 100644
--- a/media-libs/libsdl/libsdl-1.2.12.bep
+++ b/media-libs/libsdl/libsdl-1.2.12.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.libsdl.org/"
 SRC_URI="http://www.libsdl.org/release/SDL-1.2.12.tar.gz"
 CHECKSUM_MD5="544b4554986e51eed6d34435cf9c5f3f"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="stable"
 STATUS_HAIKU="untested"
 DEPEND=""
 BUILD {
diff --git a/media-libs/libsdl/libsdl-1.2.13.bep b/media-libs/libsdl/libsdl-1.2.13.bep
index 372232fea..316338764 100644
--- a/media-libs/libsdl/libsdl-1.2.13.bep
+++ b/media-libs/libsdl/libsdl-1.2.13.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.libsdl.org/"
 SRC_URI="http://www.libsdl.org/release/SDL-1.2.13.tar.gz"
 CHECKSUM_MD5="c6660feea2a6834de10bc71b2f8e4d88"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="stable"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/sdl-image/sdl-image-1.2.6.bep b/media-libs/sdl-image/sdl-image-1.2.6.bep
index edf96fe07..cf1a78ace 100644
--- a/media-libs/sdl-image/sdl-image-1.2.6.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.6.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.libsdl.org/projects/SDL_image"
 SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz"
 CHECKSUM_MD5="b866dc4f647517bdaf57f6ffdefd013e"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.bep
index 44f141f28..32b509048 100644
--- a/media-libs/smjpeg/smjpeg-0.2.1.bep
+++ b/media-libs/smjpeg/smjpeg-0.2.1.bep
@@ -1,14 +1,11 @@
 DESCRIPTION="smjpeg" 
 HOMEPAGE="http://www.icculus.org/smjpeg" 
-# We're using svn, so need to fake out the download for now
-SRC_URI="http://www.haiku-ports.de/packages/sources/expat-2.0.1.tar.gz"
+SRC_URI="svn://svn.icculus.org/smjpeg/trunk/"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
-	rm -rf smjpeg
-	svn co svn://svn.icculus.org/smjpeg/trunk/ smjpeg
-	cd smjpeg
+	cd smjpeg-0.2.1
 	rm -f acinclude.m4
 	rm -f aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) > configure.in"
@@ -27,6 +24,6 @@ BUILD {
 }
 
 INSTALL {
-	cd smjpeg
+	cd smjpeg-0.2.1
 	make install
 }
diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.bep
index f3c15a4d7..a62821c89 100644
--- a/media-libs/smpeg/smpeg-0.4.5.bep
+++ b/media-libs/smpeg/smpeg-0.4.5.bep
@@ -1,14 +1,11 @@
 DESCRIPTION="smpeg" 
 HOMEPAGE="http://www.icculus.org/smpeg" 
-# We're using svn, so need to fake out the download for now
-SRC_URI="http://www.haiku-ports.de/packages/sources/expat-2.0.1.tar.gz"
+SRC_URI="svn://svn.icculus.org/smpeg/trunk/"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
-	rm -rf smjpeg
-	svn co svn://svn.icculus.org/smpeg/trunk/ smpeg
-	cd smpeg
+	cd smpeg-0.4.5
 	rm -f acinclude.m4
 	rm -f aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in"
@@ -26,6 +23,6 @@ BUILD {
 }
 
 INSTALL {
-	cd smpeg
+	cd smpeg-0.4.5
 	make install
 }
diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.bep
index a1d49665d..eafe99279 100644
--- a/media-libs/speex/speex-1.2rc1.bep
+++ b/media-libs/speex/speex-1.2rc1.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.speex.org"
 SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
 CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/tiff/tiff-3.8.2.bep b/media-libs/tiff/tiff-3.8.2.bep
index d96442bff..d5d586ac8 100644
--- a/media-libs/tiff/tiff-3.8.2.bep
+++ b/media-libs/tiff/tiff-3.8.2.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.libtiff.org"
 SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz"
 CHECKSUM_MD5="fbb6f446ea4ed18955e2714934e5b698"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-misc/curl/curl-7.18.2.bep b/net-misc/curl/curl-7.18.2.bep
index 7096cc296..e222d9c5c 100644
--- a/net-misc/curl/curl-7.18.2.bep
+++ b/net-misc/curl/curl-7.18.2.bep
@@ -3,8 +3,6 @@ HOMEPAGE="curl.haxx.se"
 SRC_URI="http://curl.haxx.se/download/ curl-7.18.2.tar.bz2"
 CHECKSUM_MD5="c389be5b0525276e58865956b7465562"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-misc/curl/curl-7.19.1.bep b/net-misc/curl/curl-7.19.1.bep
index 6f2f3cd02..4e5efe613 100644
--- a/net-misc/curl/curl-7.19.1.bep
+++ b/net-misc/curl/curl-7.19.1.bep
@@ -3,8 +3,6 @@ HOMEPAGE="curl.haxx.se"
 SRC_URI="http://curl.haxx.se/download/ curl-7.19.1.tar.bz2"
 CHECKSUM_MD5="6c4921e55ad276154065052c9e34e1cb"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-misc/curl/curl-7.19.2.bep b/net-misc/curl/curl-7.19.2.bep
index 2a2002efe..1c7bf014e 100644
--- a/net-misc/curl/curl-7.19.2.bep
+++ b/net-misc/curl/curl-7.19.2.bep
@@ -3,8 +3,6 @@ HOMEPAGE="curl.haxx.se"
 SRC_URI="http://curl.haxx.se/download/ curl-7.19.2.tar.bz2"
 CHECKSUM_MD5="3a461b145a4a31fe7d5a44684e7fbdbc"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-misc/curl/curl-7.19.5.bep b/net-misc/curl/curl-7.19.5.bep
index 0da7021ce..e3515fad2 100644
--- a/net-misc/curl/curl-7.19.5.bep
+++ b/net-misc/curl/curl-7.19.5.bep
@@ -3,8 +3,6 @@ HOMEPAGE="curl.haxx.se"
 SRC_URI="http://curl.haxx.se/download/ curl-7.19.5.tar.bz2"
 CHECKSUM_MD5="426d161661dce70c8ea9ad8f553363a3"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-misc/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.bep
index 825149b66..40eb96353 100644
--- a/net-misc/wput/wput-0.6.1.bep
+++ b/net-misc/wput/wput-0.6.1.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://wput.sourceforge.net/"
 SRC_URI="http://voxel.dl.sourceforge.net/sourceforge/wput/wput-0.6.1.tgz"
 CHECKSUM_MD5="92b41efed4db8eb4f3443c23bf7ceecf"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.bep
index 8da928c80..1173607a2 100644
--- a/net-p2p/transmission/transmission-1.73.bep
+++ b/net-p2p/transmission/transmission-1.73.bep
@@ -3,12 +3,8 @@ HOMEPAGE="http://www.transmissionbt.com/"
 SRC_URI="http://mirrors.m0k.org/transmission/files/transmission-1.73.tar.bz2"
 CHECKSUM_MD5="9c1b5d84fb9ddbbd50b5776c1cd6daa4"
 REVISION="1"
-
-STATUS_R5="untested"
-STATUS_BONE="untested"
-# gcc4 is required
+MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 STATUS_HAIKU="stable"
-
 # pkgconfig is only a build dependency
 DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
diff --git a/sci-libs/fftw/fftw-3.2.2.bep b/sci-libs/fftw/fftw-3.2.2.bep
index f278cce51..2d6db2e89 100644
--- a/sci-libs/fftw/fftw-3.2.2.bep
+++ b/sci-libs/fftw/fftw-3.2.2.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.fftw.org/"
 SRC_URI="http://www.fftw.org/fftw-3.2.2.tar.gz"
 CHECKSUM_MD5="b616e5c91218cc778b5aa735fefb61ae"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="untested"
 DEPEND=""
 BUILD {
diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep
index 7d5afbe96..a5352bc4f 100644
--- a/sys-devel/flex/flex-2.5.35.bep
+++ b/sys-devel/flex/flex-2.5.35.bep
@@ -1,7 +1,6 @@
 DESCRIPTION="Flex is a tool for generating scanners." 
 HOMEPAGE="http://flex.sourceforge.net/" 
-SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download
-	http://www.haiku-ports.de/packages/sources/flex-2.5.35.tar.bz2"
+SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
diff --git a/sys-libs/ncurses/ncurses-5.6.bep b/sys-libs/ncurses/ncurses-5.6.bep
index 969dbe88a..293bd9d72 100644
--- a/sys-libs/ncurses/ncurses-5.6.bep
+++ b/sys-libs/ncurses/ncurses-5.6.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
 SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.6.tar.gz"
 CHECKSUM_MD5="b6593abe1089d6aab1551c105c9300e3"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {