* adjust several recipes to our new naming conventions

dev-vcs/cvs/cvs-1.12.13.1.recipe

@@ -3,15 +3,15 @@ DESCRIPTION="CVS is a version control system."
 HOMEPAGE="http://www.nongnu.org/cvs/" 
 SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
 CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="cvs = $portVersion compat >= 1.12
 	cmd:cvs = $portVersion compat >= 1.12"
-REQUIRES="haiku-devel >= $haikuVersion
+REQUIRES="haiku_devel >= $haikuVersion
 	zlib >= 1.1.4"
 BUILD_REQUIRES=""
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize

dev-vcs/subversion/subversion-1.6.15.recipe

@@ -10,7 +10,7 @@ DESCRIPTION="
 HOMEPAGE="http://subversion.apache.org"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
 CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -28,7 +28,7 @@ PROVIDES="
 REQUIRES="
 	haiku >= $haikuVersion
 	apr >= 1.3
-	apr-util >= 1.3
+	apr_util >= 1.3
 	expat >= 2.0
 	libiconv >= 1.13
 	libxml2 >= 2.7
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"
@@ -59,7 +59,7 @@ BUILD()
 	subversionPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
 	./configure $configureDirArgs \
 		--with-apr=$subversionPackageLinksDir/apr/bin/apr-1-config \
-		--with-apr-util=$subversionPackageLinksDir/apr-util/bin/apu-1-config \
+		--with-apr-util=$subversionPackageLinksDir/apr_util/bin/apu-1-config \
 		--with-neon=$subversionPackageLinksDir/neon \
 		--with-zlib=$subversionPackageLinksDir/zlib \
 		--with-editor=nano \