Merge branch 'package-management'

Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
2026-04-22 19:50:05 +02:00 · 2013-10-15 22:48:02 +02:00
parent 79f735cb8b c69048fe86
commit f3532dc2cb
1452 changed files with 31199 additions and 33804 deletions
--- a/dev-vcs/bzr/bzr-2.2.0.recipe
+++ 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`
--- a/dev-vcs/bzr/bzr-2.2.1.recipe
+++ 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}
--- a/dev-vcs/bzr/bzr-2.2.2.recipe
+++ 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}
--- a/dev-vcs/bzr/bzr-2.2b4.recipe
+++ 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}
--- a/dev-vcs/bzr/bzr-2.5.1.recipe
+++ 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,18 +16,19 @@ 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}
+		python setup.py build_ext --allow-python-fallback install --prefix=$COMMON_DIR --root=${DESTDIR}
 	else
-		python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR}
+		python setup.py install --prefix=$COMMON_DIR --root=${DESTDIR}
 	fi
 ##	Now put the man file(s) in the correct directory
-	mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1
-	mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/
+	mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1
+	mv ${DESTDIR}/$COMMON_DIR/man/man1/bzr* ${DESTDIR}/$COMMON_DOCS/man/man1/
 	if [ -e "${DESTDIR}" ]; then
-		rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man
+		rm -rf ${DESTDIR}/$COMMON_DIR/man
 	fi
 }

--- a/dev-vcs/bzr/bzr-2.6b1.recipe
+++ 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}
--- a/dev-vcs/cvs/cvs-1.12.13.1.bep
+++ b/dev-vcs/cvs/cvs-1.12.13.1.bep
@@ -1,26 +0,0 @@
-DESCRIPTION="CVS is a version control system" 
-HOMEPAGE="http://www.nongnu.org/cvs/" 
-SRC_URI="http://ports-space.haiku-files.org/dev-vcs/sources/cvs-1.12.13.1.tar.bz2"
-CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cvs-1.12.13.1
-	libtoolize --force --copy --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--enable-rootcommit \
-		EDITOR=nano
-	make
-}
-
-INSTALL {
-	cd cvs-1.12.13.1
-	make install
-}
-LICENSE="GNU GPL v1
-	GNU LGPL v2"
-COPYRIGHT="1986-2005 Free Software Foundation, Inc."
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -0,0 +1,64 @@
+SUMMARY="Concurrent Versions System"
+DESCRIPTION="CVS is a version control system, an important component of Source Configuration Management (SCM). Using it, you can record the history of sources files, and documents. It fills a similar role to the free software RCS, PRCS, and Aegis packages.
+
+CVS is a production quality system in wide use around the world, including many free software projects.
+
+While CVS stores individual file history in the same format as RCS, it offers the following significant advantages over RCS:
+
+    * It can run scripts which you can supply to log CVS operations or enforce site-specific polices.
+    * Client/server CVS enables developers scattered by geography or slow modems to function as a single team. The version history is stored on a single central server and the client machines have a copy of all the files that the developers are working on. Therefore, the network between the client and the server must be up to perform CVS operations (such as checkins or updates) but need not be up to edit or manipulate the current versions of the files. Clients can perform all the same operations which are available locally.
+    * In cases where several developers or teams want to each maintain their own version of the files, because of geography and/or policy, CVS's vendor branches can import a version from another team (even if they don't use CVS), and then CVS can merge the changes from the vendor branch with the latest files if that is what is desired.
+    * Unreserved checkouts, allowing more than one developer to work on the same files at the same time.
+    * CVS provides a flexible modules database that provides a symbolic mapping of names to components of a larger software distribution. It applies names to collections of directories and files. A single command can manipulate the entire collection.
+    * CVS servers run on most unix variants, and clients for Windows NT/95, OS/2 and VMS are also available. CVS will also operate in what is sometimes called server mode against local repositories on Windows 95/NT."
+HOMEPAGE="http://www.nongnu.org/cvs/"
+COPYRIGHT="1986-2005 Free Software Foundation, Inc."
+LICENSE="GNU GPL v1
+	GNU LGPL v2"
+SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
+CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
+REVISION="6"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="cvs-1.12.13.1.patch"
+
+PROVIDES="
+	cvs = $portVersion compat >= 1.12
+	cmd:cvs = $portVersion compat >= 1.12
+	cmd:cvsbug = $portVersion compat >= 1.12
+	cmd:rcs2log = $portVersion compat >= 1.12
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:nano
+	cmd:perl
+	lib:libz
+	"
+BUILD_REQUIRES="
+	cmd:perl
+	devel:libz >= 1.1.4
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:nano
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	PERL=$portPackageLinksDir/cmd~perl/bin/perl \
+	runConfigure ./configure --enable-rootcommit \
+		--with-external-zlib
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
--- a/dev-vcs/cvs/cvs-1.12.13.bep
+++ b/dev-vcs/cvs/cvs-1.12.13.bep
@@ -1,27 +0,0 @@
-DESCRIPTION="CVS is a version control system" 
-HOMEPAGE="http://www.nongnu.org/cvs/" 
-SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz"
-CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-BUILD {
-	cd cvs-1.12.13
-	libtoolize --force --copy --install
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--enable-rootcommit \
-		EDITOR=nano
-	make
-}
-
-INSTALL {
-	cd cvs-1.12.13
-	make install
-}
-LICENSE="GNU GPL v1
-	GNU LGPL v2"
-COPYRIGHT="1986-2005 Free Software Foundation, Inc."
--- a/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff
+++ b/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff
@@ -1,58 +0,0 @@
-diff -urN cvs-1.12.13/configure cvs-1.12.13-haiku/configure
--- cvs-1.12.13/configure	2005-10-03 13:36:42.000000000 +0000
-+++ cvs-1.12.13-haiku/configure	2008-09-30 18:38:24.000000000 +0000
-@@ -37138,7 +37138,7 @@
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_connect" = no; then
-  for ac_lib in xnet socket inet; do
-+  for ac_lib in xnet socket network inet; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-diff -urN cvs-1.12.13/configure.in cvs-1.12.13-haiku/configure.in
--- cvs-1.12.13/configure.in	2005-10-03 13:34:45.000000000 +0000
-+++ cvs-1.12.13-haiku/configure.in	2008-09-30 18:38:24.000000000 +0000
-@@ -515,7 +515,7 @@
- 
- # Try to find connect and gethostbyname.
- AC_CHECK_LIB(nsl, main)
-AC_SEARCH_LIBS(connect, xnet socket inet,
-+AC_SEARCH_LIBS(connect, xnet socket network inet,
-   AC_DEFINE(HAVE_CONNECT, 1,
- [Define if you have the connect function.]))
- dnl no need to search nsl for gethostbyname here since we should have
-diff -urN cvs-1.12.13/lib/getaddrinfo.h cvs-1.12.13-haiku/lib/getaddrinfo.h
--- cvs-1.12.13/lib/getaddrinfo.h	2005-09-08 15:55:53.000000000 +0000
-+++ cvs-1.12.13-haiku/lib/getaddrinfo.h	2008-09-30 19:33:49.000000000 +0000
-@@ -26,7 +26,7 @@
- # include <netdb.h>
- 
- # if !HAVE_GETADDRINFO
-
-+#ifndef __HAIKU__
- /* Structure to contain information about address of a service provider.  */
- struct addrinfo
- {
-@@ -61,6 +61,8 @@
- # define EAI_ADDRFAMILY	  -9	/* Address family for NAME not supported.  */
- # define EAI_MEMORY	  -10	/* Memory allocation failure.  */
- # define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
-+#endif
-+
- # define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
- # ifdef __USE_GNU
- #  define EAI_INPROGRESS  -100	/* Processing request in progress.  */
-diff -urN cvs-1.12.13/lib/getpass.c cvs-1.12.13-haiku/lib/getpass.c
--- cvs-1.12.13/lib/getpass.c	2005-09-19 21:12:21.000000000 +0000
-+++ cvs-1.12.13-haiku/lib/getpass.c	2008-09-30 19:53:05.000000000 +0000
-@@ -104,8 +104,9 @@
-   else
-     {
-       /* We do the locking ourselves.  */
-+#ifdef __HAIKU__
-       __fsetlocking (tty, FSETLOCKING_BYCALLER);
-
-+#endif
-       out = in = tty;
-     }
--- a/dev-vcs/cvs/patches/cvs-1.12.13.patch
+++ b/dev-vcs/cvs/patches/cvs-1.12.13.patch
@@ -1,75 +0,0 @@
-diff -up cvs-1.12.13/configure.in.orig cvs-1.12.13/configure.in
--- cvs-1.12.13/configure.in.orig	2010-04-28 23:59:18.202637312 -0600
-+++ cvs-1.12.13/configure.in	2010-04-29 00:01:51.938999808 -0600
-@@ -515,12 +515,12 @@ CVS_FUNC_PRINTF_PTR
- 
- # Try to find connect and gethostbyname.
- AC_CHECK_LIB(nsl, main)
-AC_SEARCH_LIBS(connect, xnet socket inet,
-+AC_SEARCH_LIBS(connect, xnet socket inet network,
-   AC_DEFINE(HAVE_CONNECT, 1,
- [Define if you have the connect function.]))
- dnl no need to search nsl for gethostbyname here since we should have
- dnl just added libnsl above if we found it.
-AC_SEARCH_LIBS(gethostbyname, netinet)
-+AC_SEARCH_LIBS(gethostbyname, netinet network)
- 
- AC_SUBST(cvs_client_objects)
- 
-diff -up cvs-1.12.13/lib/getpass.c.orig cvs-1.12.13/lib/getpass.c
--- cvs-1.12.13/lib/getpass.c.orig	2005-09-19 15:12:21.001835008 -0600
-+++ cvs-1.12.13/lib/getpass.c	2010-04-28 23:55:13.523239424 -0600
-@@ -104,7 +104,7 @@ getpass (const char *prompt)
-   else
-     {
-       /* We do the locking ourselves.  */
-      __fsetlocking (tty, FSETLOCKING_BYCALLER);
-+//      __fsetlocking (tty, FSETLOCKING_BYCALLER);
- 
-       out = in = tty;
-     }
-diff -up cvs-1.12.13/lib/stdbool_.h.orig cvs-1.12.13/lib/stdbool_.h
--- cvs-1.12.13/lib/stdbool_.h.orig	2005-05-23 11:44:32.015204352 -0600
-+++ cvs-1.12.13/lib/stdbool_.h	2010-04-28 23:55:13.506724352 -0600
-@@ -55,7 +55,7 @@
- 
- /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
-    definitions below, but temporarily we have to #undef them.  */
-#ifdef __BEOS__
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- # include <OS.h> /* defines bool but not _Bool */
- # undef false
- # undef true
-@@ -70,7 +70,7 @@
-    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
-    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
-    enum; this ensures that '_Bool' promotes to 'int'.  */
-#if !(defined __cplusplus || defined __BEOS__)
-+#if !(defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__))
- # if !@HAVE__BOOL@
- #  if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
-     /* Avoid stupid "warning: _Bool is a keyword in ISO C99".  */
-diff -up cvs-1.12.13/m4/getaddrinfo.m4.orig cvs-1.12.13/m4/getaddrinfo.m4
--- cvs-1.12.13/m4/getaddrinfo.m4.orig	2010-04-29 00:00:46.542638080 -0600
-+++ cvs-1.12.13/m4/getaddrinfo.m4	2010-04-29 00:00:53.830996480 -0600
-@@ -6,7 +6,7 @@ dnl with or without modifications, as lo
- 
- AC_DEFUN([gl_GETADDRINFO],
- [
-  AC_SEARCH_LIBS(getaddrinfo, nsl socket)
-+  AC_SEARCH_LIBS(getaddrinfo, nsl socket network)
-   AC_REPLACE_FUNCS(getaddrinfo gai_strerror)
-   gl_PREREQ_GETADDRINFO
- ])
-diff -up cvs-1.12.13/src/buffer.c.orig cvs-1.12.13/src/buffer.c
--- cvs-1.12.13/src/buffer.c.orig	2005-10-02 09:17:20.017563648 -0600
-+++ cvs-1.12.13/src/buffer.c	2010-04-28 23:55:13.536084480 -0600
-@@ -2019,7 +2019,7 @@ fd_buffer_block (void *closure, bool blo
- 			 && sb.st_uid == devnull.st_uid
- 			 && sb.st_gid == devnull.st_gid
- 			 && sb.st_size == devnull.st_size
-			 && sb.st_blocks == devnull.st_blocks
-+//			 && sb.st_blocks == devnull.st_blocks
- 			 && sb.st_blksize == devnull.st_blksize);
- 	if (isdevnull)
- 	    errno = 0;
--- a/dev-vcs/fossil/fossil-1.22-fossil.bep
+++ b/dev-vcs/fossil/fossil-1.22-fossil.bep
@@ -1,23 +0,0 @@
-DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="fossil+http://www.fossil-scm.org/"
-#CHECKSUM_MD5=""
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD {
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	make install
-}
-
-TEST {
-	make test
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
--- a/dev-vcs/fossil/fossil-1.22.recipe
+++ 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
 }
--- a/dev-vcs/git/git-1.7.10.2.bep
+++ b/dev-vcs/git/git-1.7.10.2.bep
@@ -1,26 +0,0 @@
-DESCRIPTION="git a fast version control system" 
-HOMEPAGE="http://git-scm.com/" 
-SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
-CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="net-misc/curl >= 7.20.0
-		dev-lang/perl >= 5.10.1
-		dev-vcs/gitdoc == 1.7.10"
-BUILD {
-	cd git-1.7.10.2
-	make strip
-}
-
-INSTALL {
-	cd git-1.7.10.2
-	make install
-}
-
-TEST {
-	cd git-1.7.10.2
-	make check
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
--- a/dev-vcs/git/git-1.7.10.2.recipe
+++ b/dev-vcs/git/git-1.7.10.2.recipe
@@ -0,0 +1,189 @@
+SUMMARY="Fast, scalable, distributed revision control system"
+DESCRIPTION="
+	Git is a free and open source distributed version control system designed 
+	to handle everything from small to very large projects with speed and 
+	efficiency.
+
+	Git is easy to learn and has a tiny footprint with lightning fast 
+	performance. It outclasses SCM tools like Subversion, CVS, Perforce, 
+	and ClearCase with features like cheap local branching, convenient 
+	staging areas, and multiple workflows.
+	" 
+HOMEPAGE="http://git-scm.com/" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
+
+SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
+CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
+SOURCE_DIR="$portVersionedName"
+PATCHES="git-1.7.10.2.patch"
+
+SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz"
+CHECKSUM_MD5_2="79bae5456db8366803d28db867892d74"
+
+SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz"
+CHECKSUM_MD5_3="9c401a36aee40d68f5ca3513818e8f29"
+
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	git = $portVersion compat >= 1.7
+	cmd:git = $portVersion compat >= 1.7
+	cmd:git_receive_pack = $portVersion compat >= 1.7
+	cmd:git_shell = $portVersion compat >= 1.7
+	cmd:git_upload_archive = $portVersion compat >= 1.7
+	cmd:git_upload_pack = $portVersion compat >= 1.7
+	"
+PROVIDES_arch="
+	git_arch = $portVersion compat >= 1.7
+	cmd:git_archimport = $portVersion compat >= 1.7
+	"
+PROVIDES_cvs="
+	git_cvs = $portVersion compat >= 1.7
+	cmd:git_cvsserver = $portVersion compat >= 1.7
+	"
+PROVIDES_daemon="
+	git_daemon = $portVersion compat >= 1.7
+	cmd:git_daemon = $portVersion compat >= 1.7
+	"
+PROVIDES_email="
+	git_email = $portVersion compat >= 1.7
+	cmd:git_send_email = $portVersion compat >= 1.7
+	"
+PROVIDES_source="
+	git_source = $portVersion compat >= 1.7
+	"
+PROVIDES_svn="
+	git_svn = $portVersion compat >= 1.7
+	cmd:git_svn = $portVersion compat >= 1.7
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:man
+	cmd:nano
+	cmd:perl
+	cmd:python
+	lib:libcurl
+	lib:libexpat
+	lib:libssl
+	lib:libz
+	"
+REQUIRES_arch="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_cvs="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_daemon="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_email="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_svn="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+	
+BUILD_REQUIRES="
+	cmd:man
+	cmd:nano
+	cmd:perl
+	cmd:python
+	devel:libcurl
+	devel:libexpat
+	devel:libssl
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	cmd:tar
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make strip 
+	make install
+	
+	# replace copies of git binaries with symlinks
+	cd $prefix/bin
+	for program in git*; do 
+		ln -sfn "../lib/git-core/$program" "$program"
+	done
+
+	# copy manpages
+	mkdir -p $manDir
+	cp -rd $sourceDir2/* $manDir/
+
+	# copy html documentation
+	htmlDir=$docDir/html
+	mkdir -p $htmlDir
+	cp -rd $sourceDir3/*.html $htmlDir/
+	rm $htmlDir/git-gui.html
+
+	# copy asciidoc documentation for which there isn't any corresponding html
+	asciidocDir=$docDir/asciidoc
+	mkdir -p $asciidocDir
+	for f in $sourceDir3/*.txt; do
+		html=$sourceDir3/$(basename $f .txt).html
+		if ! [ -e $html ]; then
+			cp -d $f $asciidocDir/
+		fi
+	done
+	
+	packageEntries arch \
+		documentation/packages/git/html/git-archimport.html \
+		documentation/man/man1/git-archimport.1 \
+		lib/git-core/git-archimport
+		
+	packageEntries cvs \
+		bin/git-cvsserver \
+		documentation/packages/git/html/git-cvsexportcommit.html \
+		documentation/packages/git/html/git-cvsimport.html \
+		documentation/packages/git/html/git-cvsserver.html \
+		documentation/man/man1/git-cvsexportcommit.1 \
+		documentation/man/man1/git-cvsimport.1 \
+		documentation/man/man1/git-cvsserver.1 \
+		documentation/man/man7/gitcvs-migration.7 \
+		lib/git-core/git-cvsexportcommit \
+		lib/git-core/git-cvsimport \
+		lib/git-core/git-cvsserver
+	
+	packageEntries daemon \
+		documentation/packages/git/html/git-credential-cache--daemon.html \
+		documentation/packages/git/html/git-credential-cache.html \
+		documentation/packages/git/html/git-daemon.html \
+		documentation/man/man1/git-credential-cache--daemon.1 \
+		documentation/man/man1/git-credential-cache.1 \
+		documentation/man/man1/git-daemon.1 \
+		lib/git-core/git-credential-cache--daemon \
+		lib/git-core/git-credential-cache \
+		lib/git-core/git-daemon
+		
+	packageEntries email \
+		documentation/packages/git/html/git-send-email.html \
+		documentation/man/man1/git-send-email.1 \
+		lib/git-core/git-send-email
+		
+	packageEntries svn \
+		documentation/packages/git/html/git-svn.html \
+		documentation/man/man1/git-svn.1 \
+		lib/git-core/git-svn
+}
--- a/dev-vcs/git/git-1.7.11.3.recipe
+++ 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
 }
--- a/dev-vcs/git/git-1.8.0.recipe
+++ 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
 }
--- a/dev-vcs/git/git-1.8.1.3.recipe
+++ 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
 }
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -0,0 +1,246 @@
+SUMMARY="Fast, scalable, distributed revision control system"
+DESCRIPTION="
+	Git is a free and open source distributed version control system designed
+	to handle everything from small to very large projects with speed and
+	efficiency.
+
+	Git is easy to learn and has a tiny footprint with lightning fast
+	performance. It outclasses SCM tools like Subversion, CVS, Perforce,
+	and ClearCase with features like cheap local branching, convenient
+	staging areas, and multiple workflows.
+	"
+HOMEPAGE="http://git-scm.com/"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
+
+SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz"
+CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e"
+SOURCE_DIR="$portVersionedName"
+PATCHES="git-1.8.3.4.patchset"
+
+SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz"
+CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec"
+
+SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz"
+CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a"
+
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	git = $portVersion compat >= 1.8
+	cmd:git = $portVersion compat >= 1.8
+	cmd:git_receive_pack = $portVersion compat >= 1.8
+	cmd:git_shell = $portVersion compat >= 1.8
+	cmd:git_upload_archive = $portVersion compat >= 1.8
+	cmd:git_upload_pack = $portVersion compat >= 1.8
+	"
+PROVIDES_arch="
+	git_arch = $portVersion compat >= 1.8
+	cmd:git_archimport = $portVersion compat >= 1.8
+	"
+PROVIDES_cvs="
+	git_cvs = $portVersion compat >= 1.8
+	cmd:git_cvsserver = $portVersion compat >= 1.8
+	"
+PROVIDES_daemon="
+	git_daemon = $portVersion compat >= 1.8
+	cmd:git_daemon = $portVersion compat >= 1.8
+	"
+PROVIDES_email="
+	git_email = $portVersion compat >= 1.8
+	cmd:git_send_email = $portVersion compat >= 1.8
+	"
+PROVIDES_remote_helpers="
+	git_remote_helpers = $portVersion compat >= 1.8
+	"
+PROVIDES_source="
+	git_source = $portVersion compat >= 1.8
+	"
+PROVIDES_svn="
+	git_svn = $portVersion compat >= 1.8
+	cmd:git_svn = $portVersion compat >= 1.8
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:man
+	cmd:nano
+	cmd:perl >= 5
+	cmd:python
+	lib:libcurl
+	lib:libexpat
+	lib:libiconv
+	lib:libintl
+	lib:libpcre
+	lib:libssl
+	lib:libz
+	vendor_perl
+	"
+REQUIRES_arch="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_cvs="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_daemon="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_email="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_remote_helpers="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+REQUIRES_svn="
+	haiku >= $haikuVersion
+	git == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	cmd:man
+	cmd:nano
+	cmd:perl
+	cmd:python
+	devel:libcurl
+	devel:libexpat
+	devel:libiconv
+	devel:libintl
+	devel:libpcre
+	devel:libssl
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:make
+	cmd:msgfmt
+	cmd:sed
+	cmd:tar
+	"
+
+USER_SETTINGS_FILES="
+	settings/git directory
+	"
+
+makeGit()
+{
+	make prefix=$prefix \
+		bindir_relative=$relativeBinDir \
+		mandir=$manDir \
+		infodir=$infoDir \
+		gitexecdir=$libDir/git-core \
+		sharedir=$dataDir \
+		template_dir=$dataDir/git-core/templates \
+		htmldir=$docDir \
+		sysconfdir=$sysconfDir \
+		PTHREAD_LIBS= \
+		USE_LIBPCRE=YesPlease \
+		NO_D_TYPE_IN_DIRENT=YesPlease \
+		NO_MEMMEM=YesPlease \
+		NO_MKSTEMPS=YesPlease \
+		NEEDS_LIBICONV=YesPlease \
+		NO_R_TO_GCC_LINKER=YesPlease \
+		GNU_ROFF=YesPlease \
+		PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \
+		PYTHON_PATH=$portPackageLinksDir/cmd~python/bin/python \
+		NO_TCLTK=YesPlease \
+		OBJECT_CREATION_USES_RENAMES=YesPlease \
+		NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
+		NO_INSTALL_HARDLINKS=YesPlease \
+		HAVE_DEV_TTY=YesPlease \
+		DEFAULT_EDITOR=nano \
+		BASIC_LDFLAGS="-lnetwork -lbsd" \
+		"$@"
+}
+
+
+BUILD()
+{
+	makeGit $jobArgs
+	makeGit strip
+}
+
+INSTALL()
+{
+	makeGit install
+
+	# replace copies of git binaries with symlinks
+	cd $binDir
+	for program in git*; do
+		ln -sfn "../lib/git-core/$program" "$program"
+	done
+
+	# copy manpages
+	mkdir -p $manDir
+	cp -rd $sourceDir2/* $manDir/
+
+	# copy html documentation
+	htmlDir=$docDir/html
+	mkdir -p $htmlDir
+	cp -rd $sourceDir3/*.html $htmlDir/
+	rm $htmlDir/git-gui.html
+
+	# copy asciidoc documentation for which there isn't any corresponding html
+	asciidocDir=$docDir/asciidoc
+	mkdir -p $asciidocDir
+	for f in $sourceDir3/*.txt; do
+		html=$sourceDir3/$(basename $f .txt).html
+		if ! [ -e $html ]; then
+			cp -d $f $asciidocDir/
+		fi
+	done
+
+	packageEntries arch \
+		documentation/packages/git/html/git-archimport.html \
+		documentation/man/man1/git-archimport.1 \
+		lib/git-core/git-archimport
+
+	packageEntries cvs \
+		bin/git-cvsserver \
+		documentation/packages/git/html/git-cvsexportcommit.html \
+		documentation/packages/git/html/git-cvsimport.html \
+		documentation/packages/git/html/git-cvsserver.html \
+		documentation/man/man1/git-cvsexportcommit.1 \
+		documentation/man/man1/git-cvsimport.1 \
+		documentation/man/man1/git-cvsserver.1 \
+		documentation/man/man7/gitcvs-migration.7 \
+		lib/git-core/git-cvsexportcommit \
+		lib/git-core/git-cvsimport \
+		lib/git-core/git-cvsserver
+
+	packageEntries daemon \
+		documentation/packages/git/html/git-credential-cache--daemon.html \
+		documentation/packages/git/html/git-credential-cache.html \
+		documentation/packages/git/html/git-daemon.html \
+		documentation/man/man1/git-credential-cache--daemon.1 \
+		documentation/man/man1/git-credential-cache.1 \
+		documentation/man/man1/git-daemon.1 \
+		lib/git-core/git-credential-cache--daemon \
+		lib/git-core/git-credential-cache \
+		lib/git-core/git-daemon
+
+	packageEntries email \
+		documentation/packages/git/html/git-send-email.html \
+		documentation/man/man1/git-send-email.1 \
+		lib/git-core/git-send-email
+
+	pythonDir=python$(python -c 'import sys; print("%i.%i" % sys.version_info[:2])')
+	packageEntries remote_helpers \
+		lib/$pythonDir
+
+	packageEntries svn \
+		documentation/packages/git/html/git-svn.html \
+		documentation/man/man1/git-svn.1 \
+		lib/git-core/git-svn
+}
--- a/dev-vcs/git/patches/git-1.7.10.2.patch
+++ b/dev-vcs/git/patches/git-1.7.10.2.patch
@@ -1,34 +1,30 @@
 diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile
 --- git-1.7.10.2/Makefile.orig	2012-05-11 14:25:45.066322432 -0600
 +++ git-1.7.10.2/Makefile	2012-05-19 12:53:42.392429568 -0600
-@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix)
+@@ -1242,6 +1242,27 @@ ifeq ($(uname_S),Minix)
 	NO_CURL =
 	NO_EXPAT =
 endif
 +ifeq ($(uname_S),Haiku)
+	NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
+	NO_GETTEXT = YesPlease
+	NO_ICONV = YesPlease
 +	NO_LIBGEN_H = YesPlease
 +	NO_MEMMEM = YesPlease
 +	NO_MKSTEMPS = YesPlease
-+	NEEDS_LIBICONV = YesPlease
-+	PERL_PATH = perl
-+	PYTHON_PATH = python
-+#	TCL_PATH = tclsh
-+	mandir = /boot/common/documentation/man
-+	infodir = /boot/common/documentation/info
-+	htmldir = /boot/common/documentation/doc/git-1.7.10.2
-+	gitexecdir = /boot/common/bin/git-core
-+	gitwebdir = /boot/common/data/gitweb
-+	template_dir = /boot/common/data/git-core/templates
 +	NO_TCLTK = YesPlease
-+	DEFAULT_EDITOR = nano
-+	CURL_DIR = /boot/common
-+	EXPAT_DIR = /boot/common
-+	BASIC_CFLAGS += -I/boot/common/include
-+	BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
 +	PTHREAD_LIBS =
-+	prefix = /boot/common
-+	NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
-+	NO_GETTEXT = YesPlease
+	BASIC_LDFLAGS += -lnetwork -lbsd
+	DEFAULT_EDITOR = nano
+	PERL_PATH = $(portPackageLinksDir)/perl/bin/perl
+	PYTHON_PATH = $(portPackageLinksDir)/python/bin/python
+	prefix = $(portPackageLinksDir)/.self
+	mandir = $(manDir)
+	infodir = $(infoDir)
+	htmldir = $(docDir)
+	gitexecdir = $(libDir)/git-core
+	gitwebdir = $(dataDir)/gitweb
+	template_dir = $(dataDir)/git-core/templates
 +endif
 ifneq (,$(findstring MINGW,$(uname_S)))
 	pathsep = ;
--- a/dev-vcs/git/patches/git-1.8.3.4.patchset
+++ b/dev-vcs/git/patches/git-1.8.3.4.patchset
@@ -0,0 +1,113 @@
+From 54aaa3773f83a1706140ef842e537b5dc5f37568 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 13 Aug 2013 08:07:25 +0200
+Subject: git-web--browse.sh: use "open" on Haiku
+
+
+diff --git a/git-web--browse.sh b/git-web--browse.sh
+index 1d72ec7..e3f254c 100755
+--- a/git-web--browse.sh
+++ b/git-web--browse.sh
+@@ -132,6 +132,10 @@ if test -z "$browser" ; then
+ 	if test -x /usr/bin/cygstart; then
+ 		browser_candidates="cygstart $browser_candidates"
+ 	fi
+	# /boot/system/haiku_loader indicates Haiku
+	if test -f /boot/system/haiku_loader; then
+		browser_candidates="open $browser_candidates"
+	fi
+ 
+ 	for i in $browser_candidates; do
+ 		init_browser_path $i
+-- 
+1.8.3.4
+
+
+From e42686b933c0999c3c83cac79ceff073ce2bbc32 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 13 Aug 2013 21:03:59 +0200
+Subject: On Haiku use the user settings directory instead of HOME
+
+
+diff --git a/path.c b/path.c
+index 04ff148..8668534 100644
+--- a/path.c
+++ b/path.c
+@@ -5,6 +5,11 @@
+ #include "strbuf.h"
+ #include "string-list.h"
+ 
+#ifdef __HAIKU__
+#	include <FindDirectory.h>
+#	include <StorageDefs.h>
+#endif
+
+ #ifndef get_st_mode_bits
+ /*
+  * The replacement lstat(2) we use on Cygwin is incomplete and
+@@ -139,6 +144,19 @@ char *git_path(const char *fmt, ...)
+ 
+ void home_config_paths(char **global, char **xdg, char *file)
+ {
+#ifdef __HAIKU__
+	char settingsPath[B_PATH_NAME_LENGTH];
+
+	*xdg = NULL;
+
+	if (global) {
+		if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
+			sizeof(settingsPath)) == B_OK) {
+			*global = mkpathdup("%s/git/%s", settingsPath, file);
+		} else
+			*global = NULL;
+	}
+#else
+ 	char *xdg_home = getenv("XDG_CONFIG_HOME");
+ 	char *home = getenv("HOME");
+ 	char *to_free = NULL;
+@@ -161,6 +179,7 @@ void home_config_paths(char **global, char **xdg, char *file)
+ 		*xdg = mkpathdup("%s/git/%s", xdg_home, file);
+ 
+ 	free(to_free);
+#endif
+ }
+ 
+ char *git_path_submodule(const char *path, const char *fmt, ...)
+-- 
+1.8.3.4
+
+
+From 80ed8e810eaebbecf10a20bac95c1e43fc14d2d5 Mon Sep 17 00:00:00 2001
+From: Oliver Tappe <zooey@hirschkaefer.de>
+Date: Tue, 15 Oct 2013 21:34:09 +0200
+Subject: Ensure config-directory exists before using it.
+
+
+diff --git a/config.c b/config.c
+index 7a85ebd..10be1af 100644
+--- a/config.c
+++ b/config.c
+@@ -1343,6 +1343,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
+ 	int ret;
+ 	struct lock_file *lock = NULL;
+ 	char *filename_buf = NULL;
+	char *config_dir = NULL;
+ 
+ 	/* parse-key returns negative; flip the sign to feed exit(3) */
+ 	ret = 0 - git_config_parse_key(key, &store.key, &store.baselen);
+@@ -1354,6 +1355,12 @@ int git_config_set_multivar_in_file(const char *config_filename,
+ 	if (!config_filename)
+ 		config_filename = filename_buf = git_pathdup("config");
+ 
+	config_dir = xstrdup(config_filename);
+	* find_last_dir_sep(config_dir) = '\0';
+	if (access(config_dir, F_OK) != 0)
+		mkdir(config_dir, 0755);
+	free(config_dir);
+		
+ 	/*
+ 	 * The lock serves a purpose in addition to locking: the new
+ 	 * contents of .git/config will be written into it.
+-- 
+1.8.3.4
+
--- a/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe
+++ 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}"
--- a/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe
+++ 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}"
--- a/dev-vcs/gitdoc/gitdoc-1.8.0.recipe
+++ 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}"
--- a/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe
+++ 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}"
--- a/dev-vcs/mercurial/mercurial-2.2.2.bep
+++ b/dev-vcs/mercurial/mercurial-2.2.2.bep
@@ -1,30 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
-CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD {
-	cd mercurial-2.2.2
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-2.2.2
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
-	else
-		python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force
-	fi
-}
-
-TEST {
-	cd mercurial-2.2.2/tests
-	shopt -s extglob
-	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
-	python run-tests.py
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2012 Matt Mackall et al."
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -0,0 +1,58 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="Mercurial is a free, distributed source control management tool."
+HOMEPAGE="http://mercurial.selenic.com/"
+COPYRIGHT="2005-2012 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
+CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
+REVISION="5"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="mercurial-2.2.2.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 2
+	cmd:hg = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:nano
+	lib:libintl
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
+}
+
+shopt -s extglob
+TEST()
+{
+	cd tests
+	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
+	python run-tests.py
+}
--- a/dev-vcs/mercurial/mercurial-2.2.3.recipe
+++ 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,9 +21,10 @@ INSTALL {
 	fi
 }

-TEST {
+shopt -s extglob
+TEST()
+{
 	cd mercurial-2.2.3/tests
-	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
 	python run-tests.py
 }
--- a/dev-vcs/mercurial/mercurial-2.3.recipe
+++ 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,9 +21,10 @@ INSTALL {
 	fi
 }

-TEST {
+shopt -s extglob
+TEST()
+{
 	cd mercurial-2.3/tests
-	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
 	python run-tests.py
 }
--- a/dev-vcs/mercurial/mercurial-2.4.recipe
+++ 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,9 +21,10 @@ INSTALL {
 	fi
 }

-TEST {
+shopt -s extglob
+TEST()
+{
 	cd mercurial-2.4/tests
-	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
 	python run-tests.py
 }
--- a/dev-vcs/subversion/patches/subversion-1.4.x.diff
+++ b/dev-vcs/subversion/patches/subversion-1.4.x.diff
@@ -1,13 +0,0 @@
-Index: configure.in
-===================================================================
--- configure.in	(revision 30382)
-+++ configure.in	(working copy)
-@@ -184,7 +184,7 @@
- dnl So we only turn it on for platforms where we know we really need it.
- AC_MSG_CHECKING([whether libtool needs -no-undefined])
- case $host in
-  *-*-cygwin*)
-+  *-*-cygwin* | *-*-beos* | *-*-haiku*)
-     AC_MSG_RESULT([yes])
-     LT_NO_UNDEFINED="-no-undefined"
-     ;;
--- a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff
+++ b/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff
@@ -1,11 +0,0 @@
-diff -urN subversion-1.5.4/configure.ac subversion-1.5.4-haiku/configure.ac
--- subversion-1.5.4/configure.ac	2008-12-15 00:35:49.000000000 -0800
-+++ subversion-1.5.4-haiku/configure.ac	2008-12-15 00:32:30.000000000 -0800
-@@ -220,6 +220,7 @@
- 
- # Berkeley DB on SCO OpenServer needs -lsocket
- AC_CHECK_LIB(socket, socket)
-+AC_CHECK_LIB(network, socket)
- 
- # Build the BDB filesystem library only if we have an appropriate
- # version of Berkeley DB.
--- a/dev-vcs/subversion/patches/subversion-1.6.11.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.11.patch
@@ -1,74 +0,0 @@
-diff -urN subversion-1.6.11/subversion/libsvn_subr/config_file.c subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.11/subversion/libsvn_subr/config_file.c	2009-11-25 09:27:35.047972352 -0800
-+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c	2010-03-15 22:59:57.000000000 -0700
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#	include <FindDirectory.h>
-+#	include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-@@ -1115,8 +1132,21 @@
-     *path = svn_path_join_many(pool, folder,
-                                SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
-+  
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-#else  /* ! WIN32 */
-   {
-     const char *homedir = svn_user_get_homedir(pool);
-     if (! homedir)
-diff -urN subversion-1.6.11/subversion/libsvn_subr/config_impl.h subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.11/subversion/libsvn_subr/config_impl.h	2009-01-27 05:23:50.045350912 -0800
-+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h	2010-03-15 22:39:34.000000000 -0700
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/patches/subversion-1.6.12.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.12.patch
@@ -1,74 +0,0 @@
-diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.12/subversion/libsvn_subr/config_file.c	2009-11-25 09:27:35.047972352 -0800
-+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c	2010-03-15 22:59:57.000000000 -0700
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#  include <FindDirectory.h>
-+#  include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+
-+  status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false,
-+                                  folder, sizeof(folder));
-+  if (error)
-+    return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many(pool, folder,
-+                               SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-@@ -1115,8 +1132,21 @@
-     *path = svn_path_join_many(pool, folder,
-                                SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
-+  
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+                                   folder, sizeof(folder));
-+  if (error)
-+    return SVN_NO_ERROR;
-+
-+  *path = svn_path_join_many(pool, folder,
-+                             SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-#else  /* ! WIN32 */
-   {
-     const char *homedir = svn_user_get_homedir(pool);
-     if (! homedir)
-diff -urN subversion-1.6.12/subversion/libsvn_subr/config_impl.h subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.12/subversion/libsvn_subr/config_impl.h	2009-01-27 05:23:50.045350912 -0800
-+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h	2010-03-15 22:39:34.000000000 -0700
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/patches/subversion-1.6.13.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.13.patch
@@ -1,74 +0,0 @@
-diff -urN subversion-1.6.13/subversion/libsvn_subr/config_file.c subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.13/subversion/libsvn_subr/config_file.c	2009-11-25 09:27:35.047972352 -0800
-+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c	2010-03-15 22:59:57.000000000 -0700
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#  include <FindDirectory.h>
-+#  include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+
-+  status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false,
-+                                  folder, sizeof(folder));
-+  if (error)
-+    return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many(pool, folder,
-+                               SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-@@ -1115,8 +1132,21 @@
-     *path = svn_path_join_many(pool, folder,
-                                SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
-+  
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+                                   folder, sizeof(folder));
-+  if (error)
-+    return SVN_NO_ERROR;
-+
-+  *path = svn_path_join_many(pool, folder,
-+                             SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-#else  /* ! WIN32 */
-   {
-     const char *homedir = svn_user_get_homedir(pool);
-     if (! homedir)
-diff -urN subversion-1.6.13/subversion/libsvn_subr/config_impl.h subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.13/subversion/libsvn_subr/config_impl.h	2009-01-27 05:23:50.045350912 -0800
-+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h	2010-03-15 22:39:34.000000000 -0700
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/patches/subversion-1.6.18.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch
@@ -1,6 +1,6 @@
-diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac
--- subversion-1.6.18/configure.ac	2009-10-13 09:09:30.026214400 -0700
-+++ subversion-1.6.18-haiku/configure.ac	2011-08-02 14:32:39.227278848 -0700
+diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac
+--- orig/subversion-1.6.18/configure.ac	2009-10-13 18:09:30.043778048 +0200
+++ subversion-1.6.18/configure.ac	2013-04-30 22:10:52.741605376 +0200
@@ -249,7 +249,7 @@
 dnl Check for libraries --------------------
 
@@ -10,9 +10,9 @@ diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac
 
 # Build the BDB filesystem library only if we have an appropriate
 # version of Berkeley DB.
-diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.18/subversion/libsvn_subr/config_file.c	2009-11-25 09:27:35.047972352 -0800
-+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c	2010-03-15 22:59:57.000000000 -0700
+diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c
+--- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c	2009-11-25 18:27:35.015728640 +0100
+++ subversion-1.6.18/subversion/libsvn_subr/config_file.c	2013-04-30 22:20:33.557842432 +0200
@@ -32,6 +32,11 @@
 
 #include "svn_private_config.h"
@@ -25,28 +25,7 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
 /* Used to terminate lines in large multi-line string literals. */
 #define NL APR_EOL_STR
 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+
-+  status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false,
-+                                  folder, sizeof(folder));
-+  if (error)
-+    return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many(pool, folder,
-+                               SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-@@ -1115,8 +1132,21 @@
+@@ -1115,8 +1120,21 @@
     *path = svn_path_join_many(pool, folder,
                                SVN_CONFIG__SUBDIRECTORY, fname, NULL);
   }
@@ -69,18 +48,20 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
   {
     const char *homedir = svn_user_get_homedir(pool);
     if (! homedir)
-diff -urN subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.18/subversion/libsvn_subr/config_impl.h	2009-01-27 05:23:50.045350912 -0800
-+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h	2010-03-15 22:39:34.000000000 -0700
-@@ -109,7 +109,10 @@
+diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h
+--- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h	2009-01-27 14:23:50.020971520 +0100
+++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h	2013-04-30 22:19:32.338427904 +0200
+@@ -109,8 +109,11 @@
    or svn_config_get_user_config_path() instead. */
 #ifdef WIN32
 #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
 -#else  /* ! WIN32 */
+-#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
 +#elif defined __HAIKU__ /* HAIKU */
 +#  define SVN_CONFIG__SYS_DIRECTORY   "subversion"
 +#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
 +#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
+#  define SVN_CONFIG__SYS_DIRECTORY   "@HAIKU_GLOBAL_SETTINGS_DIR@"
 #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
 #endif /* WIN32 */
+ 
--- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff
+++ b/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff
@@ -1,51 +0,0 @@
-diff -urN subversion-1.6.5/subversion/libsvn_subr/config_file.c subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.5/subversion/libsvn_subr/config_file.c	2009-08-17 18:33:43.000000000 +0000
-+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c	2009-09-03 09:01:10.000000000 +0000
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#	include <FindDirectory.h>
-+#	include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.5/subversion/libsvn_subr/config_impl.h	2009-01-27 13:23:50.000000000 +0000
-+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h	2009-09-03 08:54:11.000000000 +0000
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff
+++ b/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff
@@ -1,13 +0,0 @@
-diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.5/subversion/libsvn_subr/config_impl.h	2009-01-27 13:23:50.000000000 +0000
-+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h	2009-09-02 13:43:03.000000000 +0000
-@@ -109,6 +109,9 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "/boot/common/etc/subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "config/settings/subversion"
- #else  /* ! WIN32 */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
--- a/dev-vcs/subversion/patches/subversion-1.6.6.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.6.patch
@@ -1,51 +0,0 @@
-diff -urN subversion-1.6.6/subversion/libsvn_subr/config_file.c subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.6/subversion/libsvn_subr/config_file.c	2009-08-17 18:33:43.000000000 +0000
-+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c	2009-11-23 08:28:19.000000000 +0000
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#	include <FindDirectory.h>
-+#	include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-diff -urN subversion-1.6.6/subversion/libsvn_subr/config_impl.h subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.6/subversion/libsvn_subr/config_impl.h	2009-01-27 13:23:50.000000000 +0000
-+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h	2009-11-23 08:28:19.000000000 +0000
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/patches/subversion-1.6.9.patch
+++ b/dev-vcs/subversion/patches/subversion-1.6.9.patch
@@ -1,74 +0,0 @@
-diff -urN subversion-1.6.9/subversion/libsvn_subr/config_file.c subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.9/subversion/libsvn_subr/config_file.c	2009-11-25 09:27:35.047972352 -0800
-+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c	2010-03-15 22:59:57.000000000 -0700
-@@ -32,6 +32,11 @@
- 
- #include "svn_private_config.h"
- 
-+#ifdef __HAIKU__
-+#	include <FindDirectory.h>
-+#	include <StorageDefs.h>
-+#endif
-+
- /* Used to terminate lines in large multi-line string literals. */
- #define NL APR_EOL_STR
- 
-@@ -326,7 +331,19 @@
-                                  SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
- 
-#else  /* ! WIN32 */
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path_p = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-   *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
- 
-@@ -1115,8 +1132,21 @@
-     *path = svn_path_join_many(pool, folder,
-                                SVN_CONFIG__SUBDIRECTORY, fname, NULL);
-   }
-+  
-+#elif defined(__HAIKU__)
-+{
-+  char folder[B_PATH_NAME_LENGTH];
-+  
-+  status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false,
-+  							folder, sizeof(folder));
-+  if (error)
-+  	return SVN_NO_ERROR;
-+  
-+  *path = svn_path_join_many (pool, folder,
-+  							SVN_CONFIG__USR_DIRECTORY, fname, NULL);
-+}
-+#else  /* ! WIN32 && !__HAIKU__ */
- 
-#else  /* ! WIN32 */
-   {
-     const char *homedir = svn_user_get_homedir(pool);
-     if (! homedir)
-diff -urN subversion-1.6.9/subversion/libsvn_subr/config_impl.h subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.9/subversion/libsvn_subr/config_impl.h	2009-01-27 05:23:50.045350912 -0800
-+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h	2010-03-15 22:39:34.000000000 -0700
-@@ -109,7 +109,10 @@
-    or svn_config_get_user_config_path() instead. */
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
-#else  /* ! WIN32 */
-+#elif defined __HAIKU__ /* HAIKU */
-+#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
-+#  define SVN_CONFIG__USR_DIRECTORY   "subversion"
-+#else  /* ! WIN32 && ! __HAIKU__ */
- #  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
- #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
- #endif /* WIN32 */
--- a/dev-vcs/subversion/subversion-1.6.11.bep
+++ b/dev-vcs/subversion/subversion-1.6.11.bep
@@ -1,27 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.tigris.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.11.tar.gz"
-CHECKSUM_MD5="7331310fc786111899b305c6d141b02d"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.6.11
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ 
-	--with-neon=/boot/common \ 
-	--with-editor=lpe \ 
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.11
-	make install
-}
-LICENSE="Subversion"
-COPYRIGHT="2000-2010 CollabNet"
--- a/dev-vcs/subversion/subversion-1.6.12.bep
+++ b/dev-vcs/subversion/subversion-1.6.12.bep
@@ -1,28 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.12.tar.bz2"
-CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.6.12
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-	--with-neon=/boot/common \
-	--with-editor=nano \
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.12
-	make install
-}
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"
--- a/dev-vcs/subversion/subversion-1.6.13.bep
+++ b/dev-vcs/subversion/subversion-1.6.13.bep
@@ -1,28 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.13.tar.bz2"
-CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.6.13
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-	--with-neon=/boot/common \
-	--with-editor=nano \
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.13
-	make install
-}
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"
--- a/dev-vcs/subversion/subversion-1.6.15.bep
+++ b/dev-vcs/subversion/subversion-1.6.15.bep
@@ -1,56 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
-CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/apr >= 1.4.2
-	dev-libs/apr-util >= 1.3.10
-	net-misc/neon >= 0.29.6
-	dev-libs/libiconv >= 1.13.1
-	dev-db/sqlite >= 3.7.5
-	dev-libs/expat >= 2.0.1
-	dev-libs/openssl >= 1.0.0d
-	dev-libs/libxml2 >= 2.7.8"
-
-BUILD {
-	cd subversion-1.6.15
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-		--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-		--with-neon=$COMMON_DIR \
-		--with-zlib=$COMMON_DIR \
-		--with-editor=nano \
-		--disable-nls
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.15
-	make install
-	if type -p swig > /dev/null;then
-		if type -p python > /dev/null;then
-			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
-		fi
-		#if type -p perl > /dev/null;then
-		#	make install-swig-pl
-		#fi
-		#if type -p ruby > /dev/null;then
-		#	make install-swig-rb
-		#fi
-	fi
-}
-
-TEST {
-	cd subversion-1.6.15
-	make check
-}
-
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -0,0 +1,114 @@
+SUMMARY="Open source version control system"
+DESCRIPTION="
+	Subversion exists to be universally recognized and adopted as an 
+	open-source, centralized version control system characterized by its 
+	reliability as a safe haven for valuable data; the simplicity of its 
+	model and usage; and its ability to support the needs of a wide 
+	variety of users and projects, from individuals to large-scale enterprise 
+	operations.
+	"
+HOMEPAGE="http://subversion.apache.org"
+LICENSE="Apache-Subversion"
+COPYRIGHT="2010 The Apache Software Foundation"
+SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
+CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
+REVISION="5"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="subversion-1.6.15.patch"
+
+PROVIDES="
+	subversion = $portVersion compat >= 1.6
+	cmd:svn = $portVersion compat >= 1.6
+	cmd:svnadmin = $portVersion compat >= 1.6
+	cmd:svndumpfilter = $portVersion compat >= 1.6
+	cmd:svnlook = $portVersion compat >= 1.6
+	cmd:svnserve = $portVersion compat >= 1.6
+	cmd:svnsync = $portVersion compat >= 1.6
+	cmd:svnversion = $portVersion compat >= 1.6
+	lib:libsvn_client_1 = 0.0.0 compat >= 0
+	lib:libsvn_delta_1 = 0.0.0 compat >= 0
+	lib:libsvn_diff_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_util_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_local_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0
+	lib:libsvn_repos_1 = 0.0.0 compat >= 0
+	lib:libsvn_subr_1 = 0.0.0 compat >= 0
+	lib:libsvn_wc_1 = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	apr >= 1.3
+	apr_util >= 1.3
+	expat >= 2.0
+	libiconv >= 1.13
+	libxml2 >= 2.7
+	neon >= 0.29
+	sqlite >= 3.4
+	zlib
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I build -I build/ac-macros
+	autoconf
+	runConfigure ./configure \
+		--with-apr=$portPackageLinksDir/apr \
+		--with-apr-util=$portPackageLinksDir/apr_util \
+		--with-neon=$portPackageLinksDir/neon \
+		--with-zlib=$portPackageLinksDir/zlib \
+		--with-editor=nano \
+		--disable-nls
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	if type -p swig > /dev/null;then
+		if type -p python > /dev/null;then
+			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
+		fi
+		#if type -p perl > /dev/null;then
+		#	make install-swig-pl
+		#fi
+		#if type -p ruby > /dev/null;then
+		#	make install-swig-rb
+		#fi
+	fi
+
+	prepareInstalledDevelLibs \
+		libsvn_client-1 \
+		libsvn_delta-1 \
+		libsvn_diff-1 \
+		libsvn_fs-1 \
+		libsvn_fs_fs-1 \
+		libsvn_fs_util-1 \
+		libsvn_ra-1 \
+		libsvn_ra_local-1 \
+		libsvn_ra_neon-1 \
+		libsvn_ra_svn-1 \
+		libsvn_repos-1 \
+		libsvn_subr-1 \
+		libsvn_wc-1
+}
--- a/dev-vcs/subversion/subversion-1.6.17.bep
+++ b/dev-vcs/subversion/subversion-1.6.17.bep
@@ -1,56 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2"
-CHECKSUM_MD5="81e5dc5beee4b3fc025ac70c0b6caa14"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/apr >= 1.4.4
-	dev-libs/apr-util >= 1.3.12
-	net-misc/neon >= 0.29.6
-	dev-libs/libiconv >= 1.13.1
-	dev-db/sqlite >= 3.7.7.1
-	dev-libs/expat >= 2.0.1
-	dev-libs/openssl >= 1.0.0d
-	dev-libs/libxml2 >= 2.7.8"
-
-BUILD {
-	cd subversion-1.6.17
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-		--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-		--with-neon=$COMMON_DIR \
-		--with-zlib=$COMMON_DIR \
-		--with-editor=nano \
-		--disable-nls
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.17
-	make install
-	if type -p swig > /dev/null;then
-		if type -p python > /dev/null;then
-			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
-		fi
-		#if type -p perl > /dev/null;then
-		#	make install-swig-pl
-		#fi
-		#if type -p ruby > /dev/null;then
-		#	make install-swig-rb
-		#fi
-	fi
-}
-
-TEST {
-	cd subversion-1.6.17
-	make check
-}
-
-LICENSE="Apache-Subversion"
-COPYRIGHT="2011 The Apache Software Foundation"
--- a/dev-vcs/subversion/subversion-1.6.18.bep
+++ b/dev-vcs/subversion/subversion-1.6.18.bep
@@ -1,56 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
-CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/apr >= 1.4.4
-	dev-libs/apr-util >= 1.3.12
-	net-misc/neon >= 0.29.6
-	dev-libs/libiconv >= 1.13.1
-	dev-db/sqlite >= 3.7.7.1
-	dev-libs/expat >= 2.0.1
-	dev-libs/openssl >= 1.0.0d
-	dev-libs/libxml2 >= 2.7.8"
-
-BUILD {
-	cd subversion-1.6.18
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-		--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-		--with-neon=$COMMON_DIR \
-		--with-zlib=$COMMON_DIR \
-		--with-editor=nano \
-		--disable-nls
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.18
-	make install
-	if type -p swig > /dev/null;then
-		if type -p python > /dev/null;then
-			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
-		fi
-		#if type -p perl > /dev/null;then
-		#	make install-swig-pl
-		#fi
-		#if type -p ruby > /dev/null;then
-		#	make install-swig-rb
-		#fi
-	fi
-}
-
-TEST {
-	cd subversion-1.6.18
-	make check
-}
-
-LICENSE="Apache-Subversion"
-COPYRIGHT="2000-2009 CollabNet"
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -0,0 +1,167 @@
+SUMMARY="Open source version control system"
+DESCRIPTION="
+	Subversion exists to be universally recognized and adopted as an
+	open-source, centralized version control system characterized by its
+	reliability as a safe haven for valuable data; the simplicity of its
+	model and usage; and its ability to support the needs of a wide
+	variety of users and projects, from individuals to large-scale enterprise
+	operations.
+	"
+HOMEPAGE="http://subversion.apache.org"
+LICENSE="Apache-Subversion"
+COPYRIGHT="2010 The Apache Software Foundation"
+SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
+CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
+REVISION="6"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="subversion-1.6.18.patch"
+
+PROVIDES="
+	subversion = $portVersion compat >= 1.6
+	cmd:svn = $portVersion compat >= 1.6
+	cmd:svnadmin = $portVersion compat >= 1.6
+	cmd:svndumpfilter = $portVersion compat >= 1.6
+	cmd:svnlook = $portVersion compat >= 1.6
+	cmd:svnserve = $portVersion compat >= 1.6
+	cmd:svnsync = $portVersion compat >= 1.6
+	cmd:svnversion = $portVersion compat >= 1.6
+	lib:libsvn_client_1 = 0.0.0 compat >= 0
+	lib:libsvn_delta_1 = 0.0.0 compat >= 0
+	lib:libsvn_diff_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0
+	lib:libsvn_fs_util_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_local_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0
+	lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0
+	lib:libsvn_repos_1 = 0.0.0 compat >= 0
+	lib:libsvn_subr_1 = 0.0.0 compat >= 0
+	lib:libsvn_wc_1 = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libapr_1
+	lib:libaprutil_1
+	lib:libcrypto
+	lib:libexpat
+	lib:libiconv
+	lib:libneon
+	lib:libsqlite3
+	lib:libssl
+	lib:libxml2
+	lib:libz
+	"
+BUILD_REQUIRES="
+	expat_devel >= 2.0
+	libiconv_devel >= 1.13
+	neon_devel >= 0.29
+	sqlite_devel >= 3.4
+	devel:libapr_1 >= 0.3
+	devel:libaprutil_1 >= 0.3
+	devel:libcrypto
+	devel:libssl
+	devel:libxml2 >= 2.7
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	python
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+USER_SETTINGS_FILES="
+	settings/subversion directory
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCH()
+{
+	sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \
+		subversion/libsvn_subr/config_impl.h
+}
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I build -I build/ac-macros
+	autoconf
+	runConfigure ./configure \
+		--with-apr=$portPackageLinksDir/devel~libapr_1 \
+		--with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \
+		--with-neon=$portPackageLinksDir/neon_devel \
+		--with-zlib=$portPackageLinksDir/devel~libz \
+		--with-editor=nano \
+		--disable-nls
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	if type -p swig > /dev/null;then
+		if type -p python > /dev/null;then
+			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
+		fi
+		#if type -p perl > /dev/null;then
+		#	make install-swig-pl
+		#fi
+		#if type -p ruby > /dev/null;then
+		#	make install-swig-rb
+		#fi
+	fi
+
+	prepareInstalledDevelLibs \
+		libsvn_client-1 \
+		libsvn_delta-1 \
+		libsvn_diff-1 \
+		libsvn_fs-1 \
+		libsvn_fs_fs-1 \
+		libsvn_fs_util-1 \
+		libsvn_ra-1 \
+		libsvn_ra_local-1 \
+		libsvn_ra_neon-1 \
+		libsvn_ra_svn-1 \
+		libsvn_repos-1 \
+		libsvn_subr-1 \
+		libsvn_wc-1
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	subversion_devel = $portVersion compat >= 1.6
+	devel:libsvn_client_1 = 0.0.0 compat >= 0
+	devel:libsvn_delta_1 = 0.0.0 compat >= 0
+	devel:libsvn_diff_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0
+	devel:libsvn_fs_util_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_local_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_neon_1 = 0.0.0 compat >= 0
+	devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0
+	devel:libsvn_repos_1 = 0.0.0 compat >= 0
+	devel:libsvn_subr_1 = 0.0.0 compat >= 0
+	devel:libsvn_wc_1 = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	subversion == $portVersion base
+	"
--- a/dev-vcs/subversion/subversion-1.6.6.bep
+++ b/dev-vcs/subversion/subversion-1.6.6.bep
@@ -1,22 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.tigris.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.6.tar.bz2"
-CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.6.6
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.6
-	make install
-}
-LICENSE="Subversion"
-COPYRIGHT="2000-2010 CollabNet"
--- a/dev-vcs/subversion/subversion-1.6.9.bep
+++ b/dev-vcs/subversion/subversion-1.6.9.bep
@@ -1,34 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.tigris.org" 
-SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.9.tar.gz"
-CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.6.9
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.6.9
-	make install
-	if type -p swig > /dev/null;then
-		if type -p python > /dev/null;then
-			PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-			make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn
-		fi
-		#if type -p perl > /dev/null;then
-		#	make install-swig-pl
-		#fi
-		#if type -p ruby > /dev/null;then
-		#	make install-swig-rb
-		#fi
-	fi
-}
-LICENSE="Subversion"
-COPYRIGHT="2000-2010 CollabNet"
--- a/dev-vcs/subversion/subversion-1.7.0_rc2.recipe
+++ 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
 }
--- a/dev-vcs/subversion/subversion-1.7.xx-svn.bep
+++ b/dev-vcs/subversion/subversion-1.7.xx-svn.bep
@@ -1,28 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd subversion-1.7.xx-svn
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-	--with-neon=/boot/common \
-	--with-editor=nano \
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL {
-	cd subversion-1.7.xx-svn
-	make install
-}
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"
--- a/dev-vcs/tig/tig-0.16.recipe
+++ b/dev-vcs/tig/tig-0.16.recipe
@@ -4,8 +4,9 @@ SRC_URI="http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz"
 CHECKSUM_MD5="684572d93033d6cbfc5ee71cffe02935"
 REVISION="1"
 STATUS_HAIKU="untested"
-DEPEND="sys-libs/ncurses >= 5.7""
-BUILD {
+DEPEND="sys-libs/ncurses >= 5.7"
+BUILD()
+{
 	cd tig-0.16
 	libtoolize --force --copy --install
 	autoreconf -i
@@ -13,9 +14,10 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd tig-0.16
 	make install
 }
 LICENSE="GNU GPL v2"
-COPYRIGHT="2006-2010 Jonas Fonseca"
+COPYRIGHT="2006-2010 Jonas Fonseca"