diff --git a/app-admin/pwgen/pwgen-2.06.bep b/app-admin/pwgen/pwgen-2.06.recipe
similarity index 94%
rename from app-admin/pwgen/pwgen-2.06.bep
rename to app-admin/pwgen/pwgen-2.06.recipe
index 209ad42d1..36dcee239 100644
--- a/app-admin/pwgen/pwgen-2.06.bep
+++ b/app-admin/pwgen/pwgen-2.06.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pwgen-2.06
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pwgen-2.06
 	make install
 }
diff --git a/app-arch/arc/arc-5.21o.bep b/app-arch/arc/arc-5.21o.recipe
similarity index 83%
rename from app-arch/arc/arc-5.21o.bep
rename to app-arch/arc/arc-5.21o.recipe
index a27d79533..f1f238dfe 100644
--- a/app-arch/arc/arc-5.21o.bep
+++ b/app-arch/arc/arc-5.21o.recipe
@@ -5,16 +5,19 @@ CHECKSUM_MD5="3b30c739b42b2fe8ac4ec0a05f34f284"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd arc-5.21o
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd arc-5.21o
 	install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`
 	install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`
-	install arc.1 {$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
+	install arc.1()
+{$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
 }
 
 LICENSE="GNU GPL v2"
diff --git a/app-arch/bzip2/bzip2-1.0.5.bep b/app-arch/bzip2/bzip2-1.0.5.recipe
similarity index 95%
rename from app-arch/bzip2/bzip2-1.0.5.bep
rename to app-arch/bzip2/bzip2-1.0.5.recipe
index 1cb918a1b..4580dc8e2 100644
--- a/app-arch/bzip2/bzip2-1.0.5.bep
+++ b/app-arch/bzip2/bzip2-1.0.5.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="3c15a0c8d1d3ee1c46a1634d00617b1a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bzip2-1.0.5
 	make
 	make -f Makefile-libbz2_so
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzip2-1.0.5
 	make install PREFIX=/boot/common
 	cp libbz2.so.1.0.4 /boot/common/lib
diff --git a/app-arch/bzip2/bzip2-1.0.6.bep b/app-arch/bzip2/bzip2-1.0.6.recipe
similarity index 95%
rename from app-arch/bzip2/bzip2-1.0.6.bep
rename to app-arch/bzip2/bzip2-1.0.6.recipe
index 615a0df08..cdd18ca38 100644
--- a/app-arch/bzip2/bzip2-1.0.6.bep
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bzip2-1.0.6
 	make
 	make -f Makefile-libbz2_so
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzip2-1.0.6
 	make install PREFIX=/boot/common
 	cp libbz2.so.1.0.6 /boot/common/lib
diff --git a/app-arch/cabextract/cabextract-1.2.bep b/app-arch/cabextract/cabextract-1.2.recipe
similarity index 95%
rename from app-arch/cabextract/cabextract-1.2.bep
rename to app-arch/cabextract/cabextract-1.2.recipe
index 5e6df8e4c..1897cb9c0 100644
--- a/app-arch/cabextract/cabextract-1.2.bep
+++ b/app-arch/cabextract/cabextract-1.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="dc421a690648b503265c82ade84e143e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cabextract-1.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cabextract-1.2
 	make install
 }
diff --git a/app-arch/cabextract/cabextract-1.3.bep b/app-arch/cabextract/cabextract-1.3.recipe
similarity index 95%
rename from app-arch/cabextract/cabextract-1.3.bep
rename to app-arch/cabextract/cabextract-1.3.recipe
index be5f7b460..9a711b005 100644
--- a/app-arch/cabextract/cabextract-1.3.bep
+++ b/app-arch/cabextract/cabextract-1.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="cb9a4a38470d2a71a0275968e7eb64d3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cabextract-1.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cabextract-1.3
 	make install
 }
diff --git a/app-arch/cpio/cpio-2.10.bep b/app-arch/cpio/cpio-2.10.recipe
similarity index 96%
rename from app-arch/cpio/cpio-2.10.bep
rename to app-arch/cpio/cpio-2.10.recipe
index f0971c4c3..c22619dc0 100644
--- a/app-arch/cpio/cpio-2.10.bep
+++ b/app-arch/cpio/cpio-2.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cpio-2.10
 	sed -i 's/restrict//g' gnu/string.in.h
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cpio-2.10
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cpio-2.10
 	make check
 }
diff --git a/app-arch/cpio/cpio-2.11.bep b/app-arch/cpio/cpio-2.11.recipe
similarity index 96%
rename from app-arch/cpio/cpio-2.11.bep
rename to app-arch/cpio/cpio-2.11.recipe
index 4b5e8d0bb..cbcda6e09 100644
--- a/app-arch/cpio/cpio-2.11.bep
+++ b/app-arch/cpio/cpio-2.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cpio-2.11
 #	sed -i 's/restrict//g' gnu/string.in.h
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cpio-2.11
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cpio-2.11
 	make check
 }
diff --git a/app-arch/fastjar/fastjar-0.98.bep b/app-arch/fastjar/fastjar-0.98.recipe
similarity index 96%
rename from app-arch/fastjar/fastjar-0.98.bep
rename to app-arch/fastjar/fastjar-0.98.recipe
index d1d6e50f3..b881de5aa 100644
--- a/app-arch/fastjar/fastjar-0.98.bep
+++ b/app-arch/fastjar/fastjar-0.98.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd fastjar-0.98
 	autoreconf -vfi
 	configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fastjar-0.98
 	make install
 }
diff --git a/app-arch/gzip/gzip-1.2.4a.bep b/app-arch/gzip/gzip-1.2.4a.recipe
similarity index 93%
rename from app-arch/gzip/gzip-1.2.4a.bep
rename to app-arch/gzip/gzip-1.2.4a.recipe
index df43f1de9..a48ec2e18 100644
--- a/app-arch/gzip/gzip-1.2.4a.bep
+++ b/app-arch/gzip/gzip-1.2.4a.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.2.4a
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.2.4a
 	make install
 }
diff --git a/app-arch/gzip/gzip-1.3.12.bep b/app-arch/gzip/gzip-1.3.12.recipe
similarity index 93%
rename from app-arch/gzip/gzip-1.3.12.bep
rename to app-arch/gzip/gzip-1.3.12.recipe
index b5a35d4ef..e3fb7a487 100644
--- a/app-arch/gzip/gzip-1.3.12.bep
+++ b/app-arch/gzip/gzip-1.3.12.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.3.12
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.3.12
 	make install
 }
diff --git a/app-arch/gzip/gzip-1.4.bep b/app-arch/gzip/gzip-1.4.recipe
similarity index 95%
rename from app-arch/gzip/gzip-1.4.bep
rename to app-arch/gzip/gzip-1.4.recipe
index 555edcd22..0dbe2f094 100644
--- a/app-arch/gzip/gzip-1.4.bep
+++ b/app-arch/gzip/gzip-1.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="e381b8506210c794278f5527cba0e765"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.4
 	make install
 }
diff --git a/app-arch/ha/ha-0999.bep b/app-arch/ha/ha-0999.recipe
similarity index 95%
rename from app-arch/ha/ha-0999.bep
rename to app-arch/ha/ha-0999.recipe
index 6e95afa56..04b3d130f 100644
--- a/app-arch/ha/ha-0999.bep
+++ b/app-arch/ha/ha-0999.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 CHECKSUM_MD5="77f3266a451712bec55d60df67f61486"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	make -f makefile.nix
 }
 
-INSTALL {
+INSTALL()
+{
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	cp ha ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/ha
 }
diff --git a/app-arch/lha/lha-1.14i.bep b/app-arch/lha/lha-1.14i.recipe
similarity index 95%
rename from app-arch/lha/lha-1.14i.bep
rename to app-arch/lha/lha-1.14i.recipe
index 1219ed066..4052ba216 100644
--- a/app-arch/lha/lha-1.14i.bep
+++ b/app-arch/lha/lha-1.14i.recipe
@@ -5,20 +5,23 @@ CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lha-1.14i-ac20050924p1
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`/
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lha-1.14i-ac20050924p1
 	make install DESTDIR=${DESTDIR}
 
 }
 
-TEST {
+TEST()
+{
 	cd lha-1.14i-ac20050924p1
 	make check
 }
diff --git a/app-arch/libarchive/libarchive-2.8.3.bep b/app-arch/libarchive/libarchive-2.8.3.recipe
similarity index 95%
rename from app-arch/libarchive/libarchive-2.8.3.bep
rename to app-arch/libarchive/libarchive-2.8.3.recipe
index 2ff868cd4..27e342a7c 100644
--- a/app-arch/libarchive/libarchive-2.8.3.bep
+++ b/app-arch/libarchive/libarchive-2.8.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e4fb38b224f623e1cf1122631bf35b82"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.3
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.3
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.3 
         make check 
 }
diff --git a/app-arch/libarchive/libarchive-2.8.4.bep b/app-arch/libarchive/libarchive-2.8.4.recipe
similarity index 95%
rename from app-arch/libarchive/libarchive-2.8.4.bep
rename to app-arch/libarchive/libarchive-2.8.4.recipe
index b859d62ba..01d29a599 100644
--- a/app-arch/libarchive/libarchive-2.8.4.bep
+++ b/app-arch/libarchive/libarchive-2.8.4.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="83b237a542f27969a8d68ac217dc3796"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.4
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.4
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.4 
         make check 
 }
diff --git a/app-arch/libarchive/libarchive-2.8.5.bep b/app-arch/libarchive/libarchive-2.8.5.recipe
similarity index 96%
rename from app-arch/libarchive/libarchive-2.8.5.bep
rename to app-arch/libarchive/libarchive-2.8.5.recipe
index d44ecd1b8..4a816b54f 100644
--- a/app-arch/libarchive/libarchive-2.8.5.bep
+++ b/app-arch/libarchive/libarchive-2.8.5.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.5
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.5
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.5
         make check 
 }
diff --git a/app-arch/libarchive/libarchive-3.0.3.bep b/app-arch/libarchive/libarchive-3.0.3.recipe
similarity index 96%
rename from app-arch/libarchive/libarchive-3.0.3.bep
rename to app-arch/libarchive/libarchive-3.0.3.recipe
index b5d4644a6..6f782a822 100644
--- a/app-arch/libarchive/libarchive-3.0.3.bep
+++ b/app-arch/libarchive/libarchive-3.0.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892"
-BUILD {
+BUILD()
+{
 	cd libarchive-3.0.3
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-3.0.3
 	make install
 }
 
-TEST { 
+TEST()
+{ 
 	cd libarchive-3.0.3
 	make check 
 }
diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.recipe
similarity index 96%
rename from app-arch/p7zip/p7zip-9.04.bep
rename to app-arch/p7zip/p7zip-9.04.recipe
index 26ae736bb..f679f10b0 100644
--- a/app-arch/p7zip/p7zip-9.04.bep
+++ b/app-arch/p7zip/p7zip-9.04.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8"
-BUILD {
+BUILD()
+{
 	cd p7zip_9.04
 	cp makefile.beos makefile.machine
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd p7zip_9.04
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make install DEST_DIR=${DESTDIR} \
diff --git a/app-arch/p7zip/p7zip-9.13.bep b/app-arch/p7zip/p7zip-9.13.recipe
similarity index 96%
rename from app-arch/p7zip/p7zip-9.13.bep
rename to app-arch/p7zip/p7zip-9.13.recipe
index a2b44e7f1..7fc9cdc99 100644
--- a/app-arch/p7zip/p7zip-9.13.bep
+++ b/app-arch/p7zip/p7zip-9.13.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
-BUILD {
+BUILD()
+{
 	cd p7zip_9.13
 	cp makefile.haiku makefile.machine
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd p7zip_9.13
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
diff --git a/app-arch/p7zip/p7zip-9.20.1.bep b/app-arch/p7zip/p7zip-9.20.1.recipe
similarity index 96%
rename from app-arch/p7zip/p7zip-9.20.1.bep
rename to app-arch/p7zip/p7zip-9.20.1.recipe
index a011b20e1..2c45ea1fb 100644
--- a/app-arch/p7zip/p7zip-9.20.1.bep
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
-BUILD {
+BUILD()
+{
 	cd p7zip_9.20.1
 	cp makefile.haiku makefile.machine
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd p7zip_9.20.1
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
diff --git a/app-arch/pigz/pigz-2.1.6.bep b/app-arch/pigz/pigz-2.1.6.recipe
similarity index 94%
rename from app-arch/pigz/pigz-2.1.6.bep
rename to app-arch/pigz/pigz-2.1.6.recipe
index 1ef41604a..5beb18652 100644
--- a/app-arch/pigz/pigz-2.1.6.bep
+++ b/app-arch/pigz/pigz-2.1.6.recipe
@@ -5,21 +5,24 @@ CHECKSUM_MD5="cbe9030c4be3d0ef2438ee5f8b169ca4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pigz-2.1.6
 	sed -i 's/-lpthread/ /g' Makefile
 	sed -i 's/ln -f pigz unpigz/cp pigz unpigz/' Makefile
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pigz-2.1.6
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp pigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/pigz
 	cp unpigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unpigz
 }
 
-TEST {
+TEST()
+{
 	cd pigz-2.1.6
 	make test
 }
diff --git a/app-arch/sharutils/sharutils-4.10.bep b/app-arch/sharutils/sharutils-4.10.recipe
similarity index 96%
rename from app-arch/sharutils/sharutils-4.10.bep
rename to app-arch/sharutils/sharutils-4.10.recipe
index 9c30b836d..c81ae0831 100644
--- a/app-arch/sharutils/sharutils-4.10.bep
+++ b/app-arch/sharutils/sharutils-4.10.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd sharutils-4.10
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sharutils-4.10
 	make install
 }
diff --git a/app-arch/sharutils/sharutils-4.6.3.bep b/app-arch/sharutils/sharutils-4.6.3.recipe
similarity index 94%
rename from app-arch/sharutils/sharutils-4.6.3.bep
rename to app-arch/sharutils/sharutils-4.6.3.recipe
index e940d99d5..9adb9d2ee 100644
--- a/app-arch/sharutils/sharutils-4.6.3.bep
+++ b/app-arch/sharutils/sharutils-4.6.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sharutils-4.6.3
 	./configure --prefix=/boot/home/common
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sharutils-4.6.3
 	make install
 }
diff --git a/app-arch/tar/tar-1.22.bep b/app-arch/tar/tar-1.22.recipe
similarity index 96%
rename from app-arch/tar/tar-1.22.bep
rename to app-arch/tar/tar-1.22.recipe
index c27dcb404..e719a43bc 100644
--- a/app-arch/tar/tar-1.22.bep
+++ b/app-arch/tar/tar-1.22.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="07fa517027f426bb80f5f5ff91b63585"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tar-1.22
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tar-1.22
 	make install
 }
diff --git a/app-arch/tar/tar-1.23.bep b/app-arch/tar/tar-1.23.recipe
similarity index 95%
rename from app-arch/tar/tar-1.23.bep
rename to app-arch/tar/tar-1.23.recipe
index 8b61cc573..c1942e654 100644
--- a/app-arch/tar/tar-1.23.bep
+++ b/app-arch/tar/tar-1.23.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="41e2ca4b924ec7860e51b43ad06cdb7e"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tar-1.23
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tar-1.23
 	make install
 }
diff --git a/app-arch/tar/tar-1.25.bep b/app-arch/tar/tar-1.25.recipe
similarity index 97%
rename from app-arch/tar/tar-1.25.bep
rename to app-arch/tar/tar-1.25.recipe
index 28fecf0bf..1a16cafd0 100644
--- a/app-arch/tar/tar-1.25.bep
+++ b/app-arch/tar/tar-1.25.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/gnulib = 9999"
-BUILD {
+BUILD()
+{
 	cd tar-1.25
 	if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then
 		echo "gnulib not found, so updating it now..."
@@ -27,12 +28,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tar-1.25
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd tar-1.25
 	make check
 }
diff --git a/app-arch/tar/tar-1.26.bep b/app-arch/tar/tar-1.26.recipe
similarity index 96%
rename from app-arch/tar/tar-1.26.bep
rename to app-arch/tar/tar-1.26.recipe
index ee941c03c..4f52f7bb9 100644
--- a/app-arch/tar/tar-1.26.bep
+++ b/app-arch/tar/tar-1.26.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tar-1.26
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
     ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tar-1.26
 	make install
 }
diff --git a/app-arch/unrar/unrar-4.2.4.bep b/app-arch/unrar/unrar-4.2.4.recipe
similarity index 94%
rename from app-arch/unrar/unrar-4.2.4.bep
rename to app-arch/unrar/unrar-4.2.4.recipe
index 1b697795b..0fecb8745 100644
--- a/app-arch/unrar/unrar-4.2.4.bep
+++ b/app-arch/unrar/unrar-4.2.4.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4"
-BUILD {
+BUILD()
+{
 	cd unrar
 	make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd unrar
 	make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install
 }
diff --git a/app-arch/unzip/unzip-6.0.bep b/app-arch/unzip/unzip-6.0.recipe
similarity index 94%
rename from app-arch/unzip/unzip-6.0.bep
rename to app-arch/unzip/unzip-6.0.recipe
index 868411e99..b2cd86962 100644
--- a/app-arch/unzip/unzip-6.0.bep
+++ b/app-arch/unzip/unzip-6.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="62b490407489521db863b523a7f86375"
-BUILD {
+BUILD()
+{
 	cd unzip60
 	make -f beos/Makefile \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
@@ -13,12 +14,14 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd unzip60
 	make -f beos/Makefile install
 }
 
-TEST {
+TEST()
+{
 	cd unzip60
 #	make test
 #	make check
diff --git a/app-arch/xar/xar-1.5.2.bep b/app-arch/xar/xar-1.5.2.recipe
similarity index 95%
rename from app-arch/xar/xar-1.5.2.bep
rename to app-arch/xar/xar-1.5.2.recipe
index 5eddcd68b..2835e1565 100644
--- a/app-arch/xar/xar-1.5.2.bep
+++ b/app-arch/xar/xar-1.5.2.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd xar-1.5.2
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xar-1.5.2
 	make install
 }
diff --git a/app-arch/xz-utils/xz-utils-4.999.9.bep b/app-arch/xz-utils/xz-utils-4.999.9.recipe
similarity index 95%
rename from app-arch/xz-utils/xz-utils-4.999.9.bep
rename to app-arch/xz-utils/xz-utils-4.999.9.recipe
index a692dc832..f79763e27 100644
--- a/app-arch/xz-utils/xz-utils-4.999.9.bep
+++ b/app-arch/xz-utils/xz-utils-4.999.9.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd xz-4.999.9beta
 	cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool .
 	libtoolize -c -f
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xz-4.999.9beta
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd xz-4.999.9beta
 	make check
 }
diff --git a/app-arch/xz-utils/xz-utils-5.0.1.bep b/app-arch/xz-utils/xz-utils-5.0.1.recipe
similarity index 96%
rename from app-arch/xz-utils/xz-utils-5.0.1.bep
rename to app-arch/xz-utils/xz-utils-5.0.1.recipe
index cfec88a3c..537853ebf 100644
--- a/app-arch/xz-utils/xz-utils-5.0.1.bep
+++ b/app-arch/xz-utils/xz-utils-5.0.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd xz-5.0.1
 	touch po/t-cs.gmo
 	libtoolize --force --copy --install
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xz-5.0.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd xz-5.0.1
 	make check
 }
diff --git a/app-arch/xz-utils/xz-utils-5.0.4.bep b/app-arch/xz-utils/xz-utils-5.0.4.recipe
similarity index 96%
rename from app-arch/xz-utils/xz-utils-5.0.4.bep
rename to app-arch/xz-utils/xz-utils-5.0.4.recipe
index efeaeaeb8..987591dd8 100644
--- a/app-arch/xz-utils/xz-utils-5.0.4.bep
+++ b/app-arch/xz-utils/xz-utils-5.0.4.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd xz-5.0.4
 	touch po/t-cs.gmo
 	libtoolize --force --copy --install
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xz-5.0.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd xz-5.0.4
 	make check
 }
diff --git a/app-arch/zip/zip-3.0.bep b/app-arch/zip/zip-3.0.recipe
similarity index 94%
rename from app-arch/zip/zip-3.0.bep
rename to app-arch/zip/zip-3.0.recipe
index 132af02e8..5b68a26d1 100644
--- a/app-arch/zip/zip-3.0.bep
+++ b/app-arch/zip/zip-3.0.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37"
-BUILD {
+BUILD()
+{
 	cd zip30
 	make -f beos/Makefile \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zip30
 	make -f beos/Makefile install
 }
 
-TEST {
+TEST()
+{
 	cd zip30
 #	make test
 #	make check
diff --git a/app-arch/zoo/zoo-2.10.bep b/app-arch/zoo/zoo-2.10.recipe
similarity index 93%
rename from app-arch/zoo/zoo-2.10.bep
rename to app-arch/zoo/zoo-2.10.recipe
index 96f3dc0f9..b6f401a28 100644
--- a/app-arch/zoo/zoo-2.10.bep
+++ b/app-arch/zoo/zoo-2.10.recipe
@@ -5,11 +5,13 @@ CHECKSUM_MD5="70a0a785ecc8f7f747be1421e495d837"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	make haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	make inst_prod
 }
 LICENSE="zoo"
diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.bep b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
similarity index 97%
rename from app-benchmarks/bonnie++/bonnie++-1.03e.bep
rename to app-benchmarks/bonnie++/bonnie++-1.03e.recipe
index bb6fb950f..0f26cfcf9 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.03e.bep
+++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
@@ -5,7 +5,8 @@ REVISION= "1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
-BUILD {
+BUILD()
+{
         cd bonnie++-1.03e
         COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
         COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
@@ -15,7 +16,8 @@ BUILD {
 		--sbindir=$COMMON_BIN
         make
 }
-INSTALL {
+INSTALL()
+{
         cd bonnie++-1.03e
         make install DESTDIR=${DESTDIR}
 
diff --git a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep b/app-benchmarks/ffsb/ffsb-6.0-rc2.recipe
similarity index 96%
rename from app-benchmarks/ffsb/ffsb-6.0-rc2.bep
rename to app-benchmarks/ffsb/ffsb-6.0-rc2.recipe
index bcf3b899d..b4a80b504 100644
--- a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep
+++ b/app-benchmarks/ffsb/ffsb-6.0-rc2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891"
-BUILD {
+BUILD()
+{
 	cd ffsb-6.0-rc2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffsb-6.0-rc2
 	make install
 }
diff --git a/app-benchmarks/iozone/iozone-3.326.bep b/app-benchmarks/iozone/iozone-3.326.recipe
similarity index 96%
rename from app-benchmarks/iozone/iozone-3.326.bep
rename to app-benchmarks/iozone/iozone-3.326.recipe
index 73b7b44f4..e95216033 100644
--- a/app-benchmarks/iozone/iozone-3.326.bep
+++ b/app-benchmarks/iozone/iozone-3.326.recipe
@@ -5,11 +5,13 @@ CHECKSUM_MD5="e80f06da89d314f7fc08fcef4046d367"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd iozone3_326/src/current/
 	make haiku
 }
-INSTALL {
+INSTALL()
+{
 	cd iozone3_326/src/current/
     mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
     cp iozone ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/iozone
diff --git a/app-benchmarks/libmicro/libmicro-0.4.1.bep b/app-benchmarks/libmicro/libmicro-0.4.1.recipe
similarity index 93%
rename from app-benchmarks/libmicro/libmicro-0.4.1.bep
rename to app-benchmarks/libmicro/libmicro-0.4.1.recipe
index db2d7b796..065421c1c 100644
--- a/app-benchmarks/libmicro/libmicro-0.4.1.bep
+++ b/app-benchmarks/libmicro/libmicro-0.4.1.recipe
@@ -5,18 +5,21 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="2b6e1ff22164e4ae0c21c11e6c28f7ed"
-BUILD {
+BUILD()
+{
 	cd libMicro-0.4.1
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libMicro-0.4.1
 	cd bin-BePC
 	ls
 }
 
-TEST {
+TEST()
+{
 	cd libMicro-0.4.1
 #	make test
 #	make check
diff --git a/app-benchmarks/piozone/piozone-1.0.bep b/app-benchmarks/piozone/piozone-1.0.recipe
similarity index 95%
rename from app-benchmarks/piozone/piozone-1.0.bep
rename to app-benchmarks/piozone/piozone-1.0.recipe
index c8069b088..fc6399b29 100644
--- a/app-benchmarks/piozone/piozone-1.0.bep
+++ b/app-benchmarks/piozone/piozone-1.0.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd piozone-1.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd piozone-1.0	
 	mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone
diff --git a/app-cdr/bchunk/bchunk-1.2.0.bep b/app-cdr/bchunk/bchunk-1.2.0.recipe
similarity index 97%
rename from app-cdr/bchunk/bchunk-1.2.0.bep
rename to app-cdr/bchunk/bchunk-1.2.0.recipe
index 0e4d80adb..001e94823 100644
--- a/app-cdr/bchunk/bchunk-1.2.0.bep
+++ b/app-cdr/bchunk/bchunk-1.2.0.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
-BUILD {
+BUILD()
+{
 	cd bchunk-1.2.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bchunk-1.2.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3.bep b/app-cdr/cdrdao/cdrdao-1.2.3.recipe
similarity index 95%
rename from app-cdr/cdrdao/cdrdao-1.2.3.bep
rename to app-cdr/cdrdao/cdrdao-1.2.3.recipe
index 560f0daf2..e88cea319 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3.bep
+++ b/app-cdr/cdrdao/cdrdao-1.2.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8d15ba6280bb7ba2f4d6be31d28b3c0c"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrdao-1.2.3
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrdao-1.2.3
 	make install
 }
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep b/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe
similarity index 95%
rename from app-cdr/cdrtools/cdrtools-2.01.01a66.bep
rename to app-cdr/cdrtools/cdrtools-2.01.01a66.recipe
index ee394e382..ae598c583 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep
+++ b/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b9d40bddf1ce75989d0a36b939f0c3fb"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-2.01.01
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-2.01.01
 	make install
 }
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep b/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe
similarity index 94%
rename from app-cdr/cdrtools/cdrtools-2.01.01a77.bep
rename to app-cdr/cdrtools/cdrtools-2.01.01a77.recipe
index ea13e679c..10b69724c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep
+++ b/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="d0b4c56f1215be636996b8e1e3d2b284"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-2.01.01
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-2.01.01
 	make install
 }
diff --git a/app-cdr/cdrtools/cdrtools-3.00.bep b/app-cdr/cdrtools/cdrtools-3.00.recipe
similarity index 94%
rename from app-cdr/cdrtools/cdrtools-3.00.bep
rename to app-cdr/cdrtools/cdrtools-3.00.recipe
index 801cfa10f..a3692e607 100644
--- a/app-cdr/cdrtools/cdrtools-3.00.bep
+++ b/app-cdr/cdrtools/cdrtools-3.00.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="f9fbab08fbd458b0d2312976d8c5f558"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-3.00
 	make GMAKE_NOWARN=true
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-3.00
 	make install
 }
diff --git a/app-cdr/cdrtools/cdrtools-3.01a01.bep b/app-cdr/cdrtools/cdrtools-3.01a01.recipe
similarity index 98%
rename from app-cdr/cdrtools/cdrtools-3.01a01.bep
rename to app-cdr/cdrtools/cdrtools-3.01a01.recipe
index 146935807..e85e084c7 100644
--- a/app-cdr/cdrtools/cdrtools-3.01a01.bep
+++ b/app-cdr/cdrtools/cdrtools-3.01a01.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6c81803b1e2bedefc1ad75fabd1c8474"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-3.01
 	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
 	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
@@ -21,7 +22,8 @@ BUILD {
 	make GMAKE_NOWARN=true
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-3.01
 	make GMAKE_NOWARN=true DEFMANBASE=documentation install
 }
diff --git a/app-cdr/cdrtools/cdrtools-3.01a06.bep b/app-cdr/cdrtools/cdrtools-3.01a06.recipe
similarity index 98%
rename from app-cdr/cdrtools/cdrtools-3.01a06.bep
rename to app-cdr/cdrtools/cdrtools-3.01a06.recipe
index b4e4171fe..f9baf6c61 100644
--- a/app-cdr/cdrtools/cdrtools-3.01a06.bep
+++ b/app-cdr/cdrtools/cdrtools-3.01a06.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-3.01
 	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
 	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
@@ -21,7 +22,8 @@ BUILD {
 	make GMAKE_NOWARN=true
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-3.01
 	make GMAKE_NOWARN=true DEFMANBASE=documentation install
 }
diff --git a/app-cdr/cdrtools/cdrtools-3.01a07.bep b/app-cdr/cdrtools/cdrtools-3.01a07.recipe
similarity index 98%
rename from app-cdr/cdrtools/cdrtools-3.01a07.bep
rename to app-cdr/cdrtools/cdrtools-3.01a07.recipe
index 819664d1f..f2b262ee7 100644
--- a/app-cdr/cdrtools/cdrtools-3.01a07.bep
+++ b/app-cdr/cdrtools/cdrtools-3.01a07.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrtools-3.01
 	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
 	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
@@ -21,7 +22,8 @@ BUILD {
 	make GMAKE_NOWARN=true
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrtools-3.01
 	make GMAKE_NOWARN=true DEFMANBASE=documentation install
 }
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.bep b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
similarity index 95%
rename from app-cdr/daa2iso/daa2iso-0.1.7e.bep
rename to app-cdr/daa2iso/daa2iso-0.1.7e.recipe
index c98e0db64..d3685840c 100644
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.bep
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
@@ -6,12 +6,14 @@ DEPEND=""
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481"
 
-BUILD {
+BUILD()
+{
 	cd src
 	make CFLAGS="-DNOLFS -O2 -s"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd src
 	make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY)
 }
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.bep b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
similarity index 95%
rename from app-cdr/uif2iso/uif2iso-0.1.7c.bep
rename to app-cdr/uif2iso/uif2iso-0.1.7c.recipe
index c9bf0a10b..0803678b7 100644
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.bep
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
@@ -6,12 +6,14 @@ DEPEND=""
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="2eb9797ec463c38253014d45591a7043"
 
-BUILD {
+BUILD()
+{
 	cd src
 	make CFLAGS="-DNOLFS -O2 -s"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd src
 	make install prefix=$(finddir B_COMMON_DIRECTORY) DESTDIR="${DESTDIR}"
 }
diff --git a/app-crypt/gnupg/gnupg-1.4.10.bep b/app-crypt/gnupg/gnupg-1.4.10.recipe
similarity index 95%
rename from app-crypt/gnupg/gnupg-1.4.10.bep
rename to app-crypt/gnupg/gnupg-1.4.10.recipe
index 8ec90e2c8..04e8e6e99 100644
--- a/app-crypt/gnupg/gnupg-1.4.10.bep
+++ b/app-crypt/gnupg/gnupg-1.4.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="dcf7ed712997888d616e029637bfc303"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gnupg-1.4.10
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gnupg-1.4.10
 	make install
 }
diff --git a/app-crypt/gnupg/gnupg-1.4.11.bep b/app-crypt/gnupg/gnupg-1.4.11.recipe
similarity index 95%
rename from app-crypt/gnupg/gnupg-1.4.11.bep
rename to app-crypt/gnupg/gnupg-1.4.11.recipe
index 9e6bf53b1..0f1c2ffd5 100644
--- a/app-crypt/gnupg/gnupg-1.4.11.bep
+++ b/app-crypt/gnupg/gnupg-1.4.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gnupg-1.4.11
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gnupg-1.4.11
 	make install
 }
diff --git a/app-doc/doxygen/doxygen-1.6.1.bep b/app-doc/doxygen/doxygen-1.6.1.recipe
similarity index 96%
rename from app-doc/doxygen/doxygen-1.6.1.bep
rename to app-doc/doxygen/doxygen-1.6.1.recipe
index 85346e8d9..94f3c58ae 100644
--- a/app-doc/doxygen/doxygen-1.6.1.bep
+++ b/app-doc/doxygen/doxygen-1.6.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd doxygen-1.6.1
 	./configure --prefix /boot/common
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd doxygen-1.6.1
 	make install
 }
diff --git a/app-doc/doxygen/doxygen-1.6.2.bep b/app-doc/doxygen/doxygen-1.6.2.recipe
similarity index 96%
rename from app-doc/doxygen/doxygen-1.6.2.bep
rename to app-doc/doxygen/doxygen-1.6.2.recipe
index 39efbbab9..88d2e032d 100644
--- a/app-doc/doxygen/doxygen-1.6.2.bep
+++ b/app-doc/doxygen/doxygen-1.6.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="70260101ef60952cb99484700241c99e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd doxygen-1.6.2
 	./configure --prefix /boot/common
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd doxygen-1.6.2
 	make install
 }
diff --git a/app-doc/doxygen/doxygen-1.6.3.bep b/app-doc/doxygen/doxygen-1.6.3.recipe
similarity index 96%
rename from app-doc/doxygen/doxygen-1.6.3.bep
rename to app-doc/doxygen/doxygen-1.6.3.recipe
index 946585e34..3711e6e59 100644
--- a/app-doc/doxygen/doxygen-1.6.3.bep
+++ b/app-doc/doxygen/doxygen-1.6.3.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd doxygen-1.6.3
 	sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in
 	./configure --prefix `finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd doxygen-1.6.3
 	make install
 }
diff --git a/app-doc/doxygen/doxygen-1.7.4.bep b/app-doc/doxygen/doxygen-1.7.4.recipe
similarity index 96%
rename from app-doc/doxygen/doxygen-1.7.4.bep
rename to app-doc/doxygen/doxygen-1.7.4.recipe
index 1f00fc066..f1597e8ea 100644
--- a/app-doc/doxygen/doxygen-1.7.4.bep
+++ b/app-doc/doxygen/doxygen-1.7.4.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd doxygen-1.7.4
 	sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in
 	./configure --prefix `finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd doxygen-1.7.4
 	make install
 }
diff --git a/app-editors/jed/jed-0.99-19.bep b/app-editors/jed/jed-0.99-19.recipe
similarity index 96%
rename from app-editors/jed/jed-0.99-19.bep
rename to app-editors/jed/jed-0.99-19.recipe
index 28e7ed07f..405e19c38 100644
--- a/app-editors/jed/jed-0.99-19.bep
+++ b/app-editors/jed/jed-0.99-19.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="ncurses >= 5.7
 	slang >= 2.2.2"
 CHECKSUM_MD5="c9b2f58a3defc6f61faa1ce7d6d629ea"
-BUILD {
+BUILD()
+{
 	cd jed-0.99-19
 	cd autoconf
 	cp /boot/common/share/libtool/config/config.guess .
@@ -16,7 +17,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jed-0.99-19
 	touch src/objs/xjed
 	make install DESTDIR=${DESTDIR}
diff --git a/app-editors/joe/joe-3.8-hg.bep b/app-editors/joe/joe-3.8-hg.recipe
similarity index 96%
rename from app-editors/joe/joe-3.8-hg.bep
rename to app-editors/joe/joe-3.8-hg.recipe
index c187bada5..a1954b5f8 100644
--- a/app-editors/joe/joe-3.8-hg.bep
+++ b/app-editors/joe/joe-3.8-hg.recipe
@@ -5,7 +5,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5="66de1b073e869ba12abbfcde3885c577"
-BUILD {
+BUILD()
+{
 	cd joe-3.8-hg
 	autojoe
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd joe-3.8-hg
 	make install
 }
diff --git a/app-editors/nano/nano-2.2.3.bep b/app-editors/nano/nano-2.2.3.recipe
similarity index 95%
rename from app-editors/nano/nano-2.2.3.bep
rename to app-editors/nano/nano-2.2.3.recipe
index 77247c1bf..4bc904ada 100644
--- a/app-editors/nano/nano-2.2.3.bep
+++ b/app-editors/nano/nano-2.2.3.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6"
 CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50"
-BUILD {
+BUILD()
+{
 	cd nano-2.2.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.2.3
 	make install
 }
diff --git a/app-editors/nano/nano-2.2.5.bep b/app-editors/nano/nano-2.2.5.recipe
similarity index 95%
rename from app-editors/nano/nano-2.2.5.bep
rename to app-editors/nano/nano-2.2.5.recipe
index 216e4fc4f..ce7a97840 100644
--- a/app-editors/nano/nano-2.2.5.bep
+++ b/app-editors/nano/nano-2.2.5.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6"
 CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf"
-BUILD {
+BUILD()
+{
 	cd nano-2.2.5
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.2.5
 	make install
 }
diff --git a/app-editors/nano/nano-2.2.6.bep b/app-editors/nano/nano-2.2.6.recipe
similarity index 96%
rename from app-editors/nano/nano-2.2.6.bep
rename to app-editors/nano/nano-2.2.6.recipe
index 074d13d35..9abbc2515 100644
--- a/app-editors/nano/nano-2.2.6.bep
+++ b/app-editors/nano/nano-2.2.6.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6
 	sys-apps/groff >= 1.20.1"
 CHECKSUM_MD5="03233ae480689a008eb98feb1b599807"
-BUILD {
+BUILD()
+{
 	cd nano-2.2.6
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.2.6
 	make install
 }
diff --git a/app-editors/nano/nano-2.3.1.bep b/app-editors/nano/nano-2.3.1.recipe
similarity index 96%
rename from app-editors/nano/nano-2.3.1.bep
rename to app-editors/nano/nano-2.3.1.recipe
index 572854138..f44f95d4b 100644
--- a/app-editors/nano/nano-2.3.1.bep
+++ b/app-editors/nano/nano-2.3.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6
 	sys-apps/groff >= 1.20.1"
-BUILD {
+BUILD()
+{
 	cd nano-2.3.1
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.3.1
 	make install
 }
diff --git a/app-editors/ne/ne-2.1.bep b/app-editors/ne/ne-2.1.recipe
similarity index 95%
rename from app-editors/ne/ne-2.1.bep
rename to app-editors/ne/ne-2.1.recipe
index 474e9206a..1c7dd6bbc 100644
--- a/app-editors/ne/ne-2.1.bep
+++ b/app-editors/ne/ne-2.1.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="9f76652f6349721cfe0e8dc2aec9c767"
-BUILD {
+BUILD()
+{
 	cd ne-2.1
 	make PREFIX=`finddir B_COMMON_DIRECTORY` NE_ANSI=1 haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ne-2.1
 	make PREFIX=`finddir B_COMMON_DIRECTORY` haiku
 }
diff --git a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep b/app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe
similarity index 95%
rename from app-editors/qemacs/qemacs-0.3.2dev-cvs.bep
rename to app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe
index 61a3b25fb..1d224709c 100644
--- a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep
+++ b/app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe
@@ -5,13 +5,15 @@ SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="app-text/texi2html >= 1.82"
-BUILD {
+BUILD()
+{
 	cd qemacs-0.3.2dev-cvs
 	./configure
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qemacs-0.3.2dev-cvs
 	make install
 }
diff --git a/app-editors/qemacs/qemacs-0.3.3.bep b/app-editors/qemacs/qemacs-0.3.3.recipe
similarity index 95%
rename from app-editors/qemacs/qemacs-0.3.3.bep
rename to app-editors/qemacs/qemacs-0.3.3.recipe
index 6f08ac38a..250da5505 100644
--- a/app-editors/qemacs/qemacs-0.3.3.bep
+++ b/app-editors/qemacs/qemacs-0.3.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="app-text/texi2html >= 1.82"
-BUILD {
+BUILD()
+{
 	cd qemacs-0.3.3
 	./configure
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qemacs-0.3.3
 	make install
 }
diff --git a/app-editors/se/se-3.0.bep b/app-editors/se/se-3.0.recipe
similarity index 96%
rename from app-editors/se/se-3.0.bep
rename to app-editors/se/se-3.0.recipe
index fbb4eef2a..397b8aefe 100644
--- a/app-editors/se/se-3.0.bep
+++ b/app-editors/se/se-3.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6"
 
-BUILD {
+BUILD()
+{
 	cd se-3.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd se-3.0
 	make install
 }
diff --git a/app-editors/vim/vim-7.2.bep b/app-editors/vim/vim-7.2.recipe
similarity index 94%
rename from app-editors/vim/vim-7.2.bep
rename to app-editors/vim/vim-7.2.recipe
index 7b6d90625..8d7496e91 100644
--- a/app-editors/vim/vim-7.2.bep
+++ b/app-editors/vim/vim-7.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 CHECKSUM_MD5="c368894a65c09605517fd56ced57fb12"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd vim72
 	cd src
 	make autoconf
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vim72
 	make install
 }
diff --git a/app-editors/vim/vim-7.3.bep b/app-editors/vim/vim-7.3.recipe
similarity index 94%
rename from app-editors/vim/vim-7.3.bep
rename to app-editors/vim/vim-7.3.recipe
index 52c00432d..d4a2297e0 100644
--- a/app-editors/vim/vim-7.3.bep
+++ b/app-editors/vim/vim-7.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd vim73
 	cd src
 	make autoconf
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vim73
 	make install
 }
diff --git a/app-emulation/aranym/aranym-0.9.11-cvs.bep b/app-emulation/aranym/aranym-0.9.11-cvs.recipe
similarity index 96%
rename from app-emulation/aranym/aranym-0.9.11-cvs.bep
rename to app-emulation/aranym/aranym-0.9.11-cvs.recipe
index d5866162a..b1900a133 100644
--- a/app-emulation/aranym/aranym-0.9.11-cvs.bep
+++ b/app-emulation/aranym/aranym-0.9.11-cvs.recipe
@@ -7,14 +7,16 @@ DEPEND="dev-libs/libcdio >= 0.82
 		media-libs/libsdl >= 1.2.10"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd aranym
 	./autogen.sh --help >/dev/null
 	./configure --prefix=/boot/apps/ARAnyM
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd aranym
 	make install
 }
diff --git a/app-emulation/libdsk/libdsk-1.3.3.bep b/app-emulation/libdsk/libdsk-1.3.3.recipe
similarity index 96%
rename from app-emulation/libdsk/libdsk-1.3.3.bep
rename to app-emulation/libdsk/libdsk-1.3.3.recipe
index b9217604b..7ff988b9b 100644
--- a/app-emulation/libdsk/libdsk-1.3.3.bep
+++ b/app-emulation/libdsk/libdsk-1.3.3.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="untested"
 DEPEND=""
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd libdsk-1.3.3
 	# Need to update the libtools in the package to build shared libraries
 	libtoolize
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdsk-1.3.3
 	make install
 }
diff --git a/app-emulation/mednafen/mednafen-0.9.26.bep b/app-emulation/mednafen/mednafen-0.9.26.recipe
similarity index 95%
rename from app-emulation/mednafen/mednafen-0.9.26.bep
rename to app-emulation/mednafen/mednafen-0.9.26.recipe
index a273028a5..9e33fb29e 100644
--- a/app-emulation/mednafen/mednafen-0.9.26.bep
+++ b/app-emulation/mednafen/mednafen-0.9.26.recipe
@@ -9,18 +9,21 @@ DEPEND="media-libs/libsdl >= 1.2.15,
 	dev-libs/libcdio >= 0.82,
 	media-libs/libsndfile >= 1.0.21"
 
-BUILD {
+BUILD()
+{
 	cd mednafen
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mednafen
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd mednafen
 	make check
 }
diff --git a/app-emulation/oricutron/oricutron-0.9-svn.bep b/app-emulation/oricutron/oricutron-0.9-svn.recipe
similarity index 94%
rename from app-emulation/oricutron/oricutron-0.9-svn.bep
rename to app-emulation/oricutron/oricutron-0.9-svn.recipe
index 702d1bf26..ca7088f5b 100644
--- a/app-emulation/oricutron/oricutron-0.9-svn.bep
+++ b/app-emulation/oricutron/oricutron-0.9-svn.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="untested"
 DEPEND="media-libs/libsdl >= 1.2.10"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd trunk
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd trunk
 	make install
 }
diff --git a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep b/app-emulation/pearpc/pearpc-0.5.0-cvs.recipe
similarity index 95%
rename from app-emulation/pearpc/pearpc-0.5.0-cvs.bep
rename to app-emulation/pearpc/pearpc-0.5.0-cvs.recipe
index e8b8f682f..f742be56e 100644
--- a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep
+++ b/app-emulation/pearpc/pearpc-0.5.0-cvs.recipe
@@ -6,14 +6,16 @@ STATUS_HAIKU="untested"
 DEPEND=""
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd pearpc-0.5.0-cvs
 	./autogen.sh >/dev/null
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pearpc-0.5.0-cvs
 	make install
 }
diff --git a/app-emulation/qemu/qemu-0.12.4.bep b/app-emulation/qemu/qemu-0.12.4.recipe
similarity index 95%
rename from app-emulation/qemu/qemu-0.12.4.bep
rename to app-emulation/qemu/qemu-0.12.4.recipe
index e97a8f4f4..7e97ecfc0 100644
--- a/app-emulation/qemu/qemu-0.12.4.bep
+++ b/app-emulation/qemu/qemu-0.12.4.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="93e6b134dff89b2799f57b7d9e0e0fc5"
 
-BUILD {
+BUILD()
+{
 	cd qemu-0.12.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qemu-0.12.4
 	make install
 }
diff --git a/app-i18n/anthy/anthy-9100.bep b/app-i18n/anthy/anthy-9100.recipe
similarity index 96%
rename from app-i18n/anthy/anthy-9100.bep
rename to app-i18n/anthy/anthy-9100.recipe
index 58d79885e..8d3365daa 100644
--- a/app-i18n/anthy/anthy-9100.bep
+++ b/app-i18n/anthy/anthy-9100.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2Fanthy%2F37536%2Fant
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd anthy-9100h
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd anthy-9100h
 	make install
 }
diff --git a/app-misc/colordiff/colordiff-1.0.10.bep b/app-misc/colordiff/colordiff-1.0.10.recipe
similarity index 96%
rename from app-misc/colordiff/colordiff-1.0.10.bep
rename to app-misc/colordiff/colordiff-1.0.10.recipe
index 1f73f2885..8f8393bc7 100644
--- a/app-misc/colordiff/colordiff-1.0.10.bep
+++ b/app-misc/colordiff/colordiff-1.0.10.recipe
@@ -6,12 +6,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/perl >= 5.10.1
 		sys-apps/diffutils >= 2.8.1"
-BUILD {
+BUILD()
+{
 	# Nothing to see here
 	cd colordiff-1.0.10
 }
 
-INSTALL {
+INSTALL()
+{
 	cd colordiff-1.0.10
 	make INSTALL_DIR="$(finddir B_COMMON_BIN_DIRECTORY)" \
 	MAN_DIR="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1" \
diff --git a/app-misc/figlet/figlet-222.bep b/app-misc/figlet/figlet-222.recipe
similarity index 97%
rename from app-misc/figlet/figlet-222.bep
rename to app-misc/figlet/figlet-222.recipe
index 93ba4a04b..b889537e4 100644
--- a/app-misc/figlet/figlet-222.bep
+++ b/app-misc/figlet/figlet-222.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="5f84ad52d092d5db4ad5916df767646b"
-BUILD {
+BUILD()
+{
 	cd figlet222
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd figlet222
 	DISTRODIR=${DESTDIR}
 	MANDIR=${DISTRODIR}/`finddir B_APPS_DIRECTORY`/figlet/share/man
diff --git a/app-misc/getopt/getopt-1.1.4.bep b/app-misc/getopt/getopt-1.1.4.recipe
similarity index 95%
rename from app-misc/getopt/getopt-1.1.4.bep
rename to app-misc/getopt/getopt-1.1.4.recipe
index 2ae2b7510..28028bab7 100644
--- a/app-misc/getopt/getopt-1.1.4.bep
+++ b/app-misc/getopt/getopt-1.1.4.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="02188ca68da27c4175d6e9f3da732101"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd getopt-1.1.4
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd getopt-1.1.4
 	make install prefix=`finddir B_COMMON_DIRECTORY` DESTDIR="${DESTDIR}"
 }
diff --git a/app-office/abiword/abiword-2.8.6.bep b/app-office/abiword/abiword-2.8.6.recipe
similarity index 94%
rename from app-office/abiword/abiword-2.8.6.bep
rename to app-office/abiword/abiword-2.8.6.recipe
index a973c4127..21de67380 100644
--- a/app-office/abiword/abiword-2.8.6.bep
+++ b/app-office/abiword/abiword-2.8.6.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="broken"
 DEPEND="media-libs/jpeg >= 6b
 	media-libs/libpng >= 1.2"
 CHECKSUM_MD5="f883b0a7f26229a9c66fd6a1a94381aa"
-BUILD {
+BUILD()
+{
 	cd abiword-2.8.6
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd abiword-2.8.6
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd abiword-2.8.6
 #	make test
 #	make check
diff --git a/app-shells/bash/bash-4.1.bep b/app-shells/bash/bash-4.1.recipe
similarity index 95%
rename from app-shells/bash/bash-4.1.bep
rename to app-shells/bash/bash-4.1.recipe
index 8d09bbf5d..9bd5889c1 100644
--- a/app-shells/bash/bash-4.1.bep
+++ b/app-shells/bash/bash-4.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="9800d8724815fd84994d9be65ab5e7b8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
     cd bash-4.1
     ./configure
     make
 }
 
-INSTALL {
+INSTALL()
+{
     cd bash-4.1
     make install DESTDIR=${DESTDIR}
 }
diff --git a/app-shells/fish/fish-1.23.1-git.bep b/app-shells/fish/fish-1.23.1-git.recipe
similarity index 95%
rename from app-shells/fish/fish-1.23.1-git.bep
rename to app-shells/fish/fish-1.23.1-git.recipe
index db9e1bea1..d79dff6f6 100644
--- a/app-shells/fish/fish-1.23.1-git.bep
+++ b/app-shells/fish/fish-1.23.1-git.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="untested"
 DEPEND="app-doc/doxygen >= 1.7.4
 	sys-libs/ncurses >= 5.9"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
     cd fish-1.23.1-git
 	libtoolize --force --copy --install
     autoconf
@@ -15,12 +16,14 @@ BUILD {
     make
 }
 
-INSTALL {
+INSTALL()
+{
     cd fish-1.23.1-git
     make install DESTDIR=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd fish-1.23.1-git
 	make test
 }
diff --git a/app-shells/zsh/zsh-4.3.10.bep b/app-shells/zsh/zsh-4.3.10.recipe
similarity index 96%
rename from app-shells/zsh/zsh-4.3.10.bep
rename to app-shells/zsh/zsh-4.3.10.recipe
index dda63358d..8fc1a7402 100644
--- a/app-shells/zsh/zsh-4.3.10.bep
+++ b/app-shells/zsh/zsh-4.3.10.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 CHECKSUM_MD5="74c5b275544400082a1cde806c98682a"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd zsh-4.3.10
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zsh-4.3.10
 	make install
 }
diff --git a/app-shells/zsh/zsh-5.0.0.bep b/app-shells/zsh/zsh-5.0.0.recipe
similarity index 97%
rename from app-shells/zsh/zsh-5.0.0.bep
rename to app-shells/zsh/zsh-5.0.0.recipe
index 107a8d4ed..55e8661bd 100644
--- a/app-shells/zsh/zsh-5.0.0.bep
+++ b/app-shells/zsh/zsh-5.0.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd zsh-5.0.0
 	autoconf
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zsh-5.0.0
 	make install
 }
diff --git a/app-text/antiword/antiword-0.37.bep b/app-text/antiword/antiword-0.37.recipe
similarity index 95%
rename from app-text/antiword/antiword-0.37.bep
rename to app-text/antiword/antiword-0.37.recipe
index 1f1fe561e..7d9e8bf75 100644
--- a/app-text/antiword/antiword-0.37.bep
+++ b/app-text/antiword/antiword-0.37.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1"
-BUILD {
+BUILD()
+{
 	cd antiword-0.37
 	make --makefile Makefile.haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd antiword-0.37
 	make --makefile Makefile.haiku global_install
 }
diff --git a/app-text/aspell/aspell-0.60.6.bep b/app-text/aspell/aspell-0.60.6.recipe
similarity index 95%
rename from app-text/aspell/aspell-0.60.6.bep
rename to app-text/aspell/aspell-0.60.6.recipe
index 04b35f516..b6c56f112 100644
--- a/app-text/aspell/aspell-0.60.6.bep
+++ b/app-text/aspell/aspell-0.60.6.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="bc80f0198773d5c05086522be67334eb"
-BUILD {
+BUILD()
+{
 	cd aspell-0.60.6
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd aspell-0.60.6
 	make install
 }
diff --git a/app-text/convmv/convmv-1.15.bep b/app-text/convmv/convmv-1.15.recipe
similarity index 95%
rename from app-text/convmv/convmv-1.15.bep
rename to app-text/convmv/convmv-1.15.recipe
index 8846ecc96..2f318f0d0 100644
--- a/app-text/convmv/convmv-1.15.bep
+++ b/app-text/convmv/convmv-1.15.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/perl >= 5.8"
 CHECKSUM_MD5="b1bb703c08c6355868d15890ff193f7d"
-BUILD {
+BUILD()
+{
 	cd convmv-1.15
 	sed -i "s#/usr/bin/perl#`finddir B_COMMON_BIN_DIRECTORY`/perl#" convmv
 	make \
@@ -13,14 +14,16 @@ BUILD {
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }
 
-INSTALL {
+INSTALL()
+{
 	cd convmv-1.15
 	make install \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }
 
-TEST {
+TEST()
+{
 	cd convmv-1.15
 	make test
 }
diff --git a/app-text/discount/discount-2.1.3.bep b/app-text/discount/discount-2.1.3.recipe
similarity index 96%
rename from app-text/discount/discount-2.1.3.bep
rename to app-text/discount/discount-2.1.3.recipe
index 0dbba6cc7..0671c341d 100644
--- a/app-text/discount/discount-2.1.3.bep
+++ b/app-text/discount/discount-2.1.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98"
-BUILD {
+BUILD()
+{
 	cd discount-2.1.3
 	./configure.sh --prefix=$(finddir B_COMMON_DIRECTORY) \
 	--mandir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd discount-2.1.3
 	make install.everything
 }
diff --git a/app-text/dos2unix/dos2unix-1.0.bep b/app-text/dos2unix/dos2unix-1.0.recipe
similarity index 96%
rename from app-text/dos2unix/dos2unix-1.0.bep
rename to app-text/dos2unix/dos2unix-1.0.recipe
index 474299688..dba72d456 100644
--- a/app-text/dos2unix/dos2unix-1.0.bep
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -4,13 +4,15 @@ SRC_URI="svn+http://ports.haiku-files.org/svn/haikuports/trunk/app-text/dos2unix
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd dos2unix-1.0
 	gcc -O -o dos2unix DOS2UNIX.C
 	gcc -O -o unix2dos UNIX2DOS.C
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dos2unix-1.0
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp dos2unix ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dos2unix
diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.bep b/app-text/ebook-tools/ebook-tools-0.2.1.recipe
similarity index 96%
rename from app-text/ebook-tools/ebook-tools-0.2.1.bep
rename to app-text/ebook-tools/ebook-tools-0.2.1.recipe
index b991c058e..bf9675b0f 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.1.bep
+++ b/app-text/ebook-tools/ebook-tools-0.2.1.recipe
@@ -7,14 +7,16 @@ STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="libzip >= 0.10"
 
-BUILD {
+BUILD()
+{
 	cd ebook-tools-0.2.1
 	sed -i 's/-Wmissing-format-attribute//' CMakeLists.txt
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ebook-tools-0.2.1
 	make install
 }
diff --git a/app-text/enchant/enchant-1.6.0.bep b/app-text/enchant/enchant-1.6.0.recipe
similarity index 97%
rename from app-text/enchant/enchant-1.6.0.bep
rename to app-text/enchant/enchant-1.6.0.recipe
index 2a099a927..3c88d288b 100644
--- a/app-text/enchant/enchant-1.6.0.bep
+++ b/app-text/enchant/enchant-1.6.0.recipe
@@ -12,7 +12,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
 
 CHECKSUM_MD5="de11011aff801dc61042828041fb59c7"
 
-BUILD {
+BUILD()
+{
         cd enchant-1.6.0
         cp /boot/common/share/libtool/config/config.* .
         libtoolize --force --copy
@@ -23,7 +24,8 @@ BUILD {
         make
 }
 
-INSTALL {
+INSTALL()
+{
         cd enchant-1.6.0
         make install DESTDIR=${DESTDIR}
 }
diff --git a/app-text/gocr/gocr-0.49.bep b/app-text/gocr/gocr-0.49.recipe
similarity index 96%
rename from app-text/gocr/gocr-0.49.bep
rename to app-text/gocr/gocr-0.49.recipe
index cd25998ec..5b1361012 100644
--- a/app-text/gocr/gocr-0.49.bep
+++ b/app-text/gocr/gocr-0.49.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="4e527bc4bdd97c2be15fdd818857507f"
 
-BUILD {
+BUILD()
+{
 	cd gocr-0.49
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gocr-0.49
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/app-text/gpp/gpp-2.4.bep b/app-text/gpp/gpp-2.4.recipe
similarity index 97%
rename from app-text/gpp/gpp-2.4.bep
rename to app-text/gpp/gpp-2.4.recipe
index 24a5a82b8..0aa221569 100644
--- a/app-text/gpp/gpp-2.4.bep
+++ b/app-text/gpp/gpp-2.4.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6"
-BUILD {
+BUILD()
+{
 	cd gpp-2.24
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gpp-2.24
 	make install
 }
diff --git a/app-text/htmldoc/htmldoc-1.8.27.bep b/app-text/htmldoc/htmldoc-1.8.27.recipe
similarity index 96%
rename from app-text/htmldoc/htmldoc-1.8.27.bep
rename to app-text/htmldoc/htmldoc-1.8.27.recipe
index 617dbd975..0cfc5a444 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.bep
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072"
-BUILD {
+BUILD()
+{
 	cd htmldoc-1.8.27
 	autoconf
 	chmod 755 configure
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd htmldoc-1.8.27
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd htmldoc-1.8.27
 #	make test
 #	make check
diff --git a/app-text/htmltidy/htmltidy-20092812.bep b/app-text/htmltidy/htmltidy-20092812.recipe
similarity index 95%
rename from app-text/htmltidy/htmltidy-20092812.bep
rename to app-text/htmltidy/htmltidy-20092812.recipe
index 567430299..8a584fc01 100644
--- a/app-text/htmltidy/htmltidy-20092812.bep
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -6,11 +6,13 @@ STATUS_HAIKU="stable"
 DEPEND=""
 LICENSE="MIT"
 COPYRIGHT="1998-2008 World Wide Web Consortium"
-BUILD {
+BUILD()
+{
 	cd htmltidy-20092812/build/gmake
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd htmltidy-20092812/build/gmake
 	make installexes installhdrs installib
 }
diff --git a/app-text/hunspell/hunspell-1.3.2.bep b/app-text/hunspell/hunspell-1.3.2.recipe
similarity index 97%
rename from app-text/hunspell/hunspell-1.3.2.bep
rename to app-text/hunspell/hunspell-1.3.2.recipe
index 39cc9e780..a4e26881a 100644
--- a/app-text/hunspell/hunspell-1.3.2.bep
+++ b/app-text/hunspell/hunspell-1.3.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8"
-BUILD {
+BUILD()
+{
 	cd hunspell-1.3.2
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hunspell-1.3.2
 	make install
 }
diff --git a/app-text/libpaper/libpaper-1.1.23.bep b/app-text/libpaper/libpaper-1.1.23.recipe
similarity index 96%
rename from app-text/libpaper/libpaper-1.1.23.bep
rename to app-text/libpaper/libpaper-1.1.23.recipe
index b26f9c558..34eeaa7a3 100644
--- a/app-text/libpaper/libpaper-1.1.23.bep
+++ b/app-text/libpaper/libpaper-1.1.23.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="30e58b56c0b891b89e7d8c287be368b8"
-BUILD {
+BUILD()
+{
 	cd libpaper-1.1.23+nmu2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpaper-1.1.23+nmu2
 	make install
 }
diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.recipe
similarity index 97%
rename from app-text/libpaper/libpaper-1.1.24.bep
rename to app-text/libpaper/libpaper-1.1.24.recipe
index fd1521d8f..86c0d3792 100644
--- a/app-text/libpaper/libpaper-1.1.24.bep
+++ b/app-text/libpaper/libpaper-1.1.24.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834"
-BUILD {
+BUILD()
+{
 	cd libpaper-1.1.24
 	mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpaper-1.1.24
 	make install
 	
diff --git a/app-text/libwpd/libwpd-0.9.6.bep b/app-text/libwpd/libwpd-0.9.6.recipe
similarity index 96%
rename from app-text/libwpd/libwpd-0.9.6.bep
rename to app-text/libwpd/libwpd-0.9.6.recipe
index bc7a7bfbb..9f95286e3 100644
--- a/app-text/libwpd/libwpd-0.9.6.bep
+++ b/app-text/libwpd/libwpd-0.9.6.recipe
@@ -6,7 +6,8 @@ CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c"
 REVISION="1"
 DEPEND="glib >= 2.0.0
 	libgsf >= 1.6.0"
-BUILD {
+BUILD()
+{
 	cd libwpd-0.9.6
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libwpd-0.9.6
 	make install
 }
diff --git a/app-text/libwpg/libwpg-0.2.1.bep b/app-text/libwpg/libwpg-0.2.1.recipe
similarity index 96%
rename from app-text/libwpg/libwpg-0.2.1.bep
rename to app-text/libwpg/libwpg-0.2.1.recipe
index 972a5f7c4..7ff6df5ed 100644
--- a/app-text/libwpg/libwpg-0.2.1.bep
+++ b/app-text/libwpg/libwpg-0.2.1.recipe
@@ -6,7 +6,8 @@ CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6"
 REVISION="1"
 DEPEND="pkg-config >= 0.2
 	libwpd >= 0.8"
-BUILD {
+BUILD()
+{
 	cd libwpg-0.2.1
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd libwpg-0.2.1
 	make install
 }
diff --git a/app-text/psiconv/psiconv-0.9.8.bep b/app-text/psiconv/psiconv-0.9.8.recipe
similarity index 95%
rename from app-text/psiconv/psiconv-0.9.8.bep
rename to app-text/psiconv/psiconv-0.9.8.recipe
index 349302576..02fe07f4a 100644
--- a/app-text/psiconv/psiconv-0.9.8.bep
+++ b/app-text/psiconv/psiconv-0.9.8.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8d7548e3c6b9cd408544736133728acd"
-BUILD {
+BUILD()
+{
 	cd psiconv-0.9.8
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd psiconv-0.9.8
 	make install
 }
diff --git a/app-text/rman/rman-3.2.bep b/app-text/rman/rman-3.2.recipe
similarity index 97%
rename from app-text/rman/rman-3.2.bep
rename to app-text/rman/rman-3.2.recipe
index 5111df686..abbe39f1c 100644
--- a/app-text/rman/rman-3.2.bep
+++ b/app-text/rman/rman-3.2.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
-BUILD {
+BUILD()
+{
 	cd rman-3.2
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
 	make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rman-3.2
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/app-text/sablotron/sablotron-1.0.3.bep b/app-text/sablotron/sablotron-1.0.3.recipe
similarity index 96%
rename from app-text/sablotron/sablotron-1.0.3.bep
rename to app-text/sablotron/sablotron-1.0.3.recipe
index bac92023e..b13e7d4bc 100644
--- a/app-text/sablotron/sablotron-1.0.3.bep
+++ b/app-text/sablotron/sablotron-1.0.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="72654c4b832e7562f8240ea675577f5e"
-BUILD {
+BUILD()
+{
 	cd Sablot-1.0.3
 	touch NEWS
 	touch AUTHORS
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Sablot-1.0.3
 	make install
 }
diff --git a/app-text/tesseract/tesseract-3.x-svn.bep b/app-text/tesseract/tesseract-3.x-svn.recipe
similarity index 94%
rename from app-text/tesseract/tesseract-3.x-svn.bep
rename to app-text/tesseract/tesseract-3.x-svn.recipe
index 3b0cade1c..de89df11c 100644
--- a/app-text/tesseract/tesseract-3.x-svn.bep
+++ b/app-text/tesseract/tesseract-3.x-svn.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 #CHECKSUM_MD5="cc812a261088ea0c3d2da735be35d09f"
-BUILD {
+BUILD()
+{
 	cd tesseract-3.x-svn
 	./runautoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tesseract-3.x-svn	
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd tesseract-ocr-3.x
 #	make test
 #	make check
diff --git a/app-text/texi2html/texi2html-1.82.bep b/app-text/texi2html/texi2html-1.82.recipe
similarity index 94%
rename from app-text/texi2html/texi2html-1.82.bep
rename to app-text/texi2html/texi2html-1.82.recipe
index 4fa7ae502..3aea7ad1f 100644
--- a/app-text/texi2html/texi2html-1.82.bep
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb"
-BUILD {
+BUILD()
+{
 	cd texi2html-1.82
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd texi2html-1.82
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd texi2html-1.82
 	make check
 }
diff --git a/app-text/tree/tree-1.6.0.bep b/app-text/tree/tree-1.6.0.recipe
similarity index 94%
rename from app-text/tree/tree-1.6.0.bep
rename to app-text/tree/tree-1.6.0.recipe
index fc016e3c0..b21079d37 100644
--- a/app-text/tree/tree-1.6.0.bep
+++ b/app-text/tree/tree-1.6.0.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a"
-BUILD {
+BUILD()
+{
 	cd tree-1.6.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tree-1.6.0
 	make install \
 		BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \
 		MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }
 
-TEST {
+TEST()
+{
 	# none
 }
 
diff --git a/dev-cpp/eigen/eigen-3.1.2.bep b/dev-cpp/eigen/eigen-3.1.2.recipe
similarity index 94%
rename from dev-cpp/eigen/eigen-3.1.2.bep
rename to dev-cpp/eigen/eigen-3.1.2.recipe
index 3f4bab9a0..7b554d33e 100644
--- a/dev-cpp/eigen/eigen-3.1.2.bep
+++ b/dev-cpp/eigen/eigen-3.1.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e9c081360dde5e7dcb8eba3c8430fde2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd eigen-eigen-5097c01bcdc4
 	mkdir build
 	cd build
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd eigen-eigen-5097c01bcdc4/build
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd eigen-eigen-5097c01bcdc4/build
 	make check
 }
diff --git a/dev-cpp/glog/glog-0.3.3.bep b/dev-cpp/glog/glog-0.3.3.recipe
similarity index 97%
rename from dev-cpp/glog/glog-0.3.3.bep
rename to dev-cpp/glog/glog-0.3.3.recipe
index 381e22ec0..48d065e92 100644
--- a/dev-cpp/glog/glog-0.3.3.bep
+++ b/dev-cpp/glog/glog-0.3.3.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
-BUILD {
+BUILD()
+{
 	cd glog-0.3.3
 	sed -i 's/docdir = $(prefix)\/share/docdir = \/boot\/common\/documentation/g' Makefile.am
 	libtoolize --force --copy --install
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd glog-0.3.3
 	make install
 }
diff --git a/dev-cpp/mm-common/mm-common-0.9.2.bep b/dev-cpp/mm-common/mm-common-0.9.2.recipe
similarity index 95%
rename from dev-cpp/mm-common/mm-common-0.9.2.bep
rename to dev-cpp/mm-common/mm-common-0.9.2.recipe
index de0845cf9..1c88a8a8f 100644
--- a/dev-cpp/mm-common/mm-common-0.9.2.bep
+++ b/dev-cpp/mm-common/mm-common-0.9.2.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="87dedc889b8d642b616813f23ed8c9f9"
-BUILD {
+BUILD()
+{
 	cd mm-common-0.9.2
 	autoreconf --force --install --verbose
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mm-common-0.9.2
 	make install
 }
diff --git a/dev-cpp/mxml/mxml-2.6.bep b/dev-cpp/mxml/mxml-2.6.recipe
similarity index 96%
rename from dev-cpp/mxml/mxml-2.6.bep
rename to dev-cpp/mxml/mxml-2.6.recipe
index eef7b918a..9370a586d 100644
--- a/dev-cpp/mxml/mxml-2.6.bep
+++ b/dev-cpp/mxml/mxml-2.6.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="68977789ae64985dddbd1a1a1652642e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
         cd mxml-2.6
         ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared
         make
 }
 	
-INSTALL {
+INSTALL()
+{
         cd mxml-2.6
         make install
 }
diff --git a/dev-db/mysql/mysql-5.0.83.bep b/dev-db/mysql/mysql-5.0.83.recipe
similarity index 96%
rename from dev-db/mysql/mysql-5.0.83.bep
rename to dev-db/mysql/mysql-5.0.83.recipe
index 85a0b2dac..628e61b55 100644
--- a/dev-db/mysql/mysql-5.0.83.bep
+++ b/dev-db/mysql/mysql-5.0.83.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="sys-libs/readline >= 5.2"
 
-BUILD {
+BUILD()
+{
 	cd mysql-5.0.83
 	libtoolize --force --install --copy
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mysql-5.0.83
 	make install
 }
diff --git a/dev-db/postgresql/postgresql-9.0.4.bep b/dev-db/postgresql/postgresql-9.0.4.recipe
similarity index 95%
rename from dev-db/postgresql/postgresql-9.0.4.bep
rename to dev-db/postgresql/postgresql-9.0.4.recipe
index dc88cb0b8..baf721faa 100644
--- a/dev-db/postgresql/postgresql-9.0.4.bep
+++ b/dev-db/postgresql/postgresql-9.0.4.recipe
@@ -5,18 +5,21 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-libs/libedit >= 20100424"
 CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29"
-BUILD {
+BUILD()
+{
 	cd postgresql-9.0.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd postgresql-9.0.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd postgresql-9.0.4
 #	make test
 #	make check
diff --git a/dev-db/postgresql/postgresql-9.2.3.bep b/dev-db/postgresql/postgresql-9.2.3.recipe
similarity index 95%
rename from dev-db/postgresql/postgresql-9.2.3.bep
rename to dev-db/postgresql/postgresql-9.2.3.recipe
index 6f12c132d..61dfce44c 100644
--- a/dev-db/postgresql/postgresql-9.2.3.bep
+++ b/dev-db/postgresql/postgresql-9.2.3.recipe
@@ -5,18 +5,21 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-libs/libedit >= 20100424"
 CHECKSUM_MD5="59f42a93695b0186ed5eb03c2653a7d4"
-BUILD {
+BUILD()
+{
 	cd postgresql-9.2.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd postgresql-9.2.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd postgresql-9.2.3
 #	make test
 #	make check
diff --git a/dev-db/redis/redis-2.2.11.bep b/dev-db/redis/redis-2.2.11.recipe
similarity index 96%
rename from dev-db/redis/redis-2.2.11.bep
rename to dev-db/redis/redis-2.2.11.recipe
index 86f637606..65e74444d 100644
--- a/dev-db/redis/redis-2.2.11.bep
+++ b/dev-db/redis/redis-2.2.11.recipe
@@ -6,12 +6,14 @@ DEPEND=""
 CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619"
 STATUS_HAIKU="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd redis-2.2.11
 	make PREFIX=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd redis-2.2.11
 	make install PREFIX=`finddir B_COMMON_DIRECTORY`
 }
diff --git a/dev-db/redis/redis-2.9.0-git.bep b/dev-db/redis/redis-2.9.0-git.recipe
similarity index 96%
rename from dev-db/redis/redis-2.9.0-git.bep
rename to dev-db/redis/redis-2.9.0-git.recipe
index c4b1ac78a..e6d5a43be 100644
--- a/dev-db/redis/redis-2.9.0-git.bep
+++ b/dev-db/redis/redis-2.9.0-git.recipe
@@ -6,12 +6,14 @@ DEPEND=""
 STATUS_HAIKU="stable"
 # CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd redis-2.9.0-git
 	make PREFIX=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd redis-2.9.0-git
 	make install PREFIX=`finddir B_COMMON_DIRECTORY`
 }
diff --git a/dev-db/sqlite/sqlite-3.6.22.bep b/dev-db/sqlite/sqlite-3.6.22.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.6.22.bep
rename to dev-db/sqlite/sqlite-3.6.22.recipe
index 5095f9226..5d8723bac 100644
--- a/dev-db/sqlite/sqlite-3.6.22.bep
+++ b/dev-db/sqlite/sqlite-3.6.22.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="b683b3903e79ab8a6d928dc9d4a56937"
-BUILD {
+BUILD()
+{
 	cd sqlite-3.6.22
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-3.6.22
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.6.23.bep b/dev-db/sqlite/sqlite-3.6.23.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.6.23.bep
rename to dev-db/sqlite/sqlite-3.6.23.recipe
index 407412de8..ba681fb39 100644
--- a/dev-db/sqlite/sqlite-3.6.23.bep
+++ b/dev-db/sqlite/sqlite-3.6.23.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8f1e86b3909a27f8122b0981afd16fcd"
-BUILD {
+BUILD()
+{
 	cd sqlite-3.6.23
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-3.6.23
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.13.bep b/dev-db/sqlite/sqlite-3.7.13.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.13.bep
rename to dev-db/sqlite/sqlite-3.7.13.recipe
index f7a717d95..8ce7af2d0 100644
--- a/dev-db/sqlite/sqlite-3.7.13.bep
+++ b/dev-db/sqlite/sqlite-3.7.13.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e"
-BUILD {
+BUILD()
+{
 	cd sqlite-autoconf-3071300
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-autoconf-3071300
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.15.1.bep b/dev-db/sqlite/sqlite-3.7.15.1.recipe
similarity index 97%
rename from dev-db/sqlite/sqlite-3.7.15.1.bep
rename to dev-db/sqlite/sqlite-3.7.15.1.recipe
index b8c740e4f..5d30c8b64 100644
--- a/dev-db/sqlite/sqlite-3.7.15.1.bep
+++ b/dev-db/sqlite/sqlite-3.7.15.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="a67c25afa199a11f0a37aff7ed9d2c14"
-BUILD {
+BUILD()
+{
         cd sqlite-autoconf-3071501
         libtoolize --force --copy --install
         aclocal
@@ -17,7 +18,8 @@ BUILD {
         make
 }
 
-INSTALL {
+INSTALL()
+{
         cd sqlite-autoconf-3071501
         make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.2.bep b/dev-db/sqlite/sqlite-3.7.2.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.2.bep
rename to dev-db/sqlite/sqlite-3.7.2.recipe
index 9741f2403..482c5f9bb 100644
--- a/dev-db/sqlite/sqlite-3.7.2.bep
+++ b/dev-db/sqlite/sqlite-3.7.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="bd9586208f48ba840467bcfd066a6fa9"
-BUILD {
+BUILD()
+{
 	cd sqlite-3.7.2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-3.7.2
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.3.bep b/dev-db/sqlite/sqlite-3.7.3.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.3.bep
rename to dev-db/sqlite/sqlite-3.7.3.recipe
index 77252fc92..6e459ad97 100644
--- a/dev-db/sqlite/sqlite-3.7.3.bep
+++ b/dev-db/sqlite/sqlite-3.7.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="74fe78b264f1c434c4b159d45b78e9b7"
-BUILD {
+BUILD()
+{
 	cd sqlite-3.7.3
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-3.7.3
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.4.bep b/dev-db/sqlite/sqlite-3.7.4.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.4.bep
rename to dev-db/sqlite/sqlite-3.7.4.recipe
index 81686d062..490127749 100644
--- a/dev-db/sqlite/sqlite-3.7.4.bep
+++ b/dev-db/sqlite/sqlite-3.7.4.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8f0c690bfb33c3cbbc2471c3d9ba0158"
-BUILD {
+BUILD()
+{
 	cd sqlite-autoconf-3070400
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-autoconf-3070400
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.5.bep b/dev-db/sqlite/sqlite-3.7.5.recipe
similarity index 97%
rename from dev-db/sqlite/sqlite-3.7.5.bep
rename to dev-db/sqlite/sqlite-3.7.5.recipe
index 6cc0b64c7..ba99e8c15 100644
--- a/dev-db/sqlite/sqlite-3.7.5.bep
+++ b/dev-db/sqlite/sqlite-3.7.5.recipe
@@ -22,7 +22,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="sqlite-autoconf-3070500"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
@@ -31,7 +32,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/dev-db/sqlite/sqlite-3.7.6.2.bep b/dev-db/sqlite/sqlite-3.7.6.2.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.6.2.bep
rename to dev-db/sqlite/sqlite-3.7.6.2.recipe
index 55cf7dd3c..24337da57 100644
--- a/dev-db/sqlite/sqlite-3.7.6.2.bep
+++ b/dev-db/sqlite/sqlite-3.7.6.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f"
-BUILD {
+BUILD()
+{
 	cd sqlite-autoconf-3070602
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-autoconf-3070602
 	make install
 }
diff --git a/dev-db/sqlite/sqlite-3.7.7.1.bep b/dev-db/sqlite/sqlite-3.7.7.1.recipe
similarity index 96%
rename from dev-db/sqlite/sqlite-3.7.7.1.bep
rename to dev-db/sqlite/sqlite-3.7.7.1.recipe
index a46b764d7..a5cfdc082 100644
--- a/dev-db/sqlite/sqlite-3.7.7.1.bep
+++ b/dev-db/sqlite/sqlite-3.7.7.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419"
-BUILD {
+BUILD()
+{
 	cd sqlite-autoconf-3070701
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sqlite-autoconf-3070701
 	make install
 }
diff --git a/dev-dotnet/pnet/pnet-0.8.0.bep b/dev-dotnet/pnet/pnet-0.8.0.recipe
similarity index 95%
rename from dev-dotnet/pnet/pnet-0.8.0.bep
rename to dev-dotnet/pnet/pnet-0.8.0.recipe
index 1c6acc7d7..0f5f62432 100644
--- a/dev-dotnet/pnet/pnet-0.8.0.bep
+++ b/dev-dotnet/pnet/pnet-0.8.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-util/treecc"
 CHECKSUM_MD5="84cb3612d7175bd9e476c88e66fe19f9"
-BUILD {
+BUILD()
+{
 	cd pnet-0.8.0
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pnet-0.8.0
 	make install
 }
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe
similarity index 95%
rename from dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep
rename to dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe
index 5f038a90f..ef0172941 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe
@@ -4,13 +4,15 @@ SRC_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2"
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd u-boot-2012.10
 	mv include/image.h include/uimage.h
 	make tools
 }
 
-INSTALL {
+INSTALL()
+{
 	cd u-boot-2012.10
 	cp -r /tools/mkimage /boot/common/bin/
 	cp -r /tools/mkenvimage /boot/common/bin/
diff --git a/dev-games/box2d/box2d-2.1.2.bep b/dev-games/box2d/box2d-2.1.2.recipe
similarity index 95%
rename from dev-games/box2d/box2d-2.1.2.bep
rename to dev-games/box2d/box2d-2.1.2.recipe
index 19d75a42e..3740e7c64 100644
--- a/dev-games/box2d/box2d-2.1.2.bep
+++ b/dev-games/box2d/box2d-2.1.2.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="59d142cd8d4d73e8832c7b67591f590c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd Box2D_v2.1.2/Box2D
 	cmake . -DOPENGL_INCLUDE_DIR:=/boot/develop/headers/os/opengl/GL \
 		-DHAIKU:=TRUE
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd Box2D_v2.1.2/Box2D
 	make install
 }
diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.recipe
similarity index 96%
rename from dev-games/flatzebra/flatzebra-0.1.3.bep
rename to dev-games/flatzebra/flatzebra-0.1.3.recipe
index d65b12935..807077409 100644
--- a/dev-games/flatzebra/flatzebra-0.1.3.bep
+++ b/dev-games/flatzebra/flatzebra-0.1.3.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.4
 	media-libs/libsdl_image >= 1.2.2
 	media-libs/libsdl_mixer >= 1.2.4"
-BUILD {
+BUILD()
+{
         cd flatzebra-0.1.3
 		libtoolize --force --copy --install
 		aclocal -I macros
@@ -17,7 +18,8 @@ BUILD {
         make
 }
 	
-INSTALL {
+INSTALL()
+{
         cd flatzebra-0.1.3
         make install
 }
diff --git a/dev-games/libggz/libggz-0.99.5.bep b/dev-games/libggz/libggz-0.99.5.recipe
similarity index 96%
rename from dev-games/libggz/libggz-0.99.5.bep
rename to dev-games/libggz/libggz-0.99.5.recipe
index 894a5bb2f..bd526ab24 100644
--- a/dev-games/libggz/libggz-0.99.5.bep
+++ b/dev-games/libggz/libggz-0.99.5.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-util/pkgconfig >= 0.23"
 
-BUILD {
+BUILD()
+{
 	cd ggz-base-libs-snapshot-0.99.5
 	libtoolize -fci
 	aclocal -I m4 -I m4/ggz
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ggz-base-libs-snapshot-0.99.5
 	make install
 }
diff --git a/dev-games/ode/ode-0.12.bep b/dev-games/ode/ode-0.12.recipe
similarity index 96%
rename from dev-games/ode/ode-0.12.bep
rename to dev-games/ode/ode-0.12.recipe
index b6209a625..06df78601 100644
--- a/dev-games/ode/ode-0.12.bep
+++ b/dev-games/ode/ode-0.12.recipe
@@ -6,12 +6,14 @@ COPYRIGHT="2001-2004 Russell L. Smith"
 LICENSE="GNU LGPL v3
 	BSD (3-clause)"
 CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
-BUILD {
+BUILD()
+{
 	cd ode-0.12
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd ode-0.12
 	make install
 }
diff --git a/dev-games/physfs/physfs-2.0.1.bep b/dev-games/physfs/physfs-2.0.1.recipe
similarity index 97%
rename from dev-games/physfs/physfs-2.0.1.bep
rename to dev-games/physfs/physfs-2.0.1.recipe
index dfc030b5a..6ca2c54d8 100644
--- a/dev-games/physfs/physfs-2.0.1.bep
+++ b/dev-games/physfs/physfs-2.0.1.recipe
@@ -7,13 +7,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	dev-util/mercurial >= 1.4"
-BUILD {
+BUILD()
+{
 	cd physfs-2.0.1
 	cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd physfs-2.0.1
 	make install
 	if [ -n "$(setgcc | grep '4')" ]; then
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.bep b/dev-java/gnu-classpath/gnu-classpath-0.98.recipe
similarity index 97%
rename from dev-java/gnu-classpath/gnu-classpath-0.98.bep
rename to dev-java/gnu-classpath/gnu-classpath-0.98.recipe
index 5c3ae52ea..56d07ee1d 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98.bep
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9"
-BUILD {
+BUILD()
+{
 	cd classpath-0.98
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -23,12 +24,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd classpath-0.98
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd classpath-0.98
 #	make test
 #	make check
diff --git a/dev-java/jamvm/jamvm-1.5.4.bep b/dev-java/jamvm/jamvm-1.5.4.recipe
similarity index 96%
rename from dev-java/jamvm/jamvm-1.5.4.bep
rename to dev-java/jamvm/jamvm-1.5.4.recipe
index 056ddf8a3..771a21d35 100644
--- a/dev-java/jamvm/jamvm-1.5.4.bep
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -7,7 +7,8 @@ DEPEND=""
 CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
-BUILD {
+BUILD()
+{
 	cd jamvm-1.5.4
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jamvm-1.5.4
 	make install
 }
diff --git a/dev-lang/camlp5/camlp5-6.06.bep b/dev-lang/camlp5/camlp5-6.06.recipe
similarity index 97%
rename from dev-lang/camlp5/camlp5-6.06.bep
rename to dev-lang/camlp5/camlp5-6.06.recipe
index ec5a58d26..088012815 100644
--- a/dev-lang/camlp5/camlp5-6.06.bep
+++ b/dev-lang/camlp5/camlp5-6.06.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8de69094d73d24768844a5017a2bd04b"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="ocaml"
-BUILD {
+BUILD()
+{
 	cd camlp5-6.06
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --strict --prefix `finddir B_COMMON_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make world.opt 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd camlp5-6.06
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \
diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.bep b/dev-lang/dmd-bin/dmd-bin-1.064.recipe
similarity index 96%
rename from dev-lang/dmd-bin/dmd-bin-1.064.bep
rename to dev-lang/dmd-bin/dmd-bin-1.064.recipe
index f24e02ef8..7a024771d 100644
--- a/dev-lang/dmd-bin/dmd-bin-1.064.bep
+++ b/dev-lang/dmd-bin/dmd-bin-1.064.recipe
@@ -6,13 +6,15 @@ CHECKSUM_MD5="3d73758a7006397c2e66021532e2ff73"
 MESSAGE="This port only builds with gcc4.  Use 'setgcc gcc4' before building."
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ./dmd/src/dmd
 	make -f haiku.mak
 	strip dmd
 }
 
-INSTALL {
+INSTALL()
+{
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp dmd/src/dmd/dmd ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dmd
 	
diff --git a/dev-lang/erlang/erlang-R14B.bep b/dev-lang/erlang/erlang-R14B.recipe
similarity index 99%
rename from dev-lang/erlang/erlang-R14B.bep
rename to dev-lang/erlang/erlang-R14B.recipe
index ac71683aa..0865f3e9c 100644
--- a/dev-lang/erlang/erlang-R14B.bep
+++ b/dev-lang/erlang/erlang-R14B.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="5292a04556d17ad528d570e02357dfbb"
-BUILD {
+BUILD()
+{
 	cd otp_src_R14B
 	mkdir -p m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in"
@@ -50,7 +51,8 @@ BUILD {
 	make -s
 }
 
-INSTALL {
+INSTALL()
+{
 	cd otp_src_R14B
 	make -s install
 }
diff --git a/dev-lang/fpc/fpc-2.4.0.bep b/dev-lang/fpc/fpc-2.4.0.recipe
similarity index 93%
rename from dev-lang/fpc/fpc-2.4.0.bep
rename to dev-lang/fpc/fpc-2.4.0.recipe
index 87b1b7a36..ec36300e6 100644
--- a/dev-lang/fpc/fpc-2.4.0.bep
+++ b/dev-lang/fpc/fpc-2.4.0.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd fpc-2.4.0
 	make
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fpc-2.4.0
 	make install
 	
diff --git a/dev-lang/fpc/fpc-2.6.0.bep b/dev-lang/fpc/fpc-2.6.0.recipe
similarity index 97%
rename from dev-lang/fpc/fpc-2.6.0.bep
rename to dev-lang/fpc/fpc-2.6.0.recipe
index 6ef4f70bc..137083d32 100644
--- a/dev-lang/fpc/fpc-2.6.0.bep
+++ b/dev-lang/fpc/fpc-2.6.0.recipe
@@ -14,12 +14,14 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-lang/fpc"
 
-BUILD {
+BUILD()
+{
 	cd fpc-2.6.0
 	make build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fpc-2.6.0
 	make install INSTALL_PREFIX=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY` \
 		     FPCDIR=${DESTDIR}`finddir B_USER_LIB_DIRECTORY`/fpc/2.6.0
@@ -28,7 +30,8 @@ INSTALL {
 		${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin
 }
 
-TEST {
+TEST()
+{
 	cd fpc-2.6.0/tests
 	make full TEST_FPC=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin/fpc
 }
diff --git a/dev-lang/lua/lua-5.1.4.bep b/dev-lang/lua/lua-5.1.4-3.recipe
similarity index 96%
rename from dev-lang/lua/lua-5.1.4.bep
rename to dev-lang/lua/lua-5.1.4-3.recipe
index 525e47545..1ac5dddbe 100644
--- a/dev-lang/lua/lua-5.1.4.bep
+++ b/dev-lang/lua/lua-5.1.4-3.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
 REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.25"
-BUILD {
+BUILD()
+{
 	cd lua-5.1.4
 	make haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lua-5.1.4
 	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
 		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
diff --git a/dev-lang/lua/lua-5.1.4-3.bep b/dev-lang/lua/lua-5.1.4.recipe
similarity index 96%
rename from dev-lang/lua/lua-5.1.4-3.bep
rename to dev-lang/lua/lua-5.1.4.recipe
index 525e47545..1ac5dddbe 100644
--- a/dev-lang/lua/lua-5.1.4-3.bep
+++ b/dev-lang/lua/lua-5.1.4.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
 REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.25"
-BUILD {
+BUILD()
+{
 	cd lua-5.1.4
 	make haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lua-5.1.4
 	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
 		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
diff --git a/dev-lang/lua/lua-5.2.1.bep b/dev-lang/lua/lua-5.2.1.recipe
similarity index 95%
rename from dev-lang/lua/lua-5.2.1.bep
rename to dev-lang/lua/lua-5.2.1.recipe
index 6e4dd9fcf..e2c970227 100644
--- a/dev-lang/lua/lua-5.2.1.bep
+++ b/dev-lang/lua/lua-5.2.1.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz"
 CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3"
 REVISION="3"
 STATUS_HAIKU="stable"
-BUILD {
+BUILD()
+{
 	cd lua-5.2.1
 	make haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lua-5.2.1
 	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
 		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
diff --git a/dev-lang/nasm/nasm-2.08.01.bep b/dev-lang/nasm/nasm-2.08.01.recipe
similarity index 95%
rename from dev-lang/nasm/nasm-2.08.01.bep
rename to dev-lang/nasm/nasm-2.08.01.recipe
index f1c59328d..b4264decb 100644
--- a/dev-lang/nasm/nasm-2.08.01.bep
+++ b/dev-lang/nasm/nasm-2.08.01.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd nasm-2.08.01
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nasm-2.08.01
 	make install INSTALLROOT=${DESTDIR}
 }
diff --git a/dev-lang/ocaml/ocaml-4.00.0.bep b/dev-lang/ocaml/ocaml-4.00.0.recipe
similarity index 97%
rename from dev-lang/ocaml/ocaml-4.00.0.bep
rename to dev-lang/ocaml/ocaml-4.00.0.recipe
index 5e462e5d4..98e48d772 100644
--- a/dev-lang/ocaml/ocaml-4.00.0.bep
+++ b/dev-lang/ocaml/ocaml-4.00.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fa11560a45793bd9fa45c1295a6f4a91"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ocaml-4.00.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix `finddir B_COMMON_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make world.opt 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ocaml-4.00.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \
diff --git a/dev-lang/openjdk/openjdk-1.7.bep b/dev-lang/openjdk/openjdk-1.7.recipe
similarity index 98%
rename from dev-lang/openjdk/openjdk-1.7.bep
rename to dev-lang/openjdk/openjdk-1.7.recipe
index da068202f..7ce9e461c 100644
--- a/dev-lang/openjdk/openjdk-1.7.bep
+++ b/dev-lang/openjdk/openjdk-1.7.recipe
@@ -8,7 +8,8 @@ DEPEND="app-arch/cpio 	>= 2.10
 
 CHECKSUM_MD5="28b8630373769e1e897a75bf81f2e1eb"
 
-BUILD {
+BUILD()
+{
 	OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work
 
 	# Get and build Apache Ant.
@@ -86,12 +87,14 @@ BUILD {
 #	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	export DESTDIR=`finddir B_COMMON_DIRECTORY`
 	cp -r -f -v output ${DESTDIR}/jdk
 }
 
-TEST {
+TEST()
+{
 	echo "OpenJDK tests are not yet ported to Haiku."
 }
 
diff --git a/dev-lang/orc/orc-0.4.16.bep b/dev-lang/orc/orc-0.4.16.recipe
similarity index 96%
rename from dev-lang/orc/orc-0.4.16.bep
rename to dev-lang/orc/orc-0.4.16.recipe
index d86af92c5..e7fa5a9b5 100644
--- a/dev-lang/orc/orc-0.4.16.bep
+++ b/dev-lang/orc/orc-0.4.16.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e482932e544c847761449b106ecbc483"
-BUILD {
+BUILD()
+{
 	cd orc-0.4.16
 	autoconf
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd orc-0.4.16
 	make install
 }
diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.recipe
similarity index 98%
rename from dev-lang/perl/perl-5.10.1.bep
rename to dev-lang/perl/perl-5.10.1.recipe
index 4101df1ef..6896166aa 100644
--- a/dev-lang/perl/perl-5.10.1.bep
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -17,7 +17,8 @@ CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	./Configure \
 		-Dprefix=$prefix \
 		-Dprivlib=$prefix/lib/perl5/core_perl/$portVersion \
@@ -41,7 +42,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	perlArch=BePC-haiku
 	make install
 	cd "$binDir"
diff --git a/dev-lang/php/php-5.3.4.bep b/dev-lang/php/php-5.3.4.recipe
similarity index 95%
rename from dev-lang/php/php-5.3.4.bep
rename to dev-lang/php/php-5.3.4.recipe
index f2331a1d4..794224740 100644
--- a/dev-lang/php/php-5.3.4.bep
+++ b/dev-lang/php/php-5.3.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="2c069d8f690933e3bf6a8741ed818150"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-libs/libpcre >= 8.00"
-BUILD {
+BUILD()
+{
 	cd php-5.3.4
 	cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4
 	autoreconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd php-5.3.4
 	make install
 }
diff --git a/dev-lang/php/php-5.3.5.bep b/dev-lang/php/php-5.3.5.recipe
similarity index 97%
rename from dev-lang/php/php-5.3.5.bep
rename to dev-lang/php/php-5.3.5.recipe
index e3bdf018a..03db2e432 100644
--- a/dev-lang/php/php-5.3.5.bep
+++ b/dev-lang/php/php-5.3.5.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.00
 	"
-BUILD {
+BUILD()
+{
 	cd php-5.3.5
 	libtoolize --force --copy --install
 	aclocal
@@ -40,12 +41,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd php-5.3.5
 	make install INSTALL_ROOT=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd php-5.3.5
 	make test
 }
diff --git a/dev-lang/python/python-2.5.4.bep b/dev-lang/python/python-2.5.4.recipe
similarity index 96%
rename from dev-lang/python/python-2.5.4.bep
rename to dev-lang/python/python-2.5.4.recipe
index 90c98e358..88d459fbb 100644
--- a/dev-lang/python/python-2.5.4.bep
+++ b/dev-lang/python/python-2.5.4.recipe
@@ -7,7 +7,8 @@ CHECKSUM_MD5="ad47b23778f64edadaaa8b5534986eed"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd Python-2.5.4/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.5.4
 	make install
 }
diff --git a/dev-lang/python/python-2.6.4.bep b/dev-lang/python/python-2.6.4.recipe
similarity index 96%
rename from dev-lang/python/python-2.6.4.bep
rename to dev-lang/python/python-2.6.4.recipe
index b372618e3..bdb1c1e2e 100644
--- a/dev-lang/python/python-2.6.4.bep
+++ b/dev-lang/python/python-2.6.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="17dcac33e4f3adb69a57c2607b6de246"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd Python-2.6.4/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.6.4
 	make install
 }
diff --git a/dev-lang/python/python-2.6.5.bep b/dev-lang/python/python-2.6.5.recipe
similarity index 97%
rename from dev-lang/python/python-2.6.5.bep
rename to dev-lang/python/python-2.6.5.recipe
index b1b1afb6d..ee375a445 100644
--- a/dev-lang/python/python-2.6.5.bep
+++ b/dev-lang/python/python-2.6.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="cd04b5b9383b6c1fccdaa991af762cf4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd Python-2.6.5/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.6.5
 	make install
 }
diff --git a/dev-lang/python/python-2.6.6.bep b/dev-lang/python/python-2.6.6.recipe
similarity index 96%
rename from dev-lang/python/python-2.6.6.bep
rename to dev-lang/python/python-2.6.6.recipe
index 172740f87..cdc28008f 100644
--- a/dev-lang/python/python-2.6.6.bep
+++ b/dev-lang/python/python-2.6.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/readline >= 6.0"
-BUILD {
+BUILD()
+{
 	cd Python-2.6.6/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.6.6
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd Python-2.6.6
 	cd Lib/test
 	rm test_asynchat.py  # this one stalls, so skip it for now
diff --git a/dev-lang/python/python-2.6.7.bep b/dev-lang/python/python-2.6.7.recipe
similarity index 96%
rename from dev-lang/python/python-2.6.7.bep
rename to dev-lang/python/python-2.6.7.recipe
index f4bca719a..af4de579a 100644
--- a/dev-lang/python/python-2.6.7.bep
+++ b/dev-lang/python/python-2.6.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/readline >= 6.0"
-BUILD {
+BUILD()
+{
 	cd Python-2.6.7/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.6.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd Python-2.6.7
 	cd Lib/test
 	rm test_asynchat.py  # this one stalls, so skip it for now
diff --git a/dev-lang/python/python-2.6.8.bep b/dev-lang/python/python-2.6.8.recipe
similarity index 96%
rename from dev-lang/python/python-2.6.8.bep
rename to dev-lang/python/python-2.6.8.recipe
index 8fe22dd32..159516b43 100644
--- a/dev-lang/python/python-2.6.8.bep
+++ b/dev-lang/python/python-2.6.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/readline >= 6.0"
-BUILD {
+BUILD()
+{
 	cd Python-2.6.8/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.6.8
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd Python-2.6.8
 	cd Lib/test
 	rm test_asynchat.py  # this one stalls, so skip it for now
diff --git a/dev-lang/python/python-2.7.1.bep b/dev-lang/python/python-2.7.1.recipe
similarity index 96%
rename from dev-lang/python/python-2.7.1.bep
rename to dev-lang/python/python-2.7.1.recipe
index 264f79473..a9294c883 100644
--- a/dev-lang/python/python-2.7.1.bep
+++ b/dev-lang/python/python-2.7.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="aa27bc25725137ba155910bd8e5ddc4f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/readline >= 6.0"
-BUILD {
+BUILD()
+{
 	cd Python-2.7.1/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-2.7.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd Python-2.7.1
 	cd Lib/test
 	rm test_asynchat.py  # this one stalls, so skip it for now
diff --git a/dev-lang/python/python-3.2.bep b/dev-lang/python/python-3.2.recipe
similarity index 97%
rename from dev-lang/python/python-3.2.bep
rename to dev-lang/python/python-3.2.recipe
index fe7bb3ef1..25d290522 100644
--- a/dev-lang/python/python-3.2.bep
+++ b/dev-lang/python/python-3.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="92e94b5b6652b96349d6362b8337811d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/readline >= 6.0"
-BUILD {
+BUILD()
+{
 	cd Python-3.2/Modules/_ctypes/libffi
 	libtoolize --force --copy --install
 	cd ../../..
@@ -21,12 +22,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Python-3.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd Python-3.2
 	cd Lib/test
 	rm test_asynchat.py  # this one stalls, so skip it for now
diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.bep b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
similarity index 96%
rename from dev-lang/rebol/rebol-2.101.0.5.75.bep
rename to dev-lang/rebol/rebol-2.101.0.5.75.recipe
index 135c0d76a..5c5046485 100644
--- a/dev-lang/rebol/rebol-2.101.0.5.75.bep
+++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd r3-master/make
 	wget http://metaeducation.com/media/shared/haiku/r3-make.zip
 	unzip r3-make.zip
@@ -15,13 +16,15 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd r3-master/make
 	mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`
 	install -m 0755 r3 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`/rebol
 }
 
-TEST {
+TEST()
+{
 	mkdir -p tests
 	cd tests
 	wget -N https://github.com/rebolsource/rebol-test/archive/master.zip
diff --git a/dev-lang/ruby/ruby-1.9.1.bep b/dev-lang/ruby/ruby-1.9.1.recipe
similarity index 96%
rename from dev-lang/ruby/ruby-1.9.1.bep
rename to dev-lang/ruby/ruby-1.9.1.recipe
index c8f874a77..34f62b0c2 100644
--- a/dev-lang/ruby/ruby-1.9.1.bep
+++ b/dev-lang/ruby/ruby-1.9.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libedit >= 20100424"
-BUILD {
+BUILD()
+{
 	cd ruby-1.9.1-p243
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ruby-1.9.1-p243
 	make install
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep b/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe
similarity index 95%
rename from dev-lang/swi-prolog/swi-prolog-6.0.2.bep
rename to dev-lang/swi-prolog/swi-prolog-6.0.2.recipe
index 5e8b7c7e2..4ab667dac 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep
+++ b/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/gmp >= 5.0.5
 		sys-libs/readline >= 6.2"
-BUILD {
+BUILD()
+{
 		cd pl-6.0.2/src
 		libtoolize -fci
 		autoreconf
@@ -14,12 +15,14 @@ BUILD {
 		make
 }
 
-INSTALL {
+INSTALL()
+{
 		cd pl-6.0.2/src
 		make install
 }
 
-TEST {
+TEST()
+{
 		cd pl-6.0.2/src
 		make check
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep b/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe
similarity index 95%
rename from dev-lang/swi-prolog/swi-prolog-6.2.0.bep
rename to dev-lang/swi-prolog/swi-prolog-6.2.0.recipe
index af37884a6..d88c003b4 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/gmp >= 5.0.5
 		sys-libs/readline >= 6.2"
-BUILD {
+BUILD()
+{
 		cd pl-6.2.0/src
 		libtoolize -fci
 		autoreconf
@@ -14,12 +15,14 @@ BUILD {
 		make
 }
 
-INSTALL {
+INSTALL()
+{
 		cd pl-6.2.0/src
 		make install
 }
 
-TEST {
+TEST()
+{
 		cd pl-6.2.0/src
 		make check
 }
diff --git a/dev-lang/swig/swig-1.3.40.bep b/dev-lang/swig/swig-1.3.40.recipe
similarity index 96%
rename from dev-lang/swig/swig-1.3.40.bep
rename to dev-lang/swig/swig-1.3.40.recipe
index 2239e2fdb..072de4125 100644
--- a/dev-lang/swig/swig-1.3.40.bep
+++ b/dev-lang/swig/swig-1.3.40.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="2df766c9e03e02811b1ab4bba1c7b9cc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd swig-1.3.40
 	libtoolize -fci
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd swig-1.3.40
 	make install
 }
diff --git a/dev-lang/swig/swig-2.0.2.bep b/dev-lang/swig/swig-2.0.2.recipe
similarity index 96%
rename from dev-lang/swig/swig-2.0.2.bep
rename to dev-lang/swig/swig-2.0.2.recipe
index df8d4a24e..18dd1aaae 100644
--- a/dev-lang/swig/swig-2.0.2.bep
+++ b/dev-lang/swig/swig-2.0.2.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="eaf619a4169886923e5f828349504a29"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd swig-2.0.2
 	libtoolize -fci
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd swig-2.0.2
 	make install
 }
diff --git a/dev-lang/tcl/tcl-8.5.9.bep b/dev-lang/tcl/tcl-8.5.9.recipe
similarity index 95%
rename from dev-lang/tcl/tcl-8.5.9.bep
rename to dev-lang/tcl/tcl-8.5.9.recipe
index a95b225d0..9e424aa9b 100644
--- a/dev-lang/tcl/tcl-8.5.9.bep
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8512d8db3233041dd68a81476906012a"
-BUILD {
+BUILD()
+{
 	cd tcl8.5.9/unix
 	autoconf -f
 	./configure --prefix=$(finddir B_COMMON_DIRECTORY) \
@@ -13,13 +14,15 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tcl8.5.9/unix
 	make install
 	ln -s tclsh8.5 "$(finddir B_COMMON_BIN_DIRECTORY)/tclsh"
 }
 
-TEST {
+TEST()
+{
 	cd tcl8.5.9/unix
 	make test
 }
diff --git a/dev-lang/v8/v8-r13067.bep b/dev-lang/v8/v8-r13067.recipe
similarity index 97%
rename from dev-lang/v8/v8-r13067.bep
rename to dev-lang/v8/v8-r13067.recipe
index 39ac947e2..de190c951 100644
--- a/dev-lang/v8/v8-r13067.bep
+++ b/dev-lang/v8/v8-r13067.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="unstable"
 DEPEND=""
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	gyp_patch_path=$(dirname ${PWD})/patches/gyp-r1501.patch
 	cd v8-r13067
 	cd build
@@ -17,12 +18,14 @@ BUILD {
 	make library=shared ia32.debug
 }
 
-TEST {
+TEST()
+{
 	cd v8-r13067
 	make ia32.debug.check
 }
 
-INSTALL {
+INSTALL()
+{
 	cd v8-r13067
 	includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY`/v8
 	mkdir -p ${includedir}
diff --git a/dev-lang/yasm/yasm-1.1.0.bep b/dev-lang/yasm/yasm-1.1.0.recipe
similarity index 96%
rename from dev-lang/yasm/yasm-1.1.0.bep
rename to dev-lang/yasm/yasm-1.1.0.recipe
index d808cf8c5..08112aced 100644
--- a/dev-lang/yasm/yasm-1.1.0.bep
+++ b/dev-lang/yasm/yasm-1.1.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd yasm-1.1.0
 	libtoolize --force --copy --install
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd yasm-1.1.0
 	make install
 }
diff --git a/dev-lang/yasm/yasm-1.2.0.bep b/dev-lang/yasm/yasm-1.2.0.recipe
similarity index 96%
rename from dev-lang/yasm/yasm-1.2.0.bep
rename to dev-lang/yasm/yasm-1.2.0.recipe
index 4e556013f..cf851af25 100644
--- a/dev-lang/yasm/yasm-1.2.0.bep
+++ b/dev-lang/yasm/yasm-1.2.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd yasm-1.2.0
 	libtoolize --force --copy --install
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd yasm-1.2.0
 	make install
 }
diff --git a/dev-libs/apr-util/apr-util-1.3.10.bep b/dev-libs/apr-util/apr-util-1.3.10.recipe
similarity index 98%
rename from dev-libs/apr-util/apr-util-1.3.10.bep
rename to dev-libs/apr-util/apr-util-1.3.10.recipe
index 810b4cb48..1ee3e329a 100644
--- a/dev-libs/apr-util/apr-util-1.3.10.bep
+++ b/dev-libs/apr-util/apr-util-1.3.10.recipe
@@ -26,7 +26,8 @@ SOURCE_DIR="$portVersionedName"
 # TODO: The hard-coded reference to the apr work directory isn't good at all.
 # We should declare a build dependency on the APR sources instead.
 
-BUILD {
+BUILD()
+{
 	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
 	aprInstallDir=$aprUtilPackageLinksDir/apr
 
@@ -58,7 +59,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/dev-libs/apr-util/apr-util-1.3.11.bep b/dev-libs/apr-util/apr-util-1.3.11.recipe
similarity index 98%
rename from dev-libs/apr-util/apr-util-1.3.11.bep
rename to dev-libs/apr-util/apr-util-1.3.11.recipe
index 0c3e85385..8427643e5 100644
--- a/dev-libs/apr-util/apr-util-1.3.11.bep
+++ b/dev-libs/apr-util/apr-util-1.3.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.3.9"
-BUILD {
+BUILD()
+{
 	cd apr-util-1.3.11
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -40,7 +41,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-util-1.3.11
 	make install
 }
diff --git a/dev-libs/apr-util/apr-util-1.3.12.bep b/dev-libs/apr-util/apr-util-1.3.12.recipe
similarity index 98%
rename from dev-libs/apr-util/apr-util-1.3.12.bep
rename to dev-libs/apr-util/apr-util-1.3.12.recipe
index 893bdaeff..215237a3c 100644
--- a/dev-libs/apr-util/apr-util-1.3.12.bep
+++ b/dev-libs/apr-util/apr-util-1.3.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.3.9"
-BUILD {
+BUILD()
+{
 	cd apr-util-1.3.12
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -40,7 +41,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-util-1.3.12
 	make install
 }
diff --git a/dev-libs/apr-util/apr-util-1.3.9.bep b/dev-libs/apr-util/apr-util-1.3.9.recipe
similarity index 98%
rename from dev-libs/apr-util/apr-util-1.3.9.bep
rename to dev-libs/apr-util/apr-util-1.3.9.recipe
index a01e185fc..896323400 100644
--- a/dev-libs/apr-util/apr-util-1.3.9.bep
+++ b/dev-libs/apr-util/apr-util-1.3.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.3.9"
-BUILD {
+BUILD()
+{
 	cd apr-util-1.3.9
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -39,7 +40,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-util-1.3.9
 	make install
 }
diff --git a/dev-libs/apr-util/apr-util-1.4.1.bep b/dev-libs/apr-util/apr-util-1.4.1.recipe
similarity index 98%
rename from dev-libs/apr-util/apr-util-1.4.1.bep
rename to dev-libs/apr-util/apr-util-1.4.1.recipe
index bd3695d4c..c5878e7ef 100644
--- a/dev-libs/apr-util/apr-util-1.4.1.bep
+++ b/dev-libs/apr-util/apr-util-1.4.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr == 1.4.6"
-BUILD {
+BUILD()
+{
 	cd apr-util-1.4.1
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -40,7 +41,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-util-1.4.1
 	make install
 }
diff --git a/dev-libs/apr/apr-1.3.8.bep b/dev-libs/apr/apr-1.3.8.recipe
similarity index 94%
rename from dev-libs/apr/apr-1.3.8.bep
rename to dev-libs/apr/apr-1.3.8.recipe
index 4b7ee85d2..be0c3c309 100644
--- a/dev-libs/apr/apr-1.3.8.bep
+++ b/dev-libs/apr/apr-1.3.8.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd apr-1.3.8
 	libtoolize --force --copy --install
 	buildconf
@@ -12,7 +13,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-1.3.8
 	make install
 }
diff --git a/dev-libs/apr/apr-1.3.9.bep b/dev-libs/apr/apr-1.3.9.recipe
similarity index 95%
rename from dev-libs/apr/apr-1.3.9.bep
rename to dev-libs/apr/apr-1.3.9.recipe
index 678bd894c..8a9b44563 100644
--- a/dev-libs/apr/apr-1.3.9.bep
+++ b/dev-libs/apr/apr-1.3.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd apr-1.3.9
 	libtoolize --force --copy --install
 	buildconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-1.3.9
 	make install
 }
diff --git a/dev-libs/apr/apr-1.4.2.bep b/dev-libs/apr/apr-1.4.2.recipe
similarity index 96%
rename from dev-libs/apr/apr-1.4.2.bep
rename to dev-libs/apr/apr-1.4.2.recipe
index 477d094f7..6032068bc 100644
--- a/dev-libs/apr/apr-1.4.2.bep
+++ b/dev-libs/apr/apr-1.4.2.recipe
@@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	touch libtool.m4
 #	./buildconf
@@ -30,11 +31,13 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd apr-1.4.2
 	make test
 }
diff --git a/dev-libs/apr/apr-1.4.4.bep b/dev-libs/apr/apr-1.4.4.recipe
similarity index 97%
rename from dev-libs/apr/apr-1.4.4.bep
rename to dev-libs/apr/apr-1.4.4.recipe
index d4724c91e..0d3ffc1fa 100644
--- a/dev-libs/apr/apr-1.4.4.bep
+++ b/dev-libs/apr/apr-1.4.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf"
 REVISION="3"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd apr-1.4.4
 	libtoolize -fci
 	touch libtool.m4
@@ -25,12 +26,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-1.4.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd apr-1.4.4
 	make test
 }
diff --git a/dev-libs/apr/apr-1.4.5.bep b/dev-libs/apr/apr-1.4.5.recipe
similarity index 97%
rename from dev-libs/apr/apr-1.4.5.bep
rename to dev-libs/apr/apr-1.4.5.recipe
index 6a86547d5..750e66449 100644
--- a/dev-libs/apr/apr-1.4.5.bep
+++ b/dev-libs/apr/apr-1.4.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1"
 REVISION="4"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd apr-1.4.5
 	libtoolize -fci
 	touch libtool.m4
@@ -25,12 +26,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-1.4.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd apr-1.4.5
 	make test
 }
diff --git a/dev-libs/apr/apr-1.4.6.bep b/dev-libs/apr/apr-1.4.6.recipe
similarity index 97%
rename from dev-libs/apr/apr-1.4.6.bep
rename to dev-libs/apr/apr-1.4.6.recipe
index 5256885db..0d6e54591 100644
--- a/dev-libs/apr/apr-1.4.6.bep
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
 REVISION="4"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd apr-1.4.6
 	libtoolize -fci
 	touch libtool.m4
@@ -25,12 +26,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd apr-1.4.6
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd apr-1.4.6
 	make test
 }
diff --git a/dev-libs/atk/atk-1.29.2.bep b/dev-libs/atk/atk-1.29.2.recipe
similarity index 95%
rename from dev-libs/atk/atk-1.29.2.bep
rename to dev-libs/atk/atk-1.29.2.recipe
index 5fbeadeb8..78bf73576 100644
--- a/dev-libs/atk/atk-1.29.2.bep
+++ b/dev-libs/atk/atk-1.29.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="sys-devel/gettext >= 0.17
 	dev-libs/glib >= 2.24.0"
-BUILD {
+BUILD()
+{
 	cd atk-1.29.2
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd atk-1.29.2
 	make isntall
 }
diff --git a/dev-libs/atk/atk-1.30.0.bep b/dev-libs/atk/atk-1.30.0.recipe
similarity index 96%
rename from dev-libs/atk/atk-1.30.0.bep
rename to dev-libs/atk/atk-1.30.0.recipe
index bdaa27b25..3df557196 100644
--- a/dev-libs/atk/atk-1.30.0.bep
+++ b/dev-libs/atk/atk-1.30.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="broken"
 DEPEND="sys-devel/gettext >= 0.17
 	dev-libs/glib >= 2.24.0
 	dev-util/gtk-doc >= 1.15"
-BUILD {
+BUILD()
+{
 	cd atk-1.30.0
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd atk-1.30.0
 	make isntall
 }
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe
similarity index 96%
rename from dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep
rename to dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe
index 7f20ba736..9e2ca9c29 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep
+++ b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="319d0b18cc4eb735c8038ece9df055e4"
 
-BUILD {
+BUILD()
+{
 	cd gc-7.2alpha6
 	libtoolize --force --copy --install
 	autoconf -f
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gc-7.2alpha6
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gc-7.2alpha6
 	make check
 }
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.bep b/dev-libs/boehm-gc/boehm-gc-7.2d.recipe
similarity index 96%
rename from dev-libs/boehm-gc/boehm-gc-7.2d.bep
rename to dev-libs/boehm-gc/boehm-gc-7.2d.recipe
index b8f67af6f..194c705cb 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.2d.bep
+++ b/dev-libs/boehm-gc/boehm-gc-7.2d.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2"
 
-BUILD {
+BUILD()
+{
 	cd gc-7.2
 	libtoolize --force --copy --install
 	autoconf -f
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gc-7.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gc-7.2
 	make check
 }
diff --git a/dev-libs/boost/boost-1.42.0.bep b/dev-libs/boost/boost-1.42.0.recipe
similarity index 96%
rename from dev-libs/boost/boost-1.42.0.bep
rename to dev-libs/boost/boost-1.42.0.recipe
index 9884d876b..f7789a6c3 100644
--- a/dev-libs/boost/boost-1.42.0.bep
+++ b/dev-libs/boost/boost-1.42.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd boost_1_42_0
 	./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY`
 	./bjam --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -18,7 +19,8 @@ BUILD {
 	runtime-link=shared
 }
 
-INSTALL {
+INSTALL()
+{
 	cd boost_1_42_0
 	./bjam install
 }
diff --git a/dev-libs/boost/boost-1.50.0.bep b/dev-libs/boost/boost-1.50.0.recipe
similarity index 98%
rename from dev-libs/boost/boost-1.50.0.bep
rename to dev-libs/boost/boost-1.50.0.recipe
index d0eef3144..590e1969e 100644
--- a/dev-libs/boost/boost-1.50.0.bep
+++ b/dev-libs/boost/boost-1.50.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="boehm-gc"
-BUILD {
+BUILD()
+{
 	cd boost_1_50_0
 	./bootstrap.sh \
 		--without-icu \
@@ -34,7 +35,8 @@ BUILD {
 		runtime-link=shared
 }
 
-INSTALL {
+INSTALL()
+{
 	cd boost_1_50_0
 	./bjam install \
 		-d2 \
diff --git a/dev-libs/boost/boost-1.53.0.bep b/dev-libs/boost/boost-1.53.0.recipe
similarity index 98%
rename from dev-libs/boost/boost-1.53.0.bep
rename to dev-libs/boost/boost-1.53.0.recipe
index 65dfda630..4b4a6adbe 100644
--- a/dev-libs/boost/boost-1.53.0.bep
+++ b/dev-libs/boost/boost-1.53.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="boehm-gc"
-BUILD {
+BUILD()
+{
 	cd boost_1_53_0
 	./bootstrap.sh \
 		--without-icu \
@@ -34,7 +35,8 @@ BUILD {
 		runtime-link=shared
 }
 
-INSTALL {
+INSTALL()
+{
 	cd boost_1_53_0
 	./bjam install \
 		-d2 \
diff --git a/dev-libs/chmlib/chmlib-0.40.bep b/dev-libs/chmlib/chmlib-0.40.recipe
similarity index 96%
rename from dev-libs/chmlib/chmlib-0.40.bep
rename to dev-libs/chmlib/chmlib-0.40.recipe
index b072d2c84..9182b515e 100644
--- a/dev-libs/chmlib/chmlib-0.40.bep
+++ b/dev-libs/chmlib/chmlib-0.40.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd chmlib-0.40
 	rm aclocal.m4
 	rm acinclude.m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd chmlib-0.40
 	make install
 }
diff --git a/dev-libs/cyassl/cyassl-1.6.5.bep b/dev-libs/cyassl/cyassl-1.6.5.recipe
similarity index 95%
rename from dev-libs/cyassl/cyassl-1.6.5.bep
rename to dev-libs/cyassl/cyassl-1.6.5.recipe
index 67654514a..45c76da1a 100644
--- a/dev-libs/cyassl/cyassl-1.6.5.bep
+++ b/dev-libs/cyassl/cyassl-1.6.5.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903"
-BUILD {
+BUILD()
+{
 	cd cyassl-1.6.5
 	libtoolize --force --copy --install
 	rm acinclude.m4
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cyassl-1.6.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cyassl-1.6.5
 	make check
 	cd testsuite
diff --git a/dev-libs/cyassl/cyassl-1.8.0.bep b/dev-libs/cyassl/cyassl-1.8.0.recipe
similarity index 95%
rename from dev-libs/cyassl/cyassl-1.8.0.bep
rename to dev-libs/cyassl/cyassl-1.8.0.recipe
index ac5c9a2bd..c5f42dabb 100644
--- a/dev-libs/cyassl/cyassl-1.8.0.bep
+++ b/dev-libs/cyassl/cyassl-1.8.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="app-text/dos2unix >= 1.0"
 CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58"
-BUILD {
+BUILD()
+{
 	cd cyassl-1.8.0
 	dos2unix *
 	dos2unix include/*
@@ -22,12 +23,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cyassl-1.8.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cyassl-1.8.0
 	make check
 	cd testsuite
diff --git a/dev-libs/cyassl/cyassl-2.0.2.bep b/dev-libs/cyassl/cyassl-2.0.2.recipe
similarity index 95%
rename from dev-libs/cyassl/cyassl-2.0.2.bep
rename to dev-libs/cyassl/cyassl-2.0.2.recipe
index 9a45cb316..ee333d453 100644
--- a/dev-libs/cyassl/cyassl-2.0.2.bep
+++ b/dev-libs/cyassl/cyassl-2.0.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="app-text/dos2unix >= 1.0"
 CHECKSUM_MD5="2f51752207132c161155508eeb517e38"
-BUILD {
+BUILD()
+{
 	cd cyassl-2.0.2
 	dos2unix *
 	dos2unix include/*
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cyassl-2.0.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cyassl-2.0.2
 	make check
 	cd testsuite
diff --git a/dev-libs/cyassl/cyassl-2.5.0.bep b/dev-libs/cyassl/cyassl-2.5.0.recipe
similarity index 95%
rename from dev-libs/cyassl/cyassl-2.5.0.bep
rename to dev-libs/cyassl/cyassl-2.5.0.recipe
index cb0404bf6..890172492 100644
--- a/dev-libs/cyassl/cyassl-2.5.0.bep
+++ b/dev-libs/cyassl/cyassl-2.5.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="app-text/dos2unix >= 1.0"
 CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd"
-BUILD {
+BUILD()
+{
 	cd cyassl-2.5.0
 	dos2unix *
 	dos2unix include/*
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cyassl-2.5.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cyassl-2.5.0
 	make check
 	cd testsuite
diff --git a/dev-libs/expat/expat-2.0.1.bep b/dev-libs/expat/expat-2.0.1.recipe
similarity index 97%
rename from dev-libs/expat/expat-2.0.1.bep
rename to dev-libs/expat/expat-2.0.1.recipe
index a163d044c..a73cccda6 100644
--- a/dev-libs/expat/expat-2.0.1.bep
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -19,7 +19,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	rm -f conftools/libtool.m4
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
 	echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
@@ -30,7 +31,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.recipe
similarity index 97%
rename from dev-libs/fribidi/fribidi-0.19.2.bep
rename to dev-libs/fribidi/fribidi-0.19.2.recipe
index 2b145c184..b1ecc82ef 100644
--- a/dev-libs/fribidi/fribidi-0.19.2.bep
+++ b/dev-libs/fribidi/fribidi-0.19.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd fribidi-0.19.2
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fribidi-0.19.2
 	make install
 }
diff --git a/dev-libs/glib/glib-2.22.2.bep b/dev-libs/glib/glib-2.22.2.recipe
similarity index 96%
rename from dev-libs/glib/glib-2.22.2.bep
rename to dev-libs/glib/glib-2.22.2.recipe
index 2f27e322c..b33e97fc1 100644
--- a/dev-libs/glib/glib-2.22.2.bep
+++ b/dev-libs/glib/glib-2.22.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="00eb873975e2ef9361b8177131c7c943"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd glib-2.22.2
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glib-2.22.2
 	make install
 }
diff --git a/dev-libs/glib/glib-2.24.1.bep b/dev-libs/glib/glib-2.24.1.recipe
similarity index 96%
rename from dev-libs/glib/glib-2.24.1.bep
rename to dev-libs/glib/glib-2.24.1.recipe
index 91942f10f..0e74b1972 100644
--- a/dev-libs/glib/glib-2.24.1.bep
+++ b/dev-libs/glib/glib-2.24.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd glib-2.24.1
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glib-2.24.1
 	make install
 }
diff --git a/dev-libs/glib/glib-2.24.2.bep b/dev-libs/glib/glib-2.24.2.recipe
similarity index 98%
rename from dev-libs/glib/glib-2.24.2.bep
rename to dev-libs/glib/glib-2.24.2.recipe
index 4be365b05..a19d4cd8e 100644
--- a/dev-libs/glib/glib-2.24.2.bep
+++ b/dev-libs/glib/glib-2.24.2.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/pkgconfig >= 0.23
 	sys-devel/gettext >= 0.17
 	dev-libs/libpcre >= 8.00"
-BUILD {
+BUILD()
+{
 	cd glib-2.24.2
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -27,7 +28,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glib-2.24.2
 	make install
 }
diff --git a/dev-libs/glib/glib-2.26.1.bep b/dev-libs/glib/glib-2.26.1.recipe
similarity index 97%
rename from dev-libs/glib/glib-2.26.1.bep
rename to dev-libs/glib/glib-2.26.1.recipe
index a01e3eeec..4d44567d8 100644
--- a/dev-libs/glib/glib-2.26.1.bep
+++ b/dev-libs/glib/glib-2.26.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-libs/pkgconfig >= 0.23
 	sys-devel/gettext >= 0.17"
-BUILD {
+BUILD()
+{
 	cd glib-2.26.1
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glib-2.26.1
 	make install
 }
diff --git a/dev-libs/gmp/gmp-4.3.1.bep b/dev-libs/gmp/gmp-4.3.1.recipe
similarity index 94%
rename from dev-libs/gmp/gmp-4.3.1.bep
rename to dev-libs/gmp/gmp-4.3.1.recipe
index a79acb26d..811275dc9 100644
--- a/dev-libs/gmp/gmp-4.3.1.bep
+++ b/dev-libs/gmp/gmp-4.3.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="26cec15a90885042dd4a15c4003b08ae"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gmp-4.3.1
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gmp-4.3.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gmp-4.3.1
 	make check
 }
diff --git a/dev-libs/gmp/gmp-4.3.2.bep b/dev-libs/gmp/gmp-4.3.2.recipe
similarity index 94%
rename from dev-libs/gmp/gmp-4.3.2.bep
rename to dev-libs/gmp/gmp-4.3.2.recipe
index 25053b62d..f0190945d 100644
--- a/dev-libs/gmp/gmp-4.3.2.bep
+++ b/dev-libs/gmp/gmp-4.3.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="dd60683d7057917e34630b4a787932e8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gmp-4.3.2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gmp-4.3.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gmp-4.3.2
 	make check
 }
diff --git a/dev-libs/gmp/gmp-5.0.1.bep b/dev-libs/gmp/gmp-5.0.1.recipe
similarity index 94%
rename from dev-libs/gmp/gmp-5.0.1.bep
rename to dev-libs/gmp/gmp-5.0.1.recipe
index 7610ec638..5b7af9fa7 100644
--- a/dev-libs/gmp/gmp-5.0.1.bep
+++ b/dev-libs/gmp/gmp-5.0.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6bac6df75c192a13419dfd71d19240a7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gmp-5.0.1
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gmp-5.0.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gmp-5.0.1
 	make check
 }
diff --git a/dev-libs/gmp/gmp-5.0.5.bep b/dev-libs/gmp/gmp-5.0.5.recipe
similarity index 94%
rename from dev-libs/gmp/gmp-5.0.5.bep
rename to dev-libs/gmp/gmp-5.0.5.recipe
index 38f2da522..b9daccb9c 100644
--- a/dev-libs/gmp/gmp-5.0.5.bep
+++ b/dev-libs/gmp/gmp-5.0.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gmp-5.0.5
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gmp-5.0.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gmp-5.0.5
 	make check
 }
diff --git a/dev-libs/gmp/gmp-5.1.1.bep b/dev-libs/gmp/gmp-5.1.1.recipe
similarity index 94%
rename from dev-libs/gmp/gmp-5.1.1.bep
rename to dev-libs/gmp/gmp-5.1.1.recipe
index a50602270..7fc727a98 100644
--- a/dev-libs/gmp/gmp-5.1.1.bep
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gmp-5.1.1
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gmp-5.1.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gmp-5.1.1
 	make check
 }
diff --git a/dev-libs/gnulib/gnulib-9999.bep b/dev-libs/gnulib/gnulib-9999.recipe
similarity index 93%
rename from dev-libs/gnulib/gnulib-9999.bep
rename to dev-libs/gnulib/gnulib-9999.recipe
index d3236b7ee..35cbc5db5 100644
--- a/dev-libs/gnulib/gnulib-9999.bep
+++ b/dev-libs/gnulib/gnulib-9999.recipe
@@ -5,15 +5,18 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	echo "gnulib isn't meant to be built."
 }
 
-INSTALL {
+INSTALL()
+{
 	echo "gnulib isn't meant to be installed."
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/dev-libs/icu/icu-4.4.1.bep b/dev-libs/icu/icu-4.4.1.recipe
similarity index 95%
rename from dev-libs/icu/icu-4.4.1.bep
rename to dev-libs/icu/icu-4.4.1.recipe
index 3a3bdc891..45e38e444 100644
--- a/dev-libs/icu/icu-4.4.1.bep
+++ b/dev-libs/icu/icu-4.4.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b6bc0a1153540b2088f8b03e0ba625d3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd icu/source
 	CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd icu/source
 	make install
 }
diff --git a/dev-libs/icu/icu-4.8.1.bep b/dev-libs/icu/icu-4.8.1.recipe
similarity index 95%
rename from dev-libs/icu/icu-4.8.1.bep
rename to dev-libs/icu/icu-4.8.1.recipe
index 423c57d5d..d4b141419 100644
--- a/dev-libs/icu/icu-4.8.1.bep
+++ b/dev-libs/icu/icu-4.8.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd icu/source
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd icu/source
 	make install
 }
diff --git a/dev-libs/jansson/jansson-2.4.bep b/dev-libs/jansson/jansson-2.4.recipe
similarity index 94%
rename from dev-libs/jansson/jansson-2.4.bep
rename to dev-libs/jansson/jansson-2.4.recipe
index ad46db01e..c7f74eea7 100644
--- a/dev-libs/jansson/jansson-2.4.bep
+++ b/dev-libs/jansson/jansson-2.4.recipe
@@ -5,18 +5,21 @@ CHECKSUM_MD5="c4629b89bf0432f3158c461e88fe0113"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jansson-2.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jansson-2.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd jansson-2.4/test
 	run-suites
 }
diff --git a/dev-libs/json-c/json-c-0.9.bep b/dev-libs/json-c/json-c-0.9.recipe
similarity index 95%
rename from dev-libs/json-c/json-c-0.9.bep
rename to dev-libs/json-c/json-c-0.9.recipe
index 2672551fb..bc916a517 100644
--- a/dev-libs/json-c/json-c-0.9.bep
+++ b/dev-libs/json-c/json-c-0.9.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae"
-BUILD {
+BUILD()
+{
 	cd json-c-0.9
 	libtoolize --force --install --copy
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd json-c-0.9
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/dev-libs/libattica/libattica-0.4.1.bep b/dev-libs/libattica/libattica-0.4.1.recipe
similarity index 94%
rename from dev-libs/libattica/libattica-0.4.1.bep
rename to dev-libs/libattica/libattica-0.4.1.recipe
index 7652478be..881958ff4 100644
--- a/dev-libs/libattica/libattica-0.4.1.bep
+++ b/dev-libs/libattica/libattica-0.4.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b90983ec5d79e5ddcbc9146fa23cab72"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 		cd attica-0.4.1
 		cmake CMakeLists.txt
 		make
 }	
 
-INSTALL {
+INSTALL()
+{
 		cd attica-0.4.1
 		make install
 }
diff --git a/dev-libs/libcdio/libcdio-0.82.bep b/dev-libs/libcdio/libcdio-0.82.recipe
similarity index 96%
rename from dev-libs/libcdio/libcdio-0.82.bep
rename to dev-libs/libcdio/libcdio-0.82.recipe
index 1fb34ef75..cef7033b6 100644
--- a/dev-libs/libcdio/libcdio-0.82.bep
+++ b/dev-libs/libcdio/libcdio-0.82.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libiconv >= 1.12"
 CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360"
-BUILD {
+BUILD()
+{
 	cd libcdio-0.82
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcdio-0.82
 	make install
 }
diff --git a/dev-libs/libcdio/libcdio-0.83.bep b/dev-libs/libcdio/libcdio-0.83.recipe
similarity index 96%
rename from dev-libs/libcdio/libcdio-0.83.bep
rename to dev-libs/libcdio/libcdio-0.83.recipe
index 9c49fbacf..8de9b8fe9 100644
--- a/dev-libs/libcdio/libcdio-0.83.bep
+++ b/dev-libs/libcdio/libcdio-0.83.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libiconv >= 1.12"
 CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb"
-BUILD {
+BUILD()
+{
 	cd libcdio-0.83
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcdio-0.83
 	make install
 }
diff --git a/dev-libs/libcdio/libcdio-0.90.bep b/dev-libs/libcdio/libcdio-0.90.recipe
similarity index 96%
rename from dev-libs/libcdio/libcdio-0.90.bep
rename to dev-libs/libcdio/libcdio-0.90.recipe
index ccb9b0931..21184f10c 100644
--- a/dev-libs/libcdio/libcdio-0.90.bep
+++ b/dev-libs/libcdio/libcdio-0.90.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/libiconv >= 1.12
        dev-util/pkgconfig"
 CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247"
-BUILD {
+BUILD()
+{
        cd libcdio-0.90
        libtoolize --force --copy --install
        aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
         make
 }
      
-INSTALL {
+INSTALL()
+{
         cd libcdio-0.90
         make install
 }
diff --git a/dev-libs/libcss/libcss-0.1.2.bep b/dev-libs/libcss/libcss-0.1.2.recipe
similarity index 95%
rename from dev-libs/libcss/libcss-0.1.2.bep
rename to dev-libs/libcss/libcss-0.1.2.recipe
index 8a6a7596a..110740f12 100644
--- a/dev-libs/libcss/libcss-0.1.2.bep
+++ b/dev-libs/libcss/libcss-0.1.2.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libparserutils >= 0.1.1"
 
-BUILD {
+BUILD()
+{
 	cd libcss-0.1.2
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcss-0.1.2
 	make install
 }
diff --git a/dev-libs/libdwarf/libdwarf-20120410.bep b/dev-libs/libdwarf/libdwarf-20120410.recipe
similarity index 97%
rename from dev-libs/libdwarf/libdwarf-20120410.bep
rename to dev-libs/libdwarf/libdwarf-20120410.recipe
index 6ef959510..01c895b41 100644
--- a/dev-libs/libdwarf/libdwarf-20120410.bep
+++ b/dev-libs/libdwarf/libdwarf-20120410.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libelf >= 0.8.13"
-BUILD {
+BUILD()
+{
 		cd dwarf-20120410/libdwarf
 		./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY)
 		make
@@ -14,7 +15,8 @@ BUILD {
 		LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make
 }
 
-INSTALL {
+INSTALL()
+{
 		cd dwarf-20120410/libdwarf
 		make install
 		cd ../dwarfdump
diff --git a/dev-libs/libebml/libebml-1.0.0.bep b/dev-libs/libebml/libebml-1.0.0.recipe
similarity index 95%
rename from dev-libs/libebml/libebml-1.0.0.bep
rename to dev-libs/libebml/libebml-1.0.0.recipe
index b20b98fd2..4c79fea0c 100644
--- a/dev-libs/libebml/libebml-1.0.0.bep
+++ b/dev-libs/libebml/libebml-1.0.0.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03"
-BUILD {
+BUILD()
+{
 	cd libebml-1.0.0/make/linux
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libebml-1.0.0/make/linux
     if [ -n ${DESTDIR} ];then 
  		make install DESTDIR="${DESTDIR}" 
diff --git a/dev-libs/libedit/libedit-20090923.bep b/dev-libs/libedit/libedit-20090923.recipe
similarity index 95%
rename from dev-libs/libedit/libedit-20090923.bep
rename to dev-libs/libedit/libedit-20090923.recipe
index ccc9f99fd..bb2f281aa 100644
--- a/dev-libs/libedit/libedit-20090923.bep
+++ b/dev-libs/libedit/libedit-20090923.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libedit-20090923-3.0
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libedit-20090923-3.0
 	make install
 }
diff --git a/dev-libs/libedit/libedit-20100424.bep b/dev-libs/libedit/libedit-20100424.recipe
similarity index 96%
rename from dev-libs/libedit/libedit-20100424.bep
rename to dev-libs/libedit/libedit-20100424.recipe
index f48954ddd..9618ab12f 100644
--- a/dev-libs/libedit/libedit-20100424.bep
+++ b/dev-libs/libedit/libedit-20100424.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
-BUILD {
+BUILD()
+{
 	cd libedit-20100424-3.0
 	autoreconf --force --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libedit-20100424-3.0
 	make install
 }
diff --git a/dev-libs/libedit/libedit-20110802-3.0.bep b/dev-libs/libedit/libedit-20110802-3.0.recipe
similarity index 96%
rename from dev-libs/libedit/libedit-20110802-3.0.bep
rename to dev-libs/libedit/libedit-20110802-3.0.recipe
index 441ef480a..36fda7353 100644
--- a/dev-libs/libedit/libedit-20110802-3.0.bep
+++ b/dev-libs/libedit/libedit-20110802-3.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1992-2011 The NetBSD Foundation, Inc."
-BUILD {
+BUILD()
+{
 	cd libedit-20110802-3.0
 	autoreconf --force --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libedit-20110802-3.0
 	make install
 }
diff --git a/dev-libs/libedit/libedit-20120601-3.0.bep b/dev-libs/libedit/libedit-20120601-3.0.recipe
similarity index 96%
rename from dev-libs/libedit/libedit-20120601-3.0.bep
rename to dev-libs/libedit/libedit-20120601-3.0.recipe
index 27c02f8ce..e2482729a 100644
--- a/dev-libs/libedit/libedit-20120601-3.0.bep
+++ b/dev-libs/libedit/libedit-20120601-3.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
-BUILD {
+BUILD()
+{
 	cd libedit-20120601-3.0
 	autoreconf --force --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libedit-20120601-3.0
 	make install
 }
diff --git a/dev-libs/libelf/libelf-0.8.13.bep b/dev-libs/libelf/libelf-0.8.13.recipe
similarity index 96%
rename from dev-libs/libelf/libelf-0.8.13.bep
rename to dev-libs/libelf/libelf-0.8.13.recipe
index d1a0c7ebb..ce1ff7e9d 100644
--- a/dev-libs/libelf/libelf-0.8.13.bep
+++ b/dev-libs/libelf/libelf-0.8.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 		cd libelf-0.8.13
 		libtoolize -fci
 		autoreconf
@@ -13,7 +14,8 @@ BUILD {
 		make
 }
 
-INSTALL {
+INSTALL()
+{
 		cd libelf-0.8.13
 		make install instroot=$DESTDIR
 		make install-compat instroot=$DESTDIR
diff --git a/dev-libs/libevent/libevent-1.4.11.bep b/dev-libs/libevent/libevent-1.4.11.recipe
similarity index 95%
rename from dev-libs/libevent/libevent-1.4.11.bep
rename to dev-libs/libevent/libevent-1.4.11.recipe
index 6747e2dc5..adcc35f01 100644
--- a/dev-libs/libevent/libevent-1.4.11.bep
+++ b/dev-libs/libevent/libevent-1.4.11.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd libevent-1.4.11-stable
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libevent-1.4.11-stable
 	make install
 }
diff --git a/dev-libs/libevent/libevent-1.4.13.bep b/dev-libs/libevent/libevent-1.4.13.recipe
similarity index 95%
rename from dev-libs/libevent/libevent-1.4.13.bep
rename to dev-libs/libevent/libevent-1.4.13.recipe
index a7975f433..e20c33422 100644
--- a/dev-libs/libevent/libevent-1.4.13.bep
+++ b/dev-libs/libevent/libevent-1.4.13.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd libevent-1.4.13-stable
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libevent-1.4.13-stable
 	make install
 }
diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.recipe
similarity index 96%
rename from dev-libs/libevent/libevent-1.4.14b.bep
rename to dev-libs/libevent/libevent-1.4.14b.recipe
index aff7ae9a7..91c655a79 100644
--- a/dev-libs/libevent/libevent-1.4.14b.bep
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd libevent-1.4.14b-stable
 	autoreconf -vfi
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libevent-1.4.14b-stable
 	make install
 }
diff --git a/dev-libs/libevent/libevent-2.0.10.bep b/dev-libs/libevent/libevent-2.0.10.recipe
similarity index 96%
rename from dev-libs/libevent/libevent-2.0.10.bep
rename to dev-libs/libevent/libevent-2.0.10.recipe
index 87dc63adc..3ebdfec99 100644
--- a/dev-libs/libevent/libevent-2.0.10.bep
+++ b/dev-libs/libevent/libevent-2.0.10.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd libevent-2.0.10-stable
 	autoreconf -vfi
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libevent-2.0.10-stable
 	make install
 }
diff --git a/dev-libs/libffi/libffi-3.0.11.bep b/dev-libs/libffi/libffi-3.0.11.recipe
similarity index 96%
rename from dev-libs/libffi/libffi-3.0.11.bep
rename to dev-libs/libffi/libffi-3.0.11.recipe
index 2b187d569..ad0a8b41c 100644
--- a/dev-libs/libffi/libffi-3.0.11.bep
+++ b/dev-libs/libffi/libffi-3.0.11.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="f69b9693227d976835b4857b1ba7d0e3"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libffi-3.0.11
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libffi-3.0.11
 	make install
 }
diff --git a/dev-libs/libffi/libffi-3.0.9.bep b/dev-libs/libffi/libffi-3.0.9.recipe
similarity index 96%
rename from dev-libs/libffi/libffi-3.0.9.bep
rename to dev-libs/libffi/libffi-3.0.9.recipe
index 1dfcf228a..784fae19e 100644
--- a/dev-libs/libffi/libffi-3.0.9.bep
+++ b/dev-libs/libffi/libffi-3.0.9.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="1f300a7a7f975d4046f51c3022fa5ff1"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libffi-3.0.9
 	cp /boot/common/share/libtool/config/config.* .
 	libtoolize --force --copy
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libffi-3.0.9
 	make install
 }
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe
similarity index 95%
rename from dev-libs/libgcrypt/libgcrypt-1.4.5.bep
rename to dev-libs/libgcrypt/libgcrypt-1.4.5.recipe
index 549933e7a..cb42a44dd 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe
@@ -4,7 +4,8 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.5.tar.gz"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-libs/libgpg-error"
-BUILD {
+BUILD()
+{
 	cd libgcrypt-1.4.5
 	libtoolize --force --copy --install
 	autogen.sh
@@ -12,7 +13,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libgcrypt-1.4.5
 	make install
 }
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe
similarity index 96%
rename from dev-libs/libgcrypt/libgcrypt-1.5.0.bep
rename to dev-libs/libgcrypt/libgcrypt-1.5.0.recipe
index f22ea0cbf..a9b064944 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libgpg-error > 1.8"
 CHECKSUM_MD5="693f9c64d50c908bc4d6e01da3ff76d8"
-BUILD {
+BUILD()
+{
 	cd libgcrypt-1.5.0
 	libtoolize --force --copy --install
 	autogen.sh
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libgcrypt-1.5.0
 	make install
 }
diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.bep b/dev-libs/libgpg-error/libgpg-error-1.10.recipe
similarity index 96%
rename from dev-libs/libgpg-error/libgpg-error-1.10.bep
rename to dev-libs/libgpg-error/libgpg-error-1.10.recipe
index 4b7149696..9f673b8c1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.10.bep
+++ b/dev-libs/libgpg-error/libgpg-error-1.10.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="gettext = 0.18.1.1-dev"
 CHECKSUM_MD5="736a03daa9dc5873047d4eb4a9c22a16"
-BUILD {
+BUILD()
+{
 	cd libgpg-error-1.10
 	cd po
 	touch t-cs.gmo t-de.gmo t-fr.gmo t-it.gmo t-nl.gmo \
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libgpg-error-1.10
 	make install
 }
diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.bep b/dev-libs/libgpg-error/libgpg-error-1.7.recipe
similarity index 95%
rename from dev-libs/libgpg-error/libgpg-error-1.7.bep
rename to dev-libs/libgpg-error/libgpg-error-1.7.recipe
index d51596db0..22757c159 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.7.bep
+++ b/dev-libs/libgpg-error/libgpg-error-1.7.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
 CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665"
-BUILD {
+BUILD()
+{
 	cd libgpg-error-1.7
 	autoreconf -vfi -Im4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libgpg-error-1.7
 	make install
 }
diff --git a/dev-libs/libiconv/libiconv-1.12.bep b/dev-libs/libiconv/libiconv-1.12.recipe
similarity index 98%
rename from dev-libs/libiconv/libiconv-1.12.bep
rename to dev-libs/libiconv/libiconv-1.12.recipe
index 7b40e7808..8f73b7a67 100644
--- a/dev-libs/libiconv/libiconv-1.12.bep
+++ b/dev-libs/libiconv/libiconv-1.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libiconv-1.12
 	rm -rf aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
@@ -33,7 +34,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libiconv-1.12
 	ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir`
 	mkdir -p ${ACLOCALDIR}
diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.recipe
similarity index 98%
rename from dev-libs/libiconv/libiconv-1.13.1.bep
rename to dev-libs/libiconv/libiconv-1.13.1.recipe
index 7eb525a76..68a18ae83 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.bep
+++ b/dev-libs/libiconv/libiconv-1.13.1.recipe
@@ -22,7 +22,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	rm -rf aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
 	libtoolize -fci
@@ -45,7 +46,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	ACLOCALDIR=$prefix/data/aclocal
 	mkdir -p ${ACLOCALDIR}
 	cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4
diff --git a/dev-libs/liboil/liboil-0.3.17.bep b/dev-libs/liboil/liboil-0.3.17.recipe
similarity index 96%
rename from dev-libs/liboil/liboil-0.3.17.bep
rename to dev-libs/liboil/liboil-0.3.17.recipe
index a54643c8d..1ac563a5b 100644
--- a/dev-libs/liboil/liboil-0.3.17.bep
+++ b/dev-libs/liboil/liboil-0.3.17.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="47dc734f82faeb2964d97771cfd2e701"
-BUILD {
+BUILD()
+{
 	cd liboil-0.3.17
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd liboil-0.3.17
 	make install
 }
diff --git a/dev-libs/libparserutils/libparserutils-0.1.1.bep b/dev-libs/libparserutils/libparserutils-0.1.1.recipe
similarity index 95%
rename from dev-libs/libparserutils/libparserutils-0.1.1.bep
rename to dev-libs/libparserutils/libparserutils-0.1.1.recipe
index 28738cbe1..79b17c7e9 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.1.bep
+++ b/dev-libs/libparserutils/libparserutils-0.1.1.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.1.1-
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd libparserutils-0.1.1
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libparserutils-0.1.1
 	make install
 }
diff --git a/dev-libs/libpcre/libpcre-8.00.bep b/dev-libs/libpcre/libpcre-8.00.recipe
similarity index 96%
rename from dev-libs/libpcre/libpcre-8.00.bep
rename to dev-libs/libpcre/libpcre-8.00.recipe
index 802fb405a..04040b1d7 100644
--- a/dev-libs/libpcre/libpcre-8.00.bep
+++ b/dev-libs/libpcre/libpcre-8.00.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c95500eeda12c8c7edc6b0926d60952c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pcre-8.00
 	libtoolize --force --copy
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make check
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pcre-8.00
 	make install
 }
diff --git a/dev-libs/libpcre/libpcre-8.02.bep b/dev-libs/libpcre/libpcre-8.02.recipe
similarity index 96%
rename from dev-libs/libpcre/libpcre-8.02.bep
rename to dev-libs/libpcre/libpcre-8.02.recipe
index c5e5b701c..c4d7c571d 100644
--- a/dev-libs/libpcre/libpcre-8.02.bep
+++ b/dev-libs/libpcre/libpcre-8.02.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pcre-8.02
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
 	libtoolize --force --copy
@@ -17,7 +18,8 @@ BUILD {
 	make check
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pcre-8.02
 	make install
 }
diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.recipe
similarity index 96%
rename from dev-libs/libpcre/libpcre-8.12.bep
rename to dev-libs/libpcre/libpcre-8.12.recipe
index 1d1b9188d..3a1db3765 100644
--- a/dev-libs/libpcre/libpcre-8.12.bep
+++ b/dev-libs/libpcre/libpcre-8.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pcre-8.12
     LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
 	libtoolize --force --copy
@@ -23,12 +24,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pcre-8.12
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd pcre-8.12
 	make check
 }
diff --git a/dev-libs/libpcre/libpcre-8.21.bep b/dev-libs/libpcre/libpcre-8.21.recipe
similarity index 96%
rename from dev-libs/libpcre/libpcre-8.21.bep
rename to dev-libs/libpcre/libpcre-8.21.recipe
index 429772017..f1f33acba 100644
--- a/dev-libs/libpcre/libpcre-8.21.bep
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pcre-8.21
     LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
 	libtoolize --force --copy --install
@@ -23,12 +24,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pcre-8.21
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd pcre-8.21
 	make check
 }
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe
similarity index 95%
rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep
rename to dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe
index 7c8343203..7d65949e3 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
-BUILD {
+BUILD()
+{
 	cd libpthread-stubs-0.3
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpthread-stubs-0.3
 	make install
 }
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe
similarity index 95%
rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep
rename to dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe
index 7c8343203..7d65949e3 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
-BUILD {
+BUILD()
+{
 	cd libpthread-stubs-0.3
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpthread-stubs-0.3
 	make install
 }
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.bep b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
similarity index 97%
rename from dev-libs/libsigc++/libsigc++-1.2.7.bep
rename to dev-libs/libsigc++/libsigc++-1.2.7.recipe
index 1decbb7ed..246950f41 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.bep
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
@@ -5,7 +5,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="dev-cpp/mm-common >= 0.9.2"
 CHECKSUM_MD5="b939751dff0db9652c5dbfc9de685efa"
-BUILD {
+BUILD()
+{
 	cd libsigc++-1.2.7
 	libtoolize --force --copy --install
 	aclocal -I scripts
@@ -18,7 +19,8 @@ BUILD {
 # those errors and we really don't need either one
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsigc++-1.2.7
 	make -i install
 }
diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.bep b/dev-libs/libsigc++/libsigc++-2.2.7.recipe
similarity index 96%
rename from dev-libs/libsigc++/libsigc++-2.2.7.bep
rename to dev-libs/libsigc++/libsigc++-2.2.7.recipe
index 9a4accac8..8ab2d197f 100644
--- a/dev-libs/libsigc++/libsigc++-2.2.7.bep
+++ b/dev-libs/libsigc++/libsigc++-2.2.7.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-cpp/mm-common >= 0.9.2"
 CHECKSUM_MD5="48afe53ba0e3958f6ac5f072afed1c53"
-BUILD {
+BUILD()
+{
 	cd libsigc++-2.2.7
 	libtoolize --force --copy
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsigc++-2.2.7
 	make install
 }
diff --git a/dev-libs/libsigsegv/libsigsegv-2.8.bep b/dev-libs/libsigsegv/libsigsegv-2.8.recipe
similarity index 95%
rename from dev-libs/libsigsegv/libsigsegv-2.8.bep
rename to dev-libs/libsigsegv/libsigsegv-2.8.recipe
index 989c8e42c..43ca12414 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.8.bep
+++ b/dev-libs/libsigsegv/libsigsegv-2.8.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="ebe554e26870d8bc200ef3e3539ffd7c"
-BUILD {
+BUILD()
+{
 	cd libsigsegv-2.8
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsigsegv-2.8
 	make install
 }
diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.bep b/dev-libs/libunistring/libunistring-0.9.1.1.recipe
similarity index 96%
rename from dev-libs/libunistring/libunistring-0.9.1.1.bep
rename to dev-libs/libunistring/libunistring-0.9.1.1.recipe
index 0138a2f4e..c131742e8 100644
--- a/dev-libs/libunistring/libunistring-0.9.1.1.bep
+++ b/dev-libs/libunistring/libunistring-0.9.1.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/git >= 1.6.5.3
 	dev-util/gperf >= 3.0.4"
-BUILD {
+BUILD()
+{
 	cd libunistring-0.9.1.1
 	libtoolize --copy --force --install
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libunistring-0.9.1.1
 	make install
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe
similarity index 95%
rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep
rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe
index 8190c188a..42356bef8 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0"
 
-BUILD {
+BUILD()
+{
 	cd libwapcaplet-0.1.1-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libwapcaplet-0.1.1-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe
similarity index 94%
rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep
rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe
index 8d71ca25f..f754274f1 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.1.1-sr
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd libwapcaplet-0.1.1
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libwapcaplet-0.1.1
 	make install
 }
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe
similarity index 95%
rename from dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep
rename to dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe
index 6e1d2a3c1..09547ecfd 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7c64a28b08c8fdf6c8a95b0d5f1497b0"
-BUILD {
+BUILD()
+{
 	cd libxdg-basedir-1.1.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxdg-basedir-1.1.1
 	make install
 }
diff --git a/dev-libs/libxml2/libxml2-2.7.3.bep b/dev-libs/libxml2/libxml2-2.7.3.recipe
similarity index 96%
rename from dev-libs/libxml2/libxml2-2.7.3.bep
rename to dev-libs/libxml2/libxml2-2.7.3.recipe
index 5a7a0d4df..19024e0a9 100644
--- a/dev-libs/libxml2/libxml2-2.7.3.bep
+++ b/dev-libs/libxml2/libxml2-2.7.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8f4fda3969237c2a33bdb1583b5d06b2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxml2-2.7.3
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxml2-2.7.3
 	make install
 }
diff --git a/dev-libs/libxml2/libxml2-2.7.6.bep b/dev-libs/libxml2/libxml2-2.7.6.recipe
similarity index 96%
rename from dev-libs/libxml2/libxml2-2.7.6.bep
rename to dev-libs/libxml2/libxml2-2.7.6.recipe
index aeb674eb8..f12282c3f 100644
--- a/dev-libs/libxml2/libxml2-2.7.6.bep
+++ b/dev-libs/libxml2/libxml2-2.7.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7740a8ec23878a2f50120e1faa2730f2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxml2-2.7.6
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxml2-2.7.6
 	make install
 }
diff --git a/dev-libs/libxml2/libxml2-2.7.7.bep b/dev-libs/libxml2/libxml2-2.7.7.recipe
similarity index 95%
rename from dev-libs/libxml2/libxml2-2.7.7.bep
rename to dev-libs/libxml2/libxml2-2.7.7.recipe
index f5205acd0..f30d0bad0 100644
--- a/dev-libs/libxml2/libxml2-2.7.7.bep
+++ b/dev-libs/libxml2/libxml2-2.7.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9abc9959823ca9ff904f1fbcf21df066"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxml2-2.7.7
 	libtoolize --force --copy --install
 	aclocal
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxml2-2.7.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libxml2-2.7.7
 	make tests
 }
diff --git a/dev-libs/libxml2/libxml2-2.7.8.bep b/dev-libs/libxml2/libxml2-2.7.8.recipe
similarity index 96%
rename from dev-libs/libxml2/libxml2-2.7.8.bep
rename to dev-libs/libxml2/libxml2-2.7.8.recipe
index 446f12344..6b771096e 100644
--- a/dev-libs/libxml2/libxml2-2.7.8.bep
+++ b/dev-libs/libxml2/libxml2-2.7.8.recipe
@@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
@@ -29,11 +30,13 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make tests
 }
 
diff --git a/dev-libs/libxml2/libxml2-2.8.0.bep b/dev-libs/libxml2/libxml2-2.8.0.recipe
similarity index 96%
rename from dev-libs/libxml2/libxml2-2.8.0.bep
rename to dev-libs/libxml2/libxml2-2.8.0.recipe
index 49230b94f..f4a143cd6 100644
--- a/dev-libs/libxml2/libxml2-2.8.0.bep
+++ b/dev-libs/libxml2/libxml2-2.8.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxml2-2.8.0
 	libtoolize --force --copy --install
 	aclocal
@@ -21,12 +22,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxml2-2.8.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libxml2-2.8.0
 	make tests
 }
diff --git a/dev-libs/libxml2/libxml2-2.9.0.bep b/dev-libs/libxml2/libxml2-2.9.0.recipe
similarity index 96%
rename from dev-libs/libxml2/libxml2-2.9.0.bep
rename to dev-libs/libxml2/libxml2-2.9.0.recipe
index 70bf22569..bd26c3d12 100644
--- a/dev-libs/libxml2/libxml2-2.9.0.bep
+++ b/dev-libs/libxml2/libxml2-2.9.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5b9bebf4f5d2200ae2c4efe8fa6103f7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxml2-2.9.0
 	libtoolize --force --copy --install
 	aclocal
@@ -22,12 +23,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxml2-2.9.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libxml2-2.9.0
 	make tests
 }
diff --git a/dev-libs/libxslt/libxslt-1.1.26.bep b/dev-libs/libxslt/libxslt-1.1.26.recipe
similarity index 97%
rename from dev-libs/libxslt/libxslt-1.1.26.bep
rename to dev-libs/libxslt/libxslt-1.1.26.recipe
index 2702fe367..9eb59b7bf 100644
--- a/dev-libs/libxslt/libxslt-1.1.26.bep
+++ b/dev-libs/libxslt/libxslt-1.1.26.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e61d0364a30146aaa3001296f853b2b9"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxslt-1.1.26
 	libtoolize --force --copy --install
 	aclocal
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxslt-1.1.26
 	make install
 }
diff --git a/dev-libs/libxslt/libxslt-1.1.28.bep b/dev-libs/libxslt/libxslt-1.1.28.recipe
similarity index 97%
rename from dev-libs/libxslt/libxslt-1.1.28.bep
rename to dev-libs/libxslt/libxslt-1.1.28.recipe
index 759cc47f0..cd1fe0251 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.bep
+++ b/dev-libs/libxslt/libxslt-1.1.28.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libxslt-1.1.28
 	libtoolize --force --copy --install
 	aclocal
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxslt-1.1.28
 	make install
 }
diff --git a/dev-libs/libzip/libzip-0.10.1.bep b/dev-libs/libzip/libzip-0.10.1.recipe
similarity index 96%
rename from dev-libs/libzip/libzip-0.10.1.bep
rename to dev-libs/libzip/libzip-0.10.1.recipe
index f7500da45..11d333880 100644
--- a/dev-libs/libzip/libzip-0.10.1.bep
+++ b/dev-libs/libzip/libzip-0.10.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libzip-0.10.1
 	sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt
 	sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libzip-0.10.1
 	make install
 }
diff --git a/dev-libs/libzip/libzip-0.10.bep b/dev-libs/libzip/libzip-0.10.recipe
similarity index 96%
rename from dev-libs/libzip/libzip-0.10.bep
rename to dev-libs/libzip/libzip-0.10.recipe
index aa1f380ae..39214e8ec 100644
--- a/dev-libs/libzip/libzip-0.10.bep
+++ b/dev-libs/libzip/libzip-0.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="663d79a9d299a61026d1860d52cdf6fc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libzip-0.10
 	sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt
 	sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libzip-0.10
 	make install
 }
diff --git a/dev-libs/lzo/lzo-2.06.bep b/dev-libs/lzo/lzo-2.06.recipe
similarity index 94%
rename from dev-libs/lzo/lzo-2.06.bep
rename to dev-libs/lzo/lzo-2.06.recipe
index 487c7facc..0828119ae 100644
--- a/dev-libs/lzo/lzo-2.06.bep
+++ b/dev-libs/lzo/lzo-2.06.recipe
@@ -5,18 +5,21 @@ CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lzo-2.06
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lzo-2.06
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd lzo-2.06
 	make check
 }
diff --git a/dev-libs/mpc/mpc-1.0.1.bep b/dev-libs/mpc/mpc-1.0.1.recipe
similarity index 95%
rename from dev-libs/mpc/mpc-1.0.1.bep
rename to dev-libs/mpc/mpc-1.0.1.recipe
index b4dd82b82..f53eedff9 100644
--- a/dev-libs/mpc/mpc-1.0.1.bep
+++ b/dev-libs/mpc/mpc-1.0.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/gmp = 5.0.5"
 CHECKSUM_SHA1="8c7e19ad0dd9b3b5cc652273403423d6cf0c5edf"
-BUILD {
+BUILD()
+{
 	cd mpc-1.0.1
 #	libtoolize --force --copy --install
 #	aclocal -I m4
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mpc-1.0.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd mpc-1.0.1
 	make check
 }
diff --git a/dev-libs/mpfr/mpfr-3.0.0-7047.bep b/dev-libs/mpfr/mpfr-3.0.0-7047.recipe
similarity index 95%
rename from dev-libs/mpfr/mpfr-3.0.0-7047.bep
rename to dev-libs/mpfr/mpfr-3.0.0-7047.recipe
index e134e23d0..c72947f57 100644
--- a/dev-libs/mpfr/mpfr-3.0.0-7047.bep
+++ b/dev-libs/mpfr/mpfr-3.0.0-7047.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-libs/gmp = ?.?.?"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd mpfr-3.0.0-7047
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mpfr-3.0.0-7047
 	make install
 	make check
diff --git a/dev-libs/mpfr/mpfr-3.1.1.bep b/dev-libs/mpfr/mpfr-3.1.1.recipe
similarity index 95%
rename from dev-libs/mpfr/mpfr-3.1.1.bep
rename to dev-libs/mpfr/mpfr-3.1.1.recipe
index 791db9071..8f4a04c4b 100644
--- a/dev-libs/mpfr/mpfr-3.1.1.bep
+++ b/dev-libs/mpfr/mpfr-3.1.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/gmp = 5.0.5"
 CHECKSUM_MD5="91d51c41fcf2799e4ee7a7126fc95c17"
-BUILD {
+BUILD()
+{
 	cd mpfr-3.1.1
 #	libtoolize --force --copy --install
 #	aclocal -I m4
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mpfr-3.1.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd mpfr-3.1.1
 	make check
 }
diff --git a/dev-libs/oniguruma/oniguruma-5.9.2.bep b/dev-libs/oniguruma/oniguruma-5.9.2.recipe
similarity index 94%
rename from dev-libs/oniguruma/oniguruma-5.9.2.bep
rename to dev-libs/oniguruma/oniguruma-5.9.2.recipe
index d55211dcc..fc87ef1bd 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.2.bep
+++ b/dev-libs/oniguruma/oniguruma-5.9.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="0f4ad1b100a5f9a91623e04111707b84"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd onig-5.9.2
 	libtoolize --force --copy --install
 	touch NEWS ChangeLog
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd onig-5.9.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd onig-5.9.2
 	make check
 }
diff --git a/dev-libs/openssl/openssl-0.9.8l.bep b/dev-libs/openssl/openssl-0.9.8l.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-0.9.8l.bep
rename to dev-libs/openssl/openssl-0.9.8l.recipe
index 1e9cdad01..3980d41e4 100644
--- a/dev-libs/openssl/openssl-0.9.8l.bep
+++ b/dev-libs/openssl/openssl-0.9.8l.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="05a0ece1372392a2cf310ebb96333025"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd openssl-0.9.8l
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-0.9.8l
 	make install
 }
diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-0.9.8m.bep
rename to dev-libs/openssl/openssl-0.9.8m.recipe
index 1048d6344..9b800b609 100644
--- a/dev-libs/openssl/openssl-0.9.8m.bep
+++ b/dev-libs/openssl/openssl-0.9.8m.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-0.9.8m
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-0.9.8m
 	make install
 }
diff --git a/dev-libs/openssl/openssl-1.0.0.bep b/dev-libs/openssl/openssl-1.0.0.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-1.0.0.bep
rename to dev-libs/openssl/openssl-1.0.0.recipe
index 79c4511c3..b9bcf4c58 100644
--- a/dev-libs/openssl/openssl-1.0.0.bep
+++ b/dev-libs/openssl/openssl-1.0.0.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="89eaa86e25b2845f920ec00ae4c864ed"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
diff --git a/dev-libs/openssl/openssl-1.0.0a.bep b/dev-libs/openssl/openssl-1.0.0a.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-1.0.0a.bep
rename to dev-libs/openssl/openssl-1.0.0a.recipe
index a0cd88932..eaea93655 100644
--- a/dev-libs/openssl/openssl-1.0.0a.bep
+++ b/dev-libs/openssl/openssl-1.0.0a.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="e3873edfffc783624cfbdb65e2249cbd"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0a
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0a
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
diff --git a/dev-libs/openssl/openssl-1.0.0c.bep b/dev-libs/openssl/openssl-1.0.0c.recipe
similarity index 94%
rename from dev-libs/openssl/openssl-1.0.0c.bep
rename to dev-libs/openssl/openssl-1.0.0c.recipe
index 81b78579e..7ddfa6214 100644
--- a/dev-libs/openssl/openssl-1.0.0c.bep
+++ b/dev-libs/openssl/openssl-1.0.0c.recipe
@@ -5,18 +5,21 @@ CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0c
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0c
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
 
-TEST {
+TEST()
+{
 	cd openssl-1.0.0c
 	make test
 }
diff --git a/dev-libs/openssl/openssl-1.0.0d.bep b/dev-libs/openssl/openssl-1.0.0d.recipe
similarity index 97%
rename from dev-libs/openssl/openssl-1.0.0d.bep
rename to dev-libs/openssl/openssl-1.0.0d.recipe
index 469c670c3..128323468 100644
--- a/dev-libs/openssl/openssl-1.0.0d.bep
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -21,18 +21,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	sed -i "s@MANDIR=\$(OPENSSLDIR)\/man@MANDIR=$manDir@g" Make*
 	./config --prefix=$prefix zlib shared \
 		--openssldir=$dataRootDir/ssl
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make test
 }
 
diff --git a/dev-libs/openssl/openssl-1.0.0e.bep b/dev-libs/openssl/openssl-1.0.0e.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-1.0.0e.bep
rename to dev-libs/openssl/openssl-1.0.0e.recipe
index d84ffb104..713f871ab 100644
--- a/dev-libs/openssl/openssl-1.0.0e.bep
+++ b/dev-libs/openssl/openssl-1.0.0e.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0e
 	sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make*
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0e
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
 
-TEST {
+TEST()
+{
 	cd openssl-1.0.0e
 	make test
 }
diff --git a/dev-libs/openssl/openssl-1.0.0g.bep b/dev-libs/openssl/openssl-1.0.0g.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-1.0.0g.bep
rename to dev-libs/openssl/openssl-1.0.0g.recipe
index 5797ec087..98e450b49 100644
--- a/dev-libs/openssl/openssl-1.0.0g.bep
+++ b/dev-libs/openssl/openssl-1.0.0g.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="07ecbe4324f140d157478637d6beccf1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0g
 	sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make*
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0g
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
 
-TEST {
+TEST()
+{
 	cd openssl-1.0.0g
 	make test
 }
diff --git a/dev-libs/openssl/openssl-1.0.0j.bep b/dev-libs/openssl/openssl-1.0.0j.recipe
similarity index 95%
rename from dev-libs/openssl/openssl-1.0.0j.bep
rename to dev-libs/openssl/openssl-1.0.0j.recipe
index a86acc668..8a5a30f01 100644
--- a/dev-libs/openssl/openssl-1.0.0j.bep
+++ b/dev-libs/openssl/openssl-1.0.0j.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/zlib >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd openssl-1.0.0j
 	sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make*
 	config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssl-1.0.0j
 	make install INSTALL_PREFIX="${DESTDIR}"
 }
 
-TEST {
+TEST()
+{
 	cd openssl-1.0.0j
 	make test
 }
diff --git a/dev-libs/popt/popt-1.16.bep b/dev-libs/popt/popt-1.16.recipe
similarity index 95%
rename from dev-libs/popt/popt-1.16.bep
rename to dev-libs/popt/popt-1.16.recipe
index 1ff0dc764..c7b6f8b3f 100644
--- a/dev-libs/popt/popt-1.16.bep
+++ b/dev-libs/popt/popt-1.16.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="3743beefa3dd6247a73f8f7a32c14c33"
-BUILD {
+BUILD()
+{
 	cd popt-1.16
 	libtoolize --force --copy --install
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd popt-1.16
 	make install
 }
diff --git a/dev-libs/protobuf/protobuf-2.4.1.bep b/dev-libs/protobuf/protobuf-2.4.1.recipe
similarity index 94%
rename from dev-libs/protobuf/protobuf-2.4.1.bep
rename to dev-libs/protobuf/protobuf-2.4.1.recipe
index c71c5f1cf..ef23ac899 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.bep
+++ b/dev-libs/protobuf/protobuf-2.4.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd protobuf-2.4.1
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd protobuf-2.4.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd protobuf-2.4.1
 	make check
 }
diff --git a/dev-libs/raptor2/raptor2-2.0.8.bep b/dev-libs/raptor2/raptor2-2.0.8.recipe
similarity index 95%
rename from dev-libs/raptor2/raptor2-2.0.8.bep
rename to dev-libs/raptor2/raptor2-2.0.8.recipe
index 72941880d..201b1cf35 100644
--- a/dev-libs/raptor2/raptor2-2.0.8.bep
+++ b/dev-libs/raptor2/raptor2-2.0.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="ac60858b875aab8fa7917f21a1237aa9"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-util/gtk-doc>=1.3"
-BUILD {
+BUILD()
+{
 	cd raptor2-2.0.8
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd raptor2-2.0.8
 	make install	
 }
 
-TEST {
+TEST()
+{
 	cd raptor2-2.0.8
 	make check
 }
diff --git a/dev-libs/rasqal/rasqal-0.9.29.bep b/dev-libs/rasqal/rasqal-0.9.29.recipe
similarity index 95%
rename from dev-libs/rasqal/rasqal-0.9.29.bep
rename to dev-libs/rasqal/rasqal-0.9.29.recipe
index f8d4a3d38..c8fc0413e 100644
--- a/dev-libs/rasqal/rasqal-0.9.29.bep
+++ b/dev-libs/rasqal/rasqal-0.9.29.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="49e4b75a0c67465edf55dd20606715fa"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-libs/raptor2>=2.0.8"
-BUILD {
+BUILD()
+{
 	cd rasqal-0.9.29
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rasqal-0.9.29
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd rasqal-0.9.29
 	make check
 }
diff --git a/dev-libs/redland/redland-1.0.15.bep b/dev-libs/redland/redland-1.0.15.recipe
similarity index 95%
rename from dev-libs/redland/redland-1.0.15.bep
rename to dev-libs/redland/redland-1.0.15.recipe
index 8aa04a56b..386fff5c7 100644
--- a/dev-libs/redland/redland-1.0.15.bep
+++ b/dev-libs/redland/redland-1.0.15.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="b0deb87f3c7d3237a3d587c1e0f2f266"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="rasqal>=0.9.29"
-BUILD {
+BUILD()
+{
 	cd redland-1.0.15
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd redland-1.0.15
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd redland-1.0.15
 	make check
 }
diff --git a/dev-libs/serd/serd-0.18.0.bep b/dev-libs/serd/serd-0.18.0.recipe
similarity index 96%
rename from dev-libs/serd/serd-0.18.0.bep
rename to dev-libs/serd/serd-0.18.0.recipe
index 7ae46de27..d48670c8d 100644
--- a/dev-libs/serd/serd-0.18.0.bep
+++ b/dev-libs/serd/serd-0.18.0.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="96dbade2c81d6df8100a9ef605ce35f8"
 
-BUILD {
+BUILD()
+{
 	cd serd-0.18.0
 	sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" waf
 	sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" wscript
@@ -15,7 +16,8 @@ BUILD {
 	./waf
 }
 
-INSTALL {
+INSTALL()
+{
 	cd serd-0.18.0
 	./waf install
 }
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.bep b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
similarity index 95%
rename from dev-libs/tinyxml/tinyxml-2.6.2.bep
rename to dev-libs/tinyxml/tinyxml-2.6.2.recipe
index 76ea6f7f2..8e6deeabf 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2.bep
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd tinyxml
 	rm xmltest.cpp
 	wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tinyxml
 	make install
 	mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml
diff --git a/dev-libs/uriparser/uriparser-0.7.5.bep b/dev-libs/uriparser/uriparser-0.7.5.recipe
similarity index 96%
rename from dev-libs/uriparser/uriparser-0.7.5.bep
rename to dev-libs/uriparser/uriparser-0.7.5.recipe
index c808642ab..a65afc5c7 100644
--- a/dev-libs/uriparser/uriparser-0.7.5.bep
+++ b/dev-libs/uriparser/uriparser-0.7.5.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="459c2786758929b92bfbd0cee25b5aa0"
-BUILD {
+BUILD()
+{
 	cd uriparser-0.7.5
 	libtoolize --force --copy
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd uriparser-0.7.5
 	make install
 }
diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.bep b/dev-libs/xerces-c/xerces-c-3.1.1.recipe
similarity index 96%
rename from dev-libs/xerces-c/xerces-c-3.1.1.bep
rename to dev-libs/xerces-c/xerces-c-3.1.1.recipe
index 471c47293..6e0ce264f 100644
--- a/dev-libs/xerces-c/xerces-c-3.1.1.bep
+++ b/dev-libs/xerces-c/xerces-c-3.1.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23"
 
-BUILD {
+BUILD()
+{
 	cd xerces-c-3.1.1
 	libtoolize --copy --force --install
 	autoreconf -i
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xerces-c-3.1.1
 	make install
 }
diff --git a/dev-libs/zziplib/zziplib-0.13.59.bep b/dev-libs/zziplib/zziplib-0.13.59.recipe
similarity index 97%
rename from dev-libs/zziplib/zziplib-0.13.59.bep
rename to dev-libs/zziplib/zziplib-0.13.59.recipe
index 7812f068d..dfa96f4ec 100644
--- a/dev-libs/zziplib/zziplib-0.13.59.bep
+++ b/dev-libs/zziplib/zziplib-0.13.59.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="14b5a6fc229afe9916d48358479568d3"
-BUILD {
+BUILD()
+{
 	cd zziplib-0.13.59
 	sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac
 	libtoolize --force --copy --install
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zziplib-0.13.59
 	make install
 }
diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.bep b/dev-lua/luarocks/luarocks-2.0.4.1.recipe
similarity index 95%
rename from dev-lua/luarocks/luarocks-2.0.4.1.bep
rename to dev-lua/luarocks/luarocks-2.0.4.1.recipe
index 35715858a..96b10e818 100644
--- a/dev-lua/luarocks/luarocks-2.0.4.1.bep
+++ b/dev-lua/luarocks/luarocks-2.0.4.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/lua >= 5.1"
 CHECKSUM_MD5="2c7caccce3cdf236e6f9aca7bec9bdea"
-BUILD {
+BUILD()
+{
 	cd luarocks-2.0.4.1
 	configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd luarocks-2.0.4.1
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/dev-perl/XML-Parser/XML-Parser-2.36.bep b/dev-perl/XML-Parser/XML-Parser-2.36.recipe
similarity index 96%
rename from dev-perl/XML-Parser/XML-Parser-2.36.bep
rename to dev-perl/XML-Parser/XML-Parser-2.36.recipe
index 6067758ff..4bb691719 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.36.bep
+++ b/dev-perl/XML-Parser/XML-Parser-2.36.recipe
@@ -11,13 +11,15 @@ CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded"
 # TODO: Remove hardcoded paths. The following shows how to get the the file path:
 #find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h
 
-BUILD {
+BUILD()
+{
 	cd XML-Parser-2.36
 	perl Makefile.PL
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd XML-Parser-2.36
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/dev-python/cnf/cnf-1.0-git.bep b/dev-python/cnf/cnf-1.0-git.recipe
similarity index 95%
rename from dev-python/cnf/cnf-1.0-git.bep
rename to dev-python/cnf/cnf-1.0-git.recipe
index 85971864e..5b0f89989 100644
--- a/dev-python/cnf/cnf-1.0-git.bep
+++ b/dev-python/cnf/cnf-1.0-git.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.6.4"
 
-BUILD {
+BUILD()
+{
 	echo "No build step"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cnf-1.0-git
 	python install_cnf.py
 }
diff --git a/dev-python/numpy/numpy-1.4.1.bep b/dev-python/numpy/numpy-1.4.1.recipe
similarity index 95%
rename from dev-python/numpy/numpy-1.4.1.bep
rename to dev-python/numpy/numpy-1.4.1.recipe
index 0a4917f13..776c39a1b 100644
--- a/dev-python/numpy/numpy-1.4.1.bep
+++ b/dev-python/numpy/numpy-1.4.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="5c7b5349dc3161763f7f366ceb96516b"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-lang/python >= 2.6.5"
-BUILD {
+BUILD()
+{
 	cd numpy-1.4.1
 	python setup.py config
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd numpy-1.4.1
 	python setup.py install
 }
diff --git a/dev-python/numpy/numpy-1.5.0.bep b/dev-python/numpy/numpy-1.5.0.recipe
similarity index 96%
rename from dev-python/numpy/numpy-1.5.0.bep
rename to dev-python/numpy/numpy-1.5.0.recipe
index 14bb87b27..59be61f97 100644
--- a/dev-python/numpy/numpy-1.5.0.bep
+++ b/dev-python/numpy/numpy-1.5.0.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="3a8bfdc434df782d647161c48943ee09"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.6.5"
-BUILD {
+BUILD()
+{
 	cd numpy-1.5.0
 	python setup.py config
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd numpy-1.5.0
 	python setup.py install --root=${DESTDIR}
 }
diff --git a/dev-python/paramiko/paramiko-1.7.6.bep b/dev-python/paramiko/paramiko-1.7.6.recipe
similarity index 96%
rename from dev-python/paramiko/paramiko-1.7.6.bep
rename to dev-python/paramiko/paramiko-1.7.6.recipe
index 5a5289fdc..a1c21fd8d 100644
--- a/dev-python/paramiko/paramiko-1.7.6.bep
+++ b/dev-python/paramiko/paramiko-1.7.6.recipe
@@ -5,11 +5,13 @@ REVISION= "1"
 STATUS_HAIKU="stable"
 DEPEND="pycrypto >= 1.9"
 CHECKSUM_MD5="b1cfe0cd55772115f808a11c1baba8a0"
-BUILD {
+BUILD()
+{
         cd paramiko-1.7.6
         python setup.py build
 }
-INSTALL {
+INSTALL()
+{
         cd paramiko-1.7.6
         if [ -n "${DESTDIR}" ];then
             python setup.py install --root=${DESTDIR}
diff --git a/dev-python/pychart/pychart-1.39-bzr.bep b/dev-python/pychart/pychart-1.39-bzr.recipe
similarity index 94%
rename from dev-python/pychart/pychart-1.39-bzr.bep
rename to dev-python/pychart/pychart-1.39-bzr.recipe
index 000a90264..a83bfdf4a 100644
--- a/dev-python/pychart/pychart-1.39-bzr.bep
+++ b/dev-python/pychart/pychart-1.39-bzr.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5"
-BUILD {
+BUILD()
+{
 	cd pychart-1.39-bzr
 	python setup.py config
 	python setup.py build
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pychart-1.39-bzr
 	python setup.py install --root=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd pychart-1.39-bzr/demos
 	make
 }
diff --git a/dev-python/pychart/pychart-1.39.bep b/dev-python/pychart/pychart-1.39.recipe
similarity index 94%
rename from dev-python/pychart/pychart-1.39.bep
rename to dev-python/pychart/pychart-1.39.recipe
index 0d4469f17..eda016918 100644
--- a/dev-python/pychart/pychart-1.39.bep
+++ b/dev-python/pychart/pychart-1.39.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5"
-BUILD {
+BUILD()
+{
 	cd PyChart-1.39
 	python setup.py config
 	python setup.py build
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd PyChart-1.39
 	python setup.py install --root=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd PyChart-1.39/demos
 	make
 }
diff --git a/dev-python/pycrypto/pycrypto-2.3.bep b/dev-python/pycrypto/pycrypto-2.3.recipe
similarity index 96%
rename from dev-python/pycrypto/pycrypto-2.3.bep
rename to dev-python/pycrypto/pycrypto-2.3.recipe
index f34147622..27c9dc0bb 100644
--- a/dev-python/pycrypto/pycrypto-2.3.bep
+++ b/dev-python/pycrypto/pycrypto-2.3.recipe
@@ -5,11 +5,13 @@ REVISION= "1"
 STATUS_HAIKU="unstable"
 DEPEND=""
 CHECKSUM_MD5="2b811cfbfc342d83ee614097effb8101"
-BUILD {
+BUILD()
+{
         cd pycrypto-2.3
         python setup.py build
 }
-INSTALL {
+INSTALL()
+{
         cd pycrypto-2.3
         if [ -n "${DESTDIR}" ];then
             python setup.py install --root=${DESTDIR}
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.1.bep b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe
similarity index 96%
rename from dev-python/pydispatcher/pydispatcher-2.0.1.bep
rename to dev-python/pydispatcher/pydispatcher-2.0.1.recipe
index 73788bc85..6b39e5a92 100644
--- a/dev-python/pydispatcher/pydispatcher-2.0.1.bep
+++ b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND="dev-python/setuptools >= 0.6"
 CHECKSUM_MD5="8b1695ed6f5bdbda8fbcde82b62d505c"
 
-BUILD {
+BUILD()
+{
 	cd PyDispatcher-2.0.1
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd PyDispatcher-2.0.1
 	python setup.py install --root=${DESTDIR}
 
diff --git a/dev-python/pygame/pygame-1.9.1.bep b/dev-python/pygame/pygame-1.9.1.recipe
similarity index 96%
rename from dev-python/pygame/pygame-1.9.1.bep
rename to dev-python/pygame/pygame-1.9.1.recipe
index 37d69521a..eb266e8ba 100644
--- a/dev-python/pygame/pygame-1.9.1.bep
+++ b/dev-python/pygame/pygame-1.9.1.recipe
@@ -9,13 +9,15 @@ DEPEND="dev-lang/python >= 2.6.4
 	media-libs/sdl-image >= 1.2.10
 	media-libs/smpeg >= 0.4.5"
 
-BUILD {
+BUILD()
+{
 	cd pygame-1.9.1release
 	LOCALBASE=/boot/common/
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pygame-1.9.1release
 	python setup.py install --root=${DESTDIR}
 }
diff --git a/dev-python/pylzma/pylzma-0.4.4.bep b/dev-python/pylzma/pylzma-0.4.4.recipe
similarity index 95%
rename from dev-python/pylzma/pylzma-0.4.4.bep
rename to dev-python/pylzma/pylzma-0.4.4.recipe
index 72da8b4ea..1cf497c91 100644
--- a/dev-python/pylzma/pylzma-0.4.4.bep
+++ b/dev-python/pylzma/pylzma-0.4.4.recipe
@@ -7,12 +7,14 @@ DEPEND="dev-lang/python >= 2.6.4
 REVISION="1"
 CHECKSUM_MD5="a2be89cb2288174ebb18bec68fa559fb"
 
-BUILD {
+BUILD()
+{
 	cd pylzma-0.4.4
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pylzma-0.4.4
 	python setup.py install
 }
diff --git a/dev-python/pyopengl/pyopengl-3.0.1.bep b/dev-python/pyopengl/pyopengl-3.0.1.recipe
similarity index 95%
rename from dev-python/pyopengl/pyopengl-3.0.1.bep
rename to dev-python/pyopengl/pyopengl-3.0.1.recipe
index 4365428fc..90519f858 100644
--- a/dev-python/pyopengl/pyopengl-3.0.1.bep
+++ b/dev-python/pyopengl/pyopengl-3.0.1.recipe
@@ -7,12 +7,14 @@ STATUS_HAIKU="unstable"
 DEPEND="dev-lang/python >= 2.6.4
 	media-libs/freeglut"
 
-BUILD {
+BUILD()
+{
 	cd PyOpenGL-3.0.1
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd PyOpenGL-3.0.1
 	python setup.py install --root=${DESTDIR}
 }
diff --git a/dev-python/pyserial/pyserial-2.5.bep b/dev-python/pyserial/pyserial-2.5.recipe
similarity index 96%
rename from dev-python/pyserial/pyserial-2.5.bep
rename to dev-python/pyserial/pyserial-2.5.recipe
index 2529314bc..c17ff5e6b 100644
--- a/dev-python/pyserial/pyserial-2.5.bep
+++ b/dev-python/pyserial/pyserial-2.5.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-lang/python >= 2.6.4"
 
-BUILD {
+BUILD()
+{
 	cd pyserial-2.5
 	python setup.py build
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pyserial-2.5
 	python setup.py install --root=${DESTDIR}
 
diff --git a/dev-python/pyxml/pyxml-0.8.4.bep b/dev-python/pyxml/pyxml-0.8.4.recipe
similarity index 95%
rename from dev-python/pyxml/pyxml-0.8.4.bep
rename to dev-python/pyxml/pyxml-0.8.4.recipe
index b833fc30f..b64ff72dd 100644
--- a/dev-python/pyxml/pyxml-0.8.4.bep
+++ b/dev-python/pyxml/pyxml-0.8.4.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="1f7655050cebbb664db976405fdba209"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-lang/python >= 2.6.4"
-BUILD {
+BUILD()
+{
 	cd PyXML-0.8.4
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd PyXML-0.8.4
 	python setup.py install --root=${DESTDIR}
 }
diff --git a/dev-python/rdflib/rdflib-3.2.0.bep b/dev-python/rdflib/rdflib-3.2.0.recipe
similarity index 95%
rename from dev-python/rdflib/rdflib-3.2.0.bep
rename to dev-python/rdflib/rdflib-3.2.0.recipe
index 60cadd742..1de760e0f 100644
--- a/dev-python/rdflib/rdflib-3.2.0.bep
+++ b/dev-python/rdflib/rdflib-3.2.0.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="ab3d3a5f71ebb6fe4fd33539f5d5768e"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-lang/python >= 2.6.4"
-BUILD {
+BUILD()
+{
 	cd rdflib-3.2.0
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rdflib-3.2.0
 	python setup.py install --root=${DESTDIR}
 }
diff --git a/dev-python/setuptools/setuptools-0.6.bep b/dev-python/setuptools/setuptools-0.6.recipe
similarity index 96%
rename from dev-python/setuptools/setuptools-0.6.bep
rename to dev-python/setuptools/setuptools-0.6.recipe
index 6c6708db4..c57353d61 100644
--- a/dev-python/setuptools/setuptools-0.6.bep
+++ b/dev-python/setuptools/setuptools-0.6.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e"
 
-BUILD {
+BUILD()
+{
 	cd setuptools-0.6c11
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd setuptools-0.6c11
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root=${DESTDIR}
diff --git a/dev-python/simpleparse/simpleparse-2.1.1a2.bep b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
similarity index 95%
rename from dev-python/simpleparse/simpleparse-2.1.1a2.bep
rename to dev-python/simpleparse/simpleparse-2.1.1a2.recipe
index 5c4c5c2ea..673b4ba77 100644
--- a/dev-python/simpleparse/simpleparse-2.1.1a2.bep
+++ b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="9c4e13b4f9b087442f76e7382ba97e3b"
 
-BUILD {
+BUILD()
+{
 	cd SimpleParse-2.1.1a2
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SimpleParse-2.1.1a2
 	python setup.py install --root=${DESTDIR}
 
diff --git a/dev-qt/qtcore/qtcore-4.7.3.bep b/dev-qt/qtcore/qtcore-4.7.3.recipe
similarity index 97%
rename from dev-qt/qtcore/qtcore-4.7.3.bep
rename to dev-qt/qtcore/qtcore-4.7.3.recipe
index 2ac139579..5124291b7 100644
--- a/dev-qt/qtcore/qtcore-4.7.3.bep
+++ b/dev-qt/qtcore/qtcore-4.7.3.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="49b96eefb1224cc529af6fe5608654fe"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd qt-everywhere-opensource-src-4.7.3
 		configure --prefix-install=no -no-pch -no-opengl -no-largefile \
 		-fast -nomake examples -nomake demos -release -opensource \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qt-everywhere-opensource-src-4.7.3 
 	make install INSTALL_ROOT=${DESTDIR}
 }
diff --git a/dev-qt/qtcore/qtcore-4.8.x-git.bep b/dev-qt/qtcore/qtcore-4.8.x-git.recipe
similarity index 97%
rename from dev-qt/qtcore/qtcore-4.8.x-git.bep
rename to dev-qt/qtcore/qtcore-4.8.x-git.recipe
index eacedad16..5eddfd99a 100644
--- a/dev-qt/qtcore/qtcore-4.8.x-git.bep
+++ b/dev-qt/qtcore/qtcore-4.8.x-git.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd qtcore-4.8.x-git
 	configure --prefix-install=no -no-pch -no-opengl -no-largefile \
 		-fast -nomake examples -nomake demos -release -opensource \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qtcore-4.8.x-git
 	make install INSTALL_ROOT=${DESTDIR}
 }
diff --git a/dev-qt/qtcore/qtcore-4.8.x.bep b/dev-qt/qtcore/qtcore-4.8.x.recipe
similarity index 96%
rename from dev-qt/qtcore/qtcore-4.8.x.bep
rename to dev-qt/qtcore/qtcore-4.8.x.recipe
index af23591c3..e427e3c4f 100644
--- a/dev-qt/qtcore/qtcore-4.8.x.bep
+++ b/dev-qt/qtcore/qtcore-4.8.x.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd qtcore-4.8.x 
 	configure --prefix-install=no -no-pch -no-opengl -no-largefile \
 		-fast -nomake examples -nomake demos -release -opensource \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd qtcore-4.8.x
 	make install INSTALL_ROOT=${DESTDIR}
 }
diff --git a/dev-scheme/chicken/chicken-4.5.0.bep b/dev-scheme/chicken/chicken-4.5.0.recipe
similarity index 95%
rename from dev-scheme/chicken/chicken-4.5.0.bep
rename to dev-scheme/chicken/chicken-4.5.0.recipe
index 21c470309..60161bb62 100644
--- a/dev-scheme/chicken/chicken-4.5.0.bep
+++ b/dev-scheme/chicken/chicken-4.5.0.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="753aea676a18c8dc0161dfb4d1717e20"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd chicken-4.5.0
 	make PLATFORM=haiku PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd chicken-4.5.0
 	make PLATFORM=haiku PREFIX=/boot/common install
 }
diff --git a/dev-scheme/chicken/chicken-4.7.0.bep b/dev-scheme/chicken/chicken-4.7.0.recipe
similarity index 97%
rename from dev-scheme/chicken/chicken-4.7.0.bep
rename to dev-scheme/chicken/chicken-4.7.0.recipe
index a08075989..5a1e785f4 100644
--- a/dev-scheme/chicken/chicken-4.7.0.bep
+++ b/dev-scheme/chicken/chicken-4.7.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9389388fdf04c3c64de29633aae12539"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd chicken-4.7.0
 	if [ `gcc -dumpversion | cut -f1 -d.` -eq "2" ];then
 		echo "Removing -fwrapv flag for gcc2 build"
@@ -18,7 +19,8 @@ BUILD {
 	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd chicken-4.7.0
 	make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` install \
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 \
@@ -26,7 +28,8 @@ INSTALL {
 	DATADIR=`finddir B_COMMON_DATA_DIRECTORY`/chicken
 }
 
-TEST {
+TEST()
+{
 	if ! type -p csi > /dev/null;then
 		echo "ERROR: Chicken must be installed before running the test suite"
 		exit 1
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe
similarity index 97%
rename from dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep
rename to dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe
index c16b203e5..3befe3f31 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6"
-BUILD {
+BUILD()
+{
 	cd abi-compliance-checker-1.98.3
 	sed -i 's/linux|freebsd|openbsd|netbsd/linux|freebsd|openbsd|netbsd|haiku/' Makefile.pl
 	sed -i 's/$PREFIX\/share\/$TOOL_SNAME/$PREFIX\/data\/$TOOL_SNAME/' Makefile.pl
 	sed -i 's/..\/share\/$TOOL_SNAME/..\/data\/$TOOL_SNAME/' Makefile.pl	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd abi-compliance-checker-1.98.3
 	mkdir -p $DESTDIR/`finddir B_COMMON_DIRECTORY`/example-descriptors
 	perl Makefile.pl -install --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -21,7 +23,8 @@ INSTALL {
 		$DESTDIR/`finddir B_COMMON_DIRECTORY`/data/abi-compliance-checker
 }
 
-TEST {
+TEST()
+{
 	cd abi-compliance-checker-1.98.3
 #	make test
 #	make check
diff --git a/dev-util/astyle/astyle-r339.bep b/dev-util/astyle/astyle-r339.recipe
similarity index 96%
rename from dev-util/astyle/astyle-r339.bep
rename to dev-util/astyle/astyle-r339.recipe
index b7d557061..95757a163 100644
--- a/dev-util/astyle/astyle-r339.bep
+++ b/dev-util/astyle/astyle-r339.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd astyle-r339/build/gcc
 	make prefix=$(finddir B_COMMON_DIRECTORY)
 }
 
-INSTALL {
+INSTALL()
+{
 	cd astyle-r339/build/gcc
 	make install \
 	prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
diff --git a/dev-util/astyle/astyle-r361.bep b/dev-util/astyle/astyle-r361.recipe
similarity index 96%
rename from dev-util/astyle/astyle-r361.bep
rename to dev-util/astyle/astyle-r361.recipe
index 820652fd6..7dcb35fff 100644
--- a/dev-util/astyle/astyle-r361.bep
+++ b/dev-util/astyle/astyle-r361.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd astyle-r361/build/gcc
 	make prefix=$(finddir B_COMMON_DIRECTORY)
 }
 
-INSTALL {
+INSTALL()
+{
 	cd astyle-r361/build/gcc
 	make install \
 	prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
diff --git a/dev-util/automoc/automoc-4-git.bep b/dev-util/automoc/automoc-4-git.recipe
similarity index 93%
rename from dev-util/automoc/automoc-4-git.bep
rename to dev-util/automoc/automoc-4-git.recipe
index c05ae9b06..dc84eeb51 100644
--- a/dev-util/automoc/automoc-4-git.bep
+++ b/dev-util/automoc/automoc-4-git.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="qt4,
 		cmake"
-BUILD {
+BUILD()
+{
 	cd automoc-4-git
 	cmake CMakeLists.txt	
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automoc-4-git
 	make install	
 }
diff --git a/dev-util/bakefile/bakefile-0.2.8.bep b/dev-util/bakefile/bakefile-0.2.8.recipe
similarity index 95%
rename from dev-util/bakefile/bakefile-0.2.8.bep
rename to dev-util/bakefile/bakefile-0.2.8.recipe
index e668d3760..562bee05f 100644
--- a/dev-util/bakefile/bakefile-0.2.8.bep
+++ b/dev-util/bakefile/bakefile-0.2.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5 = "874da5c9035514366b7723bc7657c71c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bakefile-0.2.8
 	touch ./ChangeLog
 	libtoolize --force --copy --install
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bakefile-0.2.8
 	make install
 }
diff --git a/dev-util/bsdbuild/bsdbuild-2.9.bep b/dev-util/bsdbuild/bsdbuild-2.9.recipe
similarity index 97%
rename from dev-util/bsdbuild/bsdbuild-2.9.bep
rename to dev-util/bsdbuild/bsdbuild-2.9.recipe
index e77108333..5503da2bb 100644
--- a/dev-util/bsdbuild/bsdbuild-2.9.bep
+++ b/dev-util/bsdbuild/bsdbuild-2.9.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="broken"
 DEPEND="dev-lang/perl >= 5.10
 	dev-lang/lua >= 5.1"
 CHECKSUM_MD5="fd0d4a754024a39d9cf1f5e42f8075b5"
-BUILD {
+BUILD()
+{
 	cd bsdbuild-2.9
 	cp mkconfigure.pl mkconfigure
 #	cp gen-dotdepend.pl gen-dotdepend-tmp.pl
@@ -24,12 +25,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bsdbuild-2.9
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd bsdbuild-2.9
 #	make test
 #	make check
diff --git a/dev-util/buildsystem/buildsystem-0.bep b/dev-util/buildsystem/buildsystem-0.recipe
similarity index 94%
rename from dev-util/buildsystem/buildsystem-0.bep
rename to dev-util/buildsystem/buildsystem-0.recipe
index 3b3a51491..e8074bdb9 100644
--- a/dev-util/buildsystem/buildsystem-0.bep
+++ b/dev-util/buildsystem/buildsystem-0.recipe
@@ -4,12 +4,14 @@ SRC_URI="git://git.netsurf-browser.org/buildsystem"
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd buildsystem-0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd buildsystem-0
 	make install PREFIX=/boot/common/
 }
diff --git a/dev-util/ccache/ccache-3.0.1.bep b/dev-util/ccache/ccache-3.0.1.recipe
similarity index 95%
rename from dev-util/ccache/ccache-3.0.1.bep
rename to dev-util/ccache/ccache-3.0.1.recipe
index afd44e30a..c0b966fdc 100644
--- a/dev-util/ccache/ccache-3.0.1.bep
+++ b/dev-util/ccache/ccache-3.0.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4"
-BUILD {
+BUILD()
+{
 	cd ccache-3.0.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd ccache-3.0.1
 	make install
 }
diff --git a/dev-util/ccache/ccache-3.1.4.bep b/dev-util/ccache/ccache-3.1.4.recipe
similarity index 95%
rename from dev-util/ccache/ccache-3.1.4.bep
rename to dev-util/ccache/ccache-3.1.4.recipe
index 82185cdb3..430dbcedc 100644
--- a/dev-util/ccache/ccache-3.1.4.bep
+++ b/dev-util/ccache/ccache-3.1.4.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd"
-BUILD {
+BUILD()
+{
 	cd ccache-3.1.4
 	sed -i 's/\-lm//g' Ma*
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd ccache-3.1.4
 	make install
 }
diff --git a/dev-util/ccache/ccache-3.1.7.bep b/dev-util/ccache/ccache-3.1.7.recipe
similarity index 95%
rename from dev-util/ccache/ccache-3.1.7.bep
rename to dev-util/ccache/ccache-3.1.7.recipe
index 88e8845fc..a999d612c 100644
--- a/dev-util/ccache/ccache-3.1.7.bep
+++ b/dev-util/ccache/ccache-3.1.7.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="82257745eac54826527946e9e3d046f4"
-BUILD {
+BUILD()
+{
 	cd ccache-3.1.7
 	sed -i 's/\-lm//g' Ma*
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd ccache-3.1.7
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.6.4.bep b/dev-util/cmake/cmake-2.6.4.recipe
similarity index 95%
rename from dev-util/cmake/cmake-2.6.4.bep
rename to dev-util/cmake/cmake-2.6.4.recipe
index 58ad39107..e56b75190 100644
--- a/dev-util/cmake/cmake-2.6.4.bep
+++ b/dev-util/cmake/cmake-2.6.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.6.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.6.4
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8-git.bep b/dev-util/cmake/cmake-2.8-git.recipe
similarity index 96%
rename from dev-util/cmake/cmake-2.8-git.bep
rename to dev-util/cmake/cmake-2.8-git.recipe
index bb2e85396..6916936fb 100644
--- a/dev-util/cmake/cmake-2.8-git.bep
+++ b/dev-util/cmake/cmake-2.8-git.recipe
@@ -5,7 +5,8 @@ SRC_URI="git+http://cmake.org/cmake.git"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8-git
 	# cmake appends the prefix to mandir and datadir 
 	# so using ../../ to back that part out but for some reason
@@ -19,12 +20,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8-git
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cmake-2.8-git
 	make test
 }
diff --git a/dev-util/cmake/cmake-2.8.0.bep b/dev-util/cmake/cmake-2.8.0.recipe
similarity index 95%
rename from dev-util/cmake/cmake-2.8.0.bep
rename to dev-util/cmake/cmake-2.8.0.recipe
index f35325ced..4c7fdcbbf 100644
--- a/dev-util/cmake/cmake-2.8.0.bep
+++ b/dev-util/cmake/cmake-2.8.0.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.0
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.0
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.1.bep b/dev-util/cmake/cmake-2.8.1.recipe
similarity index 95%
rename from dev-util/cmake/cmake-2.8.1.bep
rename to dev-util/cmake/cmake-2.8.1.recipe
index 461a14f7b..80d31865e 100644
--- a/dev-util/cmake/cmake-2.8.1.bep
+++ b/dev-util/cmake/cmake-2.8.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.1
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.10.2.bep b/dev-util/cmake/cmake-2.8.10.2.recipe
similarity index 97%
rename from dev-util/cmake/cmake-2.8.10.2.bep
rename to dev-util/cmake/cmake-2.8.10.2.recipe
index 72db78d2a..3ab461703 100644
--- a/dev-util/cmake/cmake-2.8.10.2.bep
+++ b/dev-util/cmake/cmake-2.8.10.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="097278785da7182ec0aea8769d06860c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.10.2
 	# cmake assumes the aclocal dir is in share/aclocal
 	sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx 
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.10.2
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.2.bep b/dev-util/cmake/cmake-2.8.2.recipe
similarity index 95%
rename from dev-util/cmake/cmake-2.8.2.bep
rename to dev-util/cmake/cmake-2.8.2.recipe
index 4d8645f05..34695a63f 100644
--- a/dev-util/cmake/cmake-2.8.2.bep
+++ b/dev-util/cmake/cmake-2.8.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.2
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.3.bep b/dev-util/cmake/cmake-2.8.3.recipe
similarity index 95%
rename from dev-util/cmake/cmake-2.8.3.bep
rename to dev-util/cmake/cmake-2.8.3.recipe
index aa753fa5a..2b2f007af 100644
--- a/dev-util/cmake/cmake-2.8.3.bep
+++ b/dev-util/cmake/cmake-2.8.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.3
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.4.bep b/dev-util/cmake/cmake-2.8.4.recipe
similarity index 97%
rename from dev-util/cmake/cmake-2.8.4.bep
rename to dev-util/cmake/cmake-2.8.4.recipe
index 7725b1668..628922d88 100644
--- a/dev-util/cmake/cmake-2.8.4.bep
+++ b/dev-util/cmake/cmake-2.8.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.4
 	# cmake appends the prefix to mandir and datadir 
 	# so using ../../ to back that part out but for some reason
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.4
 	make install
 }
diff --git a/dev-util/cmake/cmake-2.8.5.bep b/dev-util/cmake/cmake-2.8.5.recipe
similarity index 97%
rename from dev-util/cmake/cmake-2.8.5.bep
rename to dev-util/cmake/cmake-2.8.5.recipe
index b08109c16..dde87fa24 100644
--- a/dev-util/cmake/cmake-2.8.5.bep
+++ b/dev-util/cmake/cmake-2.8.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cmake-2.8.5
 	# cmake appends the prefix to mandir and datadir 
 	# so using ../../ to back that part out but for some reason
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cmake-2.8.5
 	make install
 }
diff --git a/dev-util/cppunit/cppunit-1.12.1.bep b/dev-util/cppunit/cppunit-1.12.1.recipe
similarity index 95%
rename from dev-util/cppunit/cppunit-1.12.1.bep
rename to dev-util/cppunit/cppunit-1.12.1.recipe
index b6acee2c0..f1d7044bf 100644
--- a/dev-util/cppunit/cppunit-1.12.1.bep
+++ b/dev-util/cppunit/cppunit-1.12.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cppunit-1.12.1
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cppunit-1.12.1
 	make install
 }
diff --git a/dev-util/cscope/cscope-15.7a.bep b/dev-util/cscope/cscope-15.7a.recipe
similarity index 95%
rename from dev-util/cscope/cscope-15.7a.bep
rename to dev-util/cscope/cscope-15.7a.recipe
index de9159eb5..de04966d8 100644
--- a/dev-util/cscope/cscope-15.7a.bep
+++ b/dev-util/cscope/cscope-15.7a.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="da43987622ace8c36bbf14c15a350ec1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cscope-15.7a
 	autoreconf -fvi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cscope-15.7a
 	make install
 }
diff --git a/dev-util/ctags/ctags-5.8.bep b/dev-util/ctags/ctags-5.8.recipe
similarity index 96%
rename from dev-util/ctags/ctags-5.8.bep
rename to dev-util/ctags/ctags-5.8.recipe
index 409a72ab6..d00ceb3ff 100644
--- a/dev-util/ctags/ctags-5.8.bep
+++ b/dev-util/ctags/ctags-5.8.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d"
-BUILD {
+BUILD()
+{
 	cd ctags-5.8
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ctags-5.8
 		make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \
 			mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
diff --git a/dev-util/diffstat/diffstat-1.51.bep b/dev-util/diffstat/diffstat-1.51.recipe
similarity index 95%
rename from dev-util/diffstat/diffstat-1.51.bep
rename to dev-util/diffstat/diffstat-1.51.recipe
index d3a73f46f..2a1663405 100644
--- a/dev-util/diffstat/diffstat-1.51.bep
+++ b/dev-util/diffstat/diffstat-1.51.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="a7d3fd1ba2a9a6c9e2b32e867b5e8792"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd diffstat-1.51
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd diffstat-1.51
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/dev-util/fastdep/fastdep-0.16.bep b/dev-util/fastdep/fastdep-0.16.recipe
similarity index 95%
rename from dev-util/fastdep/fastdep-0.16.bep
rename to dev-util/fastdep/fastdep-0.16.recipe
index d299b7249..dee98f264 100644
--- a/dev-util/fastdep/fastdep-0.16.bep
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54"
-BUILD {
+BUILD()
+{
 	cd fastdep-0.16
 	./configure
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd fastdep-0.16
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	cp -f fastdep ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/dev-util/global/global-6.2.2.bep b/dev-util/global/global-6.2.2.recipe
similarity index 97%
rename from dev-util/global/global-6.2.2.bep
rename to dev-util/global/global-6.2.2.recipe
index 34cb8672f..3c44a3930 100644
--- a/dev-util/global/global-6.2.2.bep
+++ b/dev-util/global/global-6.2.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8317d2d6914a8e18cd725f9cd7164b87"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/ctags >= 5.8"
-BUILD {
+BUILD()
+{
 	cd global-6.2.2
 	autoreconf -fi
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd global-6.2.2
 	make install
 }
diff --git a/dev-util/global/global-6.2.4.bep b/dev-util/global/global-6.2.4.recipe
similarity index 97%
rename from dev-util/global/global-6.2.4.bep
rename to dev-util/global/global-6.2.4.recipe
index 2fea5fdf7..b98c32ac6 100644
--- a/dev-util/global/global-6.2.4.bep
+++ b/dev-util/global/global-6.2.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c778d4e52a30706db7a02070cce1078c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/ctags >= 5.8"
-BUILD {
+BUILD()
+{
 	cd global-6.2.4
 	autoreconf -fi
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd global-6.2.4
 	make install
 }
diff --git a/dev-util/gperf/gperf-3.0.4.bep b/dev-util/gperf/gperf-3.0.4.recipe
similarity index 96%
rename from dev-util/gperf/gperf-3.0.4.bep
rename to dev-util/gperf/gperf-3.0.4.recipe
index c4071044c..7a197d14c 100644
--- a/dev-util/gperf/gperf-3.0.4.bep
+++ b/dev-util/gperf/gperf-3.0.4.recipe
@@ -5,7 +5,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632"
-BUILD {
+BUILD()
+{
 	cd gperf-3.0.4
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gperf-3.0.4
 	make install
 }
diff --git a/dev-util/gtk-doc/gtk-doc-1.15.bep b/dev-util/gtk-doc/gtk-doc-1.15.recipe
similarity index 95%
rename from dev-util/gtk-doc/gtk-doc-1.15.bep
rename to dev-util/gtk-doc/gtk-doc-1.15.recipe
index dbb09f8c3..87f6e85b7 100644
--- a/dev-util/gtk-doc/gtk-doc-1.15.bep
+++ b/dev-util/gtk-doc/gtk-doc-1.15.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.23
 		dev-libs/libxslt >= 1.1.26"
-BUILD {
+BUILD()
+{
 	cd gtk-doc-1.15
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gtk-doc-1.15
 	make install
 }
diff --git a/dev-util/idutils/idutils-20061208.bep b/dev-util/idutils/idutils-20061208.recipe
similarity index 95%
rename from dev-util/idutils/idutils-20061208.bep
rename to dev-util/idutils/idutils-20061208.recipe
index 680bf7356..6d0261204 100644
--- a/dev-util/idutils/idutils-20061208.bep
+++ b/dev-util/idutils/idutils-20061208.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="75cd31c5401c329cdefc272c60c83422"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd idutils-cvs
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd idutils-cvs
 	make install
 }
diff --git a/dev-util/idutils/idutils-4.2.bep b/dev-util/idutils/idutils-4.2.recipe
similarity index 95%
rename from dev-util/idutils/idutils-4.2.bep
rename to dev-util/idutils/idutils-4.2.recipe
index 137fb9d96..8733badb2 100644
--- a/dev-util/idutils/idutils-4.2.bep
+++ b/dev-util/idutils/idutils-4.2.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="4bbd2cb0d566ab29e41088cc028ad710"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd idutils-4.2
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd idutils-4.2
 	make install
 }
diff --git a/dev-util/indent/indent-2.2.11.bep b/dev-util/indent/indent-2.2.11.recipe
similarity index 96%
rename from dev-util/indent/indent-2.2.11.bep
rename to dev-util/indent/indent-2.2.11.recipe
index b9649ad6d..aebc21acc 100644
--- a/dev-util/indent/indent-2.2.11.bep
+++ b/dev-util/indent/indent-2.2.11.recipe
@@ -7,7 +7,8 @@ DEPEND="sys-devel/gettext >= 0.17
 	net-misc/rsync >= 3.0.7
 	app-text/texi2html >= 1.82"
 CHECKSUM_MD5="98beafca62472805a3739d3867d5d70f"
-BUILD {
+BUILD()
+{
 	cd indent-2.2.11
 	libtoolize --force --copy --install
 	./bootstrap
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd indent-2.2.11
 	make install DESTDIR=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd indent-2.2.11
 #	make test
 #	make check
diff --git a/dev-util/intltool/intltool-0.40.6.bep b/dev-util/intltool/intltool-0.40.6.recipe
similarity index 96%
rename from dev-util/intltool/intltool-0.40.6.bep
rename to dev-util/intltool/intltool-0.40.6.recipe
index 9b91877ea..05eb668c7 100644
--- a/dev-util/intltool/intltool-0.40.6.bep
+++ b/dev-util/intltool/intltool-0.40.6.recipe
@@ -6,7 +6,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 MESSAGE="Requires XML::Parser perl module installed"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd intltool-0.40.6
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
 	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd intltool-0.40.6
 	make install
 	make check
diff --git a/dev-util/patchutils/patchutils-0.3.1.bep b/dev-util/patchutils/patchutils-0.3.1.recipe
similarity index 95%
rename from dev-util/patchutils/patchutils-0.3.1.bep
rename to dev-util/patchutils/patchutils-0.3.1.recipe
index 1e5a0f704..7a5547008 100644
--- a/dev-util/patchutils/patchutils-0.3.1.bep
+++ b/dev-util/patchutils/patchutils-0.3.1.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="3fd9bca58a429fbbb1c2126f1b72aa23"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd patchutils-0.3.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd patchutils-0.3.1
 	make install
 }
diff --git a/dev-util/patchutils/patchutils-0.3.2.bep b/dev-util/patchutils/patchutils-0.3.2.recipe
similarity index 95%
rename from dev-util/patchutils/patchutils-0.3.2.bep
rename to dev-util/patchutils/patchutils-0.3.2.recipe
index db1ed8e5e..7d7aba0f1 100644
--- a/dev-util/patchutils/patchutils-0.3.2.bep
+++ b/dev-util/patchutils/patchutils-0.3.2.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="74607b4a28c9009c6aeeed0e91098917"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd patchutils-0.3.2
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
 	--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man"
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd patchutils-0.3.2
 	make install
 }
diff --git a/dev-util/pjdfstest/pjdfstest-20100807.bep b/dev-util/pjdfstest/pjdfstest-20100807.recipe
similarity index 94%
rename from dev-util/pjdfstest/pjdfstest-20100807.bep
rename to dev-util/pjdfstest/pjdfstest-20100807.recipe
index 878545588..be1098a1c 100644
--- a/dev-util/pjdfstest/pjdfstest-20100807.bep
+++ b/dev-util/pjdfstest/pjdfstest-20100807.recipe
@@ -6,17 +6,20 @@ REVISION="1"
 STATUS_HAIKU="broken"
 MESSAGE="This test suite requires expect, which hasn't been ported to Haiku, yet."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pjdfstest-20100807
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pjdfstest-20100807
 
 }
 
-TEST {
+TEST()
+{
 	cd pjdfstest-20100807
 
 }
diff --git a/dev-util/pkgconfig/pkgconfig-0.23.bep b/dev-util/pkgconfig/pkgconfig-0.23.recipe
similarity index 96%
rename from dev-util/pkgconfig/pkgconfig-0.23.bep
rename to dev-util/pkgconfig/pkgconfig-0.23.recipe
index 2a71b584d..f5bd3a43d 100644
--- a/dev-util/pkgconfig/pkgconfig-0.23.bep
+++ b/dev-util/pkgconfig/pkgconfig-0.23.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d922a88782b64441d06547632fd85744"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pkg-config-0.23/glib-1.2.10
 	mkdir -p m4
 	libtoolize --force --copy --install
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pkg-config-0.23
 	make install
 }
diff --git a/dev-util/pkgconfig/pkgconfig-0.25.bep b/dev-util/pkgconfig/pkgconfig-0.25.recipe
similarity index 97%
rename from dev-util/pkgconfig/pkgconfig-0.25.bep
rename to dev-util/pkgconfig/pkgconfig-0.25.recipe
index 6df116054..8c3067e73 100644
--- a/dev-util/pkgconfig/pkgconfig-0.25.bep
+++ b/dev-util/pkgconfig/pkgconfig-0.25.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pkg-config-0.25/glib-1.2.10
 	mkdir -p m4
 	libtoolize --force --copy --install
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pkg-config-0.25
 	make install
 }
diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
similarity index 95%
rename from dev-util/posixtestsuite/posixtestsuite-1.5.2.bep
rename to dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
index 8343380ce..3a9eda09b 100644
--- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep
+++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
@@ -5,17 +5,20 @@ CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd posixtestsuite
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd posixtestsuite
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd posixtestsuite
 	execute.sh
 }
diff --git a/dev-util/premake/premake-4.3.bep b/dev-util/premake/premake-4.3.recipe
similarity index 96%
rename from dev-util/premake/premake-4.3.bep
rename to dev-util/premake/premake-4.3.recipe
index 823710ef2..d01ce86be 100644
--- a/dev-util/premake/premake-4.3.bep
+++ b/dev-util/premake/premake-4.3.recipe
@@ -6,12 +6,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd premake-4.3/build/gmake.unix
 	make config=release
 }
 
-INSTALL {
+INSTALL()
+{
 	cd premake-4.3/bin/release
 	mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`
 	install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/dev-util/quilt/quilt-0.48.bep b/dev-util/quilt/quilt-0.48.recipe
similarity index 96%
rename from dev-util/quilt/quilt-0.48.bep
rename to dev-util/quilt/quilt-0.48.recipe
index ec42bbf25..ab9333581 100644
--- a/dev-util/quilt/quilt-0.48.bep
+++ b/dev-util/quilt/quilt-0.48.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/diffstat >= 1.51
 	sys-apps/ed >= 1.4"
-BUILD {
+BUILD()
+{
 	cd quilt-0.48
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make EDITOR=nano
 }
 
-INSTALL {
+INSTALL()
+{
 	cd quilt-0.48
 	make install BUILD_ROOT="${DESTDIR}"
 }
diff --git a/dev-util/re2c/re2c-0.13.5.bep b/dev-util/re2c/re2c-0.13.5.recipe
similarity index 95%
rename from dev-util/re2c/re2c-0.13.5.bep
rename to dev-util/re2c/re2c-0.13.5.recipe
index 14ff7044c..949343943 100644
--- a/dev-util/re2c/re2c-0.13.5.bep
+++ b/dev-util/re2c/re2c-0.13.5.recipe
@@ -6,18 +6,21 @@ STATUS_HAIKU="broken"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 CHECKSUM_MD5="4a97d8f77ed6d2c76c8bd840a43f5633"
-BUILD {
+BUILD()
+{
 	cd re2c-0.13.5
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd re2c-0.13.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd re2c-0.13.5
 #	make test
 #	make check
diff --git a/dev-util/scons/scons-1.0.1-python2.5.bep b/dev-util/scons/scons-1.0.1-python2.5.recipe
similarity index 96%
rename from dev-util/scons/scons-1.0.1-python2.5.bep
rename to dev-util/scons/scons-1.0.1-python2.5.recipe
index d3ac1ef58..35267247e 100644
--- a/dev-util/scons/scons-1.0.1-python2.5.bep
+++ b/dev-util/scons/scons-1.0.1-python2.5.recipe
@@ -7,12 +7,14 @@ CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python <= 2.5.5"
-BUILD {
+BUILD()
+{
 	cd scons-1.0.1
 	python2.5 setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd scons-1.0.1
 	if [ ! -z ${DESTDIR} ];then
 		python2.5 setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib
diff --git a/dev-util/scons/scons-1.0.1.bep b/dev-util/scons/scons-1.0.1.recipe
similarity index 96%
rename from dev-util/scons/scons-1.0.1.bep
rename to dev-util/scons/scons-1.0.1.recipe
index e007090ee..53279673d 100644
--- a/dev-util/scons/scons-1.0.1.bep
+++ b/dev-util/scons/scons-1.0.1.recipe
@@ -7,12 +7,14 @@ CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.5.4"
-BUILD {
+BUILD()
+{
 	cd scons-1.0.1
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd scons-1.0.1
 	if [ ! -z ${DESTDIR} ];then
 		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib
diff --git a/dev-util/scons/scons-2.0.1.bep b/dev-util/scons/scons-2.0.1.recipe
similarity index 97%
rename from dev-util/scons/scons-2.0.1.bep
rename to dev-util/scons/scons-2.0.1.recipe
index 6ec4b1a5e..b6c6f8453 100644
--- a/dev-util/scons/scons-2.0.1.bep
+++ b/dev-util/scons/scons-2.0.1.recipe
@@ -7,7 +7,8 @@ CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.5.4"
-BUILD {
+BUILD()
+{
 	cd scons-2.0.1
 	for f in "script/scons script/scons-time script/sconsign"; do
 		sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
@@ -15,7 +16,8 @@ BUILD {
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	if [ ! -z ${DESTDIR} ]; then
 		options="${options} --root=${DESTDIR}"
 	fi
diff --git a/dev-util/scons/scons-2.2.0.bep b/dev-util/scons/scons-2.2.0.recipe
similarity index 97%
rename from dev-util/scons/scons-2.2.0.bep
rename to dev-util/scons/scons-2.2.0.recipe
index 8ecad51b5..007f389a7 100644
--- a/dev-util/scons/scons-2.2.0.bep
+++ b/dev-util/scons/scons-2.2.0.recipe
@@ -7,7 +7,8 @@ CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.5.4"
-BUILD {
+BUILD()
+{
 	cd scons-2.2.0
 	for f in "script/scons script/scons-time script/sconsign"; do
 		sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
@@ -15,7 +16,8 @@ BUILD {
 	python setup.py build
 }
 
-INSTALL {
+INSTALL()
+{
 	if [ ! -z ${DESTDIR} ]; then
 		options="${options} --root=${DESTDIR}"
 	fi
diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.2.0.bep
rename to dev-vcs/bzr/bzr-2.2.0.recipe
index d2019e4ec..876b25b26 100644
--- a/dev-vcs/bzr/bzr-2.2.0.bep
+++ b/dev-vcs/bzr/bzr-2.2.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.2.0
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.2.0
 	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
diff --git a/dev-vcs/bzr/bzr-2.2.1.bep b/dev-vcs/bzr/bzr-2.2.1.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.2.1.bep
rename to dev-vcs/bzr/bzr-2.2.1.recipe
index fd707fc9b..4823f24ec 100644
--- a/dev-vcs/bzr/bzr-2.2.1.bep
+++ b/dev-vcs/bzr/bzr-2.2.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.2.1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.2.1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
diff --git a/dev-vcs/bzr/bzr-2.2.2.bep b/dev-vcs/bzr/bzr-2.2.2.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.2.2.bep
rename to dev-vcs/bzr/bzr-2.2.2.recipe
index 2fdd8947d..dc46f3f74 100644
--- a/dev-vcs/bzr/bzr-2.2.2.bep
+++ b/dev-vcs/bzr/bzr-2.2.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.2.2
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.2.2
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
diff --git a/dev-vcs/bzr/bzr-2.2b4.bep b/dev-vcs/bzr/bzr-2.2b4.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.2b4.bep
rename to dev-vcs/bzr/bzr-2.2b4.recipe
index d58e19065..aee57c6ba 100644
--- a/dev-vcs/bzr/bzr-2.2b4.bep
+++ b/dev-vcs/bzr/bzr-2.2b4.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.2b4
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.2b4
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
diff --git a/dev-vcs/bzr/bzr-2.5.1.bep b/dev-vcs/bzr/bzr-2.5.1.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.5.1.bep
rename to dev-vcs/bzr/bzr-2.5.1.recipe
index c13bb217c..e6fcbfd31 100644
--- a/dev-vcs/bzr/bzr-2.5.1.bep
+++ b/dev-vcs/bzr/bzr-2.5.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.5.1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.5.1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
diff --git a/dev-vcs/bzr/bzr-2.6b1.bep b/dev-vcs/bzr/bzr-2.6b1.recipe
similarity index 97%
rename from dev-vcs/bzr/bzr-2.6b1.bep
rename to dev-vcs/bzr/bzr-2.6b1.recipe
index d7c6b572a..ea1c17639 100644
--- a/dev-vcs/bzr/bzr-2.6b1.bep
+++ b/dev-vcs/bzr/bzr-2.6b1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd bzr-2.6b1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzr-2.6b1
 	if [ -n "$(setgcc | grep '2')" ]; then
 		python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.bep b/dev-vcs/cvs/cvs-1.12.13.1.recipe
similarity index 97%
rename from dev-vcs/cvs/cvs-1.12.13.1.bep
rename to dev-vcs/cvs/cvs-1.12.13.1.recipe
index 94cf44780..172b2c168 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.bep
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -19,13 +19,15 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	./configure $configureDirArgs --enable-rootcommit
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/dev-vcs/cvs/cvs-1.12.13.bep b/dev-vcs/cvs/cvs-1.12.13.recipe
similarity index 97%
rename from dev-vcs/cvs/cvs-1.12.13.bep
rename to dev-vcs/cvs/cvs-1.12.13.recipe
index 2db43f73e..7fc26e23e 100644
--- a/dev-vcs/cvs/cvs-1.12.13.bep
+++ b/dev-vcs/cvs/cvs-1.12.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cvs-1.12.13
 	libtoolize --force --copy --install
 	autoconf
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cvs-1.12.13
 	make install
 }
diff --git a/dev-vcs/fossil/fossil-1.22-fossil.bep b/dev-vcs/fossil/fossil-1.22-fossil.recipe
similarity index 92%
rename from dev-vcs/fossil/fossil-1.22-fossil.bep
rename to dev-vcs/fossil/fossil-1.22-fossil.recipe
index 5096cb997..fbf764793 100644
--- a/dev-vcs/fossil/fossil-1.22-fossil.bep
+++ b/dev-vcs/fossil/fossil-1.22-fossil.recipe
@@ -6,16 +6,19 @@ REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make test
 }
 
diff --git a/dev-vcs/fossil/fossil-1.22.bep b/dev-vcs/fossil/fossil-1.22.recipe
similarity index 94%
rename from dev-vcs/fossil/fossil-1.22.bep
rename to dev-vcs/fossil/fossil-1.22.recipe
index 2faffcee5..f06bf257a 100644
--- a/dev-vcs/fossil/fossil-1.22.bep
+++ b/dev-vcs/fossil/fossil-1.22.recipe
@@ -6,18 +6,21 @@ REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd fossil-src-20120317175325
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fossil-src-20120317175325
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd fossil-src-20120317175325
 	make test
 }
diff --git a/dev-vcs/git/git-1.7.10.2.bep b/dev-vcs/git/git-1.7.10.2.recipe
similarity index 94%
rename from dev-vcs/git/git-1.7.10.2.bep
rename to dev-vcs/git/git-1.7.10.2.recipe
index 16648b18e..0e7929703 100644
--- a/dev-vcs/git/git-1.7.10.2.bep
+++ b/dev-vcs/git/git-1.7.10.2.recipe
@@ -7,17 +7,20 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.20.0
 		dev-lang/perl >= 5.10.1
 		dev-vcs/gitdoc == 1.7.10"
-BUILD {
+BUILD()
+{
 	cd git-1.7.10.2
 	make strip
 }
 
-INSTALL {
+INSTALL()
+{
 	cd git-1.7.10.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd git-1.7.10.2
 	make check
 }
diff --git a/dev-vcs/git/git-1.7.11.3.bep b/dev-vcs/git/git-1.7.11.3.recipe
similarity index 94%
rename from dev-vcs/git/git-1.7.11.3.bep
rename to dev-vcs/git/git-1.7.11.3.recipe
index b7eb17c0a..e79806686 100644
--- a/dev-vcs/git/git-1.7.11.3.bep
+++ b/dev-vcs/git/git-1.7.11.3.recipe
@@ -7,17 +7,20 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.20.0
 		dev-lang/perl >= 5.10.1
 		dev-vcs/gitdoc == 1.7.11.3"
-BUILD {
+BUILD()
+{
 	cd git-1.7.11.3
 	make strip
 }
 
-INSTALL {
+INSTALL()
+{
 	cd git-1.7.11.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd git-1.7.11.3
 	make check
 }
diff --git a/dev-vcs/git/git-1.8.0.bep b/dev-vcs/git/git-1.8.0.recipe
similarity index 93%
rename from dev-vcs/git/git-1.8.0.bep
rename to dev-vcs/git/git-1.8.0.recipe
index 7f984a813..b96e28c7b 100644
--- a/dev-vcs/git/git-1.8.0.bep
+++ b/dev-vcs/git/git-1.8.0.recipe
@@ -7,17 +7,20 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.20.0
 		dev-lang/perl >= 5.10.1
 		dev-vcs/gitdoc == 1.8.0"
-BUILD {
+BUILD()
+{
 	cd git-1.8.0
 	make strip
 }
 
-INSTALL {
+INSTALL()
+{
 	cd git-1.8.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd git-1.8.0
 	make check
 }
diff --git a/dev-vcs/git/git-1.8.1.3.bep b/dev-vcs/git/git-1.8.1.3.recipe
similarity index 94%
rename from dev-vcs/git/git-1.8.1.3.bep
rename to dev-vcs/git/git-1.8.1.3.recipe
index ba37b6fe3..094ba2ef8 100644
--- a/dev-vcs/git/git-1.8.1.3.bep
+++ b/dev-vcs/git/git-1.8.1.3.recipe
@@ -7,17 +7,20 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.20.0
 		dev-lang/perl >= 5.10.1
 		dev-vcs/gitdoc == 1.8.0"
-BUILD {
+BUILD()
+{
 	cd git-1.8.1.3
 	make strip
 }
 
-INSTALL {
+INSTALL()
+{
 	cd git-1.8.1.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd git-1.8.1.3
 	make check
 }
diff --git a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe
similarity index 97%
rename from dev-vcs/gitdoc/gitdoc-1.7.10.2.bep
rename to dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe
index 0eff3fdf2..a0fdaa334 100644
--- a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep
+++ b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	echo "Attempting to download additional formats"
 	wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz
 	if [ $? != 0 ];then
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man
 	mkdir -p "${DESTDIR}/${MAN_DIR}"
 	cp -afv man* "${DESTDIR}/${MAN_DIR}"
diff --git a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe
similarity index 97%
rename from dev-vcs/gitdoc/gitdoc-1.7.11.3.bep
rename to dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe
index 2299ff1a8..83b98f209 100644
--- a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep
+++ b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	echo "Attempting to download additional formats"
 	wget http://git-core.googlecode.com/files/git-htmldocs-1.7.11.3.tar.gz
 	if [ $? != 0 ];then
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man
 	mkdir -p "${DESTDIR}/${MAN_DIR}"
 	cp -afv man* "${DESTDIR}/${MAN_DIR}"
diff --git a/dev-vcs/gitdoc/gitdoc-1.8.0.bep b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe
similarity index 97%
rename from dev-vcs/gitdoc/gitdoc-1.8.0.bep
rename to dev-vcs/gitdoc/gitdoc-1.8.0.recipe
index 01bf49658..de6ae1bfc 100644
--- a/dev-vcs/gitdoc/gitdoc-1.8.0.bep
+++ b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	echo "Attempting to download additional formats"
 	wget http://git-core.googlecode.com/files/git-htmldocs-1.8.0.tar.gz
 	if [ $? != 0 ];then
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man
 	mkdir -p "${DESTDIR}/${MAN_DIR}"
 	cp -afv man* "${DESTDIR}/${MAN_DIR}"
diff --git a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe
similarity index 97%
rename from dev-vcs/gitdoc/gitdoc-1.8.1.3.bep
rename to dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe
index 743a2b073..545cb6c0b 100644
--- a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep
+++ b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	echo "Attempting to download additional formats"
 	wget http://git-core.googlecode.com/files/git-htmldocs-1.8.1.3.tar.gz
 	if [ $? != 0 ];then
@@ -15,7 +16,8 @@ BUILD {
 	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man
 	mkdir -p "${DESTDIR}/${MAN_DIR}"
 	cp -afv man* "${DESTDIR}/${MAN_DIR}"
diff --git a/dev-vcs/mercurial/mercurial-2.2.2.bep b/dev-vcs/mercurial/mercurial-2.2.2.recipe
similarity index 96%
rename from dev-vcs/mercurial/mercurial-2.2.2.bep
rename to dev-vcs/mercurial/mercurial-2.2.2.recipe
index 7afde93e2..b63ab2c8f 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.bep
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.3"
-BUILD {
+BUILD()
+{
 	cd mercurial-2.2.2
 	python setup.py build --force
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mercurial-2.2.2
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
@@ -19,7 +21,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd mercurial-2.2.2/tests
 	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
diff --git a/dev-vcs/mercurial/mercurial-2.2.3.bep b/dev-vcs/mercurial/mercurial-2.2.3.recipe
similarity index 96%
rename from dev-vcs/mercurial/mercurial-2.2.3.bep
rename to dev-vcs/mercurial/mercurial-2.2.3.recipe
index 9ea952ad0..58b946897 100644
--- a/dev-vcs/mercurial/mercurial-2.2.3.bep
+++ b/dev-vcs/mercurial/mercurial-2.2.3.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="f4c70af3892d964b83b2718bde44c2f8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.3"
-BUILD {
+BUILD()
+{
 	cd mercurial-2.2.3
 	python setup.py build --force
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mercurial-2.2.3
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
@@ -19,7 +21,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd mercurial-2.2.3/tests
 	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
diff --git a/dev-vcs/mercurial/mercurial-2.3.bep b/dev-vcs/mercurial/mercurial-2.3.recipe
similarity index 96%
rename from dev-vcs/mercurial/mercurial-2.3.bep
rename to dev-vcs/mercurial/mercurial-2.3.recipe
index 3889beedc..e9b1f1743 100644
--- a/dev-vcs/mercurial/mercurial-2.3.bep
+++ b/dev-vcs/mercurial/mercurial-2.3.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="8d9f776e432239571dfab2b5f88b3675"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.3"
-BUILD {
+BUILD()
+{
 	cd mercurial-2.3
 	python setup.py build --force
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mercurial-2.3
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
@@ -19,7 +21,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd mercurial-2.3/tests
 	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
diff --git a/dev-vcs/mercurial/mercurial-2.4.bep b/dev-vcs/mercurial/mercurial-2.4.recipe
similarity index 96%
rename from dev-vcs/mercurial/mercurial-2.4.bep
rename to dev-vcs/mercurial/mercurial-2.4.recipe
index 70186e0c6..7fc62876f 100644
--- a/dev-vcs/mercurial/mercurial-2.4.bep
+++ b/dev-vcs/mercurial/mercurial-2.4.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.4"
-BUILD {
+BUILD()
+{
 	cd mercurial-2.4
 	python setup.py build --force
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mercurial-2.4
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
@@ -19,7 +21,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd mercurial-2.4/tests
 	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
diff --git a/dev-vcs/subversion/subversion-1.6.11.bep b/dev-vcs/subversion/subversion-1.6.11.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.6.11.bep
rename to dev-vcs/subversion/subversion-1.6.11.recipe
index 97693b80f..88c98644a 100644
--- a/dev-vcs/subversion/subversion-1.6.11.bep
+++ b/dev-vcs/subversion/subversion-1.6.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7331310fc786111899b305c6d141b02d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.11
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.11
 	make install
 }
diff --git a/dev-vcs/subversion/subversion-1.6.12.bep b/dev-vcs/subversion/subversion-1.6.12.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.6.12.bep
rename to dev-vcs/subversion/subversion-1.6.12.recipe
index a6fe5aa74..a0bd512b1 100644
--- a/dev-vcs/subversion/subversion-1.6.12.bep
+++ b/dev-vcs/subversion/subversion-1.6.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.12
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.12
 	make install
 }
diff --git a/dev-vcs/subversion/subversion-1.6.13.bep b/dev-vcs/subversion/subversion-1.6.13.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.6.13.bep
rename to dev-vcs/subversion/subversion-1.6.13.recipe
index b2fd911fb..87caf344b 100644
--- a/dev-vcs/subversion/subversion-1.6.13.bep
+++ b/dev-vcs/subversion/subversion-1.6.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.13
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.13
 	make install
 }
diff --git a/dev-vcs/subversion/subversion-1.6.15.bep b/dev-vcs/subversion/subversion-1.6.15.recipe
similarity index 98%
rename from dev-vcs/subversion/subversion-1.6.15.bep
rename to dev-vcs/subversion/subversion-1.6.15.recipe
index 036a2146f..08127c925 100644
--- a/dev-vcs/subversion/subversion-1.6.15.bep
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -35,7 +35,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
 	autoconf
@@ -50,7 +51,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 	if type -p swig > /dev/null;then
 		if type -p python > /dev/null;then
diff --git a/dev-vcs/subversion/subversion-1.6.17.bep b/dev-vcs/subversion/subversion-1.6.17.recipe
similarity index 98%
rename from dev-vcs/subversion/subversion-1.6.17.bep
rename to dev-vcs/subversion/subversion-1.6.17.recipe
index cafa62e18..4a6a0fe54 100644
--- a/dev-vcs/subversion/subversion-1.6.17.bep
+++ b/dev-vcs/subversion/subversion-1.6.17.recipe
@@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4
 	dev-libs/openssl >= 1.0.0d
 	dev-libs/libxml2 >= 2.7.8"
 
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.17
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -30,7 +31,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.17
 	make install
 	if type -p swig > /dev/null;then
@@ -47,7 +49,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd subversion-1.6.17
 	make check
 }
diff --git a/dev-vcs/subversion/subversion-1.6.18.bep b/dev-vcs/subversion/subversion-1.6.18.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.6.18.bep
rename to dev-vcs/subversion/subversion-1.6.18.recipe
index 5985c1fcd..d484a9bcd 100644
--- a/dev-vcs/subversion/subversion-1.6.18.bep
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4
 	dev-libs/openssl >= 1.0.0d
 	dev-libs/libxml2 >= 2.7.8"
 
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.18
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -30,7 +31,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.18
 	make install
 	if type -p swig > /dev/null;then
@@ -47,7 +49,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd subversion-1.6.18
 	make check
 }
diff --git a/dev-vcs/subversion/subversion-1.6.6.bep b/dev-vcs/subversion/subversion-1.6.6.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.6.6.bep
rename to dev-vcs/subversion/subversion-1.6.6.recipe
index 969735f17..5822f2138 100644
--- a/dev-vcs/subversion/subversion-1.6.6.bep
+++ b/dev-vcs/subversion/subversion-1.6.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.6
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.6
 	make install
 }
diff --git a/dev-vcs/subversion/subversion-1.6.9.bep b/dev-vcs/subversion/subversion-1.6.9.recipe
similarity index 98%
rename from dev-vcs/subversion/subversion-1.6.9.bep
rename to dev-vcs/subversion/subversion-1.6.9.recipe
index 858cd6a22..5688cb562 100644
--- a/dev-vcs/subversion/subversion-1.6.9.bep
+++ b/dev-vcs/subversion/subversion-1.6.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.6.9
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.6.9
 	make install
 	if type -p swig > /dev/null;then
diff --git a/dev-vcs/subversion/subversion-1.7.0-rc2.bep b/dev-vcs/subversion/subversion-1.7.0-rc2.recipe
similarity index 98%
rename from dev-vcs/subversion/subversion-1.7.0-rc2.bep
rename to dev-vcs/subversion/subversion-1.7.0-rc2.recipe
index 06ea4070a..1f9c5c8d3 100644
--- a/dev-vcs/subversion/subversion-1.7.0-rc2.bep
+++ b/dev-vcs/subversion/subversion-1.7.0-rc2.recipe
@@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4
 	dev-libs/openssl >= 1.0.0d
 	dev-libs/libxml2 >= 2.7.8"
 
-BUILD {
+BUILD()
+{
 	cd subversion-1.7.0-rc2
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -30,7 +31,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.7.0-rc2
 	make install
 	if type -p swig > /dev/null;then
@@ -47,7 +49,8 @@ INSTALL {
 	fi
 }
 
-TEST {
+TEST()
+{
 	cd subversion-1.7.0-rc2
 	make check
 }
diff --git a/dev-vcs/subversion/subversion-1.7.xx-svn.bep b/dev-vcs/subversion/subversion-1.7.xx-svn.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.7.xx-svn.bep
rename to dev-vcs/subversion/subversion-1.7.xx-svn.recipe
index 5e5fa165c..3a6829236 100644
--- a/dev-vcs/subversion/subversion-1.7.xx-svn.bep
+++ b/dev-vcs/subversion/subversion-1.7.xx-svn.recipe
@@ -5,7 +5,8 @@ SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd subversion-1.7.xx-svn
 	libtoolize --force --copy --install
 	aclocal -I build -I build/ac-macros
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd subversion-1.7.xx-svn
 	make install
 }
diff --git a/dev-vcs/tig/tig-0.16.bep b/dev-vcs/tig/tig-0.16.recipe
similarity index 95%
rename from dev-vcs/tig/tig-0.16.bep
rename to dev-vcs/tig/tig-0.16.recipe
index cbd93d145..749d8fe8d 100644
--- a/dev-vcs/tig/tig-0.16.bep
+++ b/dev-vcs/tig/tig-0.16.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="684572d93033d6cbfc5ee71cffe02935"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="sys-libs/ncurses >= 5.7""
-BUILD {
+BUILD()
+{
 	cd tig-0.16
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tig-0.16
 	make install
 }
diff --git a/games-action/bzflag/bzflag-2.0.14.bep b/games-action/bzflag/bzflag-2.0.14.recipe
similarity index 96%
rename from games-action/bzflag/bzflag-2.0.14.bep
rename to games-action/bzflag/bzflag-2.0.14.recipe
index b169244d9..3301851d6 100644
--- a/games-action/bzflag/bzflag-2.0.14.bep
+++ b/games-action/bzflag/bzflag-2.0.14.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="libsdl >= 1.2.14"
 CHECKSUM_MD5="15a28cd55e46f0f39a7c8b8eea7464c6"
-BUILD {
+BUILD()
+{
 	cd bzflag-2.0.14
 	mkdir -p m4
 	libtoolize --force --copy --install
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bzflag-2.0.14
 	make install
 }
diff --git a/games-action/cylindrix/cylindrix-1.0.bep b/games-action/cylindrix/cylindrix-1.0.recipe
similarity index 94%
rename from games-action/cylindrix/cylindrix-1.0.bep
rename to games-action/cylindrix/cylindrix-1.0.recipe
index 579964e86..ec4d718f2 100644
--- a/games-action/cylindrix/cylindrix-1.0.bep
+++ b/games-action/cylindrix/cylindrix-1.0.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 CHECKSUM_MD5="914cf70b0a95f4a36cfdfde7edbaa240"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/allegro >= 4.4.1.1"
-BUILD {
+BUILD()
+{
 	cd cylindrix
 	CFLAGS='-O2' ./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd  cylindrix
 	make install
 }
diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.bep b/games-arcade/alienblaster/alienblaster-1.1.0.recipe
similarity index 97%
rename from games-arcade/alienblaster/alienblaster-1.1.0.bep
rename to games-arcade/alienblaster/alienblaster-1.1.0.recipe
index d8ebd7e39..d4c40c917 100644
--- a/games-arcade/alienblaster/alienblaster-1.1.0.bep
+++ b/games-arcade/alienblaster/alienblaster-1.1.0.recipe
@@ -7,12 +7,14 @@ STATUS_HAIKU="stable"
 REVISION="1"
 DEPEND="media-libs/libsdl >= 1.2.7
 		  media-libs/sdl-mixer >= 1.2.5"
-BUILD {
+BUILD()
+{
 	cd alienblaster
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd alienblaster 
 	GAMEDIR=`finddir B_APPS_DIRECTORY`/"AlienBlaster"
 	mkdir -p ${DESTDIR}/${GAMEDIR}
diff --git a/games-arcade/supertux/supertux-0.1.3.bep b/games-arcade/supertux/supertux-0.1.3.recipe
similarity index 96%
rename from games-arcade/supertux/supertux-0.1.3.bep
rename to games-arcade/supertux/supertux-0.1.3.recipe
index 159c000b3..ecd275ffe 100644
--- a/games-arcade/supertux/supertux-0.1.3.bep
+++ b/games-arcade/supertux/supertux-0.1.3.recipe
@@ -6,14 +6,16 @@ CHECKSUM_MD5="f2fc288459f33d5cd8f645fbca737a63"
 DEPEND=">=media-libs/libsdl-1.2.4"
 REVISION="1"
 
-BUILD {
+BUILD()
+{
 	cd supertux-0.1.3
 	autoreconf --force --install
 	./configure --prefix="`finddir B_COMMON_DIRECTORY`"
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd supertux-0.1.3
 	make install
 }
diff --git a/games-emulation/dosbox/dosbox-0.74-svn.bep b/games-emulation/dosbox/dosbox-0.74-svn.recipe
similarity index 95%
rename from games-emulation/dosbox/dosbox-0.74-svn.bep
rename to games-emulation/dosbox/dosbox-0.74-svn.recipe
index 0051b990a..e6b48bf79 100644
--- a/games-emulation/dosbox/dosbox-0.74-svn.bep
+++ b/games-emulation/dosbox/dosbox-0.74-svn.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND="media-libs/libsdl >= 1.2 < "
 
-BUILD {
+BUILD()
+{
 	cd dosbox-0.74-svn
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dosbox-0.74-svn
 	make install
 }
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe
similarity index 97%
rename from games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep
rename to games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe
index 68b9d2f0b..2cfddb434 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe
@@ -8,7 +8,8 @@ DEPEND="dev-lang/nasm >= 2.03.01
 	media-libs/libsdl >= 1.2.14
 	media-libs/sdl-mixer >= 1.2.11"
 
-BUILD {
+BUILD()
+{
 	cd VisualBoyAdvance-1.7.2
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd VisualBoyAdvance-1.7.2/src
 	GAMEDIR=`finddir B_APPS_DIRECTORY`/Visualboyadvance
 	mkdir -p ${DESTDIR}/${GAMEDIR}
diff --git a/games-misc/sdljoytest/sdljoytest-11102003.bep b/games-misc/sdljoytest/sdljoytest-11102003.recipe
similarity index 96%
rename from games-misc/sdljoytest/sdljoytest-11102003.bep
rename to games-misc/sdljoytest/sdljoytest-11102003.recipe
index bd4f42bf0..2a83588e8 100644
--- a/games-misc/sdljoytest/sdljoytest-11102003.bep
+++ b/games-misc/sdljoytest/sdljoytest-11102003.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd SDLJoytest-GL
 	sed -i 's/\-lpthread/ /' Makefile
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDLJoytest-GL
 	BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`	
 	MANDIR=${DESTDIR}`finddir B_COMMON_DATA_DIRECTORY`/man/man1
diff --git a/games-puzzle/abrick/abrick-1.12.bep b/games-puzzle/abrick/abrick-1.12.recipe
similarity index 96%
rename from games-puzzle/abrick/abrick-1.12.bep
rename to games-puzzle/abrick/abrick-1.12.recipe
index b15ac2326..f0ded688c 100644
--- a/games-puzzle/abrick/abrick-1.12.bep
+++ b/games-puzzle/abrick/abrick-1.12.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 REVISION="1"
 DEPEND="media-libs/libsdl >= 1.2.14
 	media-libs/sdl-mixer >=1.2.0"
-BUILD {
+BUILD()
+{
 	cd abrick-1.12-src
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd abrick-1.12-src
 	GAMEDIR=`finddir B_APPS_DIRECTORY`/abrick
 	mkdir -p ${DESTDIR}/${GAMEDIR}
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.bep b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe
similarity index 94%
rename from games-puzzle/flobopuyo/flobopuyo-0.20.bep
rename to games-puzzle/flobopuyo/flobopuyo-0.20.recipe
index 5c3743bed..a4b018125 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20.bep
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe
@@ -6,12 +6,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-lib/libsdl >= 1.2.14
 	media-lib/sdl-mixer >= 1.2.11"
-BUILD {
+BUILD()
+{
 	cd flubopuyo-0.2.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd  flubopuyo-0.2.0
 	make install
 }
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.65.bep b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe
similarity index 97%
rename from games-puzzle/gnurobbo/gnurobbo-0.65.bep
rename to games-puzzle/gnurobbo/gnurobbo-0.65.recipe
index dcc17c624..9e96c5ba6 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.65.bep
+++ b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe
@@ -8,12 +8,14 @@ DEPEND="media-lib/libsdl >= 1.2.14
         media-lib/sdl-mixer >= 1.2.11
         media-lib/sdl-image >= 1.2.10
         media-lib/sdl-ttf >= 2.0.10"
-BUILD {
+BUILD()
+{
 	cd gnurobbo-0.65.6
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gnurobbo-0.65.6
 	APPS_DIR=`finddir B_APPS_DIRECTORY`
 	mkdir -p ${DESTDIR}${APPS_DIR}/gnurobbo
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep b/games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe
similarity index 97%
rename from games-puzzle/numptyphysics/numptyphysics-0.2-157.bep
rename to games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe
index da4986095..66901eda6 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep
+++ b/games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND="media-libs/libsdl >= 1.2.14
 	dev-games/box2d >= 2.1.2"
-BUILD {
+BUILD()
+{
 	cd numptyphysics-0.2-157
 	libtoolize --force --copy --install
 	aclocal
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd numptyphysics-0.2-157
 	make install
 }
diff --git a/games-puzzle/wizznic/wizznic-0.9.9.bep b/games-puzzle/wizznic/wizznic-0.9.9.recipe
similarity index 97%
rename from games-puzzle/wizznic/wizznic-0.9.9.bep
rename to games-puzzle/wizznic/wizznic-0.9.9.recipe
index f81063a12..fdf9bfd4e 100644
--- a/games-puzzle/wizznic/wizznic-0.9.9.bep
+++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe
@@ -8,12 +8,14 @@ STATUS_HAIKU="stable"
 DEPEND="media-lib/libsdl >= 1.2.14
 		media-lib/sdl-mixer >= 1.2.11
 		media-lib/sdl-image >= 1.2.10"
-BUILD {
+BUILD()
+{
 	cd wizznic-0.9.9-src
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wizznic-0.9.9-src
 	GAMEDIR=`finddir B_APPS_DIRECTORY`/"Wizznic"
 	mkdir -p ${DESTDIR}/${GAMEDIR}
diff --git a/games-puzzle/wizznic/wizznic-0.9.bep b/games-puzzle/wizznic/wizznic-0.9.recipe
similarity index 96%
rename from games-puzzle/wizznic/wizznic-0.9.bep
rename to games-puzzle/wizznic/wizznic-0.9.recipe
index a9437671b..60c45b509 100644
--- a/games-puzzle/wizznic/wizznic-0.9.bep
+++ b/games-puzzle/wizznic/wizznic-0.9.recipe
@@ -7,12 +7,14 @@ STATUS_HAIKU="stable"
 DEPEND="media-lib/libsdl >= 1.2.14
 		media-lib/sdl-mixer >= 1.2.11
 		media-lib/sdl-image >= 1.2.10"
-BUILD {
+BUILD()
+{
 	cd wizznic-0.9_feedback_version-src
 	make -f Makefile.haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wizznic-0.9_feedback_version-src
 	make Makefile.haiku install
 }
diff --git a/games-rpg/freedroid/freedroid-1.0.2.bep b/games-rpg/freedroid/freedroid-1.0.2.recipe
similarity index 96%
rename from games-rpg/freedroid/freedroid-1.0.2.bep
rename to games-rpg/freedroid/freedroid-1.0.2.recipe
index 5feecf4fd..8f0dfd3f8 100644
--- a/games-rpg/freedroid/freedroid-1.0.2.bep
+++ b/games-rpg/freedroid/freedroid-1.0.2.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidClassic/Freedr
 REVISION="1"
 DEPEND="SDL >= 1.2.3 "
 CHECKSUM_MD5="585a65f61c2cd308ab45d5c514f695dc"
-BUILD {
+BUILD()
+{
 		cd freedroid-1.0.2
 		libtoolize --force --copy --install
 		aclocal
@@ -15,7 +16,8 @@ BUILD {
  		make
 }
 
-INSTALL {
+INSTALL()
+{
 		cd freedroid-1.0.2
 		make install
 }
diff --git a/games-simulation/openttd/openttd-1.2.3.bep b/games-simulation/openttd/openttd-1.2.3.recipe
similarity index 96%
rename from games-simulation/openttd/openttd-1.2.3.bep
rename to games-simulation/openttd/openttd-1.2.3.recipe
index e97ac9d7c..4f92f7b00 100644
--- a/games-simulation/openttd/openttd-1.2.3.bep
+++ b/games-simulation/openttd/openttd-1.2.3.recipe
@@ -11,13 +11,15 @@ DEPEND="media-libs/libsdl,
 		pkgconfig,
 		lzo"
 
-BUILD {
+BUILD()
+{
 	cd openttd-1.2.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openttd-1.2.3
 	make install
 	cp -R bundle /boot/apps
diff --git a/gnome-base/gnome-common/gnome-common-2.28.bep b/gnome-base/gnome-common/gnome-common-2.28.recipe
similarity index 95%
rename from gnome-base/gnome-common/gnome-common-2.28.bep
rename to gnome-base/gnome-common/gnome-common-2.28.recipe
index b5cdf1967..e3a6aa65d 100644
--- a/gnome-base/gnome-common/gnome-common-2.28.bep
+++ b/gnome-base/gnome-common/gnome-common-2.28.recipe
@@ -4,14 +4,16 @@ SRC_URI="git+git://git.gnome.org/gnome-common"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
         cd gnome-common-2.28
 		./autogen.sh
         ./configure --prefix=`finddir B_COMMON_DIRECTORY`
         make
 }
 	
-INSTALL {
+INSTALL()
+{
         cd gnome-common-2.28
         make install
 }
diff --git a/gnome-extra/libgsf/libgsf-1.14.18.bep b/gnome-extra/libgsf/libgsf-1.14.18.recipe
similarity index 96%
rename from gnome-extra/libgsf/libgsf-1.14.18.bep
rename to gnome-extra/libgsf/libgsf-1.14.18.recipe
index f91ef5d09..927751361 100644
--- a/gnome-extra/libgsf/libgsf-1.14.18.bep
+++ b/gnome-extra/libgsf/libgsf-1.14.18.recipe
@@ -9,7 +9,8 @@ DEPEND="pkgconfig >= 0.23
 	 	dev-perl/XML-Parser >= 2.3.6
         dev-util/intltool >= 0.40.6
         dev-lib/glib >= 2.18.3"
-BUILD {
+BUILD()
+{
 	cd libgsf-1.14.18
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libgsf-1.14.18
 	make install
 	cd thumbnailer
diff --git a/haiku-apps/W6/W6-1.7.bep b/haiku-apps/W6/W6-1.7.recipe
similarity index 96%
rename from haiku-apps/W6/W6-1.7.bep
rename to haiku-apps/W6/W6-1.7.recipe
index 70d7588e6..0a217b667 100644
--- a/haiku-apps/W6/W6-1.7.bep
+++ b/haiku-apps/W6/W6-1.7.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd W6Haiku
 	make
 	cd ../
@@ -15,7 +16,8 @@ BUILD {
 	cp -r W6/w6s W6Haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	cd W6Haiku
 	mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6
 	install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6
diff --git a/haiku-apps/album/album-0.9.2.bep b/haiku-apps/album/album-0.9.2.recipe
similarity index 95%
rename from haiku-apps/album/album-0.9.2.bep
rename to haiku-apps/album/album-0.9.2.recipe
index dd26abcd6..58c428455 100644
--- a/haiku-apps/album/album-0.9.2.bep
+++ b/haiku-apps/album/album-0.9.2.recipe
@@ -5,11 +5,13 @@ CHECKSUM_MD5="d22d1850ba5807c5da0432ecd530c372"
 STATUS_HAIKU="stable"
 REVISION="1"
 DEPEND=" "
-BUILD {
+BUILD()
+{
 	cd album-0.9.2/src
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd album-0.9.2
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album
 	cp -a Album ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album
diff --git a/haiku-apps/aplayer/aplayer-4.0.1.bep b/haiku-apps/aplayer/aplayer-4.0.1.recipe
similarity index 95%
rename from haiku-apps/aplayer/aplayer-4.0.1.bep
rename to haiku-apps/aplayer/aplayer-4.0.1.recipe
index 5152ab11d..a6be885ac 100644
--- a/haiku-apps/aplayer/aplayer-4.0.1.bep
+++ b/haiku-apps/aplayer/aplayer-4.0.1.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd aplayer-4.0.1/Master
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer
 	cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer
 }
diff --git a/haiku-apps/armyknife/armyknife-61.bep b/haiku-apps/armyknife/armyknife-61.recipe
similarity index 95%
rename from haiku-apps/armyknife/armyknife-61.bep
rename to haiku-apps/armyknife/armyknife-61.recipe
index 252077a6a..b0628d81b 100644
--- a/haiku-apps/armyknife/armyknife-61.bep
+++ b/haiku-apps/armyknife/armyknife-61.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/taglib >= 1.6.3"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd armyknife-61
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd armyknife-61
 	make zipfile
 	mkdir -p ${DESTDIR}/boot/apps
diff --git a/haiku-apps/armyknife/armyknife-62.bep b/haiku-apps/armyknife/armyknife-62.recipe
similarity index 95%
rename from haiku-apps/armyknife/armyknife-62.bep
rename to haiku-apps/armyknife/armyknife-62.recipe
index 5bff3c87a..b76790c4b 100644
--- a/haiku-apps/armyknife/armyknife-62.bep
+++ b/haiku-apps/armyknife/armyknife-62.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/taglib >= 1.6.3"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd armyknife-62
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd armyknife-62
 	make zipfile
 	mkdir -p ${DESTDIR}/boot/apps
diff --git a/haiku-apps/armyknife/armyknife-63.bep b/haiku-apps/armyknife/armyknife-63.recipe
similarity index 95%
rename from haiku-apps/armyknife/armyknife-63.bep
rename to haiku-apps/armyknife/armyknife-63.recipe
index c8cd02afa..ba577daaa 100644
--- a/haiku-apps/armyknife/armyknife-63.bep
+++ b/haiku-apps/armyknife/armyknife-63.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/taglib >= 1.6.3"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd armyknife-63
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd armyknife-63
 	make zipfile
 	mkdir -p ${DESTDIR}/boot/apps
diff --git a/haiku-apps/armyknife/armyknife-999-git.bep b/haiku-apps/armyknife/armyknife-999-git.recipe
similarity index 95%
rename from haiku-apps/armyknife/armyknife-999-git.bep
rename to haiku-apps/armyknife/armyknife-999-git.recipe
index 6307acc63..cd2190074 100644
--- a/haiku-apps/armyknife/armyknife-999-git.bep
+++ b/haiku-apps/armyknife/armyknife-999-git.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/taglib >= 1.6.3"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd armyknife-999-git
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd armyknife-999-git
 	make zipfile
 	mkdir -p ${DESTDIR}/boot/apps
diff --git a/haiku-apps/artpaint/artpaint-339.bep b/haiku-apps/artpaint/artpaint-339.recipe
similarity index 95%
rename from haiku-apps/artpaint/artpaint-339.bep
rename to haiku-apps/artpaint/artpaint-339.recipe
index c0514179e..3a80a0bdb 100644
--- a/haiku-apps/artpaint/artpaint-339.bep
+++ b/haiku-apps/artpaint/artpaint-339.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	echo "Need to figure out how to build this still"
 }
 
-INSTALL {
+INSTALL()
+{
 	echo "Need to figure out how to install this still"
 }
 
diff --git a/haiku-apps/beacon/beacon-27.bep b/haiku-apps/beacon/beacon-27.recipe
similarity index 93%
rename from haiku-apps/beacon/beacon-27.bep
rename to haiku-apps/beacon/beacon-27.recipe
index bb46aa7a4..929321d21 100644
--- a/haiku-apps/beacon/beacon-27.bep
+++ b/haiku-apps/beacon/beacon-27.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND="CLucene"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd beacon-27
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd beacon-27
 	jam
 }
diff --git a/haiku-apps/beae/beae-20.bep b/haiku-apps/beae/beae-20.recipe
similarity index 97%
rename from haiku-apps/beae/beae-20.bep
rename to haiku-apps/beae/beae-20.recipe
index 1ec54472a..e8e81f9f3 100644
--- a/haiku-apps/beae/beae-20.bep
+++ b/haiku-apps/beae/beae-20.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd beae-20
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd beae-20
        mkdir -p ${DESTDIR}/boot/apps
        cp -a BeAE ${DESTDIR}/boot/apps
diff --git a/haiku-apps/beae/beae-22.bep b/haiku-apps/beae/beae-22.recipe
similarity index 97%
rename from haiku-apps/beae/beae-22.bep
rename to haiku-apps/beae/beae-22.recipe
index 63edcd51f..925c91399 100644
--- a/haiku-apps/beae/beae-22.bep
+++ b/haiku-apps/beae/beae-22.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd beae-22
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd beae-22
        mkdir -p ${DESTDIR}/boot/apps
        cp -a BeAE ${DESTDIR}/boot/apps
diff --git a/haiku-apps/beae/beae-25.bep b/haiku-apps/beae/beae-25.recipe
similarity index 97%
rename from haiku-apps/beae/beae-25.bep
rename to haiku-apps/beae/beae-25.recipe
index ae9d26e62..6eed421f7 100644
--- a/haiku-apps/beae/beae-25.bep
+++ b/haiku-apps/beae/beae-25.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd beae-25
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd beae-25
        mkdir -p ${DESTDIR}/boot/apps
        cp -a BeAE ${DESTDIR}/boot/apps
diff --git a/haiku-apps/beam/beam-1.2alpha.bep b/haiku-apps/beam/beam-1.2alpha.recipe
similarity index 96%
rename from haiku-apps/beam/beam-1.2alpha.bep
rename to haiku-apps/beam/beam-1.2alpha.recipe
index f8fe770d2..0237b5074 100644
--- a/haiku-apps/beam/beam-1.2alpha.bep
+++ b/haiku-apps/beam/beam-1.2alpha.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND="liblayout >= 1.4.0
 	libpcre >= 8.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd beam-1.2alpha
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd beam-1.2alpha
 	mkdir -p ${DESTDIR}/boot/apps/Beam
 	cp -a generated/distro-haiku/* ${DESTDIR}/boot/apps/Beam
diff --git a/haiku-apps/beezer/beezer-1.bep b/haiku-apps/beezer/beezer-1.recipe
similarity index 97%
rename from haiku-apps/beezer/beezer-1.bep
rename to haiku-apps/beezer/beezer-1.recipe
index bb215a60a..7b9dbb02f 100644
--- a/haiku-apps/beezer/beezer-1.bep
+++ b/haiku-apps/beezer/beezer-1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74"
 DEPEND="cmake >= 2.8"
-BUILD {
+BUILD()
+{
 	cd cpr-beezer-82199f683571/Source
  	cmake .
  	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cpr-beezer-82199f683571/Source/build
 	BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer
 	mkdir -p $BEEZER_DIR/add-ons
diff --git a/haiku-apps/beget/beget-1.2.3.bep b/haiku-apps/beget/beget-1.2.3.recipe
similarity index 96%
rename from haiku-apps/beget/beget-1.2.3.bep
rename to haiku-apps/beget/beget-1.2.3.recipe
index c87a6858f..be90a33de 100644
--- a/haiku-apps/beget/beget-1.2.3.bep
+++ b/haiku-apps/beget/beget-1.2.3.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="net-misc/wget"
 
-BUILD {
+BUILD()
+{
 	cd beget-1.2.3
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd beget-1.2.3
 	mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`
 	cp BeGet $DESTDIR`finddir B_APPS_DIRECTORY`
diff --git a/haiku-apps/behappy/behappy-16.bep b/haiku-apps/behappy/behappy-16.recipe
similarity index 94%
rename from haiku-apps/behappy/behappy-16.bep
rename to haiku-apps/behappy/behappy-16.recipe
index 82da09219..7c14ae33a 100644
--- a/haiku-apps/behappy/behappy-16.bep
+++ b/haiku-apps/behappy/behappy-16.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="www-client/netsurf >= 2.6"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd "behappy-16"
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd "behappy-16"
 }
 
diff --git a/haiku-apps/bepdf/bepdf-1.1.1b4.bep b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe
similarity index 96%
rename from haiku-apps/bepdf/bepdf-1.1.1b4.bep
rename to haiku-apps/bepdf/bepdf-1.1.1b4.recipe
index 61df256e4..c2f2e10e8 100644
--- a/haiku-apps/bepdf/bepdf-1.1.1b4.bep
+++ b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="app-text/htmldoc == 1.8.27"	
 		
-BUILD {
+BUILD()
+{
 	export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2`
 	cd bepdf-1.1.1b4
 	./build.sh package
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bepdf-1.1.1b4
 	mkdir -p ${DESTDIR}/boot/apps
 	unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps
diff --git a/haiku-apps/beshare/beshare-4.bep b/haiku-apps/beshare/beshare-4.recipe
similarity index 92%
rename from haiku-apps/beshare/beshare-4.bep
rename to haiku-apps/beshare/beshare-4.recipe
index 70162a75d..cc82033ca 100644
--- a/haiku-apps/beshare/beshare-4.bep
+++ b/haiku-apps/beshare/beshare-4.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="muscle >= 4.63"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd beshare-4/source
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd beshare-4
 }
 
diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.bep b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe
similarity index 91%
rename from haiku-apps/bowser/bowser-1.1.1-cvs.bep
rename to haiku-apps/bowser/bowser-1.1.1-cvs.recipe
index 03e44cf2b..9d2af2a94 100644
--- a/haiku-apps/bowser/bowser-1.1.1-cvs.bep
+++ b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 		
-BUILD {
+BUILD()
+{
 
 }
 
-INSTALL {
+INSTALL()
+{
 
 }
 
diff --git a/haiku-apps/bsl/bsl-108.bep b/haiku-apps/bsl/bsl-108.recipe
similarity index 94%
rename from haiku-apps/bsl/bsl-108.bep
rename to haiku-apps/bsl/bsl-108.recipe
index a64ea3938..df2fcc8e3 100644
--- a/haiku-apps/bsl/bsl-108.bep
+++ b/haiku-apps/bsl/bsl-108.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd bsl-108
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bsl-108
 	BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${DESTDIR}${BIN_DIR}
diff --git a/haiku-apps/burnitnow/burnitnow-2-svn.bep b/haiku-apps/burnitnow/burnitnow-2-svn.recipe
similarity index 96%
rename from haiku-apps/burnitnow/burnitnow-2-svn.bep
rename to haiku-apps/burnitnow/burnitnow-2-svn.recipe
index 375b2f3d8..85423e314 100644
--- a/haiku-apps/burnitnow/burnitnow-2-svn.bep
+++ b/haiku-apps/burnitnow/burnitnow-2-svn.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-2-svn
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-2-svn
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-27.bep b/haiku-apps/burnitnow/burnitnow-27.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-27.bep
rename to haiku-apps/burnitnow/burnitnow-27.recipe
index 58815a665..7d9667d50 100644
--- a/haiku-apps/burnitnow/burnitnow-27.bep
+++ b/haiku-apps/burnitnow/burnitnow-27.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-27
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-27
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-38.bep b/haiku-apps/burnitnow/burnitnow-38.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-38.bep
rename to haiku-apps/burnitnow/burnitnow-38.recipe
index 08cc6c00d..22f906cb4 100644
--- a/haiku-apps/burnitnow/burnitnow-38.bep
+++ b/haiku-apps/burnitnow/burnitnow-38.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-38
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-38
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-39.bep b/haiku-apps/burnitnow/burnitnow-39.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-39.bep
rename to haiku-apps/burnitnow/burnitnow-39.recipe
index f02e42d17..4ed1fbf85 100644
--- a/haiku-apps/burnitnow/burnitnow-39.bep
+++ b/haiku-apps/burnitnow/burnitnow-39.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-39
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-39
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-43.bep b/haiku-apps/burnitnow/burnitnow-43.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-43.bep
rename to haiku-apps/burnitnow/burnitnow-43.recipe
index afb02e8fa..0d3dcdd90 100644
--- a/haiku-apps/burnitnow/burnitnow-43.bep
+++ b/haiku-apps/burnitnow/burnitnow-43.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-43
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-43
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep b/haiku-apps/burnitnow/burnitnow-beta5-svn.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-beta5-svn.bep
rename to haiku-apps/burnitnow/burnitnow-beta5-svn.recipe
index 00ea2266f..d2c4e80e7 100644
--- a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep
+++ b/haiku-apps/burnitnow/burnitnow-beta5-svn.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0
 	app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd burnitnow-beta5-svn
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
        cd burnitnow-beta5-svn
        mkdir -p ${DESTDIR}/boot/apps/BurnItNow
        cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
diff --git a/haiku-apps/burnitnow/burnitnow-beta6-git.bep b/haiku-apps/burnitnow/burnitnow-beta6-git.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-beta6-git.bep
rename to haiku-apps/burnitnow/burnitnow-beta6-git.recipe
index 99afe0ec0..9a3fe6948 100644
--- a/haiku-apps/burnitnow/burnitnow-beta6-git.bep
+++ b/haiku-apps/burnitnow/burnitnow-beta6-git.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd burnitnow-beta6-git/legacy
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd burnitnow-beta6-git/legacy
 	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
 	mkdir -p ${BURNITNOWDIR}/Docs
diff --git a/haiku-apps/burnitnow/burnitnow-beta6.bep b/haiku-apps/burnitnow/burnitnow-beta6.recipe
similarity index 97%
rename from haiku-apps/burnitnow/burnitnow-beta6.bep
rename to haiku-apps/burnitnow/burnitnow-beta6.recipe
index cb0e31b32..08a74e2e1 100644
--- a/haiku-apps/burnitnow/burnitnow-beta6.bep
+++ b/haiku-apps/burnitnow/burnitnow-beta6.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="app-cdr/cdrtools > 3.00"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd burnitnow-beta6/legacy
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd burnitnow-beta6/legacy
 	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
 	mkdir -p ${BURNITNOWDIR}/Docs
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe
similarity index 97%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep
rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe
index 12cc49369..225624b42 100644
--- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep
+++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="caya"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd caya-gpl-protocols-0.HEAD
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-gpl-protocols-0.HEAD
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
 	PLATFORM=`setgcc|tr / -|cut -f3 -d' '`
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe
similarity index 97%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep
rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe
index 811ae698c..93816baed 100644
--- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep
+++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="caya"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-gpl-protocols-19
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-gpl-protocols-19
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
 	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe
similarity index 97%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep
rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe
index 7d9006de3..e6c00dd27 100644
--- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep
+++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="caya"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-gpl-protocols-24
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-gpl-protocols-24
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
 	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe
similarity index 97%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep
rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe
index af80c8f9b..f6df24bd5 100644
--- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep
+++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="caya"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-gpl-protocols-35
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-gpl-protocols-35
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
 	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe
similarity index 97%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep
rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe
index e7b5d637e..52bc7407e 100644
--- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep
+++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="caya"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-gpl-protocols-36
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-gpl-protocols-36
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
 	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
diff --git a/haiku-apps/caya/caya-0.HEAD.bep b/haiku-apps/caya/caya-0.HEAD.recipe
similarity index 98%
rename from haiku-apps/caya/caya-0.HEAD.bep
rename to haiku-apps/caya/caya-0.HEAD.recipe
index 4b0144ad6..4dd066ba6 100644
--- a/haiku-apps/caya/caya-0.HEAD.bep
+++ b/haiku-apps/caya/caya-0.HEAD.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/expat >= 2.0.1"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd caya-0.HEAD
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-0.HEAD
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/caya/caya-236.bep b/haiku-apps/caya/caya-236.recipe
similarity index 98%
rename from haiku-apps/caya/caya-236.bep
rename to haiku-apps/caya/caya-236.recipe
index e828b4871..adb7367fc 100644
--- a/haiku-apps/caya/caya-236.bep
+++ b/haiku-apps/caya/caya-236.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.21.6"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-236
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-236
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/caya/caya-240.bep b/haiku-apps/caya/caya-240.recipe
similarity index 98%
rename from haiku-apps/caya/caya-240.bep
rename to haiku-apps/caya/caya-240.recipe
index e18e4cf32..78f0e79d5 100644
--- a/haiku-apps/caya/caya-240.bep
+++ b/haiku-apps/caya/caya-240.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="net-misc/curl >= 7.21.6"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-240
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-240
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/caya/caya-264.bep b/haiku-apps/caya/caya-264.recipe
similarity index 98%
rename from haiku-apps/caya/caya-264.bep
rename to haiku-apps/caya/caya-264.recipe
index 98ebf5180..c7a92ce6d 100644
--- a/haiku-apps/caya/caya-264.bep
+++ b/haiku-apps/caya/caya-264.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/expat >= 2.0.1"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-264
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-264
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/caya/caya-278.bep b/haiku-apps/caya/caya-278.recipe
similarity index 98%
rename from haiku-apps/caya/caya-278.bep
rename to haiku-apps/caya/caya-278.recipe
index 7b717dae6..ced844436 100644
--- a/haiku-apps/caya/caya-278.bep
+++ b/haiku-apps/caya/caya-278.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/expat >= 2.0.1"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-278
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-278
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/caya/caya-279.bep b/haiku-apps/caya/caya-279.recipe
similarity index 98%
rename from haiku-apps/caya/caya-279.bep
rename to haiku-apps/caya/caya-279.recipe
index 17b1b63d6..87fce694e 100644
--- a/haiku-apps/caya/caya-279.bep
+++ b/haiku-apps/caya/caya-279.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/expat >= 2.0.1"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd caya-279
 	./configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd caya-279
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
diff --git a/haiku-apps/clockwerk/clockwerk-78.bep b/haiku-apps/clockwerk/clockwerk-78.recipe
similarity index 96%
rename from haiku-apps/clockwerk/clockwerk-78.bep
rename to haiku-apps/clockwerk/clockwerk-78.recipe
index caa9ed8d3..85399a2e8 100644
--- a/haiku-apps/clockwerk/clockwerk-78.bep
+++ b/haiku-apps/clockwerk/clockwerk-78.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd clockwerk-78
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
        cd clockwerk-78
        mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
        cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
diff --git a/haiku-apps/clockwerk/clockwerk-80.bep b/haiku-apps/clockwerk/clockwerk-80.recipe
similarity index 96%
rename from haiku-apps/clockwerk/clockwerk-80.bep
rename to haiku-apps/clockwerk/clockwerk-80.recipe
index 7da9b2836..b0fdc9f33 100644
--- a/haiku-apps/clockwerk/clockwerk-80.bep
+++ b/haiku-apps/clockwerk/clockwerk-80.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd clockwerk-80
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
        cd clockwerk-80
        mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
        cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.bep b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
similarity index 96%
rename from haiku-apps/documentviewer/documentviewer-0.3.2.bep
rename to haiku-apps/documentviewer/documentviewer-0.3.2.recipe
index 510b358a2..40b750dbb 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3.2.bep
+++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
@@ -8,12 +8,14 @@ DEPEND="media-libs/fitz >= 1.0
 	media-libs/djvulibre >= 3.5.25"
 MESSAGE="This port only builds with gcc4."
 
-BUILD {
+BUILD()
+{
 	cd documentviewer-0.3.2
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd documentviewer-0.3.2
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer
 	cp application/DocumentViewer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer
diff --git a/haiku-apps/friss/friss-0.7-svn.bep b/haiku-apps/friss/friss-0.7-svn.recipe
similarity index 97%
rename from haiku-apps/friss/friss-0.7-svn.bep
rename to haiku-apps/friss/friss-0.7-svn.recipe
index 627e6cc41..4ab354445 100644
--- a/haiku-apps/friss/friss-0.7-svn.bep
+++ b/haiku-apps/friss/friss-0.7-svn.recipe
@@ -4,7 +4,8 @@ SRC_URI="svn://pulkomandy.tk/friss"
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd friss-0.7-svn/src
 	if [ -n "$(setgcc | grep '4')" ]; then
 		sed -i 's/lstdc++.r4/lstdc++/' Jamfile
@@ -14,7 +15,8 @@ BUILD {
 	chmod 755 ../bin/apps/friss/FRiSS
 }
 
-INSTALL {
+INSTALL()
+{
 	cd friss-0.7-svn
 	mkdir -p ${DESTDIR}/boot/apps/FRiSS
 	cp -a bin/apps/friss/* ${DESTDIR}/boot/apps/FRiSS
diff --git a/haiku-apps/globe/globe-0.4.bep b/haiku-apps/globe/globe-0.4.recipe
similarity index 96%
rename from haiku-apps/globe/globe-0.4.bep
rename to haiku-apps/globe/globe-0.4.recipe
index 69c8e3dbe..99039727e 100644
--- a/haiku-apps/globe/globe-0.4.bep
+++ b/haiku-apps/globe/globe-0.4.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd globe0.4
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd globe0.4
 	TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe
 	mkdir -p $TARGET_DIR
diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe
similarity index 95%
rename from haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep
rename to haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe
index 72c54af13..0696c3811 100644
--- a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep
+++ b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKUE="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="net-misc/curl >= 7.26.0"
-BUILD {
+BUILD()
+{
 	cd haikutwitter-1.0-svn
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd haikutwitter-1.0-svn
 	make install
 }
diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0.bep b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe
similarity index 95%
rename from haiku-apps/haikutwitter/haikutwitter-1.0.bep
rename to haiku-apps/haikutwitter/haikutwitter-1.0.recipe
index 008d6f9ba..69e242081 100644
--- a/haiku-apps/haikutwitter/haikutwitter-1.0.bep
+++ b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKUE="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="net-misc/curl >= 7.26.0"
-BUILD {
+BUILD()
+{
 	cd haikutwitter-1.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd haikutwitter-1.0
 	make install
 }
diff --git a/haiku-apps/hare/hare-beta1-git.bep b/haiku-apps/hare/hare-beta1-git.recipe
similarity index 96%
rename from haiku-apps/hare/hare-beta1-git.bep
rename to haiku-apps/hare/hare-beta1-git.recipe
index d7ad0f796..5bb48106f 100644
--- a/haiku-apps/hare/hare-beta1-git.bep
+++ b/haiku-apps/hare/hare-beta1-git.recipe
@@ -9,13 +9,15 @@ DEPEND="media-libs/lame > 3.98.4
 	
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd hare-beta1-git
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hare-beta1-git
 	HARE_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Hare
 	mkdir -p ${HARE_DIR}
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe
similarity index 94%
rename from haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep
rename to haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe
index 79bb31fb2..bfc5da984 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd keymapswitcher-1.2.7
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd keymapswitcher-1.2.7
 	make package
 	cp dist/*.zip ../..
diff --git a/haiku-apps/mkdepend/mkdepend-1.7.bep b/haiku-apps/mkdepend/mkdepend-1.7.recipe
similarity index 96%
rename from haiku-apps/mkdepend/mkdepend-1.7.bep
rename to haiku-apps/mkdepend/mkdepend-1.7.recipe
index eaa3d9d92..c1c6269a8 100644
--- a/haiku-apps/mkdepend/mkdepend-1.7.bep
+++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387"
-BUILD {
+BUILD()
+{
 	cd mkdepend-1.7
 	rc mkdepend.rdef
 	xres mkdepend.rsrc
 	gcc args.c getargs.c main.c nodes.c reader.c util.c -o mkdepend
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mkdepend-1.7
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a mkdepend ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/haiku-apps/open-sum-it/open-sum-it-108.bep b/haiku-apps/open-sum-it/open-sum-it-108.recipe
similarity index 96%
rename from haiku-apps/open-sum-it/open-sum-it-108.bep
rename to haiku-apps/open-sum-it/open-sum-it-108.recipe
index f866edbdd..a37479aee 100644
--- a/haiku-apps/open-sum-it/open-sum-it-108.bep
+++ b/haiku-apps/open-sum-it/open-sum-it-108.recipe
@@ -7,12 +7,14 @@ DEPEND="bsl >= 108
 	rez >= 108"
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd open-sum-it-108
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd open-sum-it-108
 	APPS_DIR=`finddir B_APPS_DIRECTORY`
 	mkdir -p ${DESTDIR}${APPS_DIR}/Open-Sum-It
diff --git a/haiku-apps/paladin/paladin-1.3-hg.bep b/haiku-apps/paladin/paladin-1.3-hg.recipe
similarity index 98%
rename from haiku-apps/paladin/paladin-1.3-hg.bep
rename to haiku-apps/paladin/paladin-1.3-hg.recipe
index fccfd5c99..e107fa3fc 100644
--- a/haiku-apps/paladin/paladin-1.3-hg.bep
+++ b/haiku-apps/paladin/paladin-1.3-hg.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd paladin-1.3-hg
 #	./buildsuite.sh 1
 	cd Paladin
@@ -26,7 +27,8 @@ BUILD {
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd paladin-1.3-hg
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
 	cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.recipe
similarity index 98%
rename from haiku-apps/paladin/paladin-1.3.bep
rename to haiku-apps/paladin/paladin-1.3.recipe
index cb7986d52..dc671765c 100644
--- a/haiku-apps/paladin/paladin-1.3.bep
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.02"
 CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
-BUILD {
+BUILD()
+{
 	cd Paladin-1.3.src/Paladin
 	chmod 755 buildhaikugcc2.sh
 	chmod 755 buildhaikugcc4.sh
@@ -24,7 +25,8 @@ BUILD {
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd Paladin-1.3.src
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
 	cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
diff --git a/haiku-apps/pe/pe-2.4.2-597.bep b/haiku-apps/pe/pe-2.4.2-597.recipe
similarity index 96%
rename from haiku-apps/pe/pe-2.4.2-597.bep
rename to haiku-apps/pe/pe-2.4.2-597.recipe
index d8700b6a1..8a9f558da 100644
--- a/haiku-apps/pe/pe-2.4.2-597.bep
+++ b/haiku-apps/pe/pe-2.4.2-597.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd pe-2.4.2-597
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
        cd pe-2.4.2-597/generated
 	if [ -d distro ];then
 		mv -f distro Pe
diff --git a/haiku-apps/pe/pe-2.4.3-600.bep b/haiku-apps/pe/pe-2.4.3-600.recipe
similarity index 96%
rename from haiku-apps/pe/pe-2.4.3-600.bep
rename to haiku-apps/pe/pe-2.4.3-600.recipe
index bc857b363..a7ea93201 100644
--- a/haiku-apps/pe/pe-2.4.3-600.bep
+++ b/haiku-apps/pe/pe-2.4.3-600.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd pe-2.4.3-600
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pe-2.4.3-600
 	mkdir -p ${DESTDIR}/boot/apps
 	cp -a generated/distro ${DESTDIR}/boot/apps/Pe
diff --git a/haiku-apps/pe/pe-2.4.3-hg.bep b/haiku-apps/pe/pe-2.4.3-hg.recipe
similarity index 96%
rename from haiku-apps/pe/pe-2.4.3-hg.bep
rename to haiku-apps/pe/pe-2.4.3-hg.recipe
index ce5e6fc70..ea4271978 100644
--- a/haiku-apps/pe/pe-2.4.3-hg.bep
+++ b/haiku-apps/pe/pe-2.4.3-hg.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.00"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd pe-2.4.3-hg
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pe-2.4.3-hg
 	mkdir -p ${DESTDIR}/boot/apps
 	cp -a generated/distro ${DESTDIR}/boot/apps/Pe
diff --git a/haiku-apps/puri/puri-0.3.9.1.bep b/haiku-apps/puri/puri-0.3.9.1.recipe
similarity index 96%
rename from haiku-apps/puri/puri-0.3.9.1.bep
rename to haiku-apps/puri/puri-0.3.9.1.recipe
index 8f7f1d4e1..272c4df9d 100644
--- a/haiku-apps/puri/puri-0.3.9.1.bep
+++ b/haiku-apps/puri/puri-0.3.9.1.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6e0a48e31dae972ccb010437a2d72dd8"
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd puri-0.3.9.1
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	puri=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Puri
 	mkdir -p ${puri}
 	mkdir -p ${puri}/data/
diff --git a/haiku-apps/rez/rez-108.bep b/haiku-apps/rez/rez-108.recipe
similarity index 94%
rename from haiku-apps/rez/rez-108.bep
rename to haiku-apps/rez/rez-108.recipe
index d0cb76395..d4d1ce2c4 100644
--- a/haiku-apps/rez/rez-108.bep
+++ b/haiku-apps/rez/rez-108.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
 
-BUILD {
+BUILD()
+{
 	cd rez-108
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rez-108
 	BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${DESTDIR}${BIN_DIR}
diff --git a/haiku-apps/sawteeth/sawteeth-1.3.bep b/haiku-apps/sawteeth/sawteeth-1.3.recipe
similarity index 97%
rename from haiku-apps/sawteeth/sawteeth-1.3.bep
rename to haiku-apps/sawteeth/sawteeth-1.3.recipe
index 3155d4445..ef0d7ce6c 100644
--- a/haiku-apps/sawteeth/sawteeth-1.3.bep
+++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd sawteeth-1.3
 	cmake .
     make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sawteeth-1.3
     SAWTEETH_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Sawteeth
     mkdir -p ${SAWTEETH_DIR}/sounds
diff --git a/haiku-apps/thememanager/thememanager-0-svn.bep b/haiku-apps/thememanager/thememanager-0-svn.recipe
similarity index 92%
rename from haiku-apps/thememanager/thememanager-0-svn.bep
rename to haiku-apps/thememanager/thememanager-0-svn.recipe
index 49ca68421..69eb763d7 100644
--- a/haiku-apps/thememanager/thememanager-0-svn.bep
+++ b/haiku-apps/thememanager/thememanager-0-svn.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd trunk
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd trunk
 }
 
diff --git a/haiku-apps/vision/vision-908.bep b/haiku-apps/vision/vision-908.recipe
similarity index 97%
rename from haiku-apps/vision/vision-908.bep
rename to haiku-apps/vision/vision-908.recipe
index 6e8b0d45b..63a723983 100644
--- a/haiku-apps/vision/vision-908.bep
+++ b/haiku-apps/vision/vision-908.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""	
 		
-BUILD {
+BUILD()
+{
 	cd vision-908
 	if [ -n "$(setgcc | grep '4')" ]; then
 		patch -p0 -ui ../../patches/vision-908-gcc4.patch
@@ -14,7 +15,8 @@ BUILD {
 	make	
 }
 
-INSTALL {
+INSTALL()
+{
 	VISIONSETTINGSDIR=${DESTDIR}/`finddir B_USER_SETTINGS_DIRECTORY`/Vision
 	mkdir -p ${VISIONSETTINGSDIR}
 	cd vision-908
diff --git a/haiku-apps/vision/vision-933.bep b/haiku-apps/vision/vision-933.recipe
similarity index 96%
rename from haiku-apps/vision/vision-933.bep
rename to haiku-apps/vision/vision-933.recipe
index 020a494dd..41876b723 100644
--- a/haiku-apps/vision/vision-933.bep
+++ b/haiku-apps/vision/vision-933.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND=""	
 		
-BUILD {
+BUILD()
+{
 	cd vision-933
 	cd Vision
 	if [ -n "$(setgcc | grep '2')" ]; then
@@ -17,7 +18,8 @@ BUILD {
 	make	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vision-933
 	cd Vision
 	mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision
diff --git a/haiku-apps/yab/yab-1.6.bep b/haiku-apps/yab/yab-1.6.recipe
similarity index 97%
rename from haiku-apps/yab/yab-1.6.bep
rename to haiku-apps/yab/yab-1.6.recipe
index 3c8340fa3..3cf2e5014 100644
--- a/haiku-apps/yab/yab-1.6.bep
+++ b/haiku-apps/yab/yab-1.6.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b"
-BUILD {
+BUILD()
+{
 	cd yab-1.6/src
 	make clean
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd yab-1.6
 	mkdir -p ${DESTDIR}/boot/apps/yab
 	cp -a src/yab ${DESTDIR}/boot/apps/yab
diff --git a/haiku-libs/libwalter/libwalter-97.bep b/haiku-libs/libwalter/libwalter-97.recipe
similarity index 97%
rename from haiku-libs/libwalter/libwalter-97.bep
rename to haiku-libs/libwalter/libwalter-97.recipe
index 577ee47f0..e90d86b06 100644
--- a/haiku-libs/libwalter/libwalter-97.bep
+++ b/haiku-libs/libwalter/libwalter-97.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd libwalter-97
 	configure
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libwalter-97
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY`
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter
@@ -19,7 +21,8 @@ INSTALL {
 	cp -a include/. ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter
 }
 
-TEST {
+TEST()
+{
 	cd tests
 	ColorWellTest	
 	ComboBoxTest
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe
similarity index 96%
rename from media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep
rename to media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe
index 4d1dde0d9..ee6aef5cd 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="11000a74da50b461b374f711392f1d46"
-BUILD {
+BUILD()
+{
 	cd ae_fonts1-1.1
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ae_fonts1-1.1
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/courier-prime/courier-prime-1.0.bep b/media-fonts/courier-prime/courier-prime-1.0.recipe
similarity index 96%
rename from media-fonts/courier-prime/courier-prime-1.0.bep
rename to media-fonts/courier-prime/courier-prime-1.0.recipe
index 91be0bec0..26fa8a9fb 100644
--- a/media-fonts/courier-prime/courier-prime-1.0.bep
+++ b/media-fonts/courier-prime/courier-prime-1.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738"
-BUILD {
+BUILD()
+{
 	echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
 	cd "Courier Prime"
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/courier-prime
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/droid/droid-113.bep b/media-fonts/droid/droid-113.recipe
similarity index 97%
rename from media-fonts/droid/droid-113.bep
rename to media-fonts/droid/droid-113.recipe
index b875f1f8d..cce5cff0d 100644
--- a/media-fonts/droid/droid-113.bep
+++ b/media-fonts/droid/droid-113.recipe
@@ -6,11 +6,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039"
-BUILD {
+BUILD()
+{
 	cd base
 }
 
-INSTALL {
+INSTALL()
+{
 	cd base
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/droid
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe
similarity index 89%
rename from media-fonts/farsi-fonts/farsi-fonts-0.4.bep
rename to media-fonts/farsi-fonts/farsi-fonts-0.4.recipe
index 103144133..33d8e94a8 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe
@@ -5,14 +5,17 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b"
-BUILD {
+BUILD()
+{
   echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
   FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/
   mkdir -p ${FONTDIR}
-  cp -r *.ttf {FONTDIR}
+  cp -r *.ttf()
+{FONTDIR}
 }
 
 LICENSE="GNU GPL v2"
diff --git a/media-fonts/inconsolata/inconsolata-1.0.bep b/media-fonts/inconsolata/inconsolata-1.0.recipe
similarity index 96%
rename from media-fonts/inconsolata/inconsolata-1.0.bep
rename to media-fonts/inconsolata/inconsolata-1.0.recipe
index d531ce2ef..23cce1f39 100644
--- a/media-fonts/inconsolata/inconsolata-1.0.bep
+++ b/media-fonts/inconsolata/inconsolata-1.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8510443343f43382566511e73abc06f8"
-BUILD {
+BUILD()
+{
 	echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata
 	mkdir -p ${FONTDIR}
 	wget http://levien.com/type/myfonts/Inconsolata.otf
diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep b/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe
similarity index 96%
rename from media-fonts/kacst-fonts/kacst-fonts-5.0.bep
rename to media-fonts/kacst-fonts/kacst-fonts-5.0.recipe
index 2c773bcf1..c2a34ed0e 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep
+++ b/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660"
-BUILD {
+BUILD()
+{
 	cd kacst_one_5.0
 }
 
-INSTALL {
+INSTALL()
+{
 	cd kacst_one_5.0
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/lateef-font/lateef-font-1.001.bep b/media-fonts/lateef-font/lateef-font-1.001.recipe
similarity index 95%
rename from media-fonts/lateef-font/lateef-font-1.001.bep
rename to media-fonts/lateef-font/lateef-font-1.001.recipe
index bc38efee9..0de1633c9 100644
--- a/media-fonts/lateef-font/lateef-font-1.001.bep
+++ b/media-fonts/lateef-font/lateef-font-1.001.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22"
-BUILD {
+BUILD()
+{
 	echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/
 	mkdir -p ${FONTDIR}
 	cp -r *.ttf ${FONTDIR}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep b/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe
similarity index 96%
rename from media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep
rename to media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe
index 95a836d80..226727d72 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep
+++ b/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="fontforge"
 CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80"
-BUILD {
+BUILD()
+{
 	cd liberation-fonts-1.06.0.20100721
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd liberation-fonts-1.06.0.20100721
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe
similarity index 97%
rename from media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep
rename to media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe
index dd201fb6f..fc56440a3 100644
--- a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep
+++ b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6"
-BUILD {
+BUILD()
+{
 	echo "Nothing to be done. To install this font, run haikuporter with -i option"
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq
 	mkdir -p ${FONTDIR}
 	cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR}
diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep b/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe
similarity index 96%
rename from media-fonts/nafees-riqa/nafees-riqa-1.00.bep
rename to media-fonts/nafees-riqa/nafees-riqa-1.00.recipe
index 805653aed..ca16a2cf9 100644
--- a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep
+++ b/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f"
-BUILD {
+BUILD()
+{
 	echo "Nothing to be done. To install this font, run haikuporter with -i option"
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa
 	mkdir -p ${FONTDIR}
 	cp "Nafees Riqa v1.0.ttf" ${FONTDIR}
diff --git a/media-fonts/nanumfont/nanumfont-2.0.bep b/media-fonts/nanumfont/nanumfont-2.0.recipe
similarity index 95%
rename from media-fonts/nanumfont/nanumfont-2.0.bep
rename to media-fonts/nanumfont/nanumfont-2.0.recipe
index 8f0cc9baf..afa82f449 100644
--- a/media-fonts/nanumfont/nanumfont-2.0.bep
+++ b/media-fonts/nanumfont/nanumfont-2.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf"
-BUILD {
+BUILD()
+{
 	echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont
 	mkdir -p ${FONTDIR}
 	cp -r *.ttf ${FONTDIR}/
diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep b/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe
similarity index 96%
rename from media-fonts/scheherazade-font/scheherazade-font-1.005.bep
rename to media-fonts/scheherazade-font/scheherazade-font-1.005.recipe
index 307e71ece..2d438f87a 100644
--- a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep
+++ b/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe
@@ -6,11 +6,13 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0"
 
-BUILD {
+BUILD()
+{
 	echo "No building required."
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade
 	mkdir -p ${FONTDIR}
 	cp -r *.ttf ${FONTDIR}	
diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe
similarity index 96%
rename from media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep
rename to media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe
index 5620593ce..05e2c6a67 100644
--- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep
+++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc"
-BUILD {
+BUILD()
+{
 	echo "Nothing to be done. To install this font, run haikuporter with -i option"
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts
 	mkdir -p ${FONTDIR}
 	cp *.ttf ${FONTDIR}
diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep b/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe
similarity index 96%
rename from media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep
rename to media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe
index 459d3138d..06a576b38 100644
--- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep
+++ b/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f"
-BUILD {
+BUILD()
+{
 	cd wqy-microhei
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wqy-microhei
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe
similarity index 96%
rename from media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep
rename to media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe
index 87777cc52..c95a82a32 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd"
-BUILD {
+BUILD()
+{
 	cd wqy-zenhei
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wqy-zenhei
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi
 	mkdir -p ${FONTDIR}
diff --git a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep b/media-fonts/x-series-fonts/x-series-fonts-2.0.recipe
similarity index 99%
rename from media-fonts/x-series-fonts/x-series-fonts-2.0.bep
rename to media-fonts/x-series-fonts/x-series-fonts-2.0.recipe
index 93c2f2064..c63036006 100644
--- a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep
+++ b/media-fonts/x-series-fonts/x-series-fonts-2.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f"
-BUILD {
+BUILD()
+{
 	cd Zar
 }
 
-INSTALL {
+INSTALL()
+{
 	FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series
 	mkdir -p ${FONTDIR}
 	wget http://irmug.com/downloads/dl.php?id=21
diff --git a/media-gfx/blender/blender-2.49b.bep b/media-gfx/blender/blender-2.49b.recipe
similarity index 95%
rename from media-gfx/blender/blender-2.49b.bep
rename to media-gfx/blender/blender-2.49b.recipe
index cb93d13d3..10b445702 100644
--- a/media-gfx/blender/blender-2.49b.bep
+++ b/media-gfx/blender/blender-2.49b.recipe
@@ -8,12 +8,14 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND="dev-util/scons >= 1.0.1
 	dev-lang/python >= 2.6.0"
-BUILD {
+BUILD()
+{
 	cd blender-2.49b
 	scons
 }
 
-INSTALL {
+INSTALL()
+{
 	# TODO
 	exit 1
 }
diff --git a/media-gfx/flam3/flam3-3.0.bep b/media-gfx/flam3/flam3-3.0.recipe
similarity index 96%
rename from media-gfx/flam3/flam3-3.0.bep
rename to media-gfx/flam3/flam3-3.0.recipe
index 3f3aa7c32..e5f209772 100644
--- a/media-gfx/flam3/flam3-3.0.bep
+++ b/media-gfx/flam3/flam3-3.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 
 DEPEND="dev-util/pkconfig >= 0.23"
 
-BUILD {
+BUILD()
+{
 	cd flam3-3.0/src
 	if [ -n "$(setgcc | grep '2')" ]; then
 		patch -p0 -ui ../../../patches/flam3-3.0-gcc2.patch
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd flam3-3.0/src
 	make install
 }
diff --git a/media-gfx/fontforge/fontforge-201005010.bep b/media-gfx/fontforge/fontforge-201005010.recipe
similarity index 95%
rename from media-gfx/fontforge/fontforge-201005010.bep
rename to media-gfx/fontforge/fontforge-201005010.recipe
index d4cadf981..f358a4973 100644
--- a/media-gfx/fontforge/fontforge-201005010.bep
+++ b/media-gfx/fontforge/fontforge-201005010.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5f3d20d645ec1aa2b7b4876386df8717"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd fontforge-20100501
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fontforge-20100501
 	make install
 }
diff --git a/media-gfx/graphviz/graphviz-2.24.bep b/media-gfx/graphviz/graphviz-2.24.recipe
similarity index 96%
rename from media-gfx/graphviz/graphviz-2.24.bep
rename to media-gfx/graphviz/graphviz-2.24.recipe
index 2285c4260..6ad367337 100644
--- a/media-gfx/graphviz/graphviz-2.24.bep
+++ b/media-gfx/graphviz/graphviz-2.24.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="806a30dbc3f8deb219216f35be0e7a40"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd graphviz-2.24.0
 	libtoolize -fci
 	aclocal -I m4
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd graphviz-2.24.0
 	make install
 	cd `finddir B_COMMON_BIN_DIRECTORY`
diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.recipe
similarity index 96%
rename from media-gfx/graphviz/graphviz-2.26.3.bep
rename to media-gfx/graphviz/graphviz-2.26.3.recipe
index 702281e4d..ca426fd62 100644
--- a/media-gfx/graphviz/graphviz-2.26.3.bep
+++ b/media-gfx/graphviz/graphviz-2.26.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd graphviz-2.26.3
 	libtoolize -fci
 	autoconf
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd graphviz-2.26.3
 	make install
 }
diff --git a/media-gfx/hqx/hqx-1.1.bep b/media-gfx/hqx/hqx-1.1.recipe
similarity index 96%
rename from media-gfx/hqx/hqx-1.1.bep
rename to media-gfx/hqx/hqx-1.1.recipe
index ba9a5e07f..83976d146 100644
--- a/media-gfx/hqx/hqx-1.1.bep
+++ b/media-gfx/hqx/hqx-1.1.recipe
@@ -7,14 +7,16 @@ DEPEND="media-libs/devil >= 1.7.8"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
 CHECKSUM_MD5="e4d3132b5f3614a75975b62fe6a066bb"
-BUILD {
+BUILD()
+{
 	cd hqx-1.1
 		
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 		
 	cd hqx-1.1
 	make install
diff --git a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep b/media-gfx/imagemagick/imagemagick-6.6.1-10.recipe
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-6.6.1-10.bep
rename to media-gfx/imagemagick/imagemagick-6.6.1-10.recipe
index 21b575066..a6bf12c1a 100644
--- a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep
+++ b/media-gfx/imagemagick/imagemagick-6.6.1-10.recipe
@@ -13,7 +13,8 @@ DEPEND="media-libs/libpng,
 		media-libs/lcms,
 		media-libs/freetype"
 CHECKSUM_MD5="fa42577f4d9ab23171bc6824b515ca13"
-BUILD {
+BUILD()
+{
 	cd ImageMagick-6.6.1-10
 	libtoolize --force
 	aclocal -I m4
@@ -27,7 +28,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ImageMagick-6.6.1-10
 	make install
 }
diff --git a/media-gfx/pngcrush/pngcrush-1.7.11.bep b/media-gfx/pngcrush/pngcrush-1.7.11.recipe
similarity index 96%
rename from media-gfx/pngcrush/pngcrush-1.7.11.bep
rename to media-gfx/pngcrush/pngcrush-1.7.11.recipe
index 4f86224ef..30ebeadd0 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.11.bep
+++ b/media-gfx/pngcrush/pngcrush-1.7.11.recipe
@@ -6,11 +6,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd pngcrush-1.7.11-nolib
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd pngcrush-1.7.11-nolib
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/media-gfx/pngcrush/pngcrush-1.7.12.bep b/media-gfx/pngcrush/pngcrush-1.7.12.recipe
similarity index 96%
rename from media-gfx/pngcrush/pngcrush-1.7.12.bep
rename to media-gfx/pngcrush/pngcrush-1.7.12.recipe
index 5564d42cc..67391fe1f 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.12.bep
+++ b/media-gfx/pngcrush/pngcrush-1.7.12.recipe
@@ -6,11 +6,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd pngcrush-1.7.12-nolib
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd pngcrush-1.7.12-nolib
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
diff --git a/media-gfx/pngcrush/pngcrush-1.7.6.bep b/media-gfx/pngcrush/pngcrush-1.7.6.recipe
similarity index 95%
rename from media-gfx/pngcrush/pngcrush-1.7.6.bep
rename to media-gfx/pngcrush/pngcrush-1.7.6.recipe
index 20dcd81d1..cf2825ac6 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.6.bep
+++ b/media-gfx/pngcrush/pngcrush-1.7.6.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="79fdedccf761f6391c11aa851c9fc6b2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pngcrush-1.7.6-nolib
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pngcrush-1.7.6-nolib
 	cp -a -f pngcrush `finddir B_COMMON_BIN_DIRECTORY`
 }
diff --git a/media-gfx/potrace/potrace-1.8.bep b/media-gfx/potrace/potrace-1.8.recipe
similarity index 95%
rename from media-gfx/potrace/potrace-1.8.bep
rename to media-gfx/potrace/potrace-1.8.recipe
index a9c35063c..973ae7e68 100644
--- a/media-gfx/potrace/potrace-1.8.bep
+++ b/media-gfx/potrace/potrace-1.8.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd potrace-1.8
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd potrace-1.8
 	make install
 }
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe
similarity index 96%
rename from media-gfx/tuxpaint/tuxpaint-0.9.21.bep
rename to media-gfx/tuxpaint/tuxpaint-0.9.21.recipe
index afcd11f6d..192f3bb24 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe
@@ -15,12 +15,14 @@ DEPEND="media-libs/libsdl >= 1.2.14
 		dev-util/pkgconfig >= 0.23
 		sys-devel/gettext >= 0.17"	
 		
-BUILD {
+BUILD()
+{
 	cd tuxpaint-0.9.21
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tuxpaint-0.9.21
 	make install
 }
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep b/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe
similarity index 97%
rename from media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep
rename to media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe
index 6dc3f1daf..f0893b193 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe
@@ -15,7 +15,8 @@ DEPEND="media-libs/libsdl >= 1.2.14
 		sys-devel/gettext >= 0.17	
 		dev-utils/gperf >= 3.0.4"
 		
-BUILD {
+BUILD()
+{
 	cd tuxpaint-0.9.2x-cvs
 	if [ ! -f /boot/common/lib/libstdc++.so ] 
 	then
@@ -24,7 +25,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tuxpaint-0.9.2x-cvs
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/media-libs/a52dec/a52dec-0.7.4.bep b/media-libs/a52dec/a52dec-0.7.4.recipe
similarity index 95%
rename from media-libs/a52dec/a52dec-0.7.4.bep
rename to media-libs/a52dec/a52dec-0.7.4.recipe
index ca528ac3c..b062a6fbd 100644
--- a/media-libs/a52dec/a52dec-0.7.4.bep
+++ b/media-libs/a52dec/a52dec-0.7.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="caa9f5bc44232dc8aeea773fea56be80"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd a52dec-0.7.4
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd a52dec-0.7.4
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/media-libs/aalib/aalib-1.4rc4.bep b/media-libs/aalib/aalib-1.4rc4.recipe
similarity index 96%
rename from media-libs/aalib/aalib-1.4rc4.bep
rename to media-libs/aalib/aalib-1.4rc4.recipe
index 34b9d7925..29a13d8cb 100644
--- a/media-libs/aalib/aalib-1.4rc4.bep
+++ b/media-libs/aalib/aalib-1.4rc4.recipe
@@ -5,7 +5,8 @@ SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd aalib-1.4.0
 	libtoolize --force --copy --install
 #	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd aalib-1.4.0
 	make install
 }
diff --git a/media-libs/agar/agar-1.4.1.bep b/media-libs/agar/agar-1.4.1.recipe
similarity index 94%
rename from media-libs/agar/agar-1.4.1.bep
rename to media-libs/agar/agar-1.4.1.recipe
index 5c13d6e2d..e88afa4c9 100644
--- a/media-libs/agar/agar-1.4.1.bep
+++ b/media-libs/agar/agar-1.4.1.recipe
@@ -5,18 +5,21 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="ce71fb11ad79c926a968a4ed29053820"
-BUILD {
+BUILD()
+{
 	cd agar-1.4.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd agar-1.4.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd agar-1.4.1
 #	make test
 #	make check
diff --git a/media-libs/allegro/allegro-4.4.0.bep b/media-libs/allegro/allegro-4.4.0.recipe
similarity index 95%
rename from media-libs/allegro/allegro-4.4.0.bep
rename to media-libs/allegro/allegro-4.4.0.recipe
index c78f14bc2..7a3ff42b1 100644
--- a/media-libs/allegro/allegro-4.4.0.bep
+++ b/media-libs/allegro/allegro-4.4.0.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libvorbis >= 1.2.3"
-BUILD {
+BUILD()
+{
 	cd allegro-4.4.0
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd allegro-4.4.0
 	make install
 }
diff --git a/media-libs/allegro/allegro-4.4.1.1.bep b/media-libs/allegro/allegro-4.4.1.1.recipe
similarity index 97%
rename from media-libs/allegro/allegro-4.4.1.1.bep
rename to media-libs/allegro/allegro-4.4.1.1.recipe
index c4a2019cd..925c2c10a 100644
--- a/media-libs/allegro/allegro-4.4.1.1.bep
+++ b/media-libs/allegro/allegro-4.4.1.1.recipe
@@ -8,7 +8,8 @@ DEPEND="dev-util/cmake >= 2.6.0
 	media-libs/libvorbis >= 1.2.3
 	media-libs/libogg >= 1.1.4"
 
-BUILD {
+BUILD()
+{
 	cd allegro-4.4.1.1
 	mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info
 	mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd allegro-4.4.1.1
 	make install
 }
diff --git a/media-libs/allegro/allegro-4.4.x-svn.bep b/media-libs/allegro/allegro-4.4.x-svn.recipe
similarity index 96%
rename from media-libs/allegro/allegro-4.4.x-svn.bep
rename to media-libs/allegro/allegro-4.4.x-svn.recipe
index ca03a5837..e114b9ab5 100644
--- a/media-libs/allegro/allegro-4.4.x-svn.bep
+++ b/media-libs/allegro/allegro-4.4.x-svn.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.6.0
 	media-libs/libvorbis >= 1.2.3
 	media-libs/libogg >= 1.1.4"
-BUILD {
+BUILD()
+{
 	cd allegro-4.4.x-svn
 	mkdir -p `finddir B_COMMON_DIRECTORY`/share/info
 	mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd allegro-4.4.x-svn
 	make install
 }
diff --git a/media-libs/almp3/almp3-2.0.4.bep b/media-libs/almp3/almp3-2.0.4.recipe
similarity index 96%
rename from media-libs/almp3/almp3-2.0.4.bep
rename to media-libs/almp3/almp3-2.0.4.recipe
index e86b5a825..7e5cfe81a 100644
--- a/media-libs/almp3/almp3-2.0.4.bep
+++ b/media-libs/almp3/almp3-2.0.4.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/allegro >= 4.4"
 CHECKSUM_MD5="8fe1517750acf23c07442b31447791a8"
-BUILD {
+BUILD()
+{
 	cd almp3
 	mkdir -p obj/haiku/dynamic
 	mkdir -p obj/haiku/static
@@ -14,7 +15,8 @@ BUILD {
 	make TARGET=HAIKU_SHARED
 }
 
-INSTALL {
+INSTALL()
+{
 	cd almp3
 	
 	make install prefix=/boot/common \
diff --git a/media-libs/cal3d/cal3d-0.11.0.bep b/media-libs/cal3d/cal3d-0.11.0.recipe
similarity index 95%
rename from media-libs/cal3d/cal3d-0.11.0.bep
rename to media-libs/cal3d/cal3d-0.11.0.recipe
index 1522e449d..37460b671 100644
--- a/media-libs/cal3d/cal3d-0.11.0.bep
+++ b/media-libs/cal3d/cal3d-0.11.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="82ad09c1c28e73bc9596aec47237bfba"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cal3d-0.11.0
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cal3d-0.11.0
 	make install
 }
diff --git a/media-libs/devil/devil-1.7.8.bep b/media-libs/devil/devil-1.7.8.recipe
similarity index 96%
rename from media-libs/devil/devil-1.7.8.bep
rename to media-libs/devil/devil-1.7.8.recipe
index 29a5e75d9..8734b2381 100644
--- a/media-libs/devil/devil-1.7.8.bep
+++ b/media-libs/devil/devil-1.7.8.recipe
@@ -10,7 +10,8 @@ DEPEND="media-libs/jasper >= 1.900.1
 	openexr >= 1.5.0
 	dev-util/pkg-config >= 0.23
 	media-libs/tiff >= 3.8.2"
-BUILD {
+BUILD()
+{
 	cd devil-1.7.8
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd  devil-1.7.8
 	make install
 }
diff --git a/media-libs/djvulibre/djvulibre-3.5.25.bep b/media-libs/djvulibre/djvulibre-3.5.25.recipe
similarity index 97%
rename from media-libs/djvulibre/djvulibre-3.5.25.bep
rename to media-libs/djvulibre/djvulibre-3.5.25.recipe
index a4355f690..7cf3da398 100644
--- a/media-libs/djvulibre/djvulibre-3.5.25.bep
+++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd djvulibre-3.5.25
 	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd djvulibre-3.5.25
 	make install
 }
diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.recipe
similarity index 97%
rename from media-libs/dumb/dumb-0.9.3.bep
rename to media-libs/dumb/dumb-0.9.3.recipe
index 133679aa6..187e82fb2 100644
--- a/media-libs/dumb/dumb-0.9.3.bep
+++ b/media-libs/dumb/dumb-0.9.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/allegro >= 4.4.1.1"
 CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2"
-BUILD {
+BUILD()
+{
 	if [ ! -f dumb-0.9.3-autotools.tar.gz ]; then
 #	get the autotools to help in building dumb	
 	wget http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz?download
@@ -23,7 +24,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dumb-0.9.3
 		make install DESTDIR=${DESTDIR}
 }
diff --git a/media-libs/faac/faac-1.28.bep b/media-libs/faac/faac-1.28.recipe
similarity index 97%
rename from media-libs/faac/faac-1.28.bep
rename to media-libs/faac/faac-1.28.recipe
index 5d03c0a98..85ace122a 100644
--- a/media-libs/faac/faac-1.28.bep
+++ b/media-libs/faac/faac-1.28.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0"
 MESSAGE="See FAAC file in licenses directory for restrictions on binary releases.  Binary releases may require a patent license in some countries."
-BUILD {
+BUILD()
+{
 	cd faac-1.28
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd faac-1.28
 	make install
 }
diff --git a/media-libs/faad2/faad2-2.7.bep b/media-libs/faad2/faad2-2.7.recipe
similarity index 96%
rename from media-libs/faad2/faad2-2.7.bep
rename to media-libs/faad2/faad2-2.7.recipe
index 215d00dbb..9f84734f3 100644
--- a/media-libs/faad2/faad2-2.7.bep
+++ b/media-libs/faad2/faad2-2.7.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="ee1b4d67ea2d76ee52c5621bc6dbf61e"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd faad2-2.7
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd faad2-2.7
 	make install
 }
diff --git a/media-libs/fblend/fblend-0.4.bep b/media-libs/fblend/fblend-0.4.recipe
similarity index 96%
rename from media-libs/fblend/fblend-0.4.bep
rename to media-libs/fblend/fblend-0.4.recipe
index 513feb254..6150e6298 100644
--- a/media-libs/fblend/fblend-0.4.bep
+++ b/media-libs/fblend/fblend-0.4.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="broken"
 DEPEND="media-libs/allegro >= 4.4
 	app-text/dos2unix >= 1.0"
 CHECKSUM_MD5="e252ae521e099793fe6caa0fb7d048f3"
-BUILD {
+BUILD()
+{
 	cd fblend
 	dos2unix *
 	dos2unix src/*
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fblend
 	make install INSTALL_DIR=/boot/common
 }
diff --git a/media-libs/fitz/fitz-1.0.bep b/media-libs/fitz/fitz-1.0.recipe
similarity index 97%
rename from media-libs/fitz/fitz-1.0.bep
rename to media-libs/fitz/fitz-1.0.recipe
index aab114c98..85c20222f 100644
--- a/media-libs/fitz/fitz-1.0.bep
+++ b/media-libs/fitz/fitz-1.0.recipe
@@ -9,12 +9,14 @@ DEPEND="jbig2dec >= 0.11
 	jpeg >= 8d
 	zlib >= 1.2.5
 	freetype >=2.4.9"
-BUILD {
+BUILD()
+{
 	cd mupdf-1.0-source
 	make libs
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mupdf-1.0-source
 	make install \
 		prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \
diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.recipe
similarity index 98%
rename from media-libs/flac/flac-1.2.1.bep
rename to media-libs/flac/flac-1.2.1.recipe
index 1a5b26f0a..df7717403 100644
--- a/media-libs/flac/flac-1.2.1.bep
+++ b/media-libs/flac/flac-1.2.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="153c8b15a54da428d1f0fadc756c22c7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="gettext >= 0.17"
-BUILD {
+BUILD()
+{
 	cd flac-1.2.1
 	haikuporter -b libiconv-1.13.1
 	cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4
@@ -24,7 +25,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd flac-1.2.1
 	make install
 }
diff --git a/media-libs/fontconfig/fontconfig-2.10.0.bep b/media-libs/fontconfig/fontconfig-2.10.0.recipe
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.10.0.bep
rename to media-libs/fontconfig/fontconfig-2.10.0.recipe
index 271be1d39..27a33a18c 100644
--- a/media-libs/fontconfig/fontconfig-2.10.0.bep
+++ b/media-libs/fontconfig/fontconfig-2.10.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23
 	media-libs/freetype >= 2.4.9"
-BUILD {
+BUILD()
+{
 	cd fontconfig-2.10.0
 	mkdir -p `finddir B_USER_CACHE_DIRECTORY`
 	libtoolize --force --copy --install
@@ -31,7 +32,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fontconfig-2.10.0
 	make install
 }
diff --git a/media-libs/fontconfig/fontconfig-2.10.2.bep b/media-libs/fontconfig/fontconfig-2.10.2.recipe
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.10.2.bep
rename to media-libs/fontconfig/fontconfig-2.10.2.recipe
index b082b6fd1..d7510c929 100644
--- a/media-libs/fontconfig/fontconfig-2.10.2.bep
+++ b/media-libs/fontconfig/fontconfig-2.10.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23
 	media-libs/freetype >= 2.4.9"
-BUILD {
+BUILD()
+{
 	cd fontconfig-2.10.2
 	mkdir -p `finddir B_USER_CACHE_DIRECTORY`
 	libtoolize --force --copy --install
@@ -31,7 +32,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fontconfig-2.10.2
 	make install
 }
diff --git a/media-libs/freealut/freealut-1.1.0.bep b/media-libs/freealut/freealut-1.1.0.recipe
similarity index 96%
rename from media-libs/freealut/freealut-1.1.0.bep
rename to media-libs/freealut/freealut-1.1.0.recipe
index 33cdd225b..b234c477b 100644
--- a/media-libs/freealut/freealut-1.1.0.bep
+++ b/media-libs/freealut/freealut-1.1.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="media-libs/openal >= 1.6.372
 		dev-util/cmake >= 2.8.1"
         
-BUILD {
+BUILD()
+{
 	cd freealut-1.1.0
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freealut-1.1.0
 	make install
 }
diff --git a/media-libs/freeimage/freeimage-3.15.3.bep b/media-libs/freeimage/freeimage-3.15.3.recipe
similarity index 97%
rename from media-libs/freeimage/freeimage-3.15.3.bep
rename to media-libs/freeimage/freeimage-3.15.3.recipe
index a24b5c2f4..31acb2cf8 100644
--- a/media-libs/freeimage/freeimage-3.15.3.bep
+++ b/media-libs/freeimage/freeimage-3.15.3.recipe
@@ -6,14 +6,16 @@ CHECKSUM_MD5="6c305b4086500ff8541c596ea6fc7cd7"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd FreeImage
 	make -f Makefile.gnu \
 		INCDIR=`finddir B_COMMON_HEADERS_DIRECTORY` \
 		INSTALLDIR=`finddir B_COMMON_LIB_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd FreeImage
 	make -f Makefile.gnu install \
 		INCDIR=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \
diff --git a/media-libs/freetype/freetype-2.3.11.bep b/media-libs/freetype/freetype-2.3.11.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.3.11.bep
rename to media-libs/freetype/freetype-2.3.11.recipe
index d3cf73bb5..adf60d5fe 100644
--- a/media-libs/freetype/freetype-2.3.11.bep
+++ b/media-libs/freetype/freetype-2.3.11.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="a693c9a4b0121890ca71e39364ffea4a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.3.11
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.3.11
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.11.bep b/media-libs/freetype/freetype-2.4.11.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.11.bep
rename to media-libs/freetype/freetype-2.4.11.recipe
index eba796d93..ff524a88f 100644
--- a/media-libs/freetype/freetype-2.4.11.bep
+++ b/media-libs/freetype/freetype-2.4.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="b93435488942486c8d0ca22e8f768034"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.11
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.11
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.2.bep b/media-libs/freetype/freetype-2.4.2.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.2.bep
rename to media-libs/freetype/freetype-2.4.2.recipe
index a8b96329f..346cd16fc 100644
--- a/media-libs/freetype/freetype-2.4.2.bep
+++ b/media-libs/freetype/freetype-2.4.2.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="647ee8ed266f9a4117c8d0a4855b3d3e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.2
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.2
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.4.bep b/media-libs/freetype/freetype-2.4.4.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.4.bep
rename to media-libs/freetype/freetype-2.4.4.recipe
index ea267c28f..684f2c221 100644
--- a/media-libs/freetype/freetype-2.4.4.bep
+++ b/media-libs/freetype/freetype-2.4.4.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="b3e2b6e2f1c3e0dffa1fd2a0f848b671"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.4
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.4
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.6.bep b/media-libs/freetype/freetype-2.4.6.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.6.bep
rename to media-libs/freetype/freetype-2.4.6.recipe
index fc759031f..7c19c245a 100644
--- a/media-libs/freetype/freetype-2.4.6.bep
+++ b/media-libs/freetype/freetype-2.4.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5e6510613f612809d2d7862592b92ab7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.6
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.6
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep
rename to media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe
index 088c810cf..5c2a3adf1 100644
--- a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep
+++ b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="77a893dae81fd5b896632715ca041179"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.9
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.9
 	make install
 }
diff --git a/media-libs/freetype/freetype-2.4.9.bep b/media-libs/freetype/freetype-2.4.9.recipe
similarity index 96%
rename from media-libs/freetype/freetype-2.4.9.bep
rename to media-libs/freetype/freetype-2.4.9.recipe
index 088c810cf..5c2a3adf1 100644
--- a/media-libs/freetype/freetype-2.4.9.bep
+++ b/media-libs/freetype/freetype-2.4.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="77a893dae81fd5b896632715ca041179"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd freetype-2.4.9
 	sh ./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd freetype-2.4.9
 	make install
 }
diff --git a/media-libs/ftgl/ftgl-2.1-svn.bep b/media-libs/ftgl/ftgl-2.1-svn.recipe
similarity index 96%
rename from media-libs/ftgl/ftgl-2.1-svn.bep
rename to media-libs/ftgl/ftgl-2.1-svn.recipe
index 4c482e482..a2cbd0a4f 100644
--- a/media-libs/ftgl/ftgl-2.1-svn.bep
+++ b/media-libs/ftgl/ftgl-2.1-svn.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.23"
 
-BUILD {
+BUILD()
+{
 	cd ftgl-2.1-svn
 	libtoolize --copy --force --install
 	aclocal --install -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ftgl-2.1-svn
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.recipe
similarity index 97%
rename from media-libs/ftgl/ftgl-2.1.3.bep
rename to media-libs/ftgl/ftgl-2.1.3.recipe
index 83126fce8..e9c2e2ec4 100644
--- a/media-libs/ftgl/ftgl-2.1.3.bep
+++ b/media-libs/ftgl/ftgl-2.1.3.recipe
@@ -6,7 +6,8 @@ REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.23"
 
-BUILD {
+BUILD()
+{
 	cd ftgl-2.1.3~rc5
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in"
 	libtoolize --copy --force --install
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ftgl-2.1.3~rc5
 	make install
 }
diff --git a/media-libs/gd/gd-2.0.36rc1.bep b/media-libs/gd/gd-2.0.36rc1.recipe
similarity index 96%
rename from media-libs/gd/gd-2.0.36rc1.bep
rename to media-libs/gd/gd-2.0.36rc1.recipe
index a6190b52f..4fc6c7b1e 100644
--- a/media-libs/gd/gd-2.0.36rc1.bep
+++ b/media-libs/gd/gd-2.0.36rc1.recipe
@@ -8,7 +8,8 @@ DEPEND="media-libs/libpng >= 1.2.44
 	media-libs/giflib >= 4.1.6"
 
 CHECKSUM_MD5="39ac48e6d5e0012a3bd2248a0102f209"
-BUILD {
+BUILD()
+{
 	cd gd-2.0.36RC1
 	libtoolize --force --copy --install
 	aclocal -I config
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gd-2.0.36RC1
 	make install
 }
diff --git a/media-libs/giflib/giflib-4.1.6.bep b/media-libs/giflib/giflib-4.1.6.recipe
similarity index 96%
rename from media-libs/giflib/giflib-4.1.6.bep
rename to media-libs/giflib/giflib-4.1.6.recipe
index 886c54f3f..137b9a547 100644
--- a/media-libs/giflib/giflib-4.1.6.bep
+++ b/media-libs/giflib/giflib-4.1.6.recipe
@@ -6,7 +6,8 @@ REVISION="3"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd giflib-4.1.6
 	sed -i 's#gl/gl.h#GL/gl.h#' configure.ac
 	sed -i 's#gl.gl.h#GL/gl.h#' lib/dev2gif.c
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd giflib-4.1.6
 	make install
 }
diff --git a/media-libs/glew/glew-1.5.7.bep b/media-libs/glew/glew-1.5.7.recipe
similarity index 94%
rename from media-libs/glew/glew-1.5.7.bep
rename to media-libs/glew/glew-1.5.7.recipe
index 8374fc9dd..d3a352eb2 100644
--- a/media-libs/glew/glew-1.5.7.bep
+++ b/media-libs/glew/glew-1.5.7.recipe
@@ -6,17 +6,20 @@ STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="f913ce9dbde4cd250b932731b3534ded"
 
-BUILD {
+BUILD()
+{
 	cd glew-1.5.7
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glew-1.5.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd glew-1.5.7/bin
 	glewinfo
 	visualinfo
diff --git a/media-libs/glpng/glpng-1.4.5.bep b/media-libs/glpng/glpng-1.4.5.recipe
similarity index 94%
rename from media-libs/glpng/glpng-1.4.5.bep
rename to media-libs/glpng/glpng-1.4.5.recipe
index 386babf10..d30cd4c31 100644
--- a/media-libs/glpng/glpng-1.4.5.bep
+++ b/media-libs/glpng/glpng-1.4.5.recipe
@@ -6,12 +6,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd src
 	make -f Makefile.HAIKU
 }
 
-INSTALL {
+INSTALL()
+{
 	cd src
 	make install -f Makefile.HAIKU
 }
diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.recipe
similarity index 96%
rename from media-libs/guilib/guilib-1.2.1.bep
rename to media-libs/guilib/guilib-1.2.1.recipe
index c04395032..f95c87490 100644
--- a/media-libs/guilib/guilib-1.2.1.bep
+++ b/media-libs/guilib/guilib-1.2.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd GUIlib-1.2.1
 	rm aclocal.m4
 	rm acinclude.m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd GUIlib-1.2.1
 	make install
 }
diff --git a/media-libs/ilmbase/ilmbase-1.0.1.bep b/media-libs/ilmbase/ilmbase-1.0.1.recipe
similarity index 95%
rename from media-libs/ilmbase/ilmbase-1.0.1.bep
rename to media-libs/ilmbase/ilmbase-1.0.1.recipe
index 72cc3fdff..14c7f90b9 100644
--- a/media-libs/ilmbase/ilmbase-1.0.1.bep
+++ b/media-libs/ilmbase/ilmbase-1.0.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 CHECKSUM_MD5="f76f094e69a6079b0beb93d97e2a217e"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ilmbase-1.0.1
 	libtoolize --copy --force --install
 	./bootstrap
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ilmbase-1.0.1
 	make install
 }
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.bep b/media-libs/ilmbase/ilmbase-1.0.2.recipe
similarity index 96%
rename from media-libs/ilmbase/ilmbase-1.0.2.bep
rename to media-libs/ilmbase/ilmbase-1.0.2.recipe
index 23c6197f2..a9ae4fa91 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.bep
+++ b/media-libs/ilmbase/ilmbase-1.0.2.recipe
@@ -6,7 +6,8 @@ CHECKSUM_MD5="26c133ee8ca48e1196fbfb3ffe292ab4"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ilmbase-1.0.2
 	libtoolize --copy --force --install
 	./bootstrap
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ilmbase-1.0.2
 	make install
 }
diff --git a/media-libs/jasper/jasper-1.900.1.bep b/media-libs/jasper/jasper-1.900.1.recipe
similarity index 96%
rename from media-libs/jasper/jasper-1.900.1.bep
rename to media-libs/jasper/jasper-1.900.1.recipe
index 9c8c58270..dee1e1aec 100644
--- a/media-libs/jasper/jasper-1.900.1.bep
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jasper-1.900.1
 	libtoolize --force --copy --install
 	aclocal -I acaux
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd  jasper-1.900.1
 	make install
 }
diff --git a/media-libs/jbig2dec/jbig2dec-0.11.bep b/media-libs/jbig2dec/jbig2dec-0.11.recipe
similarity index 96%
rename from media-libs/jbig2dec/jbig2dec-0.11.bep
rename to media-libs/jbig2dec/jbig2dec-0.11.recipe
index 96224f0ff..3103fbe4f 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11.bep
+++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jbig2dec-0.11
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jbig2dec-0.11
 	make install
 }
diff --git a/media-libs/jbigkit/jbigkit-1.6.bep b/media-libs/jbigkit/jbigkit-1.6.recipe
similarity index 92%
rename from media-libs/jbigkit/jbigkit-1.6.bep
rename to media-libs/jbigkit/jbigkit-1.6.recipe
index a2219b351..c6d8ea142 100644
--- a/media-libs/jbigkit/jbigkit-1.6.bep
+++ b/media-libs/jbigkit/jbigkit-1.6.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="ce196e45f293d40ba76af3dc981ccfd7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jbigkit
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jbigkit
 	make test
 }
diff --git a/media-libs/jbigkit/jbigkit-2.0.bep b/media-libs/jbigkit/jbigkit-2.0.recipe
similarity index 96%
rename from media-libs/jbigkit/jbigkit-2.0.bep
rename to media-libs/jbigkit/jbigkit-2.0.recipe
index ec96ef2a2..579a0da09 100644
--- a/media-libs/jbigkit/jbigkit-2.0.bep
+++ b/media-libs/jbigkit/jbigkit-2.0.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="3dd87f605abb1a97a22dc79d8b3e8f6c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jbigkit
 	make
 	cd libjbig
 	make -f Makefile-libjbig_so
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jbigkit
 	make test
 	cd libjbig
diff --git a/media-libs/jgmod/jgmod-0.99.bep b/media-libs/jgmod/jgmod-0.99.recipe
similarity index 97%
rename from media-libs/jgmod/jgmod-0.99.bep
rename to media-libs/jgmod/jgmod-0.99.recipe
index 07dedc4f6..a5b1bcb32 100644
--- a/media-libs/jgmod/jgmod-0.99.bep
+++ b/media-libs/jgmod/jgmod-0.99.recipe
@@ -8,7 +8,8 @@ STATUS_HAIKU="stable"
 DEPEND="media-libs/allegro >= 4.4"
 CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe"
 
-BUILD {
+BUILD()
+{
 	cd jgmod
 	chmod 777 ./fixbe.sh
 	./fixbe.sh
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jgmod/src
     if [ -n ${DESTDIR} ];then
 		mkdir -p ${DESTDIR}/boot/common/lib
diff --git a/media-libs/jpeg/jpeg-7.bep b/media-libs/jpeg/jpeg-7.recipe
similarity index 94%
rename from media-libs/jpeg/jpeg-7.bep
rename to media-libs/jpeg/jpeg-7.recipe
index 119a1b211..3fbb5277d 100644
--- a/media-libs/jpeg/jpeg-7.bep
+++ b/media-libs/jpeg/jpeg-7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="382ef33b339c299b56baf1296cda9785"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jpeg-7
 	aclocal
 	libtoolize --force --copy --install
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jpeg-7
 	make install
 }
diff --git a/media-libs/jpeg/jpeg-8b.bep b/media-libs/jpeg/jpeg-8b.recipe
similarity index 94%
rename from media-libs/jpeg/jpeg-8b.bep
rename to media-libs/jpeg/jpeg-8b.recipe
index d25212bf5..96add2dd1 100644
--- a/media-libs/jpeg/jpeg-8b.bep
+++ b/media-libs/jpeg/jpeg-8b.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e022acbc5b36cd2cb70785f5b575661e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jpeg-8b
 	aclocal
 	libtoolize --force --copy --install
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jpeg-8b
 	make install
 }
diff --git a/media-libs/jpeg/jpeg-8c.bep b/media-libs/jpeg/jpeg-8c.recipe
similarity index 96%
rename from media-libs/jpeg/jpeg-8c.bep
rename to media-libs/jpeg/jpeg-8c.recipe
index 95a9958ce..eb4f28643 100644
--- a/media-libs/jpeg/jpeg-8c.bep
+++ b/media-libs/jpeg/jpeg-8c.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a2c10c04f396a9ce72894beb18b4e1f9"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jpeg-8c
 	aclocal
 	libtoolize --force --copy --install
@@ -17,7 +18,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jpeg-8c
 	make install
 }
diff --git a/media-libs/jpeg/jpeg-8d.bep b/media-libs/jpeg/jpeg-8d.recipe
similarity index 96%
rename from media-libs/jpeg/jpeg-8d.bep
rename to media-libs/jpeg/jpeg-8d.recipe
index 5a6db9b8a..400231715 100644
--- a/media-libs/jpeg/jpeg-8d.bep
+++ b/media-libs/jpeg/jpeg-8d.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="52654eb3b2e60c35731ea8fc87f1bd29"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd jpeg-8d
 	aclocal
 	libtoolize --force --copy --install
@@ -17,7 +18,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jpeg-8d
 	make install
 }
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep b/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe
similarity index 94%
rename from media-libs/ladspa-sdk/ladspa-sdk-1.13.bep
rename to media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe
index 196f9d5ba..39bd1ae7f 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe
@@ -6,11 +6,13 @@ COPYRIGHT="Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 CHECKSUM_MD5="671be3e1021d0722cadc7fb27054628e"
-BUILD {
+BUILD()
+{
 	cd ladspa_sdk/src
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd ladspa_sdk/src
 	make install
 }
diff --git a/media-libs/lcms/lcms-1.18a.bep b/media-libs/lcms/lcms-1.18a.recipe
similarity index 95%
rename from media-libs/lcms/lcms-1.18a.bep
rename to media-libs/lcms/lcms-1.18a.recipe
index 00157df16..5db51c5b9 100644
--- a/media-libs/lcms/lcms-1.18a.bep
+++ b/media-libs/lcms/lcms-1.18a.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f4abfe1c57ea3f633c2e9d034e74e3e8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lcms-1.18
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lcms-1.18
 	make install
 }
diff --git a/media-libs/lcms/lcms-1.19.bep b/media-libs/lcms/lcms-1.19.recipe
similarity index 96%
rename from media-libs/lcms/lcms-1.19.bep
rename to media-libs/lcms/lcms-1.19.recipe
index 3b1a1421e..e5a20d3c1 100644
--- a/media-libs/lcms/lcms-1.19.bep
+++ b/media-libs/lcms/lcms-1.19.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8af94611baf20d9646c7c2c285859818"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lcms-1.19
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lcms-1.19
 	make install
 }
diff --git a/media-libs/lcms/lcms-2.0a.bep b/media-libs/lcms/lcms-2.0a.recipe
similarity index 96%
rename from media-libs/lcms/lcms-2.0a.bep
rename to media-libs/lcms/lcms-2.0a.recipe
index 44fc0404c..ac5ed7205 100644
--- a/media-libs/lcms/lcms-2.0a.bep
+++ b/media-libs/lcms/lcms-2.0a.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c4f115462a7a5b306c247d018d7a8982"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lcms-2.0
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lcms-2.0
 	make install
 }
diff --git a/media-libs/lcms/lcms-2.1.bep b/media-libs/lcms/lcms-2.1.recipe
similarity index 96%
rename from media-libs/lcms/lcms-2.1.bep
rename to media-libs/lcms/lcms-2.1.recipe
index 556745787..653e69863 100644
--- a/media-libs/lcms/lcms-2.1.bep
+++ b/media-libs/lcms/lcms-2.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="08036edb115ad74456dfa20b1998b5f4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lcms2-2.1
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lcms2-2.1
 	make install
 }
diff --git a/media-libs/leptonica/leptonica-1.68.bep b/media-libs/leptonica/leptonica-1.68.recipe
similarity index 94%
rename from media-libs/leptonica/leptonica-1.68.bep
rename to media-libs/leptonica/leptonica-1.68.recipe
index 979d047af..9006867da 100644
--- a/media-libs/leptonica/leptonica-1.68.bep
+++ b/media-libs/leptonica/leptonica-1.68.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="5cd7092f9ff2ca7e3f3e73bfcd556403"
-BUILD {
+BUILD()
+{
 	cd leptonica-1.68
 	libtoolize
 	aclocal
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd leptonica-1.68
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd leptonica-1.68
 #	make test
 #	make check
diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.recipe
similarity index 97%
rename from media-libs/libao/libao-1.0.0.bep
rename to media-libs/libao/libao-1.0.0.recipe
index 65c91b962..83b3ba5f3 100644
--- a/media-libs/libao/libao-1.0.0.bep
+++ b/media-libs/libao/libao-1.0.0.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="08283fbe1f587619053a156254afecec"
-BUILD {
+BUILD()
+{
 	cd libao-1.0.0
 	libtoolize --force --copy --install
 	aclocal
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libao-1.0.0
 	make install
 }
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
similarity index 96%
rename from media-libs/libart_lgpl/libart_lgpl-2.3.21.bep
rename to media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
index e5590ac61..5be103f43 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="722471ec8ae084af4293126d06b60880"
-BUILD {
+BUILD()
+{
 	cd libart_lgpl-2.3.21
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd libart_lgpl-2.3.21
 	make install
 }
diff --git a/media-libs/libass/libass-0.10.1.bep b/media-libs/libass/libass-0.10.1.recipe
similarity index 96%
rename from media-libs/libass/libass-0.10.1.bep
rename to media-libs/libass/libass-0.10.1.recipe
index 99767580b..8c668db6b 100644
--- a/media-libs/libass/libass-0.10.1.bep
+++ b/media-libs/libass/libass-0.10.1.recipe
@@ -8,13 +8,15 @@ CHECKSUM_MD5="6cace482a013a3c4bf3b31a68ac66026"
 DEPEND="pkgconfig >= 0.23
 	freetype >= 2.0"
 
-BUILD {
+BUILD()
+{
 	cd libass-0.10.1
 	configure --prefix=`finddir B_COMMON_DIRECTORY`
  	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libass-0.10.1
 	make install
 }
diff --git a/media-libs/libass/libass-0.9.11.bep b/media-libs/libass/libass-0.9.11.recipe
similarity index 96%
rename from media-libs/libass/libass-0.9.11.bep
rename to media-libs/libass/libass-0.9.11.recipe
index f86497901..70930cc41 100644
--- a/media-libs/libass/libass-0.9.11.bep
+++ b/media-libs/libass/libass-0.9.11.recipe
@@ -8,13 +8,15 @@ CHECKSUM_MD5="f9042884397002ba40aa89dc7d34f59f"
 DEPEND="pkgconfig >= 0.23
 	freetype >= 2.0"
 
-BUILD {
+BUILD()
+{
 	cd libass-0.9.11
 	configure --prefix=`finddir B_COMMON_DIRECTORY`
  	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libass-0.9.11
 	make install
 }
diff --git a/media-libs/libbluray/libbluray-0.2.2.bep b/media-libs/libbluray/libbluray-0.2.2.recipe
similarity index 96%
rename from media-libs/libbluray/libbluray-0.2.2.bep
rename to media-libs/libbluray/libbluray-0.2.2.recipe
index 2484d3694..1a001d1fb 100644
--- a/media-libs/libbluray/libbluray-0.2.2.bep
+++ b/media-libs/libbluray/libbluray-0.2.2.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libbluray-0.2.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` 
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libbluray-0.2.2
 	make install
 }
diff --git a/media-libs/libcddb/libcddb-1.3.2.bep b/media-libs/libcddb/libcddb-1.3.2.recipe
similarity index 95%
rename from media-libs/libcddb/libcddb-1.3.2.bep
rename to media-libs/libcddb/libcddb-1.3.2.recipe
index 43eb3b6db..4e88f2272 100644
--- a/media-libs/libcddb/libcddb-1.3.2.bep
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="gettext >= 0.18.1.1-dev"
 CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a"
-BUILD {
+BUILD()
+{
 	cd libcddb-1.3.2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcddb-1.3.2
 	make install
 }
diff --git a/media-libs/libcoverart/libcoverart-1.0.0.bep b/media-libs/libcoverart/libcoverart-1.0.0.recipe
similarity index 95%
rename from media-libs/libcoverart/libcoverart-1.0.0.bep
rename to media-libs/libcoverart/libcoverart-1.0.0.recipe
index 6fce1e477..3cba4dded 100644
--- a/media-libs/libcoverart/libcoverart-1.0.0.bep
+++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe
@@ -6,18 +6,21 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/jansson >= 2.4
 	net-misc/neon >= 0.29.6"
 CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50"
-BUILD {
+BUILD()
+{
 	cd libcoverart-{PROJECT_VERSION}
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcoverart-{PROJECT_VERSION}
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libcoverart-{PROJECT_VERSION}
 	make test
 	cd tests
diff --git a/media-libs/libdca/libdca-0.0.5.bep b/media-libs/libdca/libdca-0.0.5.recipe
similarity index 96%
rename from media-libs/libdca/libdca-0.0.5.bep
rename to media-libs/libdca/libdca-0.0.5.recipe
index e76da1d66..aafd99eab 100644
--- a/media-libs/libdca/libdca-0.0.5.bep
+++ b/media-libs/libdca/libdca-0.0.5.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="dab6b2795c66a82a6fcd4f8343343021"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdca-0.0.5
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdca-0.0.5
 	make install
 }
diff --git a/media-libs/libdiscid/libdiscid-0.3.0.bep b/media-libs/libdiscid/libdiscid-0.3.0.recipe
similarity index 94%
rename from media-libs/libdiscid/libdiscid-0.3.0.bep
rename to media-libs/libdiscid/libdiscid-0.3.0.recipe
index 8c64d1bed..53a53d0e2 100644
--- a/media-libs/libdiscid/libdiscid-0.3.0.bep
+++ b/media-libs/libdiscid/libdiscid-0.3.0.recipe
@@ -7,18 +7,21 @@ DEPEND=""
 CHECKSUM_MD5="17e51260062b7583e5981c82cf618127"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
-BUILD {
+BUILD()
+{
 	cd libdiscid-0.3.0
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdiscid-0.3.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libdiscid-0.3.0
 	make test
 }
diff --git a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe
similarity index 94%
rename from media-libs/libdvbpsi/libdvbpsi-0.1.7.bep
rename to media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe
index 64663e387..aeddf2a5f 100644
--- a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep
+++ b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="af419575719e356b908b0c6946499052"
-BUILD {
+BUILD()
+{
 	cd libdvbpsi-0.1.7
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` LDFLAGS="-lnetwork"
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvbpsi-0.1.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libdvbpsi-0.1.7
 #	make test
 #	make check
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.bep b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe
similarity index 95%
rename from media-libs/libdvdcss/libdvdcss-1.2.10.bep
rename to media-libs/libdvdcss/libdvdcss-1.2.10.recipe
index fe0d6ef85..74e037a57 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.10.bep
+++ b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7b03a9571c3a85d801330c7772cd69c4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdcss-1.2.10
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdcss-1.2.10
 	make install
 }
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.bep b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
similarity index 95%
rename from media-libs/libdvdcss/libdvdcss-1.2.12.bep
rename to media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index 2b69402a5..d2b3df7ec 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.bep
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdcss-1.2.12
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdcss-1.2.12
 	make install
 }
diff --git a/media-libs/libdvdnav/libdvdnav-4.1.3.bep b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe
similarity index 96%
rename from media-libs/libdvdnav/libdvdnav-4.1.3.bep
rename to media-libs/libdvdnav/libdvdnav-4.1.3.recipe
index ec98982b9..31ec8bbc1 100644
--- a/media-libs/libdvdnav/libdvdnav-4.1.3.bep
+++ b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libdvdcss >= 1.20.10
 	media-libs/libdvdread >= 4.1.3"
-BUILD {
+BUILD()
+{
 	cd libdvdnav-4.1.3
 	./autogen.sh
 	CFLAGS="-I/boot/common/include -DHAVE_DVDCSS_DVDCSS_H " \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdnav-4.1.3
 	make install
 }
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.bep b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
similarity index 96%
rename from media-libs/libdvdnav/libdvdnav-4.2.0.bep
rename to media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index 99a06b297..acd52cd0d 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.bep
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libdvdcss >= 1.20.10
 	media-libs/libdvdread >= 4.2.0"
-BUILD {
+BUILD()
+{
 	cd libdvdnav-4.2.0
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdnav-4.2.0
 	make install
 }
diff --git a/media-libs/libdvdread/libdvdread-4.1.3.bep b/media-libs/libdvdread/libdvdread-4.1.3.recipe
similarity index 94%
rename from media-libs/libdvdread/libdvdread-4.1.3.bep
rename to media-libs/libdvdread/libdvdread-4.1.3.recipe
index 44e410dff..b016206fe 100644
--- a/media-libs/libdvdread/libdvdread-4.1.3.bep
+++ b/media-libs/libdvdread/libdvdread-4.1.3.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="6dc068d442c85a3cdd5ad3da75f6c6e8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdread-4.1.3
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdread-4.1.3
 	make install
 }
diff --git a/media-libs/libdvdread/libdvdread-4.2.0.bep b/media-libs/libdvdread/libdvdread-4.2.0.recipe
similarity index 96%
rename from media-libs/libdvdread/libdvdread-4.2.0.bep
rename to media-libs/libdvdread/libdvdread-4.2.0.recipe
index 20479a269..0b149a165 100644
--- a/media-libs/libdvdread/libdvdread-4.2.0.bep
+++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="ab7a19d3ab1a437ae754ef477d6231a4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdread-4.2.0
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdread-4.2.0
 	make install
 }
diff --git a/media-libs/libdvdread/libdvdread-svn1168.bep b/media-libs/libdvdread/libdvdread-svn1168.recipe
similarity index 95%
rename from media-libs/libdvdread/libdvdread-svn1168.bep
rename to media-libs/libdvdread/libdvdread-svn1168.recipe
index 01b1a3b6c..2c9bfcf7d 100644
--- a/media-libs/libdvdread/libdvdread-svn1168.bep
+++ b/media-libs/libdvdread/libdvdread-svn1168.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdread
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdread
 	make install
 }
diff --git a/media-libs/libdvdread/libdvdread-svn1226.bep b/media-libs/libdvdread/libdvdread-svn1226.recipe
similarity index 95%
rename from media-libs/libdvdread/libdvdread-svn1226.bep
rename to media-libs/libdvdread/libdvdread-svn1226.recipe
index 3315cd103..f40b24a82 100644
--- a/media-libs/libdvdread/libdvdread-svn1226.bep
+++ b/media-libs/libdvdread/libdvdread-svn1226.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libdvdread
 	svn up -r 1226
 	libtoolize --force --copy --install
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdvdread
 	make install
 }
diff --git a/media-libs/libharu/libharu-2.1.0.bep b/media-libs/libharu/libharu-2.1.0.recipe
similarity index 95%
rename from media-libs/libharu/libharu-2.1.0.bep
rename to media-libs/libharu/libharu-2.1.0.recipe
index 4d16209e5..95b94accc 100644
--- a/media-libs/libharu/libharu-2.1.0.bep
+++ b/media-libs/libharu/libharu-2.1.0.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="app-arch/zlib >= 1.25
 	media-libs/libpng >= 1.2.44"
 CHECKSUM_MD5="0623b8fb08ae1b28af08b2cdbd66b662"
-BUILD {
+BUILD()
+{
 	cd libharu-2.1.0
 	libtoolize --force --install --copy
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libharu-2.1.0
 	make install
 }
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.bep b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
similarity index 94%
rename from media-libs/libid3tag/libid3tag-0.15.1b.bep
rename to media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 8fa5ca2ba..207c25f23 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.bep
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e5808ad997ba32c498803822078748c3"
-BUILD {
+BUILD()
+{
 	cd libid3tag-0.15.1b
 	libtoolize --force --copy --install
 	aclocal
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libid3tag-0.15.1b
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libid3tag-0.15.1b
 #	make test
 #	make check
diff --git a/media-libs/liblo/liblo-0.26.bep b/media-libs/liblo/liblo-0.26.recipe
similarity index 96%
rename from media-libs/liblo/liblo-0.26.bep
rename to media-libs/liblo/liblo-0.26.recipe
index 7463fae96..8a661854b 100644
--- a/media-libs/liblo/liblo-0.26.bep
+++ b/media-libs/liblo/liblo-0.26.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://downloads.sourceforge.net/liblo/liblo-0.26.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="5351de14262560e15e7f23865293b16f"
-BUILD {
+BUILD()
+{
 	cd liblo-0.26
 	libtoolize --force --copy --install
 	aclocal
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd liblo-0.26
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/media-libs/libmad/libmad-0.15.1b.bep b/media-libs/libmad/libmad-0.15.1b.recipe
similarity index 96%
rename from media-libs/libmad/libmad-0.15.1b.bep
rename to media-libs/libmad/libmad-0.15.1b.recipe
index ce4468e5c..6fa4adfb6 100644
--- a/media-libs/libmad/libmad-0.15.1b.bep
+++ b/media-libs/libmad/libmad-0.15.1b.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmad-0.15.1b
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd  libmad-0.15.1b
 	make install
 }
diff --git a/media-libs/libmatroska/libmatroska-1.0.0.bep b/media-libs/libmatroska/libmatroska-1.0.0.recipe
similarity index 96%
rename from media-libs/libmatroska/libmatroska-1.0.0.bep
rename to media-libs/libmatroska/libmatroska-1.0.0.recipe
index 0f406830e..4db5ffdc4 100644
--- a/media-libs/libmatroska/libmatroska-1.0.0.bep
+++ b/media-libs/libmatroska/libmatroska-1.0.0.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libebml >= 1.0.0"
 CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de"
-BUILD {
+BUILD()
+{
 	cd libmatroska-1.0.0/make/linux
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmatroska-1.0.0/make/linux
     if [ -n ${DESTDIR} ];then 
  		make install DESTDIR="${DESTDIR}" 
diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.recipe
similarity index 97%
rename from media-libs/libmikmod/libmikmod-3.1.11.bep
rename to media-libs/libmikmod/libmikmod-3.1.11.recipe
index 086377bf7..7768c5702 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11.bep
+++ b/media-libs/libmikmod/libmikmod-3.1.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="705106da305e8de191549f1e7393185c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmikmod-3.1.11
 	rm aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
@@ -25,7 +26,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmikmod-3.1.11
 	make install
 }
diff --git a/media-libs/libmms/libmms-0.5.bep b/media-libs/libmms/libmms-0.5.recipe
similarity index 95%
rename from media-libs/libmms/libmms-0.5.bep
rename to media-libs/libmms/libmms-0.5.recipe
index 9b8ec7c26..41e701a92 100644
--- a/media-libs/libmms/libmms-0.5.bep
+++ b/media-libs/libmms/libmms-0.5.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/glib >= 2.0"
 
-BUILD {
+BUILD()
+{
 	cd libmms-0.5
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmms-0.5
 	make install
 }
diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.recipe
similarity index 97%
rename from media-libs/libmng/libmng-1.0.10.bep
rename to media-libs/libmng/libmng-1.0.10.recipe
index 1b61ed321..a720984a3 100644
--- a/media-libs/libmng/libmng-1.0.10.bep
+++ b/media-libs/libmng/libmng-1.0.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmng-1.0.10
 	cp unmaintained/autogen.sh .
 	cp makefiles/configure.in .
@@ -24,7 +25,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmng-1.0.10
 	make install
 }
diff --git a/media-libs/libmodplug/libmodplug-0.8.7.bep b/media-libs/libmodplug/libmodplug-0.8.7.recipe
similarity index 96%
rename from media-libs/libmodplug/libmodplug-0.8.7.bep
rename to media-libs/libmodplug/libmodplug-0.8.7.recipe
index e10ce86ed..a2ff0c2b0 100644
--- a/media-libs/libmodplug/libmodplug-0.8.7.bep
+++ b/media-libs/libmodplug/libmodplug-0.8.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d2d9ccd8da22412999caed076140f786"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmodplug-0.8.7
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmodplug-0.8.7
 	make install
 }
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.1.bep b/media-libs/libmodplug/libmodplug-0.8.8.1.recipe
similarity index 96%
rename from media-libs/libmodplug/libmodplug-0.8.8.1.bep
rename to media-libs/libmodplug/libmodplug-0.8.8.1.recipe
index c692b6826..001ac0887 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.1.bep
+++ b/media-libs/libmodplug/libmodplug-0.8.8.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f7fa53a60c650024ff51cca88341776b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmodplug-0.8.8.1
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmodplug-0.8.8.1
 	make install
 }
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.bep b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe
similarity index 96%
rename from media-libs/libmodplug/libmodplug-0.8.8.4.bep
rename to media-libs/libmodplug/libmodplug-0.8.8.4.recipe
index 183c2df62..4846cd459 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.4.bep
+++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libmodplug-0.8.8.4
 	libtoolize --force --copy --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmodplug-0.8.8.4
 	make install
 }
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.bep b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
similarity index 95%
rename from media-libs/libmpeg2/libmpeg2-0.5.1.bep
rename to media-libs/libmpeg2/libmpeg2-0.5.1.recipe
index 71b8d295f..b23630399 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1.bep
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="0f92c7454e58379b4a5a378485bbd8ef"
-BUILD {
+BUILD()
+{
 	cd libmpeg2-0.5.1
 	rm aclocal.m4
 	libtoolize --force --copy --install
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmpeg2-0.5.1
 	make install
 }
diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe
similarity index 95%
rename from media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep
rename to media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe
index 21da355c1..23564b564 100644
--- a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep
+++ b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0"
 
-BUILD {
+BUILD()
+{
 	cd libnsbmp-0.0.3-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libnsbmp-0.0.3-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.bep b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe
similarity index 94%
rename from media-libs/libnsbmp/libnsbmp-0.0.3.bep
rename to media-libs/libnsbmp/libnsbmp-0.0.3.recipe
index dea51e029..667f0b108 100644
--- a/media-libs/libnsbmp/libnsbmp-0.0.3.bep
+++ b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.ta
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd libnsbmp-0.0.3
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libnsbmp-0.0.3
 	make install
 }
diff --git a/media-libs/libnsgif/libnsgif-0.0.3.bep b/media-libs/libnsgif/libnsgif-0.0.3.recipe
similarity index 94%
rename from media-libs/libnsgif/libnsgif-0.0.3.bep
rename to media-libs/libnsgif/libnsgif-0.0.3.recipe
index e5598c573..7b5fa0c2b 100644
--- a/media-libs/libnsgif/libnsgif-0.0.3.bep
+++ b/media-libs/libnsgif/libnsgif-0.0.3.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.ta
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd libnsgif-0.0.3
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libnsgif-0.0.3
 	make install
 }
diff --git a/media-libs/libogg/libogg-1.1.3.bep b/media-libs/libogg/libogg-1.1.3.recipe
similarity index 94%
rename from media-libs/libogg/libogg-1.1.3.bep
rename to media-libs/libogg/libogg-1.1.3.recipe
index a7d06d6ee..161b2f857 100644
--- a/media-libs/libogg/libogg-1.1.3.bep
+++ b/media-libs/libogg/libogg-1.1.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="eaf7dc6ebbff30975de7527a80831585"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libogg-1.1.3
 	./configure --prefix=/boot/home/config
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libogg-1.1.3
 	make install
 }
diff --git a/media-libs/libogg/libogg-1.1.4.bep b/media-libs/libogg/libogg-1.1.4.recipe
similarity index 95%
rename from media-libs/libogg/libogg-1.1.4.bep
rename to media-libs/libogg/libogg-1.1.4.recipe
index 2859a806d..0e30cbddb 100644
--- a/media-libs/libogg/libogg-1.1.4.bep
+++ b/media-libs/libogg/libogg-1.1.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="10200ec22543841d9d1c23e0aed4e5e9"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libogg-1.1.4
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libogg-1.1.4
 	make install
 }
diff --git a/media-libs/libogg/libogg-1.2.0.bep b/media-libs/libogg/libogg-1.2.0.recipe
similarity index 96%
rename from media-libs/libogg/libogg-1.2.0.bep
rename to media-libs/libogg/libogg-1.2.0.recipe
index b82d6c503..35b05a421 100644
--- a/media-libs/libogg/libogg-1.2.0.bep
+++ b/media-libs/libogg/libogg-1.2.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c95b73759acfc30712beef6ce4e88efa"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libogg-1.2.0
 	rm aclocal.m4
 	mkdir -p m4
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libogg-1.2.0
 	make install
 }
diff --git a/media-libs/libogg/libogg-1.2.2.bep b/media-libs/libogg/libogg-1.2.2.recipe
similarity index 97%
rename from media-libs/libogg/libogg-1.2.2.bep
rename to media-libs/libogg/libogg-1.2.2.recipe
index f1828f98e..7348503a7 100644
--- a/media-libs/libogg/libogg-1.2.2.bep
+++ b/media-libs/libogg/libogg-1.2.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5a9fcabc9a1b7c6f1cd75ddc78f36c56"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libogg-1.2.2
 	rm aclocal.m4
 	mkdir -p m4
@@ -23,7 +24,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libogg-1.2.2
 	make install
 }
diff --git a/media-libs/libogg/libogg-1.3.0.bep b/media-libs/libogg/libogg-1.3.0.recipe
similarity index 95%
rename from media-libs/libogg/libogg-1.3.0.bep
rename to media-libs/libogg/libogg-1.3.0.recipe
index ed2ac6726..9cc92e61c 100644
--- a/media-libs/libogg/libogg-1.3.0.bep
+++ b/media-libs/libogg/libogg-1.3.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libogg-1.3.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libogg-1.3.0
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.29.bep b/media-libs/libpng/libpng-1.2.29.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.29.bep
rename to media-libs/libpng/libpng-1.2.29.recipe
index 3115d3d32..7c21c5353 100644
--- a/media-libs/libpng/libpng-1.2.29.bep
+++ b/media-libs/libpng/libpng-1.2.29.recipe
@@ -4,14 +4,16 @@ SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29.
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.29
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.29
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.30.bep b/media-libs/libpng/libpng-1.2.30.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.2.30.bep
rename to media-libs/libpng/libpng-1.2.30.recipe
index bed0800f5..bc79c0eac 100644
--- a/media-libs/libpng/libpng-1.2.30.bep
+++ b/media-libs/libpng/libpng-1.2.30.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.30.
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.30
 	cp /boot/common/share/libtool/config.guess .
 	cp /boot/common/share/libtool/config.sub
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.30
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.40.bep b/media-libs/libpng/libpng-1.2.40.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.40.bep
rename to media-libs/libpng/libpng-1.2.40.recipe
index e43975616..207338d34 100644
--- a/media-libs/libpng/libpng-1.2.40.bep
+++ b/media-libs/libpng/libpng-1.2.40.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a2f6808735bf404967f81519a967fb2a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.40
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.40
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.41.bep b/media-libs/libpng/libpng-1.2.41.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.41.bep
rename to media-libs/libpng/libpng-1.2.41.recipe
index f18fd1c07..df4cef202 100644
--- a/media-libs/libpng/libpng-1.2.41.bep
+++ b/media-libs/libpng/libpng-1.2.41.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="82ab87818fb22961620aac7eca9fea14"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.41
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.41
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.43.bep b/media-libs/libpng/libpng-1.2.43.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.43.bep
rename to media-libs/libpng/libpng-1.2.43.recipe
index 869e467ce..9d846cffa 100644
--- a/media-libs/libpng/libpng-1.2.43.bep
+++ b/media-libs/libpng/libpng-1.2.43.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="00f3f6bfadbd4f83e351558ad6bb46b5"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.43
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.43
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.44.bep b/media-libs/libpng/libpng-1.2.44.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.44.bep
rename to media-libs/libpng/libpng-1.2.44.recipe
index 2a9d84070..b45fbe8fe 100644
--- a/media-libs/libpng/libpng-1.2.44.bep
+++ b/media-libs/libpng/libpng-1.2.44.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="89b62f8daaeeab1342e307d6d1411ff1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.44
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.44
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.2.46.bep b/media-libs/libpng/libpng-1.2.46.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.2.46.bep
rename to media-libs/libpng/libpng-1.2.46.recipe
index 9917b9c14..747808949 100644
--- a/media-libs/libpng/libpng-1.2.46.bep
+++ b/media-libs/libpng/libpng-1.2.46.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="03ddfc17ad321db93f984581e9415d22"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.2.46
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.2.46
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.4.1.bep b/media-libs/libpng/libpng-1.4.1.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.4.1.bep
rename to media-libs/libpng/libpng-1.4.1.recipe
index d5c4a7bc7..3f14ced79 100644
--- a/media-libs/libpng/libpng-1.4.1.bep
+++ b/media-libs/libpng/libpng-1.4.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fa0b2a84733463f90d3ac9f43ccafabc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.4.1
 	libtoolize --force --copy
 	./autogen.sh
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.4.1
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.4.2.bep b/media-libs/libpng/libpng-1.4.2.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.4.2.bep
rename to media-libs/libpng/libpng-1.4.2.recipe
index 72bb98aae..f89b98f20 100644
--- a/media-libs/libpng/libpng-1.4.2.bep
+++ b/media-libs/libpng/libpng-1.4.2.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="89fd334dc5fc84ff146b9269c4fa452f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.4.2
 	libtoolize --force --copy
 	./autogen.sh
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.4.2
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.4.3.bep b/media-libs/libpng/libpng-1.4.3.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.4.3.bep
rename to media-libs/libpng/libpng-1.4.3.recipe
index dd7d1af3f..e6c7e4978 100644
--- a/media-libs/libpng/libpng-1.4.3.bep
+++ b/media-libs/libpng/libpng-1.4.3.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="df3521f61a1b8b69489d297c0ca8c1f8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.4.3
 	libtoolize --force --copy
 	./autogen.sh
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.4.3
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.4.4.bep b/media-libs/libpng/libpng-1.4.4.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.4.4.bep
rename to media-libs/libpng/libpng-1.4.4.recipe
index 7950fef2c..bbbd67ae6 100644
--- a/media-libs/libpng/libpng-1.4.4.bep
+++ b/media-libs/libpng/libpng-1.4.4.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="297b38f925e745061489b41b1f7c4bb1"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.4.4
 	libtoolize --force --copy
 	./autogen.sh
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.4.4
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.5.0.bep b/media-libs/libpng/libpng-1.5.0.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.5.0.bep
rename to media-libs/libpng/libpng-1.5.0.recipe
index e8a1f7ac7..57f886d83 100644
--- a/media-libs/libpng/libpng-1.5.0.bep
+++ b/media-libs/libpng/libpng-1.5.0.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="32a9f9c8f7f020bf7867a453d81fcb51"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.0
 	libtoolize --force --copy
 	./autogen.sh
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.0
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.5.12.bep b/media-libs/libpng/libpng-1.5.12.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.5.12.bep
rename to media-libs/libpng/libpng-1.5.12.recipe
index 6afaf8263..ea6a3db26 100644
--- a/media-libs/libpng/libpng-1.5.12.bep
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.12
 	libtoolize --force --copy
 	./autogen.sh
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.12
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.5.13.bep b/media-libs/libpng/libpng-1.5.13.recipe
similarity index 95%
rename from media-libs/libpng/libpng-1.5.13.bep
rename to media-libs/libpng/libpng-1.5.13.recipe
index 89333093c..99bfdb083 100644
--- a/media-libs/libpng/libpng-1.5.13.bep
+++ b/media-libs/libpng/libpng-1.5.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9c5a584d4eb5fe40d0f1bc2090112c65"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.13
 	libtoolize --force --copy
 	./autogen.sh
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.13
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libpng-1.5.13
 	make test
 }
diff --git a/media-libs/libpng/libpng-1.5.2.bep b/media-libs/libpng/libpng-1.5.2.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.5.2.bep
rename to media-libs/libpng/libpng-1.5.2.recipe
index ceba7bf1a..fe9daef1a 100644
--- a/media-libs/libpng/libpng-1.5.2.bep
+++ b/media-libs/libpng/libpng-1.5.2.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="31d448eb93a1646359a23f1b23434ab3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.2
 	libtoolize --force --copy
 	./autogen.sh
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.2
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.5.4.bep b/media-libs/libpng/libpng-1.5.4.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.5.4.bep
rename to media-libs/libpng/libpng-1.5.4.recipe
index 3cec3fe68..82b9201c0 100644
--- a/media-libs/libpng/libpng-1.5.4.bep
+++ b/media-libs/libpng/libpng-1.5.4.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="dea4d1fd671160424923e92ff0cdda78"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.4
 	libtoolize --force --copy
 	./autogen.sh
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.4
 	make install
 }
diff --git a/media-libs/libpng/libpng-1.5.7.bep b/media-libs/libpng/libpng-1.5.7.recipe
similarity index 96%
rename from media-libs/libpng/libpng-1.5.7.bep
rename to media-libs/libpng/libpng-1.5.7.recipe
index 5c86a6209..dd3e2263d 100644
--- a/media-libs/libpng/libpng-1.5.7.bep
+++ b/media-libs/libpng/libpng-1.5.7.recipe
@@ -10,7 +10,8 @@ CHECKSUM_MD5="944b56a84b65d94054cc73d7ff965de8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libpng-1.5.7
 	libtoolize --force --copy
 	./autogen.sh
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpng-1.5.7
 	make install
 }
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.bep b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
similarity index 95%
rename from media-libs/libsamplerate/libsamplerate-0.1.8.bep
rename to media-libs/libsamplerate/libsamplerate-0.1.8.recipe
index fb08c551e..14a344eba 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8.bep
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
@@ -8,14 +8,16 @@ CHECKSUM_MD5="1c7fb25191b4e6e3628d198a66a84f47"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libsamplerate-0.1.8
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsamplerate-0.1.8
 	make install
 }
diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.recipe
similarity index 98%
rename from media-libs/libsdl/libsdl-1.2-hg.bep
rename to media-libs/libsdl/libsdl-1.2-hg.recipe
index 217a36dae..830489f2e 100644
--- a/media-libs/libsdl/libsdl-1.2-hg.bep
+++ b/media-libs/libsdl/libsdl-1.2-hg.recipe
@@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL#SDL-1.2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libsdl-1.2-hg
 	cp `aclocal --print-ac-dir`/libtool.m4 acinclude
 	./autogen.sh
@@ -19,13 +20,15 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsdl-1.2-hg
 	make install
 	cp ../../sdl-config `which sdl-config`
 }
 
-TEST {
+TEST()
+{
 	cd libsdl-1.2-hg/test
 	./configure
 	make
diff --git a/media-libs/libsdl/libsdl-1.2.12.bep b/media-libs/libsdl/libsdl-1.2.12.recipe
similarity index 94%
rename from media-libs/libsdl/libsdl-1.2.12.bep
rename to media-libs/libsdl/libsdl-1.2.12.recipe
index f65d7263e..602fc6123 100644
--- a/media-libs/libsdl/libsdl-1.2.12.bep
+++ b/media-libs/libsdl/libsdl-1.2.12.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="544b4554986e51eed6d34435cf9c5f3f"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL-1.2.12
 	./configure --prefix=/boot/home/config
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL-1.2.12
 	make install
 }
diff --git a/media-libs/libsdl/libsdl-1.2.13.bep b/media-libs/libsdl/libsdl-1.2.13.recipe
similarity index 94%
rename from media-libs/libsdl/libsdl-1.2.13.bep
rename to media-libs/libsdl/libsdl-1.2.13.recipe
index 3e8c4c0a9..e75b3534d 100644
--- a/media-libs/libsdl/libsdl-1.2.13.bep
+++ b/media-libs/libsdl/libsdl-1.2.13.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="c6660feea2a6834de10bc71b2f8e4d88"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL-1.2.13
 	./configure --prefix=/boot/home/config
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL-1.2.13
 	make install
 }
diff --git a/media-libs/libsdl/libsdl-1.2.14.bep b/media-libs/libsdl/libsdl-1.2.14.recipe
similarity index 96%
rename from media-libs/libsdl/libsdl-1.2.14.bep
rename to media-libs/libsdl/libsdl-1.2.14.recipe
index 68e0ae7dd..30554ec8d 100644
--- a/media-libs/libsdl/libsdl-1.2.14.bep
+++ b/media-libs/libsdl/libsdl-1.2.14.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL-1.2.14
 	./autogen.sh
 	rm aclocal.m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL-1.2.14
 	make install
 
diff --git a/media-libs/libsdl/libsdl-1.2.15.bep b/media-libs/libsdl/libsdl-1.2.15.recipe
similarity index 98%
rename from media-libs/libsdl/libsdl-1.2.15.bep
rename to media-libs/libsdl/libsdl-1.2.15.recipe
index 7618b080a..8b6cae981 100644
--- a/media-libs/libsdl/libsdl-1.2.15.bep
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL-1.2.15
 	./autogen.sh
 	rm aclocal.m4
@@ -22,12 +23,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL-1.2.15
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd SDL-1.2.15/test
 	./configure
 	make
diff --git a/media-libs/libsdl/libsdl-1.3-gsoc.bep b/media-libs/libsdl/libsdl-1.3-gsoc.recipe
similarity index 95%
rename from media-libs/libsdl/libsdl-1.3-gsoc.bep
rename to media-libs/libsdl/libsdl-1.3-gsoc.recipe
index 7d5af823c..1ae926ca8 100644
--- a/media-libs/libsdl/libsdl-1.3-gsoc.bep
+++ b/media-libs/libsdl/libsdl-1.3-gsoc.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 MESSAGE="This is a work in progress and not ready for release."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libsdl-1.3-gsoc
 	./autogen.sh
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsdl-1.3-gsoc
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libsdl-1.3-gsoc/test
 	./autogen
 	./configure
diff --git a/media-libs/libsdl/libsdl-2.0-hg-cmake.bep b/media-libs/libsdl/libsdl-2.0-hg-cmake.recipe
similarity index 96%
rename from media-libs/libsdl/libsdl-2.0-hg-cmake.bep
rename to media-libs/libsdl/libsdl-2.0-hg-cmake.recipe
index 5ff197a01..c421c0e28 100644
--- a/media-libs/libsdl/libsdl-2.0-hg-cmake.bep
+++ b/media-libs/libsdl/libsdl-2.0-hg-cmake.recipe
@@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL"
 REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libsdl-2.0-hg-cmake
 #	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 #	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsdl-2.0-hg-cmake
 	make install
 }
diff --git a/media-libs/libsdl/libsdl-2.0-hg.bep b/media-libs/libsdl/libsdl-2.0-hg.recipe
similarity index 96%
rename from media-libs/libsdl/libsdl-2.0-hg.bep
rename to media-libs/libsdl/libsdl-2.0-hg.recipe
index 502f3163f..b2300d2b4 100644
--- a/media-libs/libsdl/libsdl-2.0-hg.bep
+++ b/media-libs/libsdl/libsdl-2.0-hg.recipe
@@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL"
 REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libsdl-2.0-hg
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsdl-2.0-hg/build_haiku
 	make install
 }
diff --git a/media-libs/libsndfile/libsndfile-1.0.21.bep b/media-libs/libsndfile/libsndfile-1.0.21.recipe
similarity index 98%
rename from media-libs/libsndfile/libsndfile-1.0.21.bep
rename to media-libs/libsndfile/libsndfile-1.0.21.recipe
index 9558dd293..56901f30a 100644
--- a/media-libs/libsndfile/libsndfile-1.0.21.bep
+++ b/media-libs/libsndfile/libsndfile-1.0.21.recipe
@@ -10,7 +10,8 @@ DEPEND="media-libs/flac >= 1.2.1
         media-libs/libogg >= 1.2.0
         media-libs/libvorbis >= 1.3.1"
 
-BUILD {
+BUILD()
+{
 	cd libsndfile-1.0.21
 	rm aclocal.m4
 	echo "AC_CONFIG_MACRO_DIR([M4]) >> configure.in"
@@ -27,7 +28,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsndfile-1.0.21
 	make install
 }
diff --git a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe
similarity index 96%
rename from media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep
rename to media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe
index 341c1439c..c6db21792 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep
+++ b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe
@@ -9,12 +9,14 @@ DEPEND="dev-libs/libxml2 >= 2.7.7
 	dev-libs/libwapcaplet >= 0.1.1-HEAD
 	net-libs/libdom >= 0"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd libsvgtiny-0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsvgtiny-0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/media-libs/libsvgtiny/libsvgtiny-10856.bep b/media-libs/libsvgtiny/libsvgtiny-10856.recipe
similarity index 95%
rename from media-libs/libsvgtiny/libsvgtiny-10856.bep
rename to media-libs/libsvgtiny/libsvgtiny-10856.recipe
index d4a28bff6..b902f7b8c 100644
--- a/media-libs/libsvgtiny/libsvgtiny-10856.bep
+++ b/media-libs/libsvgtiny/libsvgtiny-10856.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/libxml2 >= 2.7.7
 	dev-util/gperf >= 3.0.4"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd libsvgtiny-10856
 	make
 	make install PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsvgtiny-10856
 	make install
 }
diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.recipe
similarity index 96%
rename from media-libs/libtheora/libtheora-1.1.1.bep
rename to media-libs/libtheora/libtheora-1.1.1.recipe
index 922a87a52..3af046122 100644
--- a/media-libs/libtheora/libtheora-1.1.1.bep
+++ b/media-libs/libtheora/libtheora-1.1.1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="media-libs/libogg >= 1.2.0
 	media-libs/libvorbis >= 1.3.0"
 CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e"
-BUILD {
+BUILD()
+{
 	cd libtheora-1.1.1
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtheora-1.1.1
 	make install
 }
diff --git a/media-libs/libvorbis/libvorbis-1.2.3.bep b/media-libs/libvorbis/libvorbis-1.2.3.recipe
similarity index 96%
rename from media-libs/libvorbis/libvorbis-1.2.3.bep
rename to media-libs/libvorbis/libvorbis-1.2.3.recipe
index cf406657e..17e3e87eb 100644
--- a/media-libs/libvorbis/libvorbis-1.2.3.bep
+++ b/media-libs/libvorbis/libvorbis-1.2.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23"
-BUILD {
+BUILD()
+{
 	cd libvorbis-1.2.3
 	libtoolize --force --copy --install
 	mkdir -p m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libvorbis-1.2.3
 	make install
 }
diff --git a/media-libs/libvorbis/libvorbis-1.3.1.bep b/media-libs/libvorbis/libvorbis-1.3.1.recipe
similarity index 96%
rename from media-libs/libvorbis/libvorbis-1.3.1.bep
rename to media-libs/libvorbis/libvorbis-1.3.1.recipe
index b618fa7a6..1fb63be62 100644
--- a/media-libs/libvorbis/libvorbis-1.3.1.bep
+++ b/media-libs/libvorbis/libvorbis-1.3.1.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23
 	media-libs/libogg >= 1.2.0"
-BUILD {
+BUILD()
+{
 	cd libvorbis-1.3.1
 	libtoolize --force --copy --install
 	mkdir -p m4
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libvorbis-1.3.1
 	make install
 }
diff --git a/media-libs/libvorbis/libvorbis-1.3.2.bep b/media-libs/libvorbis/libvorbis-1.3.2.recipe
similarity index 96%
rename from media-libs/libvorbis/libvorbis-1.3.2.bep
rename to media-libs/libvorbis/libvorbis-1.3.2.recipe
index b2c084782..2d6e23cc6 100644
--- a/media-libs/libvorbis/libvorbis-1.3.2.bep
+++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.23
 	media-libs/libogg >= 1.2.0"
-BUILD {
+BUILD()
+{
 	cd libvorbis-1.3.2
 	libtoolize -fci
 	mkdir -p m4
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libvorbis-1.3.2
 	make install
 }
diff --git a/media-libs/libvpx/libvpx-0.9.2-git.bep b/media-libs/libvpx/libvpx-0.9.2-git.recipe
similarity index 95%
rename from media-libs/libvpx/libvpx-0.9.2-git.bep
rename to media-libs/libvpx/libvpx-0.9.2-git.recipe
index 9eb7d31d4..eb598448f 100644
--- a/media-libs/libvpx/libvpx-0.9.2-git.bep
+++ b/media-libs/libvpx/libvpx-0.9.2-git.recipe
@@ -4,7 +4,8 @@ SRC_URI="git+git://review.webmproject.org/libvpx.git"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
         cd libvpx-0.9.2-git
         ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
         --enable-pic \
@@ -12,7 +13,8 @@ BUILD {
         make
 }
 	
-INSTALL {
+INSTALL()
+{
         cd libvpx-0.9.2-git
         make install
 }
diff --git a/media-libs/libvpx/libvpx-1.0.0.bep b/media-libs/libvpx/libvpx-1.0.0.recipe
similarity index 96%
rename from media-libs/libvpx/libvpx-1.0.0.bep
rename to media-libs/libvpx/libvpx-1.0.0.recipe
index ce97faebd..0d1488c3a 100644
--- a/media-libs/libvpx/libvpx-1.0.0.bep
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
         cd libvpx-v1.0.0
         ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
         --enable-pic \
@@ -13,7 +14,8 @@ BUILD {
         make
 }
 	
-INSTALL {
+INSTALL()
+{
         cd libvpx-v1.0.0
         make install
 }
diff --git a/media-libs/libwebm/libwebm-0.9.2-git.bep b/media-libs/libwebm/libwebm-0.9.2-git.recipe
similarity index 95%
rename from media-libs/libwebm/libwebm-0.9.2-git.bep
rename to media-libs/libwebm/libwebm-0.9.2-git.recipe
index 3688b9542..109c6e7d5 100644
--- a/media-libs/libwebm/libwebm-0.9.2-git.bep
+++ b/media-libs/libwebm/libwebm-0.9.2-git.recipe
@@ -4,12 +4,14 @@ SRC_URI="git+git://review.webmproject.org/libwebm.git"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libwebm-0.9.2-git
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd libwebm-0.9.2-git
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
 	echo "cp libmkvparser.a " ${LIBDIR}
diff --git a/media-libs/libwebp/libwebp-0.1.2-git.bep b/media-libs/libwebp/libwebp-0.1.2-git.recipe
similarity index 95%
rename from media-libs/libwebp/libwebp-0.1.2-git.bep
rename to media-libs/libwebp/libwebp-0.1.2-git.recipe
index 7ee89fb3a..86b78e0c9 100644
--- a/media-libs/libwebp/libwebp-0.1.2-git.bep
+++ b/media-libs/libwebp/libwebp-0.1.2-git.recipe
@@ -4,7 +4,8 @@ SRC_URI="git+git://review.webmproject.org/libwebp.git"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libwebp-0.1.2-git
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -12,7 +13,8 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd libwebp-0.1.2-git
 	make install
 }
diff --git a/media-libs/libwebp/libwebp-0.1.3.bep b/media-libs/libwebp/libwebp-0.1.3.recipe
similarity index 95%
rename from media-libs/libwebp/libwebp-0.1.3.bep
rename to media-libs/libwebp/libwebp-0.1.3.recipe
index 061e805d0..44b614dd6 100644
--- a/media-libs/libwebp/libwebp-0.1.3.bep
+++ b/media-libs/libwebp/libwebp-0.1.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="254d4670e14e9ed881f0536b006ab336"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libwebp-0.1.3
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 	
-INSTALL {
+INSTALL()
+{
 	cd libwebp-0.1.3
 	make install
 }
diff --git a/media-libs/loadpng/loadpng-1.5.bep b/media-libs/loadpng/loadpng-1.5.recipe
similarity index 97%
rename from media-libs/loadpng/loadpng-1.5.bep
rename to media-libs/loadpng/loadpng-1.5.recipe
index b5245c3b9..005b91d34 100644
--- a/media-libs/loadpng/loadpng-1.5.bep
+++ b/media-libs/loadpng/loadpng-1.5.recipe
@@ -7,12 +7,14 @@ DEPEND="media-libs/allegro >= 4.4
 		media-libs/libpng >=1.2"
 MESSAGE="This might not build with libpng >= 1.4"
 CHECKSUM_MD5="5e9ecdf1762c3fca47477bf0263b96ba"
-BUILD {
+BUILD()
+{
 	cd loadpng-1.5
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd loadpng-1.5
 	if [ -n ${DESTDIR} ];then 
 		mkdir -p ${DESTDIR}/boot/common/lib 
diff --git a/media-libs/lv2/lv2-1.2.0.bep b/media-libs/lv2/lv2-1.2.0.recipe
similarity index 97%
rename from media-libs/lv2/lv2-1.2.0.bep
rename to media-libs/lv2/lv2-1.2.0.recipe
index d422249be..840e2ae60 100644
--- a/media-libs/lv2/lv2-1.2.0.bep
+++ b/media-libs/lv2/lv2-1.2.0.recipe
@@ -10,7 +10,8 @@ DEPEND="app-doc/doxygen>=1.6.1
 		media-libs/libsndfile>=1.0.21
 		dev-python/rdflib>=3.2.0
 		dev-python/pyxml>=0.8.4"
-BUILD {
+BUILD()
+{
 	cd lv2-1.2.0
 	sed -e '1,2s:/usr/bin/env:/bin/env:g' waf > waf2
 	cp waf2 waf
@@ -21,7 +22,8 @@ BUILD {
 	./waf build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lv2-1.2.0
 	./waf install
 }
diff --git a/media-libs/mediainfo/mediainfo-0.7.61.bep b/media-libs/mediainfo/mediainfo-0.7.61.recipe
similarity index 97%
rename from media-libs/mediainfo/mediainfo-0.7.61.bep
rename to media-libs/mediainfo/mediainfo-0.7.61.recipe
index ba77d79b4..5c0ddf1c4 100644
--- a/media-libs/mediainfo/mediainfo-0.7.61.bep
+++ b/media-libs/mediainfo/mediainfo-0.7.61.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
   cd MediaInfo_CLI_GNU_FromSource
 
   cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* ZenLib/Project/GNU/Library
@@ -16,7 +17,8 @@ BUILD {
   ./CLI_Compile.sh
 }
 
-INSTALL {
+INSTALL()
+{
   cd MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI
   make install prefix=`finddir B_COMMON_DIRECTORY`
 }
diff --git a/media-libs/musicbrainz/musicbrainz-5.0.1.bep b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe
similarity index 95%
rename from media-libs/musicbrainz/musicbrainz-5.0.1.bep
rename to media-libs/musicbrainz/musicbrainz-5.0.1.recipe
index 3f00634d5..b8a85c876 100644
--- a/media-libs/musicbrainz/musicbrainz-5.0.1.bep
+++ b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe
@@ -7,18 +7,21 @@ DEPEND=""
 CHECKSUM_MD5="a0406b94c341c2b52ec0fe98f57cadf3"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
-BUILD {
+BUILD()
+{
 	cd libmusicbrainz-5.0.1
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libmusicbrainz-5.0.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libmusicbrainz-5.0.1
 	make test
 }
diff --git a/media-libs/openal/openal-1.12-git.bep b/media-libs/openal/openal-1.12-git.recipe
similarity index 95%
rename from media-libs/openal/openal-1.12-git.bep
rename to media-libs/openal/openal-1.12-git.recipe
index 1e2fd7b74..fc6f589e0 100644
--- a/media-libs/openal/openal-1.12-git.bep
+++ b/media-libs/openal/openal-1.12-git.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
         
-BUILD {
+BUILD()
+{
 	cd openal-1.12-git
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openal-1.12-git
 	make install
 }
diff --git a/media-libs/openal/openal-1.12.854.bep b/media-libs/openal/openal-1.12.854.recipe
similarity index 95%
rename from media-libs/openal/openal-1.12.854.bep
rename to media-libs/openal/openal-1.12.854.recipe
index 939c448f4..7d0674383 100644
--- a/media-libs/openal/openal-1.12.854.bep
+++ b/media-libs/openal/openal-1.12.854.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
         
-BUILD {
+BUILD()
+{
 	cd openal-soft-1.12.854
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openal-soft-1.12.854
 	make install
 }
diff --git a/media-libs/openal/openal-1.13.bep b/media-libs/openal/openal-1.13.recipe
similarity index 95%
rename from media-libs/openal/openal-1.13.bep
rename to media-libs/openal/openal-1.13.recipe
index 466527faa..b5633603d 100644
--- a/media-libs/openal/openal-1.13.bep
+++ b/media-libs/openal/openal-1.13.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.0"
         
-BUILD {
+BUILD()
+{
 	cd openal-soft-1.13
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openal-soft-1.13
 	make install
 }
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.bep b/media-libs/openjpeg/openjpeg-1.5.0.recipe
similarity index 97%
rename from media-libs/openjpeg/openjpeg-1.5.0.bep
rename to media-libs/openjpeg/openjpeg-1.5.0.recipe
index 63604c945..6f6b1f48f 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.bep
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e5d66193ddfa59a87da1eb08ea86293b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd openjpeg-1.5.0
 	./bootstrap.sh
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openjpeg-1.5.0
 	make install
 }
diff --git a/media-libs/plib/plib-1.8.5.bep b/media-libs/plib/plib-1.8.5.recipe
similarity index 95%
rename from media-libs/plib/plib-1.8.5.bep
rename to media-libs/plib/plib-1.8.5.recipe
index 460ce966e..c95d99ace 100644
--- a/media-libs/plib/plib-1.8.5.bep
+++ b/media-libs/plib/plib-1.8.5.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
         
-BUILD {
+BUILD()
+{
 	cd plib-1.8.5
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd plib-1.8.5
 	make install
 }
diff --git a/media-libs/schroedinger/schroedinger-1.0.11.bep b/media-libs/schroedinger/schroedinger-1.0.11.recipe
similarity index 96%
rename from media-libs/schroedinger/schroedinger-1.0.11.bep
rename to media-libs/schroedinger/schroedinger-1.0.11.recipe
index 94cee4162..31bdc5fbb 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11.bep
+++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/pkg-config >= 0.23
 	dev-lang/orc >= 0.4.16"
 CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891"
-BUILD {
+BUILD()
+{
 	cd schroedinger-1.0.11
 	autoconf
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd schroedinger-1.0.11
 	make install
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe
similarity index 97%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.20.bep
rename to media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe
index f32b9e0ef..e7c5561df 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8a787e538a8e4d80d4927535be5af083"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD {
+BUILD()
+{
 	cd SDL_gfx-2.0.20
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_gfx-2.0.20
 	make install
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe
similarity index 97%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.22.bep
rename to media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe
index 57cf26491..a2401bf20 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="330f291f1f09a1bdf397c9b40d92ca41"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD {
+BUILD()
+{
 	cd SDL_gfx-2.0.22
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_gfx-2.0.22
 	make install
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe
similarity index 97%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.23.bep
rename to media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe
index 44752b346..c5cc83e8b 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fcc3c4f2d1b4943409bf7e67dd65d03a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD {
+BUILD()
+{
 	cd SDL_gfx-2.0.23
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_gfx-2.0.23
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.bep b/media-libs/sdl-image/sdl-image-1.2-hg.recipe
similarity index 97%
rename from media-libs/sdl-image/sdl-image-1.2-hg.bep
rename to media-libs/sdl-image/sdl-image-1.2-hg.recipe
index 5ab8e0d40..370b1e1d9 100644
--- a/media-libs/sdl-image/sdl-image-1.2-hg.bep
+++ b/media-libs/sdl-image/sdl-image-1.2-hg.recipe
@@ -10,7 +10,8 @@ DEPEND="media-libs/libsdl >= 1.2.14
 	media-libs/tiff >= 3.8.2
 	media-libs/giflib >= 4.1.6
 	media-libs/libwebp >= 0.1.3"
-BUILD {
+BUILD()
+{
 	cd sdl-image-1.2-hg
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-image-1.2-hg
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl-image/sdl-image-1.2.10.recipe
similarity index 97%
rename from media-libs/sdl-image/sdl-image-1.2.10.bep
rename to media-libs/sdl-image/sdl-image-1.2.10.recipe
index 49613d96e..c298649cc 100644
--- a/media-libs/sdl-image/sdl-image-1.2.10.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.10.recipe
@@ -8,7 +8,8 @@ DEPEND="media-libs/jpeg >= 8b
 	media-libs/libpng >= 1.2.44 < 1.4.0
 	media-libs/tiff >= 3.8.2
 	media-libs/giflib >= 4.1.6"
-BUILD {
+BUILD()
+{
 	cd SDL_image-1.2.10
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -24,7 +25,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_image-1.2.10
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.12.bep b/media-libs/sdl-image/sdl-image-1.2.12.recipe
similarity index 97%
rename from media-libs/sdl-image/sdl-image-1.2.12.bep
rename to media-libs/sdl-image/sdl-image-1.2.12.recipe
index 8641128f6..f430b555d 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.12.recipe
@@ -10,7 +10,8 @@ DEPEND="media-libs/libsdl >= 1.2.14
         media-libs/tiff >= 3.8.2
         media-libs/giflib >= 4.1.6
         media-libs/libwebp >= 0.1.3"
-BUILD {
+BUILD()
+{
 	cd SDL_image-1.2.12
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_image-1.2.12
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.6.bep b/media-libs/sdl-image/sdl-image-1.2.6.recipe
similarity index 96%
rename from media-libs/sdl-image/sdl-image-1.2.6.bep
rename to media-libs/sdl-image/sdl-image-1.2.6.recipe
index d52989c78..3e79c65b7 100644
--- a/media-libs/sdl-image/sdl-image-1.2.6.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="b866dc4f647517bdaf57f6ffdefd013e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sdl-image-1.2.6
 	cat acinclude/libtool.m4 >> aclocal.m4
 	cat acinclude/sdl.m4 >> aclocal.m4
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-image-1.2.6
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.8.bep b/media-libs/sdl-image/sdl-image-1.2.8.recipe
similarity index 95%
rename from media-libs/sdl-image/sdl-image-1.2.8.bep
rename to media-libs/sdl-image/sdl-image-1.2.8.recipe
index 3f0fd1054..d9f80df59 100644
--- a/media-libs/sdl-image/sdl-image-1.2.8.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="2e7c3efa0ec2acc039c46960e27c0792"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_image-1.2.8
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_image-1.2.8
 	make install
 }
diff --git a/media-libs/sdl-image/sdl-image-1.2.9.bep b/media-libs/sdl-image/sdl-image-1.2.9.recipe
similarity index 95%
rename from media-libs/sdl-image/sdl-image-1.2.9.bep
rename to media-libs/sdl-image/sdl-image-1.2.9.recipe
index 3318cb3db..eb781ba26 100644
--- a/media-libs/sdl-image/sdl-image-1.2.9.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="793eb3e7bbbf396f83fc6cd031842aa3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_image-1.2.9
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_image-1.2.9
 	make install
 }
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe
similarity index 97%
rename from media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
rename to media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe
index c25d1478c..670953ed7 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe
@@ -12,7 +12,8 @@ DEPEND="libsdl >= 1.2.14
 	media-libs/libogg >= 1.2.0
 	media-libs/smpeg >= 0.4.5"
 
-BUILD {
+BUILD()
+{
 	cd sdl-mixer-1.2-hg
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
@@ -23,7 +24,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-mixer-1.2-hg
 	make install
 }
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe
similarity index 96%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.10.bep
rename to media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe
index 930a94ac7..e9d30d1d9 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="a357558552436b0b5ea0333b3e2327df"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_mixer-1.2.10
 	libtoolize --force --copy --install
 	cp ltmain.sh build-scripts/ltmain.sh
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_mixer-1.2.10
 	make install
 }
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe
similarity index 97%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.11.bep
rename to media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe
index 964492470..f4a205f2f 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe
@@ -11,7 +11,8 @@ DEPEND="libsdl >= 1.2.14
 	media-libs/libmikmod >= 3.1.11
 	media-libs/libogg >= 1.2.0
 	media-libs/smpeg >= 0.4.5"
-BUILD {
+BUILD()
+{
 	cd SDL_mixer-1.2.11
 	libtoolize --force --copy --install
 	cp ltmain.sh build-scripts/ltmain.sh
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_mixer-1.2.11
 	make install
 }
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe
similarity index 97%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.12.bep
rename to media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe
index a884056b7..18c50b697 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe
@@ -12,7 +12,8 @@ DEPEND="libsdl >= 1.2.14
 	media-libs/libogg >= 1.2.0
 	media-libs/smpeg >= 0.4.5"
 
-BUILD {
+BUILD()
+{
 	cd SDL_mixer-1.2.12
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_mixer-1.2.12
 	make install
 }
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe
similarity index 96%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.9.bep
rename to media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe
index c9bf5b91b..b1e9c4e91 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="09eb4585f46d3527fe7fce8af8f9e591"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_mixer-1.2.9
 	libtoolize --force --copy --install
 	cp ltmain.sh build-scripts/ltmain.sh
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_mixer-1.2.9
 	make install
 }
diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.bep b/media-libs/sdl-net/sdl-net-1.2-hg.recipe
similarity index 96%
rename from media-libs/sdl-net/sdl-net-1.2-hg.bep
rename to media-libs/sdl-net/sdl-net-1.2-hg.recipe
index 30f868251..bbea0675b 100644
--- a/media-libs/sdl-net/sdl-net-1.2-hg.bep
+++ b/media-libs/sdl-net/sdl-net-1.2-hg.recipe
@@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL_net"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sdl-net-1.2-hg
 	aclocal --force --install -I acinclude
 	libtoolize -fci
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-net-1.2-hg
 	make install
 }
diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl-net/sdl-net-1.2.7.recipe
similarity index 96%
rename from media-libs/sdl-net/sdl-net-1.2.7.bep
rename to media-libs/sdl-net/sdl-net-1.2.7.recipe
index fbc4fe049..3ba48eb2b 100644
--- a/media-libs/sdl-net/sdl-net-1.2.7.bep
+++ b/media-libs/sdl-net/sdl-net-1.2.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_net-1.2.7
 	aclocal --force --install -I acinclude
 	libtoolize -fci
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_net-1.2.7
 	make install
 }
diff --git a/media-libs/sdl-net/sdl-net-1.2.8.bep b/media-libs/sdl-net/sdl-net-1.2.8.recipe
similarity index 96%
rename from media-libs/sdl-net/sdl-net-1.2.8.bep
rename to media-libs/sdl-net/sdl-net-1.2.8.recipe
index 7a5dfd4a8..c43a9b14d 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8.bep
+++ b/media-libs/sdl-net/sdl-net-1.2.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="20e64e61d65662db66c379034f11f718"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_net-1.2.8
 	aclocal --force --install -I acinclude
 	libtoolize -fci
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_net-1.2.8
 	make install
 }
diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe
similarity index 97%
rename from media-libs/sdl-rtf/sdl-rtf-0.1.0.bep
rename to media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe
index 9b81a0285..ce2f2658e 100644
--- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep
+++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fe36733167b5c89f128414f32612121a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/sdl-ttf >= 2.0.9"
-BUILD {
+BUILD()
+{
 	cd SDL_rtf-0.1.0
 	rm aclocal.m4
 	rm acinclude.m4
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_rtf-0.1.0
 	make install
 }
diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep b/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe
similarity index 96%
rename from media-libs/sdl-sound/sdl-sound-1.0-hg.bep
rename to media-libs/sdl-sound/sdl-sound-1.0-hg.recipe
index 275fb2fca..86fe30fca 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep
+++ b/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe
@@ -4,7 +4,8 @@ SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libogg >= 1.1.4"
-BUILD {
+BUILD()
+{
 	cd sdl-sound-1.0-hg
 	libtoolize --copy --force --install
 	./bootstrap
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-sound-1.0-hg
 	make install
 }
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.recipe
similarity index 96%
rename from media-libs/sdl-sound/sdl-sound-1.0.3.bep
rename to media-libs/sdl-sound/sdl-sound-1.0.3.recipe
index 6432c7014..4f5b773e0 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3.recipe
@@ -4,7 +4,8 @@ SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libogg >= 1.1.4"
-BUILD {
+BUILD()
+{
 	cd sdl-sound-1.0.3
 	libtoolize --copy --force --install
 	./bootstrap
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-sound-1.0.3
 	make install
 }
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe
similarity index 97%
rename from media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep
rename to media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe
index df5fda109..b6bec4fe4 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.12
 	dev-util/pkgconfig >= 0.9"
-BUILD {
+BUILD()
+{
 	cd sdl-ttf-2.0-hg
 	rm -f acinclude.m4
 	libtoolize --copy --force --install
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sdl-ttf-2.0-hg
 	make install
 }
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe
similarity index 97%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
rename to media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe
index 15cd7c98e..7fd96a9d8 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.12
 	dev-util/pkgconfig >= 0.9"
-BUILD {
+BUILD()
+{
 	cd SDL_ttf-2.0.10
 	rm -f acinclude.m4
 	libtoolize --copy --force --install
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_ttf-2.0.10
 	make install
 }
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe
similarity index 97%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.11.bep
rename to media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe
index 28f407403..8e2d5fb59 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2.12
 	dev-util/pkgconfig >= 0.9"
-BUILD {
+BUILD()
+{
 	cd SDL_ttf-2.0.11
 	rm -f acinclude.m4
 	libtoolize --copy --force --install
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_ttf-2.0.11
 	make install
 }
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe
similarity index 96%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.9.bep
rename to media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe
index 18f5cb80d..b068d6603 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6dd5a85e4924689a35a5fb1cb3336156"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd SDL_ttf-2.0.9
 	rm aclocal.m4
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd SDL_ttf-2.0.9
 	make install
 }
diff --git a/media-libs/sge/sge-030809.bep b/media-libs/sge/sge-030809.recipe
similarity index 94%
rename from media-libs/sge/sge-030809.bep
rename to media-libs/sge/sge-030809.recipe
index 2b05bbd16..d8b9f38b5 100644
--- a/media-libs/sge/sge-030809.bep
+++ b/media-libs/sge/sge-030809.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="a76975665b6a2bf189130fa2c8821caf"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sge030809
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sge030809
 	make install
 }
diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.recipe
similarity index 96%
rename from media-libs/smjpeg/smjpeg-0.2.1.bep
rename to media-libs/smjpeg/smjpeg-0.2.1.recipe
index 2208d923a..62199881e 100644
--- a/media-libs/smjpeg/smjpeg-0.2.1.bep
+++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe
@@ -4,7 +4,8 @@ SRC_URI="svn://svn.icculus.org/smjpeg/trunk/"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd smjpeg-0.2.1
 	rm -f acinclude.m4
 	rm -f aclocal.m4
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	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.recipe
similarity index 97%
rename from media-libs/smpeg/smpeg-0.4.5.bep
rename to media-libs/smpeg/smpeg-0.4.5.recipe
index 76a86a1ff..87e4d3872 100644
--- a/media-libs/smpeg/smpeg-0.4.5.bep
+++ b/media-libs/smpeg/smpeg-0.4.5.recipe
@@ -4,7 +4,8 @@ SRC_URI="svn://svn.icculus.org/smpeg/trunk/"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd smpeg-0.4.5
 	rm -f acinclude.m4
 	rm -f aclocal.m4
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd smpeg-0.4.5
 	make install
 }
diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.recipe
similarity index 97%
rename from media-libs/speex/speex-1.2-git.bep
rename to media-libs/speex/speex-1.2-git.recipe
index 320e8878a..1cc925689 100644
--- a/media-libs/speex/speex-1.2-git.bep
+++ b/media-libs/speex/speex-1.2-git.recipe
@@ -5,7 +5,8 @@ SRC_URI="git+http://git.xiph.org/speex.git"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="libogg >= 1.2.0"
-BUILD {
+BUILD()
+{
 	cd speex-1.2-git
 	libtoolize --copy --force --install
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd speex-1.2-git
 	make install
 }
diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.recipe
similarity index 97%
rename from media-libs/speex/speex-1.2rc1.bep
rename to media-libs/speex/speex-1.2rc1.recipe
index e8d06c9ed..489052c8c 100644
--- a/media-libs/speex/speex-1.2rc1.bep
+++ b/media-libs/speex/speex-1.2rc1.recipe
@@ -6,7 +6,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.25
 	libogg > 1.3.0"
-BUILD {
+BUILD()
+{
 	cd speex-1.2rc1
 	libtoolize --copy --force --install
 	aclocal
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd speex-1.2rc1
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.6.1.bep b/media-libs/taglib/taglib-1.6.1.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.6.1.bep
rename to media-libs/taglib/taglib-1.6.1.recipe
index 62ca47242..08a332fbf 100644
--- a/media-libs/taglib/taglib-1.6.1.bep
+++ b/media-libs/taglib/taglib-1.6.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="db0502b3c3448ff1f1f9b090c1daa5f7"
-BUILD {
+BUILD()
+{
 	cd taglib-1.6.1
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.6.1
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.6.2.bep b/media-libs/taglib/taglib-1.6.2.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.6.2.bep
rename to media-libs/taglib/taglib-1.6.2.recipe
index d9235c09f..bf9d09163 100644
--- a/media-libs/taglib/taglib-1.6.2.bep
+++ b/media-libs/taglib/taglib-1.6.2.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7c936a07acfc53b2beda4151a0f66336"
-BUILD {
+BUILD()
+{
 	cd taglib-1.6.2
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.6.2
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.6.3.bep b/media-libs/taglib/taglib-1.6.3.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.6.3.bep
rename to media-libs/taglib/taglib-1.6.3.recipe
index 14b6ed2c5..3395ffa3d 100644
--- a/media-libs/taglib/taglib-1.6.3.bep
+++ b/media-libs/taglib/taglib-1.6.3.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="ddf02f4e1d2dc30f76734df806e613eb"
-BUILD {
+BUILD()
+{
 	cd taglib-1.6.3
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.6.3
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.7.1.bep b/media-libs/taglib/taglib-1.7.1.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.7.1.bep
rename to media-libs/taglib/taglib-1.7.1.recipe
index d8a160ffd..0eb629e5c 100644
--- a/media-libs/taglib/taglib-1.7.1.bep
+++ b/media-libs/taglib/taglib-1.7.1.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="aa0f7e2d9700bbb78c5f990ed2f5d9b6"
-BUILD {
+BUILD()
+{
 	cd taglib-1.7.1
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.7.1
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.7.2.bep b/media-libs/taglib/taglib-1.7.2.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.7.2.bep
rename to media-libs/taglib/taglib-1.7.2.recipe
index d8aba64fd..a71332c80 100644
--- a/media-libs/taglib/taglib-1.7.2.bep
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="cmake"
 CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720"
-BUILD {
+BUILD()
+{
 	cd taglib-1.7.2
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.7.2
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.7.bep b/media-libs/taglib/taglib-1.7.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.7.bep
rename to media-libs/taglib/taglib-1.7.recipe
index 0716bb487..862ebbe76 100644
--- a/media-libs/taglib/taglib-1.7.bep
+++ b/media-libs/taglib/taglib-1.7.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6a7e312668f153fa905a81714aebc257"
-BUILD {
+BUILD()
+{
 	cd taglib-1.7
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.7
 	make install
 }
diff --git a/media-libs/taglib/taglib-1.8.bep b/media-libs/taglib/taglib-1.8.recipe
similarity index 94%
rename from media-libs/taglib/taglib-1.8.bep
rename to media-libs/taglib/taglib-1.8.recipe
index a7abbd2ff..7c6b5e78a 100644
--- a/media-libs/taglib/taglib-1.8.bep
+++ b/media-libs/taglib/taglib-1.8.recipe
@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15"
-BUILD {
+BUILD()
+{
 	cd taglib-1.8
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd taglib-1.8
 	make install
 }
diff --git a/media-libs/tiff/tiff-3.8.2.bep b/media-libs/tiff/tiff-3.8.2.recipe
similarity index 96%
rename from media-libs/tiff/tiff-3.8.2.bep
rename to media-libs/tiff/tiff-3.8.2.recipe
index 4a2338e42..5e5826c88 100644
--- a/media-libs/tiff/tiff-3.8.2.bep
+++ b/media-libs/tiff/tiff-3.8.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fbb6f446ea4ed18955e2714934e5b698"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tiff-3.8.2
 	cp /boot/home/config/share/libtool/config.guess config.guess
 	cp /boot/home/config/share/libtool/config.sub config.sub
@@ -20,6 +21,7 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
diff --git a/media-libs/tiff/tiff-3.9.1.bep b/media-libs/tiff/tiff-3.9.1.recipe
similarity index 94%
rename from media-libs/tiff/tiff-3.9.1.bep
rename to media-libs/tiff/tiff-3.9.1.recipe
index d0aa4e446..d1b0b6a18 100644
--- a/media-libs/tiff/tiff-3.9.1.bep
+++ b/media-libs/tiff/tiff-3.9.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="63c59a44f34ae0787f2d71de3d256e20"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tiff-3.9.1
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tiff-3.9.1
 	make install
 }
diff --git a/media-libs/tiff/tiff-3.9.4.bep b/media-libs/tiff/tiff-3.9.4.recipe
similarity index 94%
rename from media-libs/tiff/tiff-3.9.4.bep
rename to media-libs/tiff/tiff-3.9.4.recipe
index 4718a9b5f..8e13c6bb1 100644
--- a/media-libs/tiff/tiff-3.9.4.bep
+++ b/media-libs/tiff/tiff-3.9.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="2006c1bdd12644dbf02956955175afd6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tiff-3.9.4
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tiff-3.9.4
 	make install
 }
diff --git a/media-libs/tiff/tiff-3.9.6.bep b/media-libs/tiff/tiff-3.9.6.recipe
similarity index 94%
rename from media-libs/tiff/tiff-3.9.6.bep
rename to media-libs/tiff/tiff-3.9.6.recipe
index a8fc84aaa..1305cc483 100644
--- a/media-libs/tiff/tiff-3.9.6.bep
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tiff-3.9.6
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tiff-3.9.6
 	make install
 }
diff --git a/media-libs/tiff/tiff-4.0.2.bep b/media-libs/tiff/tiff-4.0.2.recipe
similarity index 94%
rename from media-libs/tiff/tiff-4.0.2.bep
rename to media-libs/tiff/tiff-4.0.2.recipe
index c94a19245..c625630a0 100644
--- a/media-libs/tiff/tiff-4.0.2.bep
+++ b/media-libs/tiff/tiff-4.0.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd tiff-4.0.2
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tiff-4.0.2
 	make install
 }
diff --git a/media-libs/vigra/vigra-1.8.0.bep b/media-libs/vigra/vigra-1.8.0.recipe
similarity index 96%
rename from media-libs/vigra/vigra-1.8.0.bep
rename to media-libs/vigra/vigra-1.8.0.recipe
index dee691ec6..e05e7b3c5 100644
--- a/media-libs/vigra/vigra-1.8.0.bep
+++ b/media-libs/vigra/vigra-1.8.0.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="cmake"
-BUILD {
+BUILD()
+{
 	cd vigra-1.8.0
 	cmake CMakelists.txt
 	make 	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vigra-1.8.0
 	make install
 }
diff --git a/media-libs/waave/waave-1.01.bep b/media-libs/waave/waave-1.01.recipe
similarity index 94%
rename from media-libs/waave/waave-1.01.bep
rename to media-libs/waave/waave-1.01.recipe
index 2c42eff3f..262d8426f 100644
--- a/media-libs/waave/waave-1.01.bep
+++ b/media-libs/waave/waave-1.01.recipe
@@ -6,18 +6,21 @@ STATUS_HAIKU="broken"
 DEPEND="media-libs/libsdl >= 1.2.15
 	media-video/ffmeg >= 0.10.2"
 CHECKSUM_MD5="7f168d3122a3889ee6da3a380cfe1c99"
-BUILD {
+BUILD()
+{
 	cd waave-1.01
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd waave-1.01
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd waave-1.01/test
 	make
 }
diff --git a/media-libs/x264/x264-20120803.bep b/media-libs/x264/x264-20120803.recipe
similarity index 96%
rename from media-libs/x264/x264-20120803.bep
rename to media-libs/x264/x264-20120803.recipe
index 21aed8d29..e0881ff35 100644
--- a/media-libs/x264/x264-20120803.bep
+++ b/media-libs/x264/x264-20120803.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building."
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd x264-snapshot-20120803-2245
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` 
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd x264-snapshot-20120803-2245
 	make install-lib-static
 }
diff --git a/media-sound/bladeenc/bladeenc-0.94.2.bep b/media-sound/bladeenc/bladeenc-0.94.2.recipe
similarity index 96%
rename from media-sound/bladeenc/bladeenc-0.94.2.bep
rename to media-sound/bladeenc/bladeenc-0.94.2.recipe
index dd03383d4..24e084884 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2.bep
+++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bladeenc-0.94.2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bladeenc-0.94.2
 	make install
 }
diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe
similarity index 96%
rename from media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep
rename to media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe
index 093c96677..e76b7af16 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep
+++ b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe
@@ -7,14 +7,16 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/glib >= 2.24.1
 		media-libs/libsndfile >= 1.0.18"
 
-BUILD {
+BUILD()
+{
 	cd fluidsynth-1.1-midi-buffer
 	cd fluidsynth
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fluidsynth-1.1-midi-buffer
 	cd fluidsynth
 	make install
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.3.bep b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe
similarity index 96%
rename from media-sound/fluidsynth/fluidsynth-1.1.3.bep
rename to media-sound/fluidsynth/fluidsynth-1.1.3.recipe
index d4792455e..9b759f617 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.3.bep
+++ b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe
@@ -7,13 +7,15 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/glib >= 2.24.1
 		media-libs/libsndfile >= 1.0.18"
 
-BUILD {
+BUILD()
+{
 	cd fluidsynth-1.1.3
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fluidsynth-1.1.3
 	make install
 }
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.bep b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
similarity index 96%
rename from media-sound/fluidsynth/fluidsynth-1.1.6.bep
rename to media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index 86ea54247..d4b900964 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.bep
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -8,13 +8,15 @@ DEPEND="dev-libs/glib >= 2.26.1
 	media-libs/libsndfile >= 1.0.21
 	sys-libs/readline >= 6.0"
 
-BUILD {
+BUILD()
+{
 	cd fluidsynth-1.1.6
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fluidsynth-1.1.6
 	make install prefix=`finddir B_COMMON_DIRECTORY`
 }
diff --git a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep b/media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe
similarity index 96%
rename from media-sound/gogo-no-coda/gogo-no-coda-3.13.bep
rename to media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe
index a69303f3f..21443ce70 100644
--- a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep
+++ b/media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe
@@ -7,12 +7,14 @@ STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc2. Use 'setgcc gcc2' before building."
 DEPEND="dev-lang/nasm"
 
-BUILD {
+BUILD()
+{
 	cd gogo-no-coda-master/linux
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gogo-no-coda-master/linux
 	make install prefix=`finddir B_COMMON_DIRECTORY`
 }
diff --git a/media-sound/jack2/jack2-1.9.8.bep b/media-sound/jack2/jack2-1.9.8.recipe
similarity index 96%
rename from media-sound/jack2/jack2-1.9.8.bep
rename to media-sound/jack2/jack2-1.9.8.recipe
index 9f83969e5..a19991b37 100644
--- a/media-sound/jack2/jack2-1.9.8.bep
+++ b/media-sound/jack2/jack2-1.9.8.recipe
@@ -7,13 +7,15 @@ DEPEND="media-libs/libsamplerate >= 0.1.8
  media-libs/libsndfile >= 1.0.21"
 #CHECKSUM_MD5=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd jack2-1.9.8
 	python ./waf configure --prefix=/boot/common/
 	python ./waf build
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jack2-1.9.8
 	python ./waf build install
 }
diff --git a/media-sound/lame/lame-3.98.4.bep b/media-sound/lame/lame-3.98.4.recipe
similarity index 96%
rename from media-sound/lame/lame-3.98.4.bep
rename to media-sound/lame/lame-3.98.4.recipe
index d5f82fbe4..232777e1f 100644
--- a/media-sound/lame/lame-3.98.4.bep
+++ b/media-sound/lame/lame-3.98.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8e9866ad6b570c6c95c8cba48060473f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lame-3.98.4
 	mkdir -p m4
 # configure checks for gtk, but they didn't include the gtk.m4 so we need to.
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lame-3.98.4
 	make install
 }
diff --git a/media-sound/lame/lame-3.99.bep b/media-sound/lame/lame-3.99.recipe
similarity index 96%
rename from media-sound/lame/lame-3.99.bep
rename to media-sound/lame/lame-3.99.recipe
index 79a54d80d..079bb19ce 100644
--- a/media-sound/lame/lame-3.99.bep
+++ b/media-sound/lame/lame-3.99.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="7abacd1d0a65a63733335786015626db"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lame-3.99
 	mkdir -p m4
 # configure checks for gtk, but they didn't include the gtk.m4 so we need to.
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lame-3.99
 	make install
 }
diff --git a/media-sound/lame/lame-398-2.bep b/media-sound/lame/lame-398-2.recipe
similarity index 95%
rename from media-sound/lame/lame-398-2.bep
rename to media-sound/lame/lame-398-2.recipe
index 35b0cb71b..e53af5d43 100644
--- a/media-sound/lame/lame-398-2.bep
+++ b/media-sound/lame/lame-398-2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="dev-lang/nasm >= 2.03.01"
-BUILD {
+BUILD()
+{
 	cd lame-398-2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lame-398-2
 	make install
 }
diff --git a/media-sound/milkytracker/milkytracker-0.90.85.bep b/media-sound/milkytracker/milkytracker-0.90.85.recipe
similarity index 97%
rename from media-sound/milkytracker/milkytracker-0.90.85.bep
rename to media-sound/milkytracker/milkytracker-0.90.85.recipe
index 6a8dd7a64..a5835b041 100644
--- a/media-sound/milkytracker/milkytracker-0.90.85.bep
+++ b/media-sound/milkytracker/milkytracker-0.90.85.recipe
@@ -7,14 +7,16 @@ REVISION="1"
 DEPEND="media-libs/libsdl >= 1.2
 	sys-libs/zlib >= 1.2.5"
 			
-BUILD {
+BUILD()
+{
 	cd 'MilkyTracker Source Code'/platforms/haiku
 	bash ./Add_Jamfiles.sh
 	cd ../..
 	jam
 }
 
-INSTALL {
+INSTALL()
+{
 	cd 'MilkyTracker Source Code'/src/tracker
 	APPDIR=`finddir B_APPS_DIRECTORY`/MilkyTracker
 	APPSETTINGSDIR=`finddir B_USER_SETTINGS_DIRECTORY`/MilkyTracker/
diff --git a/media-sound/mpg123/mpg123-1.12.1.bep b/media-sound/mpg123/mpg123-1.12.1.recipe
similarity index 96%
rename from media-sound/mpg123/mpg123-1.12.1.bep
rename to media-sound/mpg123/mpg123-1.12.1.recipe
index 361107799..753a9e082 100644
--- a/media-sound/mpg123/mpg123-1.12.1.bep
+++ b/media-sound/mpg123/mpg123-1.12.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libsdl >= 1.2"
 CHECKSUM_MD5="e7d810a75d22954169f1530a436aca4c"
-BUILD {
+BUILD()
+{
 	cd mpg123-1.12.1
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mpg123-1.12.1
 	make install
 }
diff --git a/media-sound/naspro/naspro-0.2.9-hg.bep b/media-sound/naspro/naspro-0.2.9-hg.recipe
similarity index 95%
rename from media-sound/naspro/naspro-0.2.9-hg.bep
rename to media-sound/naspro/naspro-0.2.9-hg.recipe
index 7129d2e0f..468000b09 100644
--- a/media-sound/naspro/naspro-0.2.9-hg.bep
+++ b/media-sound/naspro/naspro-0.2.9-hg.recipe
@@ -5,14 +5,16 @@ SRC_URI="hg+http://hg.atheme.org/naspro"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd naspro-0.2.9-hg/naspro-core
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd naspro-0.2.9-hg-core
 	make install
 }
diff --git a/media-sound/ocp/ocp-0.1.21-git.bep b/media-sound/ocp/ocp-0.1.21-git.recipe
similarity index 96%
rename from media-sound/ocp/ocp-0.1.21-git.bep
rename to media-sound/ocp/ocp-0.1.21-git.recipe
index f300ccc3b..0abc28e07 100644
--- a/media-sound/ocp/ocp-0.1.21-git.bep
+++ b/media-sound/ocp/ocp-0.1.21-git.recipe
@@ -10,14 +10,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1
 #		media-libs/flac >= 1.2.1"
 # ncurses zlib ... cf. ocp.spec
 MESSAGE="This port requires gcc4"
-BUILD {
+BUILD()
+{
 	cd code
 	autoconf
 	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd code
 	make install
 }
diff --git a/media-sound/ocp/ocp-snapshot20110319.bep b/media-sound/ocp/ocp-snapshot20110319.recipe
similarity index 97%
rename from media-sound/ocp/ocp-snapshot20110319.bep
rename to media-sound/ocp/ocp-snapshot20110319.recipe
index 1998800f0..5884c5770 100644
--- a/media-sound/ocp/ocp-snapshot20110319.bep
+++ b/media-sound/ocp/ocp-snapshot20110319.recipe
@@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1
 #		media-libs/flac >= 1.2.1"
 # ncurses zlib ... cf. ocp.spec
 MESSAGE="This port requires gcc4"
-BUILD {
+BUILD()
+{
 	cd ocp-snapshot-20110319
 	autoconf
 	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ocp-snapshot-20110319
 	make install
 }
diff --git a/media-sound/ocp/ocp-snapshot20110320.bep b/media-sound/ocp/ocp-snapshot20110320.recipe
similarity index 97%
rename from media-sound/ocp/ocp-snapshot20110320.bep
rename to media-sound/ocp/ocp-snapshot20110320.recipe
index 0df6d4339..5fb1ed52c 100644
--- a/media-sound/ocp/ocp-snapshot20110320.bep
+++ b/media-sound/ocp/ocp-snapshot20110320.recipe
@@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1
 #		media-libs/flac >= 1.2.1"
 # ncurses zlib ... cf. ocp.spec
 MESSAGE="This port requires gcc4"
-BUILD {
+BUILD()
+{
 	cd ocp-snapshot-20110320
 	autoconf
 	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ocp-snapshot-20110320
 	make install
 }
diff --git a/media-sound/opensound/opensound-232d0de71550.bep b/media-sound/opensound/opensound-232d0de71550.recipe
similarity index 96%
rename from media-sound/opensound/opensound-232d0de71550.bep
rename to media-sound/opensound/opensound-232d0de71550.recipe
index 7b6582407..21c69c1f3 100644
--- a/media-sound/opensound/opensound-232d0de71550.bep
+++ b/media-sound/opensound/opensound-232d0de71550.recipe
@@ -4,7 +4,8 @@ SRC_URI="hg+http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound/
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd opensound-232d0de71550
 	mkdir -p build
 	cd build
@@ -12,7 +13,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd opensound-232d0de71550/build
 	if [ -n "${DESTDIR}" ];then
 		make package
diff --git a/media-sound/opensound/opensound-4.2.bep b/media-sound/opensound/opensound-4.2.recipe
similarity index 96%
rename from media-sound/opensound/opensound-4.2.bep
rename to media-sound/opensound/opensound-4.2.recipe
index bfcc02c84..d5e2e0ff7 100644
--- a/media-sound/opensound/opensound-4.2.bep
+++ b/media-sound/opensound/opensound-4.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="da28b1fea261554a1480fcd3c5509cb5"
-BUILD {
+BUILD()
+{
 	cd oss-v4.2-build2002-src-bsd
 	mkdir -p build
 	cd build
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd oss-v4.2-build2002-src-bsd/build
 	if [ -n "${DESTDIR}" ];then
 		make package
diff --git a/media-sound/opensound/opensound-cac211efd60d.bep b/media-sound/opensound/opensound-cac211efd60d.recipe
similarity index 95%
rename from media-sound/opensound/opensound-cac211efd60d.bep
rename to media-sound/opensound/opensound-cac211efd60d.recipe
index 452abdbed..149d67b74 100644
--- a/media-sound/opensound/opensound-cac211efd60d.bep
+++ b/media-sound/opensound/opensound-cac211efd60d.recipe
@@ -4,7 +4,8 @@ SRC_URI="hg+http://mercurial.opensound.com/#cac211efd60d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd opensound-cac211efd60d
 	mkdir -p build
 	cd build
@@ -12,7 +13,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd opensound-cac211efd60d/build
 	if [ -n "${DESTDIR}" ];then
 		make package
diff --git a/media-sound/schismtracker/schismtracker-20100713.bep b/media-sound/schismtracker/schismtracker-20100713.recipe
similarity index 96%
rename from media-sound/schismtracker/schismtracker-20100713.bep
rename to media-sound/schismtracker/schismtracker-20100713.recipe
index d1c10a5d2..bc19e05ae 100644
--- a/media-sound/schismtracker/schismtracker-20100713.bep
+++ b/media-sound/schismtracker/schismtracker-20100713.recipe
@@ -7,7 +7,8 @@ MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="libsdl >= 1.2.14
 	gcc >= 4"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd schismtracker-20100713
 	aclocal
 	autoconf
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd schismtracker-20100713
 	make install
 }
diff --git a/media-sound/twolame/twolame-0.3.13.bep b/media-sound/twolame/twolame-0.3.13.recipe
similarity index 96%
rename from media-sound/twolame/twolame-0.3.13.bep
rename to media-sound/twolame/twolame-0.3.13.recipe
index 4fc7b7d54..2afb81b4b 100644
--- a/media-sound/twolame/twolame-0.3.13.bep
+++ b/media-sound/twolame/twolame-0.3.13.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb"
-BUILD {
+BUILD()
+{
 	cd twolame-0.3.13
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd twolame-0.3.13
 	make install
 }
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe
similarity index 96%
rename from media-sound/vorbis-tools/vorbis-tools-1.2.0.bep
rename to media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe
index 6e314d7c3..ae10bc5fc 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep
+++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="df976d24e51ef3d87cd462edf747bf9a"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd vorbis-tools-1.2.0
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vorbis-tools-1.2.0
 	make install
 }
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe
similarity index 97%
rename from media-sound/vorbis-tools/vorbis-tools-1.4.0.bep
rename to media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe
index 9ee4fdad5..d16c1b2f3 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe
@@ -8,7 +8,8 @@ DEPEND="media-libs/libvorbis >= 1.3.1
 		media-libs/flac >= 1.2.1
 		media-libs/libao >= 1.0.0
 		media-libs/speex >1.2"
-BUILD {
+BUILD()
+{
 	cd vorbis-tools-1.4.0
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vorbis-tools-1.4.0
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe
similarity index 97%
rename from media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep
rename to media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe
index 9d69e0e65..75c5d9949 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep
+++ b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe
@@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0
 	media-libs/libtheora >= 1.1.0
 	media-libs/libvorbis >= 1.3.2
 	media-libs/libvpx >= 1.0.0"
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.10.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
 		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.10.2
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.bep b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
similarity index 97%
rename from media-video/ffmpeg/ffmpeg-0.10.2.bep
rename to media-video/ffmpeg/ffmpeg-0.10.2.recipe
index 30b0122b7..8016d4281 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.bep
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
@@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0
 	media-libs/libtheora >= 1.1.0
 	media-libs/libvorbis >= 1.3.2
 	media-libs/libvpx >= 1.0.0"
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.10.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
 		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.10.2
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.10.bep b/media-video/ffmpeg/ffmpeg-0.10.recipe
similarity index 97%
rename from media-video/ffmpeg/ffmpeg-0.10.bep
rename to media-video/ffmpeg/ffmpeg-0.10.recipe
index 0df10e0e6..95f5fe931 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.bep
+++ b/media-video/ffmpeg/ffmpeg-0.10.recipe
@@ -9,14 +9,16 @@ DEPEND="media-libs/libogg >= 1.3.0
 	media-libs/libtheora >= 1.1.0
 	media-libs/libvorbis >= 1.3.2
 	media-libs/libvpx >= 1.0.0"
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.10
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
 		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.10
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.bep b/media-video/ffmpeg/ffmpeg-0.11.1.recipe
similarity index 97%
rename from media-video/ffmpeg/ffmpeg-0.11.1.bep
rename to media-video/ffmpeg/ffmpeg-0.11.1.recipe
index d1921cc63..5397f247f 100644
--- a/media-video/ffmpeg/ffmpeg-0.11.1.bep
+++ b/media-video/ffmpeg/ffmpeg-0.11.1.recipe
@@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0
 	media-libs/libtheora >= 1.1.0
 	media-libs/libvorbis >= 1.3.2
 	media-libs/libvpx >= 1.0.0"
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.11.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
 		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.11.1
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.5.bep b/media-video/ffmpeg/ffmpeg-0.5.recipe
similarity index 95%
rename from media-video/ffmpeg/ffmpeg-0.5.bep
rename to media-video/ffmpeg/ffmpeg-0.5.recipe
index 8cd65dcd9..d06e4376a 100644
--- a/media-video/ffmpeg/ffmpeg-0.5.bep
+++ b/media-video/ffmpeg/ffmpeg-0.5.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.5
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.5
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-0.6.bep b/media-video/ffmpeg/ffmpeg-0.6.recipe
similarity index 96%
rename from media-video/ffmpeg/ffmpeg-0.6.bep
rename to media-video/ffmpeg/ffmpeg-0.6.recipe
index 861154286..a538f342c 100644
--- a/media-video/ffmpeg/ffmpeg-0.6.bep
+++ b/media-video/ffmpeg/ffmpeg-0.6.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ffmpeg-0.6
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-0.6
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-23081.bep b/media-video/ffmpeg/ffmpeg-23081.recipe
similarity index 95%
rename from media-video/ffmpeg/ffmpeg-23081.bep
rename to media-video/ffmpeg/ffmpeg-23081.recipe
index 6a0cbb238..f423a2a47 100644
--- a/media-video/ffmpeg/ffmpeg-23081.bep
+++ b/media-video/ffmpeg/ffmpeg-23081.recipe
@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ffmpeg-23081
 	chmod 777 configure
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-23081
 	make install
 }
diff --git a/media-video/ffmpeg/ffmpeg-7407.bep b/media-video/ffmpeg/ffmpeg-7407.recipe
similarity index 95%
rename from media-video/ffmpeg/ffmpeg-7407.bep
rename to media-video/ffmpeg/ffmpeg-7407.recipe
index 2f2d3e0d2..832de1171 100644
--- a/media-video/ffmpeg/ffmpeg-7407.bep
+++ b/media-video/ffmpeg/ffmpeg-7407.recipe
@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ffmpeg-7407
 	chmod 777 configure
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffmpeg-7407
 	make install
 }
diff --git a/media-video/gnash/gnash-0.bep b/media-video/gnash/gnash-0.recipe
similarity index 99%
rename from media-video/gnash/gnash-0.bep
rename to media-video/gnash/gnash-0.recipe
index 3c1644d43..f523e4159 100644
--- a/media-video/gnash/gnash-0.bep
+++ b/media-video/gnash/gnash-0.recipe
@@ -23,7 +23,8 @@ DEPEND="media-video/ffmpeg >= 0.5
 #
 
 
-BUILD {
+BUILD()
+{
     if test ! -e gnash; then
         bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/ gnash || true;
     fi
@@ -67,7 +68,8 @@ BUILD {
 
     popd
 }
-INSTALL {
+INSTALL()
+{
     cd gnash
     setgcc gcc4
     make install "CXXFLAGS=-I/boot/common/include/boost-1_38/"
diff --git a/media-video/handbrake/handbrake-0.9.5.bep b/media-video/handbrake/handbrake-0.9.5.recipe
similarity index 98%
rename from media-video/handbrake/handbrake-0.9.5.bep
rename to media-video/handbrake/handbrake-0.9.5.recipe
index ba4f05613..ff4aca03a 100644
--- a/media-video/handbrake/handbrake-0.9.5.bep
+++ b/media-video/handbrake/handbrake-0.9.5.recipe
@@ -14,7 +14,8 @@ DEPEND="dev-libs/libxml2 >= 2.7.7
 	media-libs/libass >= 0.9.9
 	media-libs/dvdread >= 4.1.3"
 	
-BUILD {
+BUILD()
+{
 	cd HandBrake-0.9.5
 	cp make/variant/linux.defs make/variant/haiku.defs
 
@@ -35,7 +36,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd HandBrake-0.9.5
 	make install
 }
diff --git a/media-video/mplayer/mplayer-1.0.bep b/media-video/mplayer/mplayer-1.0.recipe
similarity index 97%
rename from media-video/mplayer/mplayer-1.0.bep
rename to media-video/mplayer/mplayer-1.0.recipe
index f36c5081e..7950db12e 100644
--- a/media-video/mplayer/mplayer-1.0.bep
+++ b/media-video/mplayer/mplayer-1.0.recipe
@@ -16,7 +16,8 @@ DEPEND="pkgconfig >= 0.23
 		media-libs/libdvdread >= 4.1.3
 		media-libs/libdvdnav >= 4.1.3"
 
-BUILD {
+BUILD()
+{
 	cd mplayer-1.0
 	cp /boot/common/share/libtool/config/config.* .
 	libtoolize --force --copy --install
@@ -28,7 +29,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mplayer-1.0
 	make install
 }
diff --git a/media-video/vlc/vlc-0.8.6i.bep b/media-video/vlc/vlc-0.8.6i.recipe
similarity index 96%
rename from media-video/vlc/vlc-0.8.6i.bep
rename to media-video/vlc/vlc-0.8.6i.recipe
index 0cc7f3333..8b1e4981e 100644
--- a/media-video/vlc/vlc-0.8.6i.bep
+++ b/media-video/vlc/vlc-0.8.6i.recipe
@@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23,
 		libmad
 		ffmpeg = 7407"
 CHECKSUM_MD5="fd852166d1705573cd7768a06117ed51"
-BUILD {
+BUILD()
+{
 	cd vlc-0.8.6i
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vlc-0.8.6i
 	make install
 }
diff --git a/media-video/vlc/vlc-1.1.5-20101107.bep b/media-video/vlc/vlc-1.1.5-20101107.recipe
similarity index 96%
rename from media-video/vlc/vlc-1.1.5-20101107.bep
rename to media-video/vlc/vlc-1.1.5-20101107.recipe
index 53aca8ef8..f949fcd33 100644
--- a/media-video/vlc/vlc-1.1.5-20101107.bep
+++ b/media-video/vlc/vlc-1.1.5-20101107.recipe
@@ -16,14 +16,16 @@ DEPEND="pkgconfig >= 0.23
 	libdca
 	ffmpeg >= 0.6"
 CHECKSUM_MD5="9ab7d8218ff37e362f996fd7d8879dbc"
-BUILD {
+BUILD()
+{
 	cd vlc-1.1.5
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vlc-1.1.5
 	make install
 }
diff --git a/media-video/vlc/vlc-2.0.5.bep b/media-video/vlc/vlc-2.0.5.recipe
similarity index 97%
rename from media-video/vlc/vlc-2.0.5.bep
rename to media-video/vlc/vlc-2.0.5.recipe
index 8fc3003ea..f8376144c 100644
--- a/media-video/vlc/vlc-2.0.5.bep
+++ b/media-video/vlc/vlc-2.0.5.recipe
@@ -24,14 +24,16 @@ DEPEND="faad2,
 		libsdl
 		sdl-image"
 CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe"
-BUILD {
+BUILD()
+{
 	cd vlc-2.0.5
 	bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd vlc-2.0.5
 	make install
 }
diff --git a/net-ftp/tnftp/tnftp-20091122.bep b/net-ftp/tnftp/tnftp-20091122.recipe
similarity index 96%
rename from net-ftp/tnftp/tnftp-20091122.bep
rename to net-ftp/tnftp/tnftp-20091122.recipe
index 44df64778..548a015ae 100644
--- a/net-ftp/tnftp/tnftp-20091122.bep
+++ b/net-ftp/tnftp/tnftp-20091122.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="e7f86e7680648b675ee27c94655de494"
-BUILD {
+BUILD()
+{
 	cd tnftpd-20091122
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tnftpd-20091122
 	make install
 }
diff --git a/net-irc/irssi/irssi-0.8.15.bep b/net-irc/irssi/irssi-0.8.15.recipe
similarity index 96%
rename from net-irc/irssi/irssi-0.8.15.bep
rename to net-irc/irssi/irssi-0.8.15.recipe
index 6399e319a..8018d3fc9 100644
--- a/net-irc/irssi/irssi-0.8.15.bep
+++ b/net-irc/irssi/irssi-0.8.15.recipe
@@ -9,7 +9,8 @@ DEPEND="sys-devel/gettext >= 0.18.1
 	dev-util/pkgconfig  >= 0.25
 	dev-libs/glib >= 2.24.2"
 
-BUILD {	
+BUILD()
+{	
 	cd irssi-0.8.15
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -19,7 +20,8 @@ BUILD {
 		
 }
 
-INSTALL {
+INSTALL()
+{
 	cd irssi-0.8.15
 	make install
 }
diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe
similarity index 95%
rename from net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep
rename to net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe
index 922b8640b..36f23e23e 100644
--- a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep
+++ b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="untested"
 DEPEND=""
 CHECKSUM_MD5="0792de636a2625a826491e387fcb1305"
 
-BUILD {
+BUILD()
+{
 	cd rhapsody-0.28b
 	./configure
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rhapsody-0.28b
 	make install
 }
diff --git a/net-libs/enet/enet-1.2.2.bep b/net-libs/enet/enet-1.2.2.recipe
similarity index 94%
rename from net-libs/enet/enet-1.2.2.bep
rename to net-libs/enet/enet-1.2.2.recipe
index 0cca6af8c..cb333e94b 100644
--- a/net-libs/enet/enet-1.2.2.bep
+++ b/net-libs/enet/enet-1.2.2.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd enet-1.2.2
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd enet-1.2.2
 	make install
 }
diff --git a/net-libs/enet/enet-1.3.0.bep b/net-libs/enet/enet-1.3.0.recipe
similarity index 94%
rename from net-libs/enet/enet-1.3.0.bep
rename to net-libs/enet/enet-1.3.0.recipe
index 6373d6cee..4d50c2c85 100644
--- a/net-libs/enet/enet-1.3.0.bep
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd enet-1.3.0
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd enet-1.3.0
 	make install
 }
diff --git a/net-libs/gnutls/gnutls-2.8.6.bep b/net-libs/gnutls/gnutls-2.8.6.recipe
similarity index 97%
rename from net-libs/gnutls/gnutls-2.8.6.bep
rename to net-libs/gnutls/gnutls-2.8.6.recipe
index 274b38205..5555e8d64 100644
--- a/net-libs/gnutls/gnutls-2.8.6.bep
+++ b/net-libs/gnutls/gnutls-2.8.6.recipe
@@ -10,7 +10,8 @@ LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2009-2010 Free Software Fundation Inc.
 		2004-2008 Simon Josefsson
 		2000-2004 Nikos Mavrogiannopoulos"
-BUILD {
+BUILD()
+{
 	cd gnutls-2.8.6
 	libtoolize --force --copy --install
 	autoreconf
@@ -25,7 +26,8 @@ BUILD {
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd gnutls-2.8.6
 	make install
 }
diff --git a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep b/net-libs/hubbub/hubbub-0.1.2-HEAD.recipe
similarity index 95%
rename from net-libs/hubbub/hubbub-0.1.2-HEAD.bep
rename to net-libs/hubbub/hubbub-0.1.2-HEAD.recipe
index f39828ea1..32617af60 100644
--- a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep
+++ b/net-libs/hubbub/hubbub-0.1.2-HEAD.recipe
@@ -6,12 +6,14 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0
 	dev-libs/libparserutils >= 0.1.1"
 
-BUILD {
+BUILD()
+{
 	cd hubbub-0.1.2-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hubbub-0.1.2-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/net-libs/hubbub/hubbub-0.1.2.bep b/net-libs/hubbub/hubbub-0.1.2.recipe
similarity index 94%
rename from net-libs/hubbub/hubbub-0.1.2.bep
rename to net-libs/hubbub/hubbub-0.1.2.recipe
index 18e4c6314..46bb76916 100644
--- a/net-libs/hubbub/hubbub-0.1.2.bep
+++ b/net-libs/hubbub/hubbub-0.1.2.recipe
@@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd hubbub-0.1.2
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hubbub-0.1.2
 	make install
 }
diff --git a/net-libs/libdom/libdom-0.bep b/net-libs/libdom/libdom-0.recipe
similarity index 94%
rename from net-libs/libdom/libdom-0.bep
rename to net-libs/libdom/libdom-0.recipe
index a7992f9d9..c40feeb05 100644
--- a/net-libs/libdom/libdom-0.bep
+++ b/net-libs/libdom/libdom-0.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lib/hubbub >= 0.1.2-HEAD"
 
-BUILD {
+BUILD()
+{
 	cd libdom-0
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdom-0
 	make install PREFIX=/boot/common
 }
diff --git a/net-libs/libs3/libs3-2.0.bep b/net-libs/libs3/libs3-2.0.recipe
similarity index 95%
rename from net-libs/libs3/libs3-2.0.bep
rename to net-libs/libs3/libs3-2.0.recipe
index 7d2683e9c..b17e948e3 100644
--- a/net-libs/libs3/libs3-2.0.bep
+++ b/net-libs/libs3/libs3-2.0.recipe
@@ -7,12 +7,14 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/libxml2>=2.7.3
 	net-misc/curl>=7.18.2"
 
-BUILD {
+BUILD()
+{
 	cd libs3-2.0
 	make DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libs3-2.0
 	make install DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY`
 }
diff --git a/net-libs/libtorrent/libtorrent-0.12.5.bep b/net-libs/libtorrent/libtorrent-0.12.5.recipe
similarity index 96%
rename from net-libs/libtorrent/libtorrent-0.12.5.bep
rename to net-libs/libtorrent/libtorrent-0.12.5.recipe
index cb29cf3cb..fa8156d4b 100644
--- a/net-libs/libtorrent/libtorrent-0.12.5.bep
+++ b/net-libs/libtorrent/libtorrent-0.12.5.recipe
@@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	dev-libs/openssl >= 0.9.8l
 	libsigc++ >= ??"
 
-BUILD {
+BUILD()
+{
 	cd libtorrent-0.12.5
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-mincore
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtorrent-0.12.5
 	make install
 }
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.bep b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe
similarity index 96%
rename from net-libs/libyahoo2/libyahoo2-1.0.1.bep
rename to net-libs/libyahoo2/libyahoo2-1.0.1.recipe
index 73e0b396a..5ffba2e85 100644
--- a/net-libs/libyahoo2/libyahoo2-1.0.1.bep
+++ b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/libyahoo2/files/libyahoo2/1.0.1/libyaho
 DEPEND="glib >= 1.2.8"
 REVISION="1"
 CHECKSUM_MD5="e62dd7bc2dd77622cc0987a4dbf9b38c"
-BUILD {
+BUILD()
+{
 	cd libyahoo2-1.0.1
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libyahoo2-1.0.1
 	make install
 }
diff --git a/net-misc/axel/axel-2.4.bep b/net-misc/axel/axel-2.4.recipe
similarity index 95%
rename from net-misc/axel/axel-2.4.bep
rename to net-misc/axel/axel-2.4.recipe
index f8a7e1722..367d54498 100644
--- a/net-misc/axel/axel-2.4.bep
+++ b/net-misc/axel/axel-2.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="a2a762fce0c96781965c8f9786a3d09d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd axel-2.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --i18n=0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd axel-2.4
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/net-misc/curl/curl-7.18.2.bep b/net-misc/curl/curl-7.18.2.recipe
similarity index 95%
rename from net-misc/curl/curl-7.18.2.bep
rename to net-misc/curl/curl-7.18.2.recipe
index 2dfa3a06c..5c903e97f 100644
--- a/net-misc/curl/curl-7.18.2.bep
+++ b/net-misc/curl/curl-7.18.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c389be5b0525276e58865956b7465562"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.18.2
 	libtoolize --force --copy
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.18.2
 	make install
 }
diff --git a/net-misc/curl/curl-7.19.1.bep b/net-misc/curl/curl-7.19.1.recipe
similarity index 95%
rename from net-misc/curl/curl-7.19.1.bep
rename to net-misc/curl/curl-7.19.1.recipe
index 2aa33457c..5210c9985 100644
--- a/net-misc/curl/curl-7.19.1.bep
+++ b/net-misc/curl/curl-7.19.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6c4921e55ad276154065052c9e34e1cb"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.19.1
        libtoolize --force --copy
        aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.19.1
 	make install
 }
diff --git a/net-misc/curl/curl-7.19.2.bep b/net-misc/curl/curl-7.19.2.recipe
similarity index 95%
rename from net-misc/curl/curl-7.19.2.bep
rename to net-misc/curl/curl-7.19.2.recipe
index a5aec318b..806c637a5 100644
--- a/net-misc/curl/curl-7.19.2.bep
+++ b/net-misc/curl/curl-7.19.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="3a461b145a4a31fe7d5a44684e7fbdbc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.19.2
        libtoolize --force --copy
        aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.19.2
 	make install
 }
diff --git a/net-misc/curl/curl-7.19.5.bep b/net-misc/curl/curl-7.19.5.recipe
similarity index 95%
rename from net-misc/curl/curl-7.19.5.bep
rename to net-misc/curl/curl-7.19.5.recipe
index 00a363fbe..8cda1fcf2 100644
--- a/net-misc/curl/curl-7.19.5.bep
+++ b/net-misc/curl/curl-7.19.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="426d161661dce70c8ea9ad8f553363a3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.19.5
        libtoolize --force --copy
        aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.19.5
 	make install
 }
diff --git a/net-misc/curl/curl-7.19.7.bep b/net-misc/curl/curl-7.19.7.recipe
similarity index 95%
rename from net-misc/curl/curl-7.19.7.bep
rename to net-misc/curl/curl-7.19.7.recipe
index 8f1b9aab4..5ef534c41 100644
--- a/net-misc/curl/curl-7.19.7.bep
+++ b/net-misc/curl/curl-7.19.7.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="ecb2e37e45c9933e2a963cabe03670ab"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.19.7
     cmake -DCMAKE_INSTALL_PREFIX=`finddir B_COMMON_DIRECTORY` -DCURL_DISABLE_LDAP=ON .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.19.7
 	make install
 }
diff --git a/net-misc/curl/curl-7.20.0.bep b/net-misc/curl/curl-7.20.0.recipe
similarity index 95%
rename from net-misc/curl/curl-7.20.0.bep
rename to net-misc/curl/curl-7.20.0.recipe
index 904bc0e74..d65fac283 100644
--- a/net-misc/curl/curl-7.20.0.bep
+++ b/net-misc/curl/curl-7.20.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="3dda78c4a808d9a779dc3a2ae81b47d8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.20.0
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.20.0
 	make install
 }
diff --git a/net-misc/curl/curl-7.20.1.bep b/net-misc/curl/curl-7.20.1.recipe
similarity index 95%
rename from net-misc/curl/curl-7.20.1.bep
rename to net-misc/curl/curl-7.20.1.recipe
index 56a82aeb8..3042ce4a0 100644
--- a/net-misc/curl/curl-7.20.1.bep
+++ b/net-misc/curl/curl-7.20.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="244b16b2a38c70e47130c8494b7371b9"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.20.1
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.20.1
 	make install
 }
diff --git a/net-misc/curl/curl-7.21.1.bep b/net-misc/curl/curl-7.21.1.recipe
similarity index 95%
rename from net-misc/curl/curl-7.21.1.bep
rename to net-misc/curl/curl-7.21.1.recipe
index eb7349259..18ef3caf8 100644
--- a/net-misc/curl/curl-7.21.1.bep
+++ b/net-misc/curl/curl-7.21.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="eafde5b933bce1c1dca82d1054c8d967"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.1
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.1
 	make install
 }
diff --git a/net-misc/curl/curl-7.21.2.bep b/net-misc/curl/curl-7.21.2.recipe
similarity index 95%
rename from net-misc/curl/curl-7.21.2.bep
rename to net-misc/curl/curl-7.21.2.recipe
index 1a0e915f9..2afa1f2cc 100644
--- a/net-misc/curl/curl-7.21.2.bep
+++ b/net-misc/curl/curl-7.21.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="ca96df88e044c7c25d19692ec8b250b2"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.2
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.2
 	make install
 }
diff --git a/net-misc/curl/curl-7.21.3.bep b/net-misc/curl/curl-7.21.3.recipe
similarity index 94%
rename from net-misc/curl/curl-7.21.3.bep
rename to net-misc/curl/curl-7.21.3.recipe
index 8d4c718da..59cc61d4d 100644
--- a/net-misc/curl/curl-7.21.3.bep
+++ b/net-misc/curl/curl-7.21.3.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5b57fee22090b5c43a6886fdd35af2ce"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.3
 	libtoolize --force --copy --install
 	autoconf
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.21.3
 	make check
 }
diff --git a/net-misc/curl/curl-7.21.4.bep b/net-misc/curl/curl-7.21.4.recipe
similarity index 94%
rename from net-misc/curl/curl-7.21.4.bep
rename to net-misc/curl/curl-7.21.4.recipe
index 255a593ed..ea31867da 100644
--- a/net-misc/curl/curl-7.21.4.bep
+++ b/net-misc/curl/curl-7.21.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e2dd20c88a7d01c745af9d788545ab2a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.4
 	libtoolize --force --copy --install
 	autoconf
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.21.4
 	make check
 }
diff --git a/net-misc/curl/curl-7.21.6.bep b/net-misc/curl/curl-7.21.6.recipe
similarity index 94%
rename from net-misc/curl/curl-7.21.6.bep
rename to net-misc/curl/curl-7.21.6.recipe
index 117f23860..85ee980e4 100644
--- a/net-misc/curl/curl-7.21.6.bep
+++ b/net-misc/curl/curl-7.21.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="6611989a81ebd7b03a35adc3001ddee0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.6
 	libtoolize --force --copy --install
 	autoconf
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.6
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.21.6
 	make check
 }
diff --git a/net-misc/curl/curl-7.21.7.bep b/net-misc/curl/curl-7.21.7.recipe
similarity index 95%
rename from net-misc/curl/curl-7.21.7.bep
rename to net-misc/curl/curl-7.21.7.recipe
index a06380a11..c3b091d38 100644
--- a/net-misc/curl/curl-7.21.7.bep
+++ b/net-misc/curl/curl-7.21.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5f6d50c4d4ee38c57fe37e3cff75adbd"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.21.7
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.21.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.21.7
 	make check
 }
diff --git a/net-misc/curl/curl-7.22.0.bep b/net-misc/curl/curl-7.22.0.recipe
similarity index 95%
rename from net-misc/curl/curl-7.22.0.bep
rename to net-misc/curl/curl-7.22.0.recipe
index 50d927213..ad9fd6a90 100644
--- a/net-misc/curl/curl-7.22.0.bep
+++ b/net-misc/curl/curl-7.22.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="bdb5c226d37c4a6082c70e7ef6f63060"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.22.0
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.22.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.22.0
 	make check
 }
diff --git a/net-misc/curl/curl-7.24.0.bep b/net-misc/curl/curl-7.24.0.recipe
similarity index 95%
rename from net-misc/curl/curl-7.24.0.bep
rename to net-misc/curl/curl-7.24.0.recipe
index 2510ae640..2c8816086 100644
--- a/net-misc/curl/curl-7.24.0.bep
+++ b/net-misc/curl/curl-7.24.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f912221d75eb8d8fe08900eaf011b023"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.24.0
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.24.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.24.0
 	make check
 }
diff --git a/net-misc/curl/curl-7.25.0.bep b/net-misc/curl/curl-7.25.0.recipe
similarity index 95%
rename from net-misc/curl/curl-7.25.0.bep
rename to net-misc/curl/curl-7.25.0.recipe
index 63d578dd4..f613065c8 100644
--- a/net-misc/curl/curl-7.25.0.bep
+++ b/net-misc/curl/curl-7.25.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f0303d47d9d3e6e4f08c2863c6504823"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.25.0
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.25.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.25.0
 	make check
 }
diff --git a/net-misc/curl/curl-7.26.0.bep b/net-misc/curl/curl-7.26.0.recipe
similarity index 95%
rename from net-misc/curl/curl-7.26.0.bep
rename to net-misc/curl/curl-7.26.0.recipe
index 6159dc157..1e3eac980 100644
--- a/net-misc/curl/curl-7.26.0.bep
+++ b/net-misc/curl/curl-7.26.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.26.0
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.26.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.26.0
 	make check
 }
diff --git a/net-misc/curl/curl-7.28.1.bep b/net-misc/curl/curl-7.28.1.recipe
similarity index 95%
rename from net-misc/curl/curl-7.28.1.bep
rename to net-misc/curl/curl-7.28.1.recipe
index db5cc8c17..4edbc9429 100644
--- a/net-misc/curl/curl-7.28.1.bep
+++ b/net-misc/curl/curl-7.28.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="26eb081c999b0e203770869427e9a93d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd curl-7.28.1
 	libtoolize --force --copy --install
 	autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd curl-7.28.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd curl-7.28.1
 	make check
 }
diff --git a/net-misc/mediatomb/mediatomb-0.12.1.bep b/net-misc/mediatomb/mediatomb-0.12.1.recipe
similarity index 97%
rename from net-misc/mediatomb/mediatomb-0.12.1.bep
rename to net-misc/mediatomb/mediatomb-0.12.1.recipe
index 4fcad94e2..2d39714bb 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1.bep
+++ b/net-misc/mediatomb/mediatomb-0.12.1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 CHECKSUM_MD5="e927dd5dc52d3cfcebd8ca1af6f0d3c2"
-BUILD {
+BUILD()
+{
 	cd mediatomb-0.12.1
 	libtoolize --force --copy --install
 	aclocal
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd mediatomb-0.12.1
 	make install
 }
diff --git a/net-misc/minidlna/minidlna-1.0.21.bep b/net-misc/minidlna/minidlna-1.0.21.recipe
similarity index 97%
rename from net-misc/minidlna/minidlna-1.0.21.bep
rename to net-misc/minidlna/minidlna-1.0.21.recipe
index 03bf74f5f..8839d9911 100644
--- a/net-misc/minidlna/minidlna-1.0.21.bep
+++ b/net-misc/minidlna/minidlna-1.0.21.recipe
@@ -12,12 +12,14 @@ DEPEND="dev-db/sqlite >= 3.0
 	media-lib/libid3tag >= 0.15.1b"
 	
 CHECKSUM_MD5="a53e0008ad225843a1782e4af6e5bf0b"
-BUILD {
+BUILD()
+{
 	cd minidlna-1.0.21
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd minidlna-1.0.21
 	make install
 }
diff --git a/net-misc/neon/neon-0.29.1.bep b/net-misc/neon/neon-0.29.1.recipe
similarity index 96%
rename from net-misc/neon/neon-0.29.1.bep
rename to net-misc/neon/neon-0.29.1.recipe
index 1736b67db..950c45d2c 100644
--- a/net-misc/neon/neon-0.29.1.bep
+++ b/net-misc/neon/neon-0.29.1.recipe
@@ -6,14 +6,16 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 0.9.8l
 	dev-libs/libxml2 >= 2.7.3"
 CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb"
-BUILD {
+BUILD()
+{
 	cd neon-0.29.1
 	autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd neon-0.29.1
 	make install
 }
diff --git a/net-misc/neon/neon-0.29.3.bep b/net-misc/neon/neon-0.29.3.recipe
similarity index 96%
rename from net-misc/neon/neon-0.29.3.bep
rename to net-misc/neon/neon-0.29.3.recipe
index 074fcef9e..b3c3da7a5 100644
--- a/net-misc/neon/neon-0.29.3.bep
+++ b/net-misc/neon/neon-0.29.3.recipe
@@ -6,14 +6,16 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libxml2 >= 2.7.7"
 CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51"
-BUILD {
+BUILD()
+{
 	cd neon-0.29.3
 	autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd neon-0.29.3
 	make install
 }
diff --git a/net-misc/neon/neon-0.29.4.bep b/net-misc/neon/neon-0.29.4.recipe
similarity index 96%
rename from net-misc/neon/neon-0.29.4.bep
rename to net-misc/neon/neon-0.29.4.recipe
index 8634d568f..dd059582c 100644
--- a/net-misc/neon/neon-0.29.4.bep
+++ b/net-misc/neon/neon-0.29.4.recipe
@@ -6,14 +6,16 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libxml2 >= 2.7.7"
 CHECKSUM_MD5="29438dbdaee84db2d7fbc73248a92d93"
-BUILD {
+BUILD()
+{
 	cd neon-0.29.4
 	autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd neon-0.29.4
 	make install
 }
diff --git a/net-misc/neon/neon-0.29.5.bep b/net-misc/neon/neon-0.29.5.recipe
similarity index 97%
rename from net-misc/neon/neon-0.29.5.bep
rename to net-misc/neon/neon-0.29.5.recipe
index 89d0f5957..1cd36b5e1 100644
--- a/net-misc/neon/neon-0.29.5.bep
+++ b/net-misc/neon/neon-0.29.5.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libxml2 >= 2.7.7"
 CHECKSUM_MD5="ff369e69ef0f0143beb5626164e87ae2"
-BUILD {
+BUILD()
+{
 	cd neon-0.29.5
 	echo 'LT_INIT' >> configure.in.
 	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in
@@ -28,7 +29,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd neon-0.29.5
 	make install
 }
diff --git a/net-misc/neon/neon-0.29.6.bep b/net-misc/neon/neon-0.29.6.recipe
similarity index 97%
rename from net-misc/neon/neon-0.29.6.bep
rename to net-misc/neon/neon-0.29.6.recipe
index 53911385f..a51d30e38 100644
--- a/net-misc/neon/neon-0.29.6.bep
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	echo 'LT_INIT' >> configure.in
 	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in
 	./autogen.sh
@@ -39,7 +40,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/net-misc/ntp/ntp-4.2.6p2.bep b/net-misc/ntp/ntp-4.2.6p2.recipe
similarity index 96%
rename from net-misc/ntp/ntp-4.2.6p2.bep
rename to net-misc/ntp/ntp-4.2.6p2.recipe
index a49f06770..b35017e6c 100644
--- a/net-misc/ntp/ntp-4.2.6p2.bep
+++ b/net-misc/ntp/ntp-4.2.6p2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="cf73cd85f248232c62f8029e6eb05938"
-BUILD {
+BUILD()
+{
 	cd ntp-4.2.6p2
 	libtoolize --force --copy --install
 	./bootstrap
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ntp-4.2.6p2
 	make install
 }
diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.recipe
similarity index 98%
rename from net-misc/openssh/openssh-5.4p1.bep
rename to net-misc/openssh/openssh-5.4p1.recipe
index 50854a365..7aa9d7b30 100644
--- a/net-misc/openssh/openssh-5.4p1.bep
+++ b/net-misc/openssh/openssh-5.4p1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 0.9.8l"
 CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e"
-BUILD {
+BUILD()
+{
 	cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h
 	cd openssh-5.4p1
 	mkdir -p m4
@@ -29,7 +30,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.4p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
diff --git a/net-misc/openssh/openssh-5.5p1.bep b/net-misc/openssh/openssh-5.5p1.recipe
similarity index 98%
rename from net-misc/openssh/openssh-5.5p1.bep
rename to net-misc/openssh/openssh-5.5p1.recipe
index c07b09b58..67445c6f8 100644
--- a/net-misc/openssh/openssh-5.5p1.bep
+++ b/net-misc/openssh/openssh-5.5p1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb"
-BUILD {
+BUILD()
+{
 	cd openssh-5.5p1
 	autoconf
 	mkdir -p m4
@@ -32,7 +33,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.5p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
diff --git a/net-misc/openssh/openssh-5.6p1.bep b/net-misc/openssh/openssh-5.6p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-5.6p1.bep
rename to net-misc/openssh/openssh-5.6p1.recipe
index e2691ddfe..bbcdc33f3 100644
--- a/net-misc/openssh/openssh-5.6p1.bep
+++ b/net-misc/openssh/openssh-5.6p1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="e6ee52e47c768bf0ec42a232b5d18fb0"
-BUILD {
+BUILD()
+{
 	cd openssh-5.6p1
 	autoconf
 	mkdir -p m4
@@ -32,14 +33,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.6p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-5.6p1
 	make tests
 }
diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-5.7p1.bep
rename to net-misc/openssh/openssh-5.7p1.recipe
index 6763b784f..314979133 100644
--- a/net-misc/openssh/openssh-5.7p1.bep
+++ b/net-misc/openssh/openssh-5.7p1.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="50231fa257219791fa41b84a16c9df04"
-BUILD {
+BUILD()
+{
 	cd openssh-5.7p1
 	autoconf
 	mkdir -p m4
@@ -33,14 +34,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.7p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-5.7p1
 	make tests
 }
diff --git a/net-misc/openssh/openssh-5.8p1.bep b/net-misc/openssh/openssh-5.8p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-5.8p1.bep
rename to net-misc/openssh/openssh-5.8p1.recipe
index 07b4d6461..bb0142c14 100644
--- a/net-misc/openssh/openssh-5.8p1.bep
+++ b/net-misc/openssh/openssh-5.8p1.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="86f5e1c23b4c4845f23b9b7b493fb53d"
-BUILD {
+BUILD()
+{
 	cd openssh-5.8p1
 	autoconf
 	mkdir -p m4
@@ -34,14 +35,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.8p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-5.8p1
 	make tests
 }
diff --git a/net-misc/openssh/openssh-5.8p2.bep b/net-misc/openssh/openssh-5.8p2.recipe
similarity index 97%
rename from net-misc/openssh/openssh-5.8p2.bep
rename to net-misc/openssh/openssh-5.8p2.recipe
index d5d99c515..5fd558387 100644
--- a/net-misc/openssh/openssh-5.8p2.bep
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e"
-BUILD {
+BUILD()
+{
 	cd openssh-5.8p2
 	autoconf
 	mkdir -p m4
@@ -36,14 +37,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.8p2
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-5.8p2
 	make tests
 }
diff --git a/net-misc/openssh/openssh-5.9p1.bep b/net-misc/openssh/openssh-5.9p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-5.9p1.bep
rename to net-misc/openssh/openssh-5.9p1.recipe
index b99bf3fd4..d37389f50 100644
--- a/net-misc/openssh/openssh-5.9p1.bep
+++ b/net-misc/openssh/openssh-5.9p1.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="afe17eee7e98d3b8550cc349834a85d0"
-BUILD {
+BUILD()
+{
 	cd openssh-5.9p1
 	autoconf
 	mkdir -p m4
@@ -36,14 +37,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-5.9p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-5.9p1
 	make tests
 }
diff --git a/net-misc/openssh/openssh-6.0p1.bep b/net-misc/openssh/openssh-6.0p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-6.0p1.bep
rename to net-misc/openssh/openssh-6.0p1.recipe
index dfc6c758d..2781d3495 100644
--- a/net-misc/openssh/openssh-6.0p1.bep
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b"
-BUILD {
+BUILD()
+{
 	cd openssh-6.0p1
 	autoconf
 	mkdir -p m4
@@ -35,14 +36,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-6.0p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh
 	make tests
 }
diff --git a/net-misc/openssh/openssh-6.1p1.bep b/net-misc/openssh/openssh-6.1p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-6.1p1.bep
rename to net-misc/openssh/openssh-6.1p1.recipe
index 774fd80b5..42e495aa7 100644
--- a/net-misc/openssh/openssh-6.1p1.bep
+++ b/net-misc/openssh/openssh-6.1p1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="3345cbf4efe90ffb06a78670ab2d05d5"
-BUILD {
+BUILD()
+{
 	cd openssh-6.1p1
 	autoconf
 	mkdir -p m4
@@ -35,14 +36,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-6.1p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-6.1p1
 
 	make tests
diff --git a/net-misc/openssh/openssh-6.2p1.bep b/net-misc/openssh/openssh-6.2p1.recipe
similarity index 97%
rename from net-misc/openssh/openssh-6.2p1.bep
rename to net-misc/openssh/openssh-6.2p1.recipe
index 478b6ea04..6ae4454c7 100644
--- a/net-misc/openssh/openssh-6.2p1.bep
+++ b/net-misc/openssh/openssh-6.2p1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
 CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316"
-BUILD {
+BUILD()
+{
 	cd openssh-6.2p1
 #	sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' 
 #Makefile.in
@@ -37,14 +38,16 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd openssh-6.2p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	cd openssh-6.2p1
 	make tests
 }
diff --git a/net-misc/putty/putty-0.60.bep b/net-misc/putty/putty-0.60.recipe
similarity index 95%
rename from net-misc/putty/putty-0.60.bep
rename to net-misc/putty/putty-0.60.recipe
index b3d5378bd..560513fb6 100644
--- a/net-misc/putty/putty-0.60.bep
+++ b/net-misc/putty/putty-0.60.recipe
@@ -5,14 +5,16 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="07e65fd98b16d115ae38a180bfb242e2"
-BUILD {
+BUILD()
+{
 	cd putty-0.60/unix
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make all-cli
 }
 
-INSTALL {
+INSTALL()
+{
 	cd putty-0.60/unix
 	make install
 }
diff --git a/net-misc/rsync/rsync-3.0.6.bep b/net-misc/rsync/rsync-3.0.6.recipe
similarity index 96%
rename from net-misc/rsync/rsync-3.0.6.bep
rename to net-misc/rsync/rsync-3.0.6.recipe
index 05957249e..a6f65b494 100644
--- a/net-misc/rsync/rsync-3.0.6.bep
+++ b/net-misc/rsync/rsync-3.0.6.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e9865d093a18e4668b9d31b635dc8e99"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd rsync-3.0.6
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-ipv6 --disable-locale --disable-debug
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rsync-3.0.6
 	make install
 	make test
diff --git a/net-misc/rsync/rsync-3.0.7.bep b/net-misc/rsync/rsync-3.0.7.recipe
similarity index 95%
rename from net-misc/rsync/rsync-3.0.7.bep
rename to net-misc/rsync/rsync-3.0.7.recipe
index 8870b43cc..f41741b4c 100644
--- a/net-misc/rsync/rsync-3.0.7.bep
+++ b/net-misc/rsync/rsync-3.0.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="b53525900817cf1ba7ad3a516ab5bfe9"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd rsync-3.0.7
 	libtoolize --force --copy --install
 	aclocal
@@ -21,12 +22,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rsync-3.0.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd rsync-3.0.7
 	make test
 }
diff --git a/net-misc/tor/tor-0.2.2.35.bep b/net-misc/tor/tor-0.2.2.35.recipe
similarity index 94%
rename from net-misc/tor/tor-0.2.2.35.bep
rename to net-misc/tor/tor-0.2.2.35.recipe
index d55bb8c24..25429e380 100644
--- a/net-misc/tor/tor-0.2.2.35.bep
+++ b/net-misc/tor/tor-0.2.2.35.recipe
@@ -6,19 +6,22 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 0.9.8
 	dev-libs/libevent >= 2.0.10"
 CHECKSUM_MD5="dcecf699c4b929319d5f1ce0358d4835"
-BUILD {
+BUILD()
+{
 	cd tor-0.2.2.35
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tor-0.2.2.35
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd tor-0.2.2.35
 	make test
 }
diff --git a/net-misc/tor/tor-0.2.3.25.bep b/net-misc/tor/tor-0.2.3.25.recipe
similarity index 96%
rename from net-misc/tor/tor-0.2.3.25.bep
rename to net-misc/tor/tor-0.2.3.25.recipe
index e94e06d86..5ad986a9d 100644
--- a/net-misc/tor/tor-0.2.3.25.bep
+++ b/net-misc/tor/tor-0.2.3.25.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-libs/openssl >= 0.9.8
 		dev-libs/libevent >= 2.0.10"
 CHECKSUM_MD5="a1c364189a9a66ed9daa8e6436489daf"
 
-BUILD {
+BUILD()
+{
 	cd tor-0.2.3.25
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd tor-0.2.3.25
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd tor-0.2.3.25
 	make test
 }
diff --git a/net-misc/wget/wget-1.12.bep b/net-misc/wget/wget-1.12.recipe
similarity index 95%
rename from net-misc/wget/wget-1.12.bep
rename to net-misc/wget/wget-1.12.recipe
index 8954800d9..88030be1d 100644
--- a/net-misc/wget/wget-1.12.bep
+++ b/net-misc/wget/wget-1.12.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="141461b9c04e454dc8933c9d1f2abf83"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd wget-1.12
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wget-1.12
 	make install
 }
diff --git a/net-misc/wget/wget-1.13.4.bep b/net-misc/wget/wget-1.13.4.recipe
similarity index 94%
rename from net-misc/wget/wget-1.13.4.bep
rename to net-misc/wget/wget-1.13.4.recipe
index 673ebc9ea..8b3a0e2f3 100644
--- a/net-misc/wget/wget-1.13.4.bep
+++ b/net-misc/wget/wget-1.13.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd wget-1.13.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wget-1.13.4
 	make install
 }
diff --git a/net-misc/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.recipe
similarity index 96%
rename from net-misc/wput/wput-0.6.1.bep
rename to net-misc/wput/wput-0.6.1.recipe
index 063e55f5b..0d1884ebf 100644
--- a/net-misc/wput/wput-0.6.1.bep
+++ b/net-misc/wput/wput-0.6.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="92b41efed4db8eb4f3443c23bf7ceecf"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd wput-0.6.1
 	echo 'LT_INIT' >> configure.in
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
@@ -16,7 +17,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd wput-0.6.1
 	make install
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.bep b/net-p2p/rtorrent/rtorrent-0.8.5.recipe
similarity index 96%
rename from net-p2p/rtorrent/rtorrent-0.8.5.bep
rename to net-p2p/rtorrent/rtorrent-0.8.5.recipe
index b5f3f8eee..60b24ccb1 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.5.bep
+++ b/net-p2p/rtorrent/rtorrent-0.8.5.recipe
@@ -11,14 +11,16 @@ DEPEND="pkgconfig >= 0.23
 	libsigc++ >= ??
 	net-libs/libtorrent >= 0.12.5"
 
-BUILD {
+BUILD()
+{
 	cd rtorrent-0.8.5
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd rtorrent-0.8.5
 	make install
 }
diff --git a/net-p2p/seeks/seeks-0.x-git.bep b/net-p2p/seeks/seeks-0.x-git.recipe
similarity index 96%
rename from net-p2p/seeks/seeks-0.x-git.bep
rename to net-p2p/seeks/seeks-0.x-git.recipe
index 0b074c7a6..71ce8179b 100644
--- a/net-p2p/seeks/seeks-0.x-git.bep
+++ b/net-p2p/seeks/seeks-0.x-git.recipe
@@ -8,14 +8,16 @@ STATUS_HAIKU="untested"
 # pkgconfig is only a build dependency
 DEPEND="pkgconfig >= 0.25"
 
-BUILD {
+BUILD()
+{
 	cd seeks-0.x-git
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd seeks-0.x-git
 	make install
 }
diff --git a/net-p2p/transmission/transmission-1.72.bep b/net-p2p/transmission/transmission-1.72.recipe
similarity index 96%
rename from net-p2p/transmission/transmission-1.72.bep
rename to net-p2p/transmission/transmission-1.72.recipe
index 7bad2285c..09e7cdb9c 100644
--- a/net-p2p/transmission/transmission-1.72.bep
+++ b/net-p2p/transmission/transmission-1.72.recipe
@@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 1.4.11"
 
-BUILD {
+BUILD()
+{
 	cd transmission-1.72
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-1.72
 	make install
 }
diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.recipe
similarity index 96%
rename from net-p2p/transmission/transmission-1.73.bep
rename to net-p2p/transmission/transmission-1.73.recipe
index 1b0aef828..a52a5c4ff 100644
--- a/net-p2p/transmission/transmission-1.73.bep
+++ b/net-p2p/transmission/transmission-1.73.recipe
@@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 1.4.11"
 
-BUILD {
+BUILD()
+{
 	cd transmission-1.73
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-1.73
 	make install
 }
diff --git a/net-p2p/transmission/transmission-1.93.bep b/net-p2p/transmission/transmission-1.93.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-1.93.bep
rename to net-p2p/transmission/transmission-1.93.recipe
index 1c00284ba..edda11292 100644
--- a/net-p2p/transmission/transmission-1.93.bep
+++ b/net-p2p/transmission/transmission-1.93.recipe
@@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 1.4.11"
 
-BUILD {
+BUILD()
+{
 	cd transmission-1.93
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-1.93
 	make install
 }
diff --git a/net-p2p/transmission/transmission-2.01.bep b/net-p2p/transmission/transmission-2.01.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-2.01.bep
rename to net-p2p/transmission/transmission-2.01.recipe
index 432836baf..51c142d8e 100644
--- a/net-p2p/transmission/transmission-2.01.bep
+++ b/net-p2p/transmission/transmission-2.01.recipe
@@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 1.4.11"
 
-BUILD {
+BUILD()
+{
 	cd transmission-2.01
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-2.01
 	make install
 }
diff --git a/net-p2p/transmission/transmission-2.12.bep b/net-p2p/transmission/transmission-2.12.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-2.12.bep
rename to net-p2p/transmission/transmission-2.12.recipe
index 125121a95..46c99ffde 100644
--- a/net-p2p/transmission/transmission-2.12.bep
+++ b/net-p2p/transmission/transmission-2.12.recipe
@@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 1.4.11"
 
-BUILD {
+BUILD()
+{
 	cd transmission-2.12
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-2.12
 	make install
 }
diff --git a/net-p2p/transmission/transmission-2.21.bep b/net-p2p/transmission/transmission-2.21.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-2.21.bep
rename to net-p2p/transmission/transmission-2.21.recipe
index 5609c0d99..20c92b794 100644
--- a/net-p2p/transmission/transmission-2.21.bep
+++ b/net-p2p/transmission/transmission-2.21.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	net-misc/curl >= 7.20.1
 	dev-libs/libevent >= 2.0.10"
 
-BUILD {
+BUILD()
+{
 	cd transmission-2.21
 	autoreconf -vfi
 	
@@ -26,7 +27,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd transmission-2.21
 	make install
 }
diff --git a/net-p2p/transmission/transmission-2.73.bep b/net-p2p/transmission/transmission-2.73.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-2.73.bep
rename to net-p2p/transmission/transmission-2.73.recipe
index 6033b9893..5170abbcb 100644
--- a/net-p2p/transmission/transmission-2.73.bep
+++ b/net-p2p/transmission/transmission-2.73.recipe
@@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
         dev-libs/libevent >= 2.0.10
 	dev-libs/openssl >= 0.9.8"
 
-BUILD {
+BUILD()
+{
         cd transmission-2.73
 
         ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -24,7 +25,8 @@ BUILD {
         make
 }
 
-INSTALL {
+INSTALL()
+{
         cd transmission-2.73
         make install
 }
diff --git a/net-p2p/transmission/transmission-2.75.bep b/net-p2p/transmission/transmission-2.75.recipe
similarity index 97%
rename from net-p2p/transmission/transmission-2.75.bep
rename to net-p2p/transmission/transmission-2.75.recipe
index 7252e2e99..047f0d56e 100644
--- a/net-p2p/transmission/transmission-2.75.bep
+++ b/net-p2p/transmission/transmission-2.75.recipe
@@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
         dev-libs/libevent >= 2.0.10
 	dev-libs/openssl >= 0.9.8"
 
-BUILD {
+BUILD()
+{
         cd transmission-2.75
 
         ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -24,7 +25,8 @@ BUILD {
         make
 }
 
-INSTALL {
+INSTALL()
+{
         cd transmission-2.75
         make install
 }
diff --git a/net-proxy/privoxy/privoxy-3.0.19.bep b/net-proxy/privoxy/privoxy-3.0.19.recipe
similarity index 97%
rename from net-proxy/privoxy/privoxy-3.0.19.bep
rename to net-proxy/privoxy/privoxy-3.0.19.recipe
index d7dc1ebac..c862b36a9 100644
--- a/net-proxy/privoxy/privoxy-3.0.19.bep
+++ b/net-proxy/privoxy/privoxy-3.0.19.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="57acc79059565cc42eda67982842785d"
 
-BUILD {
+BUILD()
+{
 	cd privoxy-3.0.19-stable
 	autoheader
 	autoconf
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd privoxy-3.0.19-stable
 	make install
 }
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep b/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe
similarity index 97%
rename from net-wireless/b43-fwcutter/b43-fwcutter-012.bep
rename to net-wireless/b43-fwcutter/b43-fwcutter-012.recipe
index 3f5bf8b68..43d1a74d7 100644
--- a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep
+++ b/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd b43-fwcutter-012
 	wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/string/byteswap.h
 	mkdir bits
@@ -13,7 +14,8 @@ BUILD {
 	make PREFIX=`finddir B_COMMON_DIRECTORY` CFLAGS="-I. -Wall -D_BSD_SOURCE"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd b43-fwcutter-012
 	make PREFIX=$DESTDIR/`finddir B_COMMON_DIRECTORY` install
 }
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
similarity index 96%
rename from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep
rename to net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
index ac9dcb041..6374d8267 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
@@ -5,11 +5,13 @@ CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd wpa_supplicant-0.7.3/wpa_supplicant
 	CFLAGS="-MMD -O2 -Wall" make wpa_supplicant
 }
-INSTALL {
+INSTALL()
+{
 	cd wpa_supplicant-0.7.3/wpa_supplicant
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/
diff --git a/packs/libpak/libpak-0.9.1.bep b/packs/libpak/libpak-0.9.1.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.1.bep
rename to packs/libpak/libpak-0.9.1.recipe
index a71ef6ef9..d78b19c27 100644
--- a/packs/libpak/libpak-0.9.1.bep
+++ b/packs/libpak/libpak-0.9.1.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/mercurial >= 1.6
 	dev-libs/libedit >= 20100424"
 CHECKSUM_MD5="16c697819a60958a4aaaef772a46c726"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	cd libpak-0.9.1
 
@@ -99,7 +100,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.1
 	mkdir -p ${DESTDIR}/boot
 	echo "" > ${DESTDIR}/boot/.opd
diff --git a/packs/libpak/libpak-0.9.2.bep b/packs/libpak/libpak-0.9.2.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.2.bep
rename to packs/libpak/libpak-0.9.2.recipe
index 7e58d2d67..7f012e8c9 100644
--- a/packs/libpak/libpak-0.9.2.bep
+++ b/packs/libpak/libpak-0.9.2.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-vcs/mercurial >= 1.6
 	dev-vcs/git >= 1.7.1
 	dev-libs/libedit >= 20100424"
 CHECKSUM_MD5="7c42abb8d837ead79bf64e3c276b1170"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	cd libpak-0.9.2
 
@@ -103,7 +104,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.2
 	mkdir -p ${DESTDIR}/boot
 	echo "" > ${DESTDIR}/boot/.opd
diff --git a/packs/libpak/libpak-0.9.3.bep b/packs/libpak/libpak-0.9.3.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.3.bep
rename to packs/libpak/libpak-0.9.3.recipe
index 34378d9db..03778310c 100644
--- a/packs/libpak/libpak-0.9.3.bep
+++ b/packs/libpak/libpak-0.9.3.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="f183eb4b0b6ac2282a9f1c7fd41ac282"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	cd libpak-0.9.3
 
@@ -147,7 +148,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.3
 	mkdir -p ${DESTDIR}/boot
 	echo "" > ${DESTDIR}/boot/.opd
diff --git a/packs/libpak/libpak-0.9.4-gcc2.bep b/packs/libpak/libpak-0.9.4-gcc2.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.4-gcc2.bep
rename to packs/libpak/libpak-0.9.4-gcc2.recipe
index d105198fa..1d807bb85 100644
--- a/packs/libpak/libpak-0.9.4-gcc2.bep
+++ b/packs/libpak/libpak-0.9.4-gcc2.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -124,7 +125,8 @@ BUILD {
 #b	mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.4
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
diff --git a/packs/libpak/libpak-0.9.4-gcc4.bep b/packs/libpak/libpak-0.9.4-gcc4.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.4-gcc4.bep
rename to packs/libpak/libpak-0.9.4-gcc4.recipe
index c6d34055c..5765db9e2 100644
--- a/packs/libpak/libpak-0.9.4-gcc4.bep
+++ b/packs/libpak/libpak-0.9.4-gcc4.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -131,7 +132,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.4
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
diff --git a/packs/libpak/libpak-0.9.4.bep b/packs/libpak/libpak-0.9.4.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.4.bep
rename to packs/libpak/libpak-0.9.4.recipe
index 630bfa5f3..aa6779909 100644
--- a/packs/libpak/libpak-0.9.4.bep
+++ b/packs/libpak/libpak-0.9.4.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -247,7 +248,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.4
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
diff --git a/packs/libpak/libpak-0.9.5-gcc2.bep b/packs/libpak/libpak-0.9.5-gcc2.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.5-gcc2.bep
rename to packs/libpak/libpak-0.9.5-gcc2.recipe
index a6c22aa88..a9606619f 100644
--- a/packs/libpak/libpak-0.9.5-gcc2.bep
+++ b/packs/libpak/libpak-0.9.5-gcc2.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -127,7 +128,8 @@ BUILD {
 	mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9.5
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
diff --git a/packs/libpak/libpak-0.9.6-gcc2.bep b/packs/libpak/libpak-0.9.6-gcc2.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.6-gcc2.bep
rename to packs/libpak/libpak-0.9.6-gcc2.recipe
index 4355acd4e..5518cccb1 100644
--- a/packs/libpak/libpak-0.9.6-gcc2.bep
+++ b/packs/libpak/libpak-0.9.6-gcc2.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -138,7 +139,8 @@ BUILD {
 	mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips
 }
 
-INSTALL {
+INSTALL()
+{
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
 	#No need to install these, 
diff --git a/packs/libpak/libpak-0.9.6-gcc4.bep b/packs/libpak/libpak-0.9.6-gcc4.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.6-gcc4.bep
rename to packs/libpak/libpak-0.9.6-gcc4.recipe
index 508433dc2..2ad1ecbf7 100644
--- a/packs/libpak/libpak-0.9.6-gcc4.bep
+++ b/packs/libpak/libpak-0.9.6-gcc4.recipe
@@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424
 	sys-devel/gettext >= 0.17"
 
 CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -145,7 +146,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips
 }
 
-INSTALL {
+INSTALL()
+{
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
 	#No need to install these, 
diff --git a/packs/libpak/libpak-0.9.bep b/packs/libpak/libpak-0.9.recipe
similarity index 99%
rename from packs/libpak/libpak-0.9.bep
rename to packs/libpak/libpak-0.9.recipe
index 5c15c47b1..8f890f10b 100644
--- a/packs/libpak/libpak-0.9.bep
+++ b/packs/libpak/libpak-0.9.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/mercurial >= 1.6
 	dev-libs/libedit >= 20100424"
 CHECKSUM_MD5="59bc51118c6be6ef40f4fe681ef783a0"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	cd libpak-0.9
 ##	these are needed for building package in the libpak
@@ -94,7 +95,8 @@ BUILD {
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libpak-0.9
 	mkdir -p ${DESTDIR}
 	echo "" > ${DESTDIR}/.opd
diff --git a/packs/optionalpackages/optionalpackages-0.5.bep b/packs/optionalpackages/optionalpackages-0.5.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.5.bep
rename to packs/optionalpackages/optionalpackages-0.5.recipe
index dca30b895..0614a9e28 100644
--- a/packs/optionalpackages/optionalpackages-0.5.bep
+++ b/packs/optionalpackages/optionalpackages-0.5.recipe
@@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3
 	gcc-4.4.4"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -245,7 +246,8 @@ BUILD {
 	mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep b/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.6-gcc2.bep
rename to packs/optionalpackages/optionalpackages-0.6-gcc2.recipe
index 946bdc58c..aa284f6ce 100644
--- a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep
+++ b/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe
@@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3
 	gcc-4.4.4"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -164,7 +165,8 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep b/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.6-gcc4.bep
rename to packs/optionalpackages/optionalpackages-0.6-gcc4.recipe
index 4a7196378..3be4faab5 100644
--- a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep
+++ b/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="sys-devel/gcc >= 4.4.4"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -164,7 +165,8 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/packs/optionalpackages/optionalpackages-0.6.bep b/packs/optionalpackages/optionalpackages-0.6.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.6.bep
rename to packs/optionalpackages/optionalpackages-0.6.recipe
index 7bfb26aef..892e22c35 100644
--- a/packs/optionalpackages/optionalpackages-0.6.bep
+++ b/packs/optionalpackages/optionalpackages-0.6.recipe
@@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3
 	gcc-4.4.4"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -247,7 +248,8 @@ BUILD {
 	mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources	
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep b/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.7-gcc2.bep
rename to packs/optionalpackages/optionalpackages-0.7-gcc2.recipe
index e024c32dc..010dae572 100644
--- a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep
+++ b/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe
@@ -8,7 +8,8 @@ DEPEND="gcc == 2.95.3
 	dev-util/cmake >= 2.8.4"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -169,7 +170,8 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep b/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe
similarity index 99%
rename from packs/optionalpackages/optionalpackages-0.7-gcc4.bep
rename to packs/optionalpackages/optionalpackages-0.7-gcc4.recipe
index 2661a45e2..78bca54b0 100644
--- a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep
+++ b/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="sys-devel/gcc >= 4.6.2"
 
 CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051"
-BUILD {
+BUILD()
+{
 	HPLOC=`haikuporter -t`
 	mkdir -p ../zips
 	mkdir -p ../sources
@@ -163,7 +164,8 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd .
 	echo "Done.  Zipped files are in the zips directory."
 	echo "GPL/LGPL sources are in the source directory."
diff --git a/sci-astronomy/celestia/celestia-1.6.0.bep b/sci-astronomy/celestia/celestia-1.6.0.recipe
similarity index 96%
rename from sci-astronomy/celestia/celestia-1.6.0.bep
rename to sci-astronomy/celestia/celestia-1.6.0.recipe
index b49b90048..f7d34d146 100644
--- a/sci-astronomy/celestia/celestia-1.6.0.bep
+++ b/sci-astronomy/celestia/celestia-1.6.0.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="unstable"
 DEPEND="dev-lang/lua >= 5.1.4
 		sys-devel/gettext >= 0.17"
 
-BUILD {
+BUILD()
+{
 	cd celestia-1.6.0
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd celestia-1.6.0
 	make install
 }
diff --git a/sci-libs/cln/cln-1.3.2.bep b/sci-libs/cln/cln-1.3.2.recipe
similarity index 96%
rename from sci-libs/cln/cln-1.3.2.bep
rename to sci-libs/cln/cln-1.3.2.recipe
index f1cd7d57a..bbde965c6 100644
--- a/sci-libs/cln/cln-1.3.2.bep
+++ b/sci-libs/cln/cln-1.3.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4."
-BUILD {
+BUILD()
+{
 	cd cln-1.3.2
 	autoreconf -i
 	./configure	--prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cln-1.3.2
 	make install
 }
diff --git a/sci-libs/fftw/fftw-3.2.2.bep b/sci-libs/fftw/fftw-3.2.2.recipe
similarity index 95%
rename from sci-libs/fftw/fftw-3.2.2.bep
rename to sci-libs/fftw/fftw-3.2.2.recipe
index abd185311..78768e63d 100644
--- a/sci-libs/fftw/fftw-3.2.2.bep
+++ b/sci-libs/fftw/fftw-3.2.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b616e5c91218cc778b5aa735fefb61ae"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd fftw-3.2.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fftw-3.2.2
 	make install
 }
diff --git a/sci-libs/gdal/gdal-1.7.2.bep b/sci-libs/gdal/gdal-1.7.2.recipe
similarity index 96%
rename from sci-libs/gdal/gdal-1.7.2.bep
rename to sci-libs/gdal/gdal-1.7.2.recipe
index 5e0bbc0c8..be839a25e 100644
--- a/sci-libs/gdal/gdal-1.7.2.bep
+++ b/sci-libs/gdal/gdal-1.7.2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gdal-1.7.2
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gdal-1.7.2
 	make install
 }
diff --git a/sci-libs/gsl/gsl-1.13.bep b/sci-libs/gsl/gsl-1.13.recipe
similarity index 94%
rename from sci-libs/gsl/gsl-1.13.bep
rename to sci-libs/gsl/gsl-1.13.recipe
index c388c8e58..95070ad2f 100644
--- a/sci-libs/gsl/gsl-1.13.bep
+++ b/sci-libs/gsl/gsl-1.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d9fcfa367c44ab68a25b4edf34c3c5f7"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gsl-1.13
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gsl-1.13
 	make install
 }
diff --git a/sci-libs/gsl/gsl-1.14.bep b/sci-libs/gsl/gsl-1.14.recipe
similarity index 97%
rename from sci-libs/gsl/gsl-1.14.bep
rename to sci-libs/gsl/gsl-1.14.recipe
index 93efa709b..cd9d6e3ac 100644
--- a/sci-libs/gsl/gsl-1.14.bep
+++ b/sci-libs/gsl/gsl-1.14.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d55e7b141815412a072a3f0e12442042"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gsl-1.14
 	libtoolize --force --copy --install
 	aclocal
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gsl-1.14
 	make install
 }
diff --git a/sci-physics/bullet/bullet-2.78.bep b/sci-physics/bullet/bullet-2.78.recipe
similarity index 95%
rename from sci-physics/bullet/bullet-2.78.bep
rename to sci-physics/bullet/bullet-2.78.recipe
index b49bedd4f..b4ffe6c11 100644
--- a/sci-physics/bullet/bullet-2.78.bep
+++ b/sci-physics/bullet/bullet-2.78.recipe
@@ -6,13 +6,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/cmake >= 2.8.3"
 
-BUILD {
+BUILD()
+{
 	cd bullet-2.78
 	cmake -DBUILD_DEMOS=ON .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bullet-2.78
 	make install
 }
diff --git a/sys-apps/coreutils/coreutils-8.5.bep b/sys-apps/coreutils/coreutils-8.5.recipe
similarity index 95%
rename from sys-apps/coreutils/coreutils-8.5.bep
rename to sys-apps/coreutils/coreutils-8.5.recipe
index b01781390..23abb5040 100644
--- a/sys-apps/coreutils/coreutils-8.5.bep
+++ b/sys-apps/coreutils/coreutils-8.5.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="c1ffe586d001e87d66cd80c4536ee823"
-BUILD {
+BUILD()
+{
 	cd coreutils-8.5
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd coreutils-8.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd coreutils-8.5
 	make check
 }
diff --git a/sys-apps/dbus/dbus-1.6.8.bep b/sys-apps/dbus/dbus-1.6.8.recipe
similarity index 95%
rename from sys-apps/dbus/dbus-1.6.8.bep
rename to sys-apps/dbus/dbus-1.6.8.recipe
index 6eafcc6a8..9ee5b2dbe 100644
--- a/sys-apps/dbus/dbus-1.6.8.bep
+++ b/sys-apps/dbus/dbus-1.6.8.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="untested"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 
-BUILD {
+BUILD()
+{
 	cd dbus-1.6.8
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
 	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dbus-1.6.8
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd dbus-1.6.8
 	make check
 }
diff --git a/sys-apps/diffutils/diffutils-2.9.bep b/sys-apps/diffutils/diffutils-2.9.recipe
similarity index 95%
rename from sys-apps/diffutils/diffutils-2.9.bep
rename to sys-apps/diffutils/diffutils-2.9.recipe
index bf83c0540..0f2e94ede 100644
--- a/sys-apps/diffutils/diffutils-2.9.bep
+++ b/sys-apps/diffutils/diffutils-2.9.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="d6bc1bdc874ddb14cfed4d1655a0dbbe"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd diffutils-2.9
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd diffutils-2.9
 	make install
 }
diff --git a/sys-apps/diffutils/diffutils-3.0.bep b/sys-apps/diffutils/diffutils-3.0.recipe
similarity index 94%
rename from sys-apps/diffutils/diffutils-3.0.bep
rename to sys-apps/diffutils/diffutils-3.0.recipe
index 9912eb089..9f729b672 100644
--- a/sys-apps/diffutils/diffutils-3.0.bep
+++ b/sys-apps/diffutils/diffutils-3.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="684aaba1baab743a2a90e52162ff07da"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd diffutils-3.0
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd diffutils-3.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd diffutils-3.0
 	make check
 }
diff --git a/sys-apps/diffutils/diffutils-3.2.bep b/sys-apps/diffutils/diffutils-3.2.recipe
similarity index 95%
rename from sys-apps/diffutils/diffutils-3.2.bep
rename to sys-apps/diffutils/diffutils-3.2.recipe
index 9e9e9c088..1c047549b 100644
--- a/sys-apps/diffutils/diffutils-3.2.bep
+++ b/sys-apps/diffutils/diffutils-3.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="22e4deef5d8949a727b159d6bc65c1cc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd diffutils-3.2
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
 	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
@@ -14,12 +15,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd diffutils-3.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd diffutils-3.2
 	make check
 }
diff --git a/sys-apps/dmidecode/dmidecode-2.11.bep b/sys-apps/dmidecode/dmidecode-2.11.recipe
similarity index 97%
rename from sys-apps/dmidecode/dmidecode-2.11.bep
rename to sys-apps/dmidecode/dmidecode-2.11.recipe
index 1810d2489..2fa3b81b2 100644
--- a/sys-apps/dmidecode/dmidecode-2.11.bep
+++ b/sys-apps/dmidecode/dmidecode-2.11.recipe
@@ -5,12 +5,14 @@ CHECKSUM_MD5="9fddbbc3e330bee5950b8b5d424a57cb"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd dmidecode-2.11
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dmidecode-2.11
 	make install prefix=`finddir B_COMMON_DIRECTORY` \
 		sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
diff --git a/sys-apps/dtc/dtc-1.3.0-git.bep b/sys-apps/dtc/dtc-1.3.0-git.recipe
similarity index 94%
rename from sys-apps/dtc/dtc-1.3.0-git.bep
rename to sys-apps/dtc/dtc-1.3.0-git.recipe
index 08edd3315..d29ddcb4f 100644
--- a/sys-apps/dtc/dtc-1.3.0-git.bep
+++ b/sys-apps/dtc/dtc-1.3.0-git.recipe
@@ -7,17 +7,20 @@ DEPEND="sys-devel/bison >= 2.5"
 # TODO: test gcc2 build
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd dtc-1.3.0-git
 	make PREFIX=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd dtc-1.3.0-git
 	make install PREFIX=`finddir B_COMMON_DIRECTORY`
 }
 
-TEST {
+TEST()
+{
 	cd dtc-1.3.0-git
 	make tests
 }
diff --git a/sys-apps/ed/ed-1.4.bep b/sys-apps/ed/ed-1.4.recipe
similarity index 95%
rename from sys-apps/ed/ed-1.4.bep
rename to sys-apps/ed/ed-1.4.recipe
index 5284c8e06..ba94d9645 100644
--- a/sys-apps/ed/ed-1.4.bep
+++ b/sys-apps/ed/ed-1.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="da0ddc0e0b0bec2da4b13b0d0d1bce2b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ed-1.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ed-1.4
 	make install
 }
diff --git a/sys-apps/file/file-5.04.bep b/sys-apps/file/file-5.04.recipe
similarity index 95%
rename from sys-apps/file/file-5.04.bep
rename to sys-apps/file/file-5.04.recipe
index ebeca7087..f209cef63 100644
--- a/sys-apps/file/file-5.04.bep
+++ b/sys-apps/file/file-5.04.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="accade81ff1cc774904b47c72c8aeea0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd file-5.04
 	autoreconf -fvi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd file-5.04
 	make install
 }
diff --git a/sys-apps/file/file-5.11.bep b/sys-apps/file/file-5.11.recipe
similarity index 96%
rename from sys-apps/file/file-5.11.bep
rename to sys-apps/file/file-5.11.recipe
index d2af82c38..a4c0c9db7 100644
--- a/sys-apps/file/file-5.11.bep
+++ b/sys-apps/file/file-5.11.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="16a407bd66d6c7a832f3a5c0d609c27b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd file-5.11
 	autoreconf -fvi
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd file-5.11
 	make install
 }
diff --git a/sys-apps/findutils/findutils-4.4.2.bep b/sys-apps/findutils/findutils-4.4.2.recipe
similarity index 95%
rename from sys-apps/findutils/findutils-4.4.2.bep
rename to sys-apps/findutils/findutils-4.4.2.recipe
index df895eda2..cb8b14ff4 100644
--- a/sys-apps/findutils/findutils-4.4.2.bep
+++ b/sys-apps/findutils/findutils-4.4.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="351cc4adb07d54877fa15f75fb77d39f"
-BUILD {
+BUILD()
+{
 	cd findutils-4.4.2
 	./import-gnulib.sh
 	libtoolize --force --copy --install
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd findutils-4.4.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd findutils-4.4.2
 	make install
 }
diff --git a/sys-apps/gawk/gawk-3.1.8.bep b/sys-apps/gawk/gawk-3.1.8.recipe
similarity index 95%
rename from sys-apps/gawk/gawk-3.1.8.bep
rename to sys-apps/gawk/gawk-3.1.8.recipe
index b3c8cdc4e..75cf770e1 100644
--- a/sys-apps/gawk/gawk-3.1.8.bep
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb"
-BUILD {
+BUILD()
+{
 	cd gawk-3.1.8
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gawk-3.1.8
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gawk-3.1.8
 	make check
 }
diff --git a/sys-apps/gawk/gawk-4.0.1.bep b/sys-apps/gawk/gawk-4.0.1.recipe
similarity index 96%
rename from sys-apps/gawk/gawk-4.0.1.bep
rename to sys-apps/gawk/gawk-4.0.1.recipe
index 798af1565..2ae99b32d 100644
--- a/sys-apps/gawk/gawk-4.0.1.bep
+++ b/sys-apps/gawk/gawk-4.0.1.recipe
@@ -4,7 +4,8 @@ SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.0.1.tar.gz"
 CHECKSUM_MD5="bab2bda483e9f32be65b43b8dab39fa5"
 STATUS_HAIKU="stable"
 REVISION="1"
-BUILD {
+BUILD()
+{
 	cd gawk-4.0.1
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -14,7 +15,8 @@ BUILD {
 	make		
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gawk-4.0.1
 	make install
 }
diff --git a/sys-apps/grep/grep-2.12.bep b/sys-apps/grep/grep-2.12.recipe
similarity index 95%
rename from sys-apps/grep/grep-2.12.bep
rename to sys-apps/grep/grep-2.12.recipe
index 15fa46273..e80283c2b 100644
--- a/sys-apps/grep/grep-2.12.bep
+++ b/sys-apps/grep/grep-2.12.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-devel/gettext >= 0.17
 	sys-devel/libiconv >= 1.13.1"
-BUILD {
+BUILD()
+{
 	cd grep-2.12
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.12
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.12
 	make check
 }
diff --git a/sys-apps/grep/grep-2.14-bz2.bep b/sys-apps/grep/grep-2.14-bz2.recipe
similarity index 97%
rename from sys-apps/grep/grep-2.14-bz2.bep
rename to sys-apps/grep/grep-2.14-bz2.recipe
index fafecfa4a..b2b487fdf 100644
--- a/sys-apps/grep/grep-2.14-bz2.bep
+++ b/sys-apps/grep/grep-2.14-bz2.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-devel/gettext >= 0.17
 	sys-devel/libiconv >= 1.13.1"
-BUILD {
+BUILD()
+{
 	cd grep-2.14
 
 	libtoolize --force --copy --install
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.14
 	make install
 }
diff --git a/sys-apps/grep/grep-2.14.bep b/sys-apps/grep/grep-2.14.recipe
similarity index 96%
rename from sys-apps/grep/grep-2.14.bep
rename to sys-apps/grep/grep-2.14.recipe
index cde4042d8..6a045db54 100644
--- a/sys-apps/grep/grep-2.14.bep
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="sys-devel/gettext >= 0.17
 	sys-devel/libiconv >= 1.13.1"
 
-BUILD {
+BUILD()
+{
 	cd grep-2.14
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.14
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.14
 	make check
 }
diff --git a/sys-apps/grep/grep-2.5.4.bep b/sys-apps/grep/grep-2.5.4.recipe
similarity index 94%
rename from sys-apps/grep/grep-2.5.4.bep
rename to sys-apps/grep/grep-2.5.4.recipe
index 6b60cb53b..995eee96c 100644
--- a/sys-apps/grep/grep-2.5.4.bep
+++ b/sys-apps/grep/grep-2.5.4.recipe
@@ -5,19 +5,22 @@ CHECKSUM_MD5="5650ee2ae6ea4b39e9459d7d0585b315"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd grep-2.5.4
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.5.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.5.4
 	make check
 }
diff --git a/sys-apps/grep/grep-2.6.1.bep b/sys-apps/grep/grep-2.6.1.recipe
similarity index 94%
rename from sys-apps/grep/grep-2.6.1.bep
rename to sys-apps/grep/grep-2.6.1.recipe
index ec6be1fb0..59fdaac05 100644
--- a/sys-apps/grep/grep-2.6.1.bep
+++ b/sys-apps/grep/grep-2.6.1.recipe
@@ -5,19 +5,22 @@ CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd grep-2.6.1
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.6.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.6.1
 	make check
 }
diff --git a/sys-apps/grep/grep-2.6.3.bep b/sys-apps/grep/grep-2.6.3.recipe
similarity index 94%
rename from sys-apps/grep/grep-2.6.3.bep
rename to sys-apps/grep/grep-2.6.3.recipe
index dfbd623d2..b28c35d7b 100644
--- a/sys-apps/grep/grep-2.6.3.bep
+++ b/sys-apps/grep/grep-2.6.3.recipe
@@ -5,19 +5,22 @@ CHECKSUM_MD5="3095b57837b312f087c0680559de7f13"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd grep-2.6.3
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.6.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.6.3
 	make check
 }
diff --git a/sys-apps/grep/grep-2.7.bep b/sys-apps/grep/grep-2.7.recipe
similarity index 95%
rename from sys-apps/grep/grep-2.7.bep
rename to sys-apps/grep/grep-2.7.recipe
index b3db2cf09..484684bc3 100644
--- a/sys-apps/grep/grep-2.7.bep
+++ b/sys-apps/grep/grep-2.7.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-devel/gettext >= 0.17
 	sys-devel/libiconv >= 1.13.1"
-BUILD {
+BUILD()
+{
 	cd grep-2.7
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd grep-2.7
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd grep-2.7
 	make check
 }
diff --git a/sys-apps/groff/groff-1.20.1.bep b/sys-apps/groff/groff-1.20.1.recipe
similarity index 96%
rename from sys-apps/groff/groff-1.20.1.bep
rename to sys-apps/groff/groff-1.20.1.recipe
index fb330f71b..5fe7f0c9c 100644
--- a/sys-apps/groff/groff-1.20.1.bep
+++ b/sys-apps/groff/groff-1.20.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd groff-1.20.1
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -19,12 +20,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd groff-1.20.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd groff-1.20.1
 	make check
 }
diff --git a/sys-apps/hgrep/hgrep-1.0.1.bep b/sys-apps/hgrep/hgrep-1.0.1.recipe
similarity index 95%
rename from sys-apps/hgrep/hgrep-1.0.1.bep
rename to sys-apps/hgrep/hgrep-1.0.1.recipe
index 5e94a7b5a..b4ad651a2 100644
--- a/sys-apps/hgrep/hgrep-1.0.1.bep
+++ b/sys-apps/hgrep/hgrep-1.0.1.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="1c11724bc9fedd058fde03b5a9f242c2"
-BUILD {
+BUILD()
+{
 	cd hgrep-1.0.1
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hgrep-1.0.1
 	BINDIR=`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p $DESTDIR/$BINDIR
diff --git a/sys-apps/hgrep/hgrep-1.0.bep b/sys-apps/hgrep/hgrep-1.0.recipe
similarity index 95%
rename from sys-apps/hgrep/hgrep-1.0.bep
rename to sys-apps/hgrep/hgrep-1.0.recipe
index c4cf23569..0aa95c571 100644
--- a/sys-apps/hgrep/hgrep-1.0.bep
+++ b/sys-apps/hgrep/hgrep-1.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e909cea8f7ae7f6c73fe75a691b0440f"
-BUILD {
+BUILD()
+{
 	cd hgrep-1.0
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hgrep-1.0
 	BINDIR=`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p $DESTDIR/$BINDIR
diff --git a/sys-apps/less/less-436.bep b/sys-apps/less/less-436.recipe
similarity index 96%
rename from sys-apps/less/less-436.bep
rename to sys-apps/less/less-436.recipe
index b0199b2d6..734ed9dac 100644
--- a/sys-apps/less/less-436.bep
+++ b/sys-apps/less/less-436.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="817bf051953ad2dea825a1cdf460caa4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd less-436
 	autoreconf -fvi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd less-436
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-apps/less/less-451.bep b/sys-apps/less/less-451.recipe
similarity index 96%
rename from sys-apps/less/less-451.bep
rename to sys-apps/less/less-451.recipe
index 1927de598..030b4844f 100644
--- a/sys-apps/less/less-451.bep
+++ b/sys-apps/less/less-451.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="765f082658002b2b46b86af4a0da1842"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd less-451
 	autoreconf -fvi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd less-451
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-apps/lgrep/lgrep-1.0.bep b/sys-apps/lgrep/lgrep-1.0.recipe
similarity index 95%
rename from sys-apps/lgrep/lgrep-1.0.bep
rename to sys-apps/lgrep/lgrep-1.0.recipe
index 1abb6f3fe..eeda1bc24 100644
--- a/sys-apps/lgrep/lgrep-1.0.bep
+++ b/sys-apps/lgrep/lgrep-1.0.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="2a699321a362a64d0999bf883be21452"
-BUILD {
+BUILD()
+{
 	cd lgrep-1.0
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lgrep-1.0
 	BINDIR=`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p $DESTDIR/$BINDIR
diff --git a/sys-apps/man/man-1.6f.bep b/sys-apps/man/man-1.6f.recipe
similarity index 96%
rename from sys-apps/man/man-1.6f.bep
rename to sys-apps/man/man-1.6f.recipe
index 3f91d74ee..c4797f0fd 100644
--- a/sys-apps/man/man-1.6f.bep
+++ b/sys-apps/man/man-1.6f.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-apps/groff >= 1.20.1"
-BUILD {
+BUILD()
+{
 	cd man-1.6f
 	./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd man-1.6f
 	make install
 }
diff --git a/sys-apps/man/man-1.6g.bep b/sys-apps/man/man-1.6g.recipe
similarity index 96%
rename from sys-apps/man/man-1.6g.bep
rename to sys-apps/man/man-1.6g.recipe
index 593d7f308..812c21cd4 100644
--- a/sys-apps/man/man-1.6g.bep
+++ b/sys-apps/man/man-1.6g.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-apps/groff >= 1.20.1"
-BUILD {
+BUILD()
+{
 	cd man-1.6g
 	./configure -prefix=`finddir B_COMMON_DIRECTORY` \
 	-sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd man-1.6g
 	make install
 }
diff --git a/sys-apps/sed/sed-4.2.1.bep b/sys-apps/sed/sed-4.2.1.recipe
similarity index 97%
rename from sys-apps/sed/sed-4.2.1.bep
rename to sys-apps/sed/sed-4.2.1.recipe
index 97fad8c84..9b2dc4cdd 100644
--- a/sys-apps/sed/sed-4.2.1.bep
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sed-4.2.1
 	autoconf
 	prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/sed-4.2.1
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sed-4.2.1
 	make install
 	make check
diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.recipe
similarity index 97%
rename from sys-apps/texinfo/texinfo-4.13a.bep
rename to sys-apps/texinfo/texinfo-4.13a.recipe
index 74e817a85..b6dba1cc4 100644
--- a/sys-apps/texinfo/texinfo-4.13a.bep
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -25,13 +25,15 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="texinfo-4.13"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	./configure $configureDirArgs
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/sys-apps/xinetd/xinetd-2.3.14.bep b/sys-apps/xinetd/xinetd-2.3.14.recipe
similarity index 98%
rename from sys-apps/xinetd/xinetd-2.3.14.bep
rename to sys-apps/xinetd/xinetd-2.3.14.recipe
index 4957efced..cc3d0868b 100644
--- a/sys-apps/xinetd/xinetd-2.3.14.bep
+++ b/sys-apps/xinetd/xinetd-2.3.14.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="567382d7972613090215c6c54f9b82d9"
-BUILD {
+BUILD()
+{
 	cd xinetd-2.3.14
 
 	# if we don't have rpc/rpc.h then why does it still try to use it??
@@ -30,7 +31,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xinetd-2.3.14
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5
diff --git a/sys-devel/autoconf/autoconf-2.65.bep b/sys-devel/autoconf/autoconf-2.65.recipe
similarity index 95%
rename from sys-devel/autoconf/autoconf-2.65.bep
rename to sys-devel/autoconf/autoconf-2.65.recipe
index 17def4b3b..f3bcfcf3c 100644
--- a/sys-devel/autoconf/autoconf-2.65.bep
+++ b/sys-devel/autoconf/autoconf-2.65.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="46cfb40e0babf4c64f8325f03da81c9b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd autoconf-2.65
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd autoconf-2.65
 	make install
 }
diff --git a/sys-devel/autoconf/autoconf-2.66.bep b/sys-devel/autoconf/autoconf-2.66.recipe
similarity index 95%
rename from sys-devel/autoconf/autoconf-2.66.bep
rename to sys-devel/autoconf/autoconf-2.66.recipe
index fafe8e8c8..c2c2d6ff4 100644
--- a/sys-devel/autoconf/autoconf-2.66.bep
+++ b/sys-devel/autoconf/autoconf-2.66.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="d2d22a532ee0e4d6d86a02e6425ecfce"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd autoconf-2.66
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd autoconf-2.66
 	make install
 }
diff --git a/sys-devel/autoconf/autoconf-2.67.bep b/sys-devel/autoconf/autoconf-2.67.recipe
similarity index 95%
rename from sys-devel/autoconf/autoconf-2.67.bep
rename to sys-devel/autoconf/autoconf-2.67.recipe
index 8930dea1b..ac2f75749 100644
--- a/sys-devel/autoconf/autoconf-2.67.bep
+++ b/sys-devel/autoconf/autoconf-2.67.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="3fbf92eb8eaca1e0d33dff9710edb5f0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd autoconf-2.67
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd autoconf-2.67
 	make install
 }
diff --git a/sys-devel/autoconf/autoconf-2.67xz.bep b/sys-devel/autoconf/autoconf-2.67xz.recipe
similarity index 95%
rename from sys-devel/autoconf/autoconf-2.67xz.bep
rename to sys-devel/autoconf/autoconf-2.67xz.recipe
index a2bda5564..f83fde14b 100644
--- a/sys-devel/autoconf/autoconf-2.67xz.bep
+++ b/sys-devel/autoconf/autoconf-2.67xz.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="1da24eebe4e6a774e4039242a4f06aad"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd autoconf-2.67
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd autoconf-2.67
 	make install
 }
diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.recipe
similarity index 97%
rename from sys-devel/autoconf/autoconf-2.68.bep
rename to sys-devel/autoconf/autoconf-2.68.recipe
index e38df7694..32f17f3c3 100644
--- a/sys-devel/autoconf/autoconf-2.68.bep
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -32,18 +32,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	autoreconf
 	PERL="perl" M4="m4" SED="sed" \
 		./configure $configureDirArgs
 	make -j$jobs
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/autoconf/autoconf-2.69.bep b/sys-devel/autoconf/autoconf-2.69.recipe
similarity index 95%
rename from sys-devel/autoconf/autoconf-2.69.bep
rename to sys-devel/autoconf/autoconf-2.69.recipe
index 73321003d..223b78f20 100644
--- a/sys-devel/autoconf/autoconf-2.69.bep
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd autoconf-2.69
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd autoconf-2.69
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd autoconf-2.69
 	make check
 }
diff --git a/sys-devel/automake/automake-1.10.3.bep b/sys-devel/automake/automake-1.10.3.recipe
similarity index 95%
rename from sys-devel/automake/automake-1.10.3.bep
rename to sys-devel/automake/automake-1.10.3.recipe
index fbf875cae..0fa193e63 100644
--- a/sys-devel/automake/automake-1.10.3.bep
+++ b/sys-devel/automake/automake-1.10.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="03bc9ebfa805f9ee5635f1f53fa1fa5f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd automake-1.10.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automake-1.10.3
 	make install
 }
diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.recipe
similarity index 97%
rename from sys-devel/automake/automake-1.11.1.bep
rename to sys-devel/automake/automake-1.11.1.recipe
index 601e4dc80..6afc2948f 100644
--- a/sys-devel/automake/automake-1.11.1.bep
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -26,16 +26,19 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	PERL="/bin/env perl" ./configure $configureDirArgs
 	make -j$jobs
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/automake/automake-1.12.2.bep b/sys-devel/automake/automake-1.12.2.recipe
similarity index 95%
rename from sys-devel/automake/automake-1.12.2.bep
rename to sys-devel/automake/automake-1.12.2.recipe
index 491853e4b..f54777222 100644
--- a/sys-devel/automake/automake-1.12.2.bep
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd automake-1.12.2
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY`
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automake-1.12.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd automake-1.12.2
 	make check
 }
diff --git a/sys-devel/automake/automake-1.12.5.bep b/sys-devel/automake/automake-1.12.5.recipe
similarity index 95%
rename from sys-devel/automake/automake-1.12.5.bep
rename to sys-devel/automake/automake-1.12.5.recipe
index 2d8fc54b8..46843dcbe 100644
--- a/sys-devel/automake/automake-1.12.5.bep
+++ b/sys-devel/automake/automake-1.12.5.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="674f6d28f8723e0f478cb03de30f36f1"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd automake-1.12.5
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY`
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automake-1.12.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd automake-1.12.5
 	make check
 }
diff --git a/sys-devel/automake/automake-1.13.1.bep b/sys-devel/automake/automake-1.13.1.recipe
similarity index 96%
rename from sys-devel/automake/automake-1.13.1.bep
rename to sys-devel/automake/automake-1.13.1.recipe
index e59db8f10..11395f3b4 100644
--- a/sys-devel/automake/automake-1.13.1.bep
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd automake-1.13.1
 	libtoolize --force --copy --install
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automake-1.13.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd automake-1.13.1
 	make check
 }
diff --git a/sys-devel/automake/automake-1.13.bep b/sys-devel/automake/automake-1.13.recipe
similarity index 95%
rename from sys-devel/automake/automake-1.13.bep
rename to sys-devel/automake/automake-1.13.recipe
index d31d5c63c..2169760e4 100644
--- a/sys-devel/automake/automake-1.13.bep
+++ b/sys-devel/automake/automake-1.13.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="255661c7729d04ef2f8f58d076c89ecc"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd automake-1.13
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY`
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd automake-1.13
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd automake-1.13
 	make check
 }
diff --git a/sys-devel/bc/bc-1.06.bep b/sys-devel/bc/bc-1.06.recipe
similarity index 95%
rename from sys-devel/bc/bc-1.06.bep
rename to sys-devel/bc/bc-1.06.recipe
index 67808119b..cf88b843d 100644
--- a/sys-devel/bc/bc-1.06.bep
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117"
-BUILD {
+BUILD()
+{
 	cd bc-1.06
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
@@ -13,12 +14,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bc-1.06
 	make install DESTDIR=${DESTDIR}
 }
 
-TEST {
+TEST()
+{
 	cd bc-1.06/Test
 	timetest
 }
diff --git a/sys-devel/bison/bison-2.4.1.bep b/sys-devel/bison/bison-2.4.1.recipe
similarity index 94%
rename from sys-devel/bison/bison-2.4.1.bep
rename to sys-devel/bison/bison-2.4.1.recipe
index a537c49e8..ca29bc406 100644
--- a/sys-devel/bison/bison-2.4.1.bep
+++ b/sys-devel/bison/bison-2.4.1.recipe
@@ -5,18 +5,21 @@ CHECKSUM_MD5="c58aa1da418dc9704070872489e89bf5"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bison-2.4.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bison-2.4.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd bison-2.4.1
 	make check
 }
diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.recipe
similarity index 97%
rename from sys-devel/bison/bison-2.4.3.bep
rename to sys-devel/bison/bison-2.4.3.recipe
index 2c99d2368..92392ee5f 100644
--- a/sys-devel/bison/bison-2.4.3.bep
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -27,7 +27,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	# bison looks for m4 in an absolute path, but uses that only within
 	# its own testsuite, so we let it be ...
 	./configure $configureDirArgs \
@@ -35,11 +36,13 @@ BUILD {
 	make -j$jobs
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/bison/bison-2.4.bep b/sys-devel/bison/bison-2.4.recipe
similarity index 95%
rename from sys-devel/bison/bison-2.4.bep
rename to sys-devel/bison/bison-2.4.recipe
index 5e6b68cc2..03195f317 100644
--- a/sys-devel/bison/bison-2.4.bep
+++ b/sys-devel/bison/bison-2.4.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="2b9b088b46271c7fa902a7e85f503e1e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bison-2.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bison-2.4
 	make install
 	make check
diff --git a/sys-devel/bison/bison-2.5.bep b/sys-devel/bison/bison-2.5.recipe
similarity index 95%
rename from sys-devel/bison/bison-2.5.bep
rename to sys-devel/bison/bison-2.5.recipe
index 002b5e015..fd0151916 100644
--- a/sys-devel/bison/bison-2.5.bep
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bison-2.5
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bison-2.5
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd bison-2.5
 	make check
 }
diff --git a/sys-devel/bison/bison-2.6.2.bep b/sys-devel/bison/bison-2.6.2.recipe
similarity index 96%
rename from sys-devel/bison/bison-2.6.2.bep
rename to sys-devel/bison/bison-2.6.2.recipe
index be4759628..e6414b836 100644
--- a/sys-devel/bison/bison-2.6.2.bep
+++ b/sys-devel/bison/bison-2.6.2.recipe
@@ -6,7 +6,8 @@ REVISION="15"
 STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd bison-2.6.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bison-2.6.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd bison-2.6.2
 	make check
 }
diff --git a/sys-devel/clang/clang-3.0.bep b/sys-devel/clang/clang-3.0.recipe
similarity index 96%
rename from sys-devel/clang/clang-3.0.bep
rename to sys-devel/clang/clang-3.0.recipe
index 1b9813895..19d1c2497 100644
--- a/sys-devel/clang/clang-3.0.bep
+++ b/sys-devel/clang/clang-3.0.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="groff"
 CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd llvm-3.0.src/tools
 	wget "http://llvm.org/releases/3.0/clang-3.0.tar.gz"
 	echo "Extracting clang llvm tool..."
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd llvm-3.0.src
 	make install
 }
diff --git a/sys-devel/clang/clang-3.2.bep b/sys-devel/clang/clang-3.2.recipe
similarity index 96%
rename from sys-devel/clang/clang-3.2.bep
rename to sys-devel/clang/clang-3.2.recipe
index 56f007d2d..9ed169501 100644
--- a/sys-devel/clang/clang-3.2.bep
+++ b/sys-devel/clang/clang-3.2.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="untested"
 DEPEND="groff"
 CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	if [ ! -L /usr ]; then
 		ln -s /boot/system/ /usr
 	fi
@@ -22,12 +23,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd llvm-3.2.src
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd llvm-3.2.src
 	make check
 }
diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.recipe
similarity index 98%
rename from sys-devel/flex/flex-2.5.35.bep
rename to sys-devel/flex/flex-2.5.35.recipe
index 2b77fbc15..89e5022d2 100644
--- a/sys-devel/flex/flex-2.5.35.bep
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -23,7 +23,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	rm aclocal.m4
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -34,7 +35,8 @@ BUILD {
 	make -j$jobs
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.recipe
similarity index 99%
rename from sys-devel/gcc/gcc-2.95.3_110711.bep
rename to sys-devel/gcc/gcc-2.95.3_110711.recipe
index 1b2bf7bc0..0c0f6aa31 100644
--- a/sys-devel/gcc/gcc-2.95.3_110711.bep
+++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe
@@ -37,7 +37,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	gccDate=110711
 	gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}"
 	objectsDir=$(pwd)/../${portVersionedName}-obj
@@ -76,7 +77,8 @@ BUILD {
 		# anyway.
 }
 
-INSTALL {
+INSTALL()
+{
 	# TODO: Avoid the duplication by defining the variables globally once we've
 	# moved the bep-format to shell.
 	gccDate=110711
diff --git a/sys-devel/gettext/gettext-0.17.bep b/sys-devel/gettext/gettext-0.17.recipe
similarity index 97%
rename from sys-devel/gettext/gettext-0.17.bep
rename to sys-devel/gettext/gettext-0.17.recipe
index da33c7509..f3ccbea5f 100644
--- a/sys-devel/gettext/gettext-0.17.bep
+++ b/sys-devel/gettext/gettext-0.17.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="58a2bc6d39c0ba57823034d55d65d606"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gettext-0.17
 	rm ./gettext-tools/gnulib-m4/openmp.m4
 	libtoolize --force --copy --install
@@ -33,12 +34,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gettext-0.17
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gettext-0.17
 	make check
 }
diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.bep b/sys-devel/gettext/gettext-0.18.1.1-dev.recipe
similarity index 96%
rename from sys-devel/gettext/gettext-0.18.1.1-dev.bep
rename to sys-devel/gettext/gettext-0.18.1.1-dev.recipe
index dc485e35a..c4964c6b9 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-dev.bep
+++ b/sys-devel/gettext/gettext-0.18.1.1-dev.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gettext-0.18.1.1
 	libtoolize --force --copy --install
 	./autogen.sh --quick --skip-gnulib
@@ -19,12 +20,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gettext-0.18.1.1
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gettext-0.18.1.1/gettext-runtime/tests
 	make check
 }
diff --git a/sys-devel/gettext/gettext-0.18.1.1.bep b/sys-devel/gettext/gettext-0.18.1.1.recipe
similarity index 97%
rename from sys-devel/gettext/gettext-0.18.1.1.bep
rename to sys-devel/gettext/gettext-0.18.1.1.recipe
index 9254ac9b2..f544bb76d 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.bep
+++ b/sys-devel/gettext/gettext-0.18.1.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gettext-0.18.1.1
 	libtoolize --force --copy --install
 	sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac
@@ -31,12 +32,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gettext-0.18.1.1/gettext-runtime
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd gettext-0.18.1.1/gettext-runtime
 	make check
 }
diff --git a/sys-devel/jam/jam-2.5.bep b/sys-devel/jam/jam-2.5.recipe
similarity index 94%
rename from sys-devel/jam/jam-2.5.bep
rename to sys-devel/jam/jam-2.5.recipe
index 42d0b0c75..4d4295ee5 100644
--- a/sys-devel/jam/jam-2.5.bep
+++ b/sys-devel/jam/jam-2.5.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd jam-2.5/jam
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jam-2.5/jam
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a bin.haikux86/jam ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/jam
diff --git a/sys-devel/lemon/lemon-3.7.5.bep b/sys-devel/lemon/lemon-3.7.5.recipe
similarity index 95%
rename from sys-devel/lemon/lemon-3.7.5.bep
rename to sys-devel/lemon/lemon-3.7.5.recipe
index af7eeb1f6..d10849a5a 100644
--- a/sys-devel/lemon/lemon-3.7.5.bep
+++ b/sys-devel/lemon/lemon-3.7.5.recipe
@@ -5,11 +5,13 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="612fa38f920df9b588ce90006eb4b53a"
-BUILD {
+BUILD()
+{
 	gcc lemon.c -o lemon
 }
 
-INSTALL {
+INSTALL()
+{
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp lemon ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/lemon
 }
diff --git a/sys-devel/libtool/libtool-2.2.10.bep b/sys-devel/libtool/libtool-2.2.10.recipe
similarity index 93%
rename from sys-devel/libtool/libtool-2.2.10.bep
rename to sys-devel/libtool/libtool-2.2.10.recipe
index 186945748..d1c5f448c 100644
--- a/sys-devel/libtool/libtool-2.2.10.bep
+++ b/sys-devel/libtool/libtool-2.2.10.recipe
@@ -5,19 +5,22 @@ CHECKSUM_MD5="b745d220e88163fcd9eea0a90ccf21b0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.10
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.10
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/libtool/libtool-2.2.6.bep b/sys-devel/libtool/libtool-2.2.6.recipe
similarity index 95%
rename from sys-devel/libtool/libtool-2.2.6.bep
rename to sys-devel/libtool/libtool-2.2.6.recipe
index edfbbcdae..25796d1ae 100644
--- a/sys-devel/libtool/libtool-2.2.6.bep
+++ b/sys-devel/libtool/libtool-2.2.6.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="8ca1ea241cd27ff9832e045fe9afe4fd"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.6
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.6
 	make install
 	make check
diff --git a/sys-devel/libtool/libtool-2.2.6b.bep b/sys-devel/libtool/libtool-2.2.6b.recipe
similarity index 95%
rename from sys-devel/libtool/libtool-2.2.6b.bep
rename to sys-devel/libtool/libtool-2.2.6b.recipe
index 20e87fecc..5e883a244 100644
--- a/sys-devel/libtool/libtool-2.2.6b.bep
+++ b/sys-devel/libtool/libtool-2.2.6b.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="07da460450490148c6d2df0f21481a25"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.6b
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.6b
 	make install
 #	make check
diff --git a/sys-devel/libtool/libtool-2.2.7b.bep b/sys-devel/libtool/libtool-2.2.7b.recipe
similarity index 95%
rename from sys-devel/libtool/libtool-2.2.7b.bep
rename to sys-devel/libtool/libtool-2.2.7b.recipe
index bbc0f7af6..59e86ce63 100644
--- a/sys-devel/libtool/libtool-2.2.7b.bep
+++ b/sys-devel/libtool/libtool-2.2.7b.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="9f66a85efaeed0d9652f647986f6ad5b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.7b
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.7b
 	make install
 #	make check
diff --git a/sys-devel/libtool/libtool-2.2.8.bep b/sys-devel/libtool/libtool-2.2.8.recipe
similarity index 93%
rename from sys-devel/libtool/libtool-2.2.8.bep
rename to sys-devel/libtool/libtool-2.2.8.recipe
index 58dadb83a..6f6212797 100644
--- a/sys-devel/libtool/libtool-2.2.8.bep
+++ b/sys-devel/libtool/libtool-2.2.8.recipe
@@ -5,19 +5,22 @@ CHECKSUM_MD5="cad2a7188242bc8dbab0645532ae3d6f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.8
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.8
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/libtool/libtool-2.2.x.bep b/sys-devel/libtool/libtool-2.2.x.recipe
similarity index 95%
rename from sys-devel/libtool/libtool-2.2.x.bep
rename to sys-devel/libtool/libtool-2.2.x.recipe
index 6ba36a6ad..882c40316 100644
--- a/sys-devel/libtool/libtool-2.2.x.bep
+++ b/sys-devel/libtool/libtool-2.2.x.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 MESSAGE="This is for building and testing of unreleased libtool"
 STATUS_HAIKU="unstable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.2.x
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.2.x
 	make install
 	make check
diff --git a/sys-devel/libtool/libtool-2.4.2.bep b/sys-devel/libtool/libtool-2.4.2.recipe
similarity index 95%
rename from sys-devel/libtool/libtool-2.4.2.bep
rename to sys-devel/libtool/libtool-2.4.2.recipe
index ffb7ebf6b..a81f7819f 100644
--- a/sys-devel/libtool/libtool-2.4.2.bep
+++ b/sys-devel/libtool/libtool-2.4.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd libtool-2.4.2
 	./bootstrap
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libtool-2.4.2
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd libtool-2.4.2
 	make check
 }
diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.recipe
similarity index 98%
rename from sys-devel/libtool/libtool-2.4.bep
rename to sys-devel/libtool/libtool-2.4.recipe
index 0c21d9366..a6e0a3c3d 100644
--- a/sys-devel/libtool/libtool-2.4.bep
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -26,7 +26,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	./bootstrap
 	SED='sed' NM='nm' LD=ld ./configure $configureDirArgs --with-gnu-ld
 	make -j$jobs
@@ -44,11 +45,13 @@ BUILD {
 		libtool
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/llvm/llvm-3.0.bep b/sys-devel/llvm/llvm-3.0.recipe
similarity index 96%
rename from sys-devel/llvm/llvm-3.0.bep
rename to sys-devel/llvm/llvm-3.0.recipe
index 63e4b04b7..229634d29 100644
--- a/sys-devel/llvm/llvm-3.0.bep
+++ b/sys-devel/llvm/llvm-3.0.recipe
@@ -6,13 +6,15 @@ STATUS_HAIKU="untested"
 DEPEND=""
 CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd llvm-3.0.src
 	./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd llvm-3.0.src
 	make install
 }
diff --git a/sys-devel/llvm/llvm-3.2.bep b/sys-devel/llvm/llvm-3.2.recipe
similarity index 97%
rename from sys-devel/llvm/llvm-3.2.bep
rename to sys-devel/llvm/llvm-3.2.recipe
index 1fdabddd4..14a31f213 100644
--- a/sys-devel/llvm/llvm-3.2.bep
+++ b/sys-devel/llvm/llvm-3.2.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	if [ ! -L /usr ]; then
 		ln -s /boot/system/ /usr
 	fi
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd llvm-3.2.src
 	make install
 }
diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.recipe
similarity index 96%
rename from sys-devel/m4/m4-1.4.14.bep
rename to sys-devel/m4/m4-1.4.14.recipe
index 6584ca424..8d4435360 100644
--- a/sys-devel/m4/m4-1.4.14.bep
+++ b/sys-devel/m4/m4-1.4.14.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="unstable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd m4-1.4.14
 	prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.14
 	./configure --prefix=$prefix \
@@ -22,12 +23,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd m4-1.4.14
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd m4-1.4.14
 	makecheck
 }
diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.recipe
similarity index 96%
rename from sys-devel/m4/m4-1.4.15.bep
rename to sys-devel/m4/m4-1.4.15.recipe
index 25fff6c84..8e141440e 100644
--- a/sys-devel/m4/m4-1.4.15.bep
+++ b/sys-devel/m4/m4-1.4.15.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd m4-1.4.15
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
 	echo >> configure.ac
@@ -29,12 +30,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd m4-1.4.15
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd m4-1.4.15
 	make check
 }
diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.recipe
similarity index 95%
rename from sys-devel/m4/m4-1.4.16.bep
rename to sys-devel/m4/m4-1.4.16.recipe
index 257c5db60..83f900e7f 100644
--- a/sys-devel/m4/m4-1.4.16.bep
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -16,18 +16,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	./configure $configureDirArgs \
 		--disable-rpath --with-gnu-ld \
 		--enable-changeword
 	make -j$jobs
 }
 
-INSTALL {
+INSTALL()
+{
 	make install
 }
 
-TEST {
+TEST()
+{
 	make check
 }
 
diff --git a/sys-devel/make/make-3.81.bep b/sys-devel/make/make-3.81.recipe
similarity index 97%
rename from sys-devel/make/make-3.81.bep
rename to sys-devel/make/make-3.81.recipe
index 33fafa9b7..f3efec007 100644
--- a/sys-devel/make/make-3.81.bep
+++ b/sys-devel/make/make-3.81.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="354853e0b2da90c527e35aabb8d6f1e6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd make-3.81
 	libtoolize -fci
 	prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.81
@@ -20,7 +21,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd make-3.81
 	make install
 }
diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.recipe
similarity index 97%
rename from sys-devel/make/make-3.82.bep
rename to sys-devel/make/make-3.82.recipe
index 029333bbe..fa0f3634a 100644
--- a/sys-devel/make/make-3.82.bep
+++ b/sys-devel/make/make-3.82.recipe
@@ -18,14 +18,16 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
 
 SOURCE_DIR="$portVersionedName"
 
-BUILD {
+BUILD()
+{
 	libtoolize --force --copy --install
 	./configure $configureDirArgs \
 		--disable-rpath --with-gnu-ld
 	./build.sh
 }
 
-INSTALL {
+INSTALL()
+{
 	./make install
 }
 
diff --git a/sys-devel/patch/patch-2.6.1.bep b/sys-devel/patch/patch-2.6.1.recipe
similarity index 97%
rename from sys-devel/patch/patch-2.6.1.bep
rename to sys-devel/patch/patch-2.6.1.recipe
index 87002778c..869ed1002 100644
--- a/sys-devel/patch/patch-2.6.1.bep
+++ b/sys-devel/patch/patch-2.6.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="0818d1763ae0c4281bcdc63cdac0b2c0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd patch-2.6.1
 	prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/patch-2.6.1
 	./configure --prefix=$prefix \
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd patch-2.6.1
 	make install
 }
diff --git a/sys-devel/patch/patch-2.7.1.bep b/sys-devel/patch/patch-2.7.1.recipe
similarity index 95%
rename from sys-devel/patch/patch-2.7.1.bep
rename to sys-devel/patch/patch-2.7.1.recipe
index ce005d780..5be2da908 100644
--- a/sys-devel/patch/patch-2.7.1.bep
+++ b/sys-devel/patch/patch-2.7.1.recipe
@@ -4,14 +4,16 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/patch/patch-2.7.1.tar.bz2"
 CHECKSUM_MD5="0881a7c6477862fc395f373ada0ec6b6"
 STATUS_HAIKU="stable"
 REVISION="1"
-BUILD {
+BUILD()
+{
 	cd patch-2.7.1
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd patch-2.7.1
 	make install
 }
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe
similarity index 96%
rename from sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep
rename to sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe
index cc5b02d07..5adffe854 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd e2fsprogs
 	autoconf
 	libdir=`finddir B_COMMON_LIB_DIRECTORY` 
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd e2fsprogs
 	make install-libs
 }
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe
similarity index 97%
rename from sys-fs/e2fsprogs/e2fsprogs-1.43.bep
rename to sys-fs/e2fsprogs/e2fsprogs-1.43.recipe
index 298212606..9531f3103 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="broken"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd e2fsprogs-1.43
 	autoconf
 	libdir=`finddir B_COMMON_LIB_DIRECTORY` 
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd e2fsprogs-1.43
 	make install-libs
 }
diff --git a/sys-libs/glu/glu-9.0.bep b/sys-libs/glu/glu-9.0.recipe
similarity index 96%
rename from sys-libs/glu/glu-9.0.bep
rename to sys-libs/glu/glu-9.0.recipe
index 1f6601b29..a8a380c00 100644
--- a/sys-libs/glu/glu-9.0.bep
+++ b/sys-libs/glu/glu-9.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd glu-9.0.0
 	./configure --prefix=`finddir B_SYSTEM_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd glu-9.0.0
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.recipe
similarity index 98%
rename from sys-libs/mesa/mesa-7.8.2.bep
rename to sys-libs/mesa/mesa-7.8.2.recipe
index 0fbc12615..e908cd79a 100644
--- a/sys-libs/mesa/mesa-7.8.2.bep
+++ b/sys-libs/mesa/mesa-7.8.2.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
 MESSAGE="This port only builds with gcc2. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=0
 	cd Mesa-7.8.2
 	make
diff --git a/sys-libs/mesa/mesa-9.0.1.bep b/sys-libs/mesa/mesa-9.0.1.recipe
similarity index 98%
rename from sys-libs/mesa/mesa-9.0.1.bep
rename to sys-libs/mesa/mesa-9.0.1.recipe
index d03000d46..5568ca758 100644
--- a/sys-libs/mesa/mesa-9.0.1.bep
+++ b/sys-libs/mesa/mesa-9.0.1.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="stable"
 DEPEND="scons"
 CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018"
 MESSAGE="This port only builds with gcc4. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=0
 	cd Mesa-9.0.1
 	scons debug=$DEBUG
diff --git a/sys-libs/mesa/mesa-9.0.2.bep b/sys-libs/mesa/mesa-9.0.2.recipe
similarity index 99%
rename from sys-libs/mesa/mesa-9.0.2.bep
rename to sys-libs/mesa/mesa-9.0.2.recipe
index 6bc915411..45fec2387 100644
--- a/sys-libs/mesa/mesa-9.0.2.bep
+++ b/sys-libs/mesa/mesa-9.0.2.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="stable"
 DEPEND="scons, llvm >= 3.2"
 CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc"
 MESSAGE="This port only builds with gcc4. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=0
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 	echo "This generates a Mesa3D build package for Haiku... not for general use"
diff --git a/sys-libs/mesa/mesa-9.0.bep b/sys-libs/mesa/mesa-9.0.recipe
similarity index 98%
rename from sys-libs/mesa/mesa-9.0.bep
rename to sys-libs/mesa/mesa-9.0.recipe
index 768707c1e..99f182f27 100644
--- a/sys-libs/mesa/mesa-9.0.bep
+++ b/sys-libs/mesa/mesa-9.0.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="stable"
 DEPEND="scons"
 CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c"
 MESSAGE="This port only builds with gcc4. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=0
 	cd Mesa-9.0
 	scons debug=$DEBUG
diff --git a/sys-libs/mesa/mesa-9.1.0.bep b/sys-libs/mesa/mesa-9.1.0.recipe
similarity index 99%
rename from sys-libs/mesa/mesa-9.1.0.bep
rename to sys-libs/mesa/mesa-9.1.0.recipe
index e35967ffc..812de0624 100644
--- a/sys-libs/mesa/mesa-9.1.0.bep
+++ b/sys-libs/mesa/mesa-9.1.0.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="unstable"
 DEPEND="scons, llvm >= 3.2"
 CHECKSUM_MD5="d3891e02215422e120271d976ff1947e"
 MESSAGE="This port only builds with gcc4. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=0
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 	echo "This generates a Mesa3D build package for Haiku... not for general use"
diff --git a/sys-libs/mesa/mesa-9.1.1.bep b/sys-libs/mesa/mesa-9.1.1.recipe
similarity index 99%
rename from sys-libs/mesa/mesa-9.1.1.bep
rename to sys-libs/mesa/mesa-9.1.1.recipe
index 573804871..d663f81c9 100644
--- a/sys-libs/mesa/mesa-9.1.1.bep
+++ b/sys-libs/mesa/mesa-9.1.1.recipe
@@ -12,7 +12,8 @@ STATUS_HAIKU="unstable"
 DEPEND="scons, llvm >= 3.2"
 CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580"
 MESSAGE="This port only builds with gcc4. Not for general use."
-BUILD {
+BUILD()
+{
 	export DEBUG=1
 	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 	echo "This generates a Mesa3D build package for Haiku... not for general use"
diff --git a/sys-libs/ncurses/ncurses-5.6.bep b/sys-libs/ncurses/ncurses-5.6.recipe
similarity index 94%
rename from sys-libs/ncurses/ncurses-5.6.bep
rename to sys-libs/ncurses/ncurses-5.6.recipe
index 69ec76766..f04e2b6b5 100644
--- a/sys-libs/ncurses/ncurses-5.6.bep
+++ b/sys-libs/ncurses/ncurses-5.6.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="b6593abe1089d6aab1551c105c9300e3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ncurses-5.6
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ncurses-5.6
 	make install
 }
diff --git a/sys-libs/ncurses/ncurses-5.7.bep b/sys-libs/ncurses/ncurses-5.7.recipe
similarity index 95%
rename from sys-libs/ncurses/ncurses-5.7.bep
rename to sys-libs/ncurses/ncurses-5.7.recipe
index 06d53abd4..704df8033 100644
--- a/sys-libs/ncurses/ncurses-5.7.bep
+++ b/sys-libs/ncurses/ncurses-5.7.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="cce05daf61a64501ef6cd8da1f727ec6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ncurses-5.7
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-libtool
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ncurses-5.7
 	./misc/shlib make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/ncurses/ncurses-5.8.bep b/sys-libs/ncurses/ncurses-5.8.recipe
similarity index 96%
rename from sys-libs/ncurses/ncurses-5.8.bep
rename to sys-libs/ncurses/ncurses-5.8.recipe
index 8679d2720..1511c5ce7 100644
--- a/sys-libs/ncurses/ncurses-5.8.bep
+++ b/sys-libs/ncurses/ncurses-5.8.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="20ed3fa7599937f0ca268d9088837a64"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ncurses-5.8
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ncurses-5.8
 	./misc/shlib make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/ncurses/ncurses-5.9.bep b/sys-libs/ncurses/ncurses-5.9.recipe
similarity index 96%
rename from sys-libs/ncurses/ncurses-5.9.bep
rename to sys-libs/ncurses/ncurses-5.9.recipe
index 392f126e2..d4f2696ad 100644
--- a/sys-libs/ncurses/ncurses-5.9.bep
+++ b/sys-libs/ncurses/ncurses-5.9.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd ncurses-5.9
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ncurses-5.9
 	./misc/shlib make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/readline/readline-5.2.bep b/sys-libs/readline/readline-5.2.recipe
similarity index 95%
rename from sys-libs/readline/readline-5.2.bep
rename to sys-libs/readline/readline-5.2.recipe
index b2fbf3746..e8d97ae75 100644
--- a/sys-libs/readline/readline-5.2.bep
+++ b/sys-libs/readline/readline-5.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="e39331f32ad14009b9ff49cc10c5e751"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd readline-5.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd readline-5.2
 	make install
 }
diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.recipe
similarity index 96%
rename from sys-libs/readline/readline-6.0.bep
rename to sys-libs/readline/readline-6.0.recipe
index 77b1ff870..3cc6001b9 100644
--- a/sys-libs/readline/readline-6.0.bep
+++ b/sys-libs/readline/readline-6.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd readline-6.0
 	libtoolize --force --copy --install
 	aclocal
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd readline-6.0
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.recipe
similarity index 97%
rename from sys-libs/readline/readline-6.1.bep
rename to sys-libs/readline/readline-6.1.recipe
index 90bbcff1c..5e38331a9 100644
--- a/sys-libs/readline/readline-6.1.bep
+++ b/sys-libs/readline/readline-6.1.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd readline-6.1
 	libtoolize --force --copy --install
 	aclocal
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd readline-6.1
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/readline/readline-6.2.bep b/sys-libs/readline/readline-6.2.recipe
similarity index 96%
rename from sys-libs/readline/readline-6.2.bep
rename to sys-libs/readline/readline-6.2.recipe
index b1725633f..f53a06d9e 100644
--- a/sys-libs/readline/readline-6.2.bep
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd readline-6.2
 	libtoolize --force --copy --install
 	aclocal
@@ -18,7 +19,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd readline-6.2
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/slang/slang-2.2.2.bep b/sys-libs/slang/slang-2.2.2.recipe
similarity index 96%
rename from sys-libs/slang/slang-2.2.2.bep
rename to sys-libs/slang/slang-2.2.2.recipe
index 2f452ce71..c65383837 100644
--- a/sys-libs/slang/slang-2.2.2.bep
+++ b/sys-libs/slang/slang-2.2.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e7183d0acab9cc35fae12849f8b848e2"
-BUILD {
+BUILD()
+{
 	cd slang-2.2.2/autoconf
 	libtoolize --force --copy --install
 	cp autoconf/config.guess config.guess
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd slang-2.2.2
 	make install DESTDIR="${DESTDIR}"
 }
diff --git a/sys-libs/zlib/zlib-1.2.3.bep b/sys-libs/zlib/zlib-1.2.3.recipe
similarity index 94%
rename from sys-libs/zlib/zlib-1.2.3.bep
rename to sys-libs/zlib/zlib-1.2.3.recipe
index d74407c3d..388677748 100644
--- a/sys-libs/zlib/zlib-1.2.3.bep
+++ b/sys-libs/zlib/zlib-1.2.3.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="dee233bf288ee795ac96a98cc2e369b6"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd zlib-1.2.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zlib-1.2.3
 	make install
 }
diff --git a/sys-libs/zlib/zlib-1.2.5.bep b/sys-libs/zlib/zlib-1.2.5.recipe
similarity index 94%
rename from sys-libs/zlib/zlib-1.2.5.bep
rename to sys-libs/zlib/zlib-1.2.5.recipe
index 03f91d8b2..e5a947a9e 100644
--- a/sys-libs/zlib/zlib-1.2.5.bep
+++ b/sys-libs/zlib/zlib-1.2.5.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="be1e89810e66150f5b0327984d8625a0"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd zlib-1.2.5
 	sed -i 's/share\/man/documentation\/man/' CMakeLists.txt
 	cmake .
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zlib-1.2.5
 	make install
 }
diff --git a/sys-libs/zlib/zlib-1.2.7.bep b/sys-libs/zlib/zlib-1.2.7.recipe
similarity index 95%
rename from sys-libs/zlib/zlib-1.2.7.bep
rename to sys-libs/zlib/zlib-1.2.7.recipe
index 6210e8655..f3b1b8ad9 100644
--- a/sys-libs/zlib/zlib-1.2.7.bep
+++ b/sys-libs/zlib/zlib-1.2.7.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="60df6a37c56e7c1366cca812414f7b85"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd zlib-1.2.7
 	sed -i 's/share\/man/documentation\/man/' CMakeLists.txt
 	sed -i 's/share\/pkgconfig/lib\/pkgconfig/' CMakeLists.txt	
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zlib-1.2.7
 	make install
 }
diff --git a/sys-libs/zopfli/zopfli-999.bep b/sys-libs/zopfli/zopfli-999.recipe
similarity index 96%
rename from sys-libs/zopfli/zopfli-999.bep
rename to sys-libs/zopfli/zopfli-999.recipe
index 9efa227a0..5679ad437 100644
--- a/sys-libs/zopfli/zopfli-999.bep
+++ b/sys-libs/zopfli/zopfli-999.recipe
@@ -7,13 +7,15 @@ STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."	
 
-BUILD {
+BUILD()
+{
 	cd zopfli-999
 	sed -i 's/\-lm//' makefile
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zopfli-999
 	BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${BINDIR}
diff --git a/sys-process/htop/htop-1.0.2.bep b/sys-process/htop/htop-1.0.2.recipe
similarity index 96%
rename from sys-process/htop/htop-1.0.2.bep
rename to sys-process/htop/htop-1.0.2.recipe
index 5b4c800ed..9ba195434 100644
--- a/sys-process/htop/htop-1.0.2.bep
+++ b/sys-process/htop/htop-1.0.2.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="0d01cca8df3349c74569cefebbd9919e"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd htop-1.0.2
 	./configure --disable-unicode --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd htop-1.0.2
 	make install
 }
diff --git a/www-client/links/links-2.3pre2.bep b/www-client/links/links-2.3pre2.recipe
similarity index 96%
rename from www-client/links/links-2.3pre2.bep
rename to www-client/links/links-2.3pre2.recipe
index 15bb7a6f7..c2882b221 100644
--- a/www-client/links/links-2.3pre2.bep
+++ b/www-client/links/links-2.3pre2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c"
-BUILD {
+BUILD()
+{
 	cd links-2.3pre2
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -19,7 +20,8 @@ BUILD {
 	mimeset links
 }
 
-INSTALL {
+INSTALL()
+{
 	cd links-2.3pre2
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/www-client/netsurf/netsurf-10380.bep b/www-client/netsurf/netsurf-10380.recipe
similarity index 97%
rename from www-client/netsurf/netsurf-10380.bep
rename to www-client/netsurf/netsurf-10380.recipe
index 53a10d09f..1d850b1a9 100644
--- a/www-client/netsurf/netsurf-10380.bep
+++ b/www-client/netsurf/netsurf-10380.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	dev-util/gperf >= 3.0.4
 	media-libs/libpng >= 1.4.1"
 #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592"
-BUILD {
+BUILD()
+{
 	export GCCVER=2
 	cp ../scanner.c netsurf-10380/netsurf/css/scanner.c
 	cd netsurf-10380
@@ -29,7 +30,8 @@ BUILD {
 	make beos
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-10380
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.1.bep b/www-client/netsurf/netsurf-2.1.recipe
similarity index 98%
rename from www-client/netsurf/netsurf-2.1.bep
rename to www-client/netsurf/netsurf-2.1.recipe
index f1fd077b1..9005480f2 100644
--- a/www-client/netsurf/netsurf-2.1.bep
+++ b/www-client/netsurf/netsurf-2.1.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f0a34fd076b492c1a13b45432e8d7e49"
-BUILD {
+BUILD()
+{
 	cd netsurf
 	svn co svn://svn.netsurf-browser.org/trunk/libparserutils
 	svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet
@@ -45,7 +46,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.6.bep b/www-client/netsurf/netsurf-2.6.recipe
similarity index 98%
rename from www-client/netsurf/netsurf-2.6.bep
rename to www-client/netsurf/netsurf-2.6.recipe
index 8285bec06..a4d406fc4 100644
--- a/www-client/netsurf/netsurf-2.6.bep
+++ b/www-client/netsurf/netsurf-2.6.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8653789d2ede6dbbfe79882afc7538fc"
-BUILD {
+BUILD()
+{
 	cd netsurf
 	svn co svn://svn.netsurf-browser.org/trunk/libparserutils
 	svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet
@@ -45,7 +46,8 @@ BUILD {
 	make beos
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.7-svn.bep b/www-client/netsurf/netsurf-2.7-svn.recipe
similarity index 98%
rename from www-client/netsurf/netsurf-2.7-svn.bep
rename to www-client/netsurf/netsurf-2.7-svn.recipe
index fd2d8c123..9b8719291 100644
--- a/www-client/netsurf/netsurf-2.7-svn.bep
+++ b/www-client/netsurf/netsurf-2.7-svn.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-util/gperf >= 3.0.4
 	media-libs/libmng > 1.0.10
 	dev-libs/pkgconfig >= 0.25
 	net-misc/curl >= 7.21.6"
-BUILD {
+BUILD()
+{
 	cd netsurf-2.7-svn
 
 	sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp
@@ -49,7 +50,8 @@ BUILD {
 	make beos
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-2.7-svn
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.7.bep b/www-client/netsurf/netsurf-2.7.recipe
similarity index 98%
rename from www-client/netsurf/netsurf-2.7.bep
rename to www-client/netsurf/netsurf-2.7.recipe
index 8394fd42d..12ac7f385 100644
--- a/www-client/netsurf/netsurf-2.7.bep
+++ b/www-client/netsurf/netsurf-2.7.recipe
@@ -9,7 +9,8 @@ DEPEND="dev-util/gperf >= 3.0.4
 	net-misc/curl >= 7.21.6"
 CHECKSUM_MD5="52939f2e2319269d7d758ec665f6cb8e"
 
-BUILD {
+BUILD()
+{
 	cd netsurf
 	sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp	
 	svn co svn://svn.netsurf-browser.org/trunk/libparserutils -r12456
@@ -49,7 +50,8 @@ BUILD {
 	make beos
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.9.bep b/www-client/netsurf/netsurf-2.9.recipe
similarity index 96%
rename from www-client/netsurf/netsurf-2.9.bep
rename to www-client/netsurf/netsurf-2.9.recipe
index 95d70633f..4d6d9ed8e 100644
--- a/www-client/netsurf/netsurf-2.9.bep
+++ b/www-client/netsurf/netsurf-2.9.recipe
@@ -13,12 +13,14 @@ DEPEND="dev-util/gperf >= 3.0.4
 	media-libs/lcms >= 2.1"
 CHECKSUM_MD5="cfc2789997b356f2ea9d9f7694c4c909"
 
-BUILD {
+BUILD()
+{
 	cd netsurf-2.9
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-2.9
 	make install
 }
diff --git a/www-client/netsurf/netsurf-2.HEAD.bep b/www-client/netsurf/netsurf-2.HEAD.recipe
similarity index 97%
rename from www-client/netsurf/netsurf-2.HEAD.bep
rename to www-client/netsurf/netsurf-2.HEAD.recipe
index c13cdb423..fc3f5ef8c 100644
--- a/www-client/netsurf/netsurf-2.HEAD.bep
+++ b/www-client/netsurf/netsurf-2.HEAD.recipe
@@ -19,12 +19,14 @@ DEPEND="dev-util/gperf >= 3.0.4
 	net-libs/libdom >= 0
 	"
 
-BUILD {
+BUILD()
+{
 	cd netsurf-2.HEAD
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-2.HEAD
 	make install
 }
diff --git a/www-client/netsurf/netsurf-9799.bep b/www-client/netsurf/netsurf-9799.recipe
similarity index 98%
rename from www-client/netsurf/netsurf-9799.bep
rename to www-client/netsurf/netsurf-9799.recipe
index 5870ed123..b988044f0 100644
--- a/www-client/netsurf/netsurf-9799.bep
+++ b/www-client/netsurf/netsurf-9799.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	dev-util/gperf >= 3.0.4
 	media-libs/libpng >= 1.4.1"
 CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592"
-BUILD {
+BUILD()
+{
 	cd netsurf
 	svn co svn://svn.netsurf-browser.org/trunk/libparserutils
 	svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet
@@ -46,7 +47,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf
 	make install
 }
diff --git a/www-client/netsurf/netsurf-9872.bep b/www-client/netsurf/netsurf-9872.recipe
similarity index 97%
rename from www-client/netsurf/netsurf-9872.bep
rename to www-client/netsurf/netsurf-9872.recipe
index 7f61719e1..e7f033c11 100644
--- a/www-client/netsurf/netsurf-9872.bep
+++ b/www-client/netsurf/netsurf-9872.recipe
@@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23
 	dev-util/gperf >= 3.0.4
 	media-libs/libpng >= 1.4.1"
 #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592"
-BUILD {
+BUILD()
+{
 	export GCCVER=2
 	cp ../scanner.c netsurf-9872/netsurf/css/scanner.c
 	cd netsurf-9872
@@ -29,7 +30,8 @@ BUILD {
 	make beos
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-9872
 	make install
 }
diff --git a/www-client/w3m/w3m-0.5.3.bep b/www-client/w3m/w3m-0.5.3.recipe
similarity index 97%
rename from www-client/w3m/w3m-0.5.3.bep
rename to www-client/w3m/w3m-0.5.3.recipe
index fc8b1b292..8742a33a6 100644
--- a/www-client/w3m/w3m-0.5.3.bep
+++ b/www-client/w3m/w3m-0.5.3.recipe
@@ -8,7 +8,8 @@ DEPEND="dev-libs/boehm-gc >= 7.2_alpha6
 		dev-libs/openssl >= 0.9.8l
 		sys-devel/gettext >= 0.17"
 CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc"
-BUILD {
+BUILD()
+{
 	cd w3m-0.5.3
 	libtoolize -fci
 	autoconf
@@ -19,7 +20,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd w3m-0.5.3
 	make install
 }
diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.recipe
similarity index 95%
rename from www-servers/apache/apache-2.2.17.bep
rename to www-servers/apache/apache-2.2.17.recipe
index 201911275..03f0586e4 100644
--- a/www-servers/apache/apache-2.2.17.bep
+++ b/www-servers/apache/apache-2.2.17.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.4 2
 	dev-libs/apr-utils >= 1.3.9"
 CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9"
-BUILD {
+BUILD()
+{
 	cd httpd-2.2.17
 	libtoolize --force --copy --install
 	aclocal
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd httpd-2.2.17
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd httpd-2.2.17
 	make test
 }
diff --git a/www-servers/apache/apache-2.2.22.bep b/www-servers/apache/apache-2.2.22.recipe
similarity index 95%
rename from www-servers/apache/apache-2.2.22.bep
rename to www-servers/apache/apache-2.2.22.recipe
index 66ac4713a..24d867e0e 100644
--- a/www-servers/apache/apache-2.2.22.bep
+++ b/www-servers/apache/apache-2.2.22.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.4 2
 	dev-libs/apr-utils >= 1.3.9"
 CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1"
-BUILD {
+BUILD()
+{
 	cd httpd-2.2.22
 	libtoolize --force --copy --install
 	aclocal
@@ -18,12 +19,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd httpd-2.2.22
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd httpd-2.2.22
 	make test
 }
diff --git a/www-servers/apache/apache-2.4.3.bep b/www-servers/apache/apache-2.4.3.recipe
similarity index 96%
rename from www-servers/apache/apache-2.4.3.bep
rename to www-servers/apache/apache-2.4.3.recipe
index 10bc209c9..58bceb591 100644
--- a/www-servers/apache/apache-2.4.3.bep
+++ b/www-servers/apache/apache-2.4.3.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="dev-libs/apr >= 1.4 2
 	dev-libs/apr-util >= 1.3.9"
 CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417"
-BUILD {
+BUILD()
+{
 	cd httpd-2.4.3
 	libtoolize --force --copy --install
 	aclocal
@@ -19,12 +20,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd httpd-2.4.3
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd httpd-2.4.3
 	make test
 }
diff --git a/www-servers/cherokee/cherokee-1.2.101.bep b/www-servers/cherokee/cherokee-1.2.101.recipe
similarity index 95%
rename from www-servers/cherokee/cherokee-1.2.101.bep
rename to www-servers/cherokee/cherokee-1.2.101.recipe
index 468b11357..82a05810a 100644
--- a/www-servers/cherokee/cherokee-1.2.101.bep
+++ b/www-servers/cherokee/cherokee-1.2.101.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="ef47003355a2e368e4d9596cd070ef23"
-BUILD {
+BUILD()
+{
 	cd cherokee-1.2.101
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -17,12 +18,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cherokee-1.2.101
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cherokee-1.2.101
 #	make test
 #	make check
diff --git a/www-servers/haproxy/haproxy-1.4.22.bep b/www-servers/haproxy/haproxy-1.4.22.recipe
similarity index 97%
rename from www-servers/haproxy/haproxy-1.4.22.bep
rename to www-servers/haproxy/haproxy-1.4.22.recipe
index fa1d3ce35..854d047dc 100644
--- a/www-servers/haproxy/haproxy-1.4.22.bep
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -4,14 +4,16 @@ SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
 CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c"
 STATUS_HAIKU="stable"
 REVISION="1"
-BUILD {
+BUILD()
+{
 	cd haproxy-1.4.22
 	make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
 		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd haproxy-1.4.22
 	make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
diff --git a/x11-libs/agg/agg-2.5.bep b/x11-libs/agg/agg-2.5.recipe
similarity index 96%
rename from x11-libs/agg/agg-2.5.bep
rename to x11-libs/agg/agg-2.5.recipe
index 6d243794d..e5d686489 100644
--- a/x11-libs/agg/agg-2.5.bep
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6"
-BUILD {
+BUILD()
+{
 	cd agg-2.5
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd agg-2.5
 	make install DESTDIR=${DESTDIR}
 }
diff --git a/x11-libs/cairo/cairo-1.10.0.bep b/x11-libs/cairo/cairo-1.10.0.recipe
similarity index 97%
rename from x11-libs/cairo/cairo-1.10.0.bep
rename to x11-libs/cairo/cairo-1.10.0.recipe
index b23acc8b0..776d8bdfb 100644
--- a/x11-libs/cairo/cairo-1.10.0.bep
+++ b/x11-libs/cairo/cairo-1.10.0.recipe
@@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11
 	fontconfig >= 2.8.0
 	pixman >= 0.18.4"
 CHECKSUM_MD5="70a2ece66cf473d976e2db0f75bf199e"
-BUILD {
+BUILD()
+{
 	cd cairo-1.10.0
 	libtoolize --force --copy --install
 	aclocal -I build
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cairo-1.10.0
 	make install
 }
diff --git a/x11-libs/cairo/cairo-1.8.10.bep b/x11-libs/cairo/cairo-1.8.10.recipe
similarity index 97%
rename from x11-libs/cairo/cairo-1.8.10.bep
rename to x11-libs/cairo/cairo-1.8.10.recipe
index 69bfa28fd..571c35752 100644
--- a/x11-libs/cairo/cairo-1.8.10.bep
+++ b/x11-libs/cairo/cairo-1.8.10.recipe
@@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11
 	fontconfig >= 2.8.0
 	pixman >= 0.17.2"
 CHECKSUM_MD5="b60a82f405f9400bbfdcf850b1728d25"
-BUILD {
+BUILD()
+{
 	cd cairo-1.8.10
 	libtoolize --force --copy --install
 	aclocal -I build
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cairo-1.8.10
 	make install
 }
diff --git a/x11-libs/libX11/libX11-1.3.3.bep b/x11-libs/libX11/libX11-1.3.3.recipe
similarity index 97%
rename from x11-libs/libX11/libX11-1.3.3.bep
rename to x11-libs/libX11/libX11-1.3.3.recipe
index d5d0199d2..2616a1939 100644
--- a/x11-libs/libX11/libX11-1.3.3.bep
+++ b/x11-libs/libX11/libX11-1.3.3.recipe
@@ -15,7 +15,8 @@ DEPEND="x11-misc/util-macros >= 1.7.0
         x11-libs/libxcb >= 1.6
         x11-libs/libXau >= 1.0.5
         x11-proto/xextproto >= 7.1.1"
-BUILD {
+BUILD()
+{
 	cd libX11-1.3.3
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -23,7 +24,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libX11-1.3.3
 	make install
 }
diff --git a/x11-libs/libXau/libXau-1.0.5.bep b/x11-libs/libXau/libXau-1.0.5.recipe
similarity index 95%
rename from x11-libs/libXau/libXau-1.0.5.bep
rename to x11-libs/libXau/libXau-1.0.5.recipe
index fd8eee947..262bf426b 100644
--- a/x11-libs/libXau/libXau-1.0.5.bep
+++ b/x11-libs/libXau/libXau-1.0.5.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.23
         x11-misc/util-macros >= 1.7.0"
-BUILD {
+BUILD()
+{
 	cd libXau-1.0.5
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libXau-1.0.5
 	make install
 }
diff --git a/x11-libs/libxcb/libxcb-1.6.bep b/x11-libs/libxcb/libxcb-1.6.recipe
similarity index 96%
rename from x11-libs/libxcb/libxcb-1.6.bep
rename to x11-libs/libxcb/libxcb-1.6.recipe
index 4ecfc01c2..8d316acf2 100644
--- a/x11-libs/libxcb/libxcb-1.6.bep
+++ b/x11-libs/libxcb/libxcb-1.6.recipe
@@ -10,14 +10,16 @@ DEPEND="pkgconfig >= 0.23
         x11-proto/xcb-proto >= 1.6
         x11-libs/libXau >= 1.0.5"
         
-BUILD {
+BUILD()
+{
 	cd libxcb-1.6
 	libtoolize --force --copy --install
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libxcb-1.6
 	make install
 }
diff --git a/x11-libs/pango/pango-1.28.1.bep b/x11-libs/pango/pango-1.28.1.recipe
similarity index 96%
rename from x11-libs/pango/pango-1.28.1.bep
rename to x11-libs/pango/pango-1.28.1.recipe
index 0f68809d9..a783d46ad 100644
--- a/x11-libs/pango/pango-1.28.1.bep
+++ b/x11-libs/pango/pango-1.28.1.recipe
@@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23
 		media-libs/fontconfig >= 2.8.0
 	    x11-libs/cairo >= 1.8.10"
 	    
-BUILD {
+BUILD()
+{
 	cd pango-1.28.1
 	./autogen.sh
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pango-1.28.1
 	make install
 }
diff --git a/x11-libs/pixman/pixman-0.17.2.bep b/x11-libs/pixman/pixman-0.17.2.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.17.2.bep
rename to x11-libs/pixman/pixman-0.17.2.recipe
index db949ba89..e4d9efc2d 100644
--- a/x11-libs/pixman/pixman-0.17.2.bep
+++ b/x11-libs/pixman/pixman-0.17.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="006c74f1450e5ed2e1bdaf88e9806faa"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-0.17.2
 	libtoolize --force --copy --install
 	aclocal 
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-0.17.2
 	make install
 }
diff --git a/x11-libs/pixman/pixman-0.18.2.bep b/x11-libs/pixman/pixman-0.18.2.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.18.2.bep
rename to x11-libs/pixman/pixman-0.18.2.recipe
index 0141d1aef..3207fc846 100644
--- a/x11-libs/pixman/pixman-0.18.2.bep
+++ b/x11-libs/pixman/pixman-0.18.2.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="5d1378fa61610dd5d3c7e0111b2c5253"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-0.18.2
 	libtoolize --force --copy --install
 	aclocal 
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-0.18.2
 	make install
 }
diff --git a/x11-libs/pixman/pixman-0.18.4.bep b/x11-libs/pixman/pixman-0.18.4.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.18.4.bep
rename to x11-libs/pixman/pixman-0.18.4.recipe
index 8a8d9f5f1..c2fd8770b 100644
--- a/x11-libs/pixman/pixman-0.18.4.bep
+++ b/x11-libs/pixman/pixman-0.18.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="532db4194e18c108d0b7dd85f20d39b8"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-0.18.4
 	libtoolize --force --copy --install
 	aclocal 
@@ -15,7 +16,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-0.18.4
 	make install
 }
diff --git a/x11-libs/pixman/pixman-0.19-master.bep b/x11-libs/pixman/pixman-0.19-master.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.19-master.bep
rename to x11-libs/pixman/pixman-0.19-master.recipe
index 620b4c6ef..e0af5913a 100644
--- a/x11-libs/pixman/pixman-0.19-master.bep
+++ b/x11-libs/pixman/pixman-0.19-master.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c53466dc2e6145afdb80b5a74491a2de"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-master
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -13,12 +14,14 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-master
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd pixman-master
 	make check
 }
diff --git a/x11-libs/pixman/pixman-0.19.4.bep b/x11-libs/pixman/pixman-0.19.4.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.19.4.bep
rename to x11-libs/pixman/pixman-0.19.4.recipe
index c97b06ae6..d40a8126f 100644
--- a/x11-libs/pixman/pixman-0.19.4.bep
+++ b/x11-libs/pixman/pixman-0.19.4.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="100a2d23f1d5683fdaa5d7ca71a0182b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-0.19.4
 	libtoolize --force --copy --install
 	./autogen.sh
@@ -13,12 +14,14 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-0.19.4
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd pixman-0.19.4
 	make check
 }
diff --git a/x11-libs/pixman/pixman-0.20.0.bep b/x11-libs/pixman/pixman-0.20.0.recipe
similarity index 95%
rename from x11-libs/pixman/pixman-0.20.0.bep
rename to x11-libs/pixman/pixman-0.20.0.recipe
index d93ac2db0..ffa1be8dd 100644
--- a/x11-libs/pixman/pixman-0.20.0.bep
+++ b/x11-libs/pixman/pixman-0.20.0.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pixman-0.20.0
 	libtoolize --force --copy --install
 	aclocal
@@ -14,12 +15,14 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pixman-0.20.0
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd pixman-0.20.0
 	make check
 }
diff --git a/x11-libs/xtrans/xtrans-1.2.5.bep b/x11-libs/xtrans/xtrans-1.2.5.recipe
similarity index 96%
rename from x11-libs/xtrans/xtrans-1.2.5.bep
rename to x11-libs/xtrans/xtrans-1.2.5.recipe
index dabe29737..fb109065a 100644
--- a/x11-libs/xtrans/xtrans-1.2.5.bep
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND="pkgconfig >= 0.23
         x11-misc/util-macros >= 1.7.0"
         
-BUILD {
+BUILD()
+{
 	cd xtrans-1.2.5
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -15,7 +16,8 @@ BUILD {
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xtrans-1.2.5
 	make install
 }
diff --git a/x11-misc/makedepend/makedepend-1.0.2.bep b/x11-misc/makedepend/makedepend-1.0.2.recipe
similarity index 96%
rename from x11-misc/makedepend/makedepend-1.0.2.bep
rename to x11-misc/makedepend/makedepend-1.0.2.recipe
index 58fb5b71b..b6319037a 100644
--- a/x11-misc/makedepend/makedepend-1.0.2.bep
+++ b/x11-misc/makedepend/makedepend-1.0.2.recipe
@@ -7,14 +7,16 @@ STATUS_HAIKU="stable"
 DEPEND="dev-util/pkgconfig >= 0.9
 	x11-misc/util-macros >= 1.7.0
 	x11-proto/xproto >= 7.0.16"
-BUILD {
+BUILD()
+{
 	cd makedepend-1.0.2
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd makedepend-1.0.2
 	make install
 }
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep b/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe
similarity index 96%
rename from x11-misc/shared-mime-info/shared-mime-info-1.0.bep
rename to x11-misc/shared-mime-info/shared-mime-info-1.0.recipe
index 0c61c66ad..ac8adccf1 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND="intltool,
 		glib"
-BUILD {
+BUILD()
+{
 	cd shared-mime-info-1.0
 	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
 	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd shared-mime-info-1.0
 	make install	
 }
diff --git a/x11-misc/util-macros/util-macros-1.17.0-git.bep b/x11-misc/util-macros/util-macros-1.17.0-git.recipe
similarity index 95%
rename from x11-misc/util-macros/util-macros-1.17.0-git.bep
rename to x11-misc/util-macros/util-macros-1.17.0-git.recipe
index ea93fa92c..8f7f416d5 100644
--- a/x11-misc/util-macros/util-macros-1.17.0-git.bep
+++ b/x11-misc/util-macros/util-macros-1.17.0-git.recipe
@@ -9,7 +9,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/util/macros"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd util-macros-1.17.0-git
 	./autogen.sh -V
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd util-macros-1.17.0-git
 	make install
 }
diff --git a/x11-misc/util-macros/util-macros-1.7.0.bep b/x11-misc/util-macros/util-macros-1.7.0.recipe
similarity index 95%
rename from x11-misc/util-macros/util-macros-1.7.0.bep
rename to x11-misc/util-macros/util-macros-1.7.0.recipe
index 13a30101a..6144a32f7 100644
--- a/x11-misc/util-macros/util-macros-1.7.0.bep
+++ b/x11-misc/util-macros/util-macros-1.7.0.recipe
@@ -5,13 +5,15 @@ CHECKSUM_MD5="8a8d208f24672e7a37d1aa4d2ffcef8e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd util-macros-1.7.0
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd util-macros-1.7.0
 	make install
 }
diff --git a/x11-proto/inputproto/inputproto-2.0.bep b/x11-proto/inputproto/inputproto-2.0.recipe
similarity index 95%
rename from x11-proto/inputproto/inputproto-2.0.bep
rename to x11-proto/inputproto/inputproto-2.0.recipe
index 8428ac375..6d461f68d 100644
--- a/x11-proto/inputproto/inputproto-2.0.bep
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
 
-BUILD {
+BUILD()
+{
 	cd inputproto-2.0
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd inputproto-2.0
 	make install
 }
diff --git a/x11-proto/kbproto/kbproto-1.0.4.bep b/x11-proto/kbproto/kbproto-1.0.4.recipe
similarity index 95%
rename from x11-proto/kbproto/kbproto-1.0.4.bep
rename to x11-proto/kbproto/kbproto-1.0.4.recipe
index aa6a56080..970e88e87 100644
--- a/x11-proto/kbproto/kbproto-1.0.4.bep
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
 
-BUILD {
+BUILD()
+{
 	cd kbproto-1.0.4
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd kbproto-1.0.4
 	make install
 }
diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.bep b/x11-proto/xcb-proto/xcb-proto-1.6.recipe
similarity index 94%
rename from x11-proto/xcb-proto/xcb-proto-1.6.bep
rename to x11-proto/xcb-proto/xcb-proto-1.6.recipe
index ab77c5e0e..6573458f7 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.6.bep
+++ b/x11-proto/xcb-proto/xcb-proto-1.6.recipe
@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
 
-BUILD {
+BUILD()
+{
 	cd xcb-proto-1.6
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -14,7 +15,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xcb-proto-1.6
 	make install
 }
diff --git a/x11-proto/xextproto/xextproto-7.1.1.bep b/x11-proto/xextproto/xextproto-7.1.1.recipe
similarity index 95%
rename from x11-proto/xextproto/xextproto-7.1.1.bep
rename to x11-proto/xextproto/xextproto-7.1.1.recipe
index 79bbbd807..224d93786 100644
--- a/x11-proto/xextproto/xextproto-7.1.1.bep
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -6,14 +6,16 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
 
-BUILD {
+BUILD()
+{
 	cd xextproto-7.1.1
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xextproto-7.1.1
 	make install
 }
diff --git a/x11-proto/xproto/xproto-7.0.16.bep b/x11-proto/xproto/xproto-7.0.16.recipe
similarity index 95%
rename from x11-proto/xproto/xproto-7.0.16.bep
rename to x11-proto/xproto/xproto-7.0.16.recipe
index d3ab77900..cd13a63fb 100644
--- a/x11-proto/xproto/xproto-7.0.16.bep
+++ b/x11-proto/xproto/xproto-7.0.16.recipe
@@ -5,14 +5,16 @@ CHECKSUM_MD5="6e6b6510ccd568f82093ebd7ae58700b"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="x11-misc/util-macros >= 1.7.0"
-BUILD {
+BUILD()
+{
 	cd xproto-7.0.16
 	libtoolize --force --copy --install
 	autoreconf -i
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xproto-7.0.16
 	make install
 }
diff --git a/x11-proto/xproto/xproto-7.0.23-git.bep b/x11-proto/xproto/xproto-7.0.23-git.recipe
similarity index 97%
rename from x11-proto/xproto/xproto-7.0.23-git.bep
rename to x11-proto/xproto/xproto-7.0.23-git.recipe
index 643668b5a..1d808c8c7 100644
--- a/x11-proto/xproto/xproto-7.0.23-git.bep
+++ b/x11-proto/xproto/xproto-7.0.23-git.recipe
@@ -13,7 +13,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd xproto-7.0.23-git
 	./autogen.sh -V
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -21,7 +22,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xproto-7.0.23-git
 	make install
 }