From a704dbf9a72b836e49ee169b81ba565e5652e73a Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Fri, 19 Apr 2013 23:06:59 +0000
Subject: [PATCH] * adjust several recipes to our new naming conventions

---
 app-arch/tar/tar-1.26.recipe                  |   4 +-
 dev-db/sqlite/sqlite-3.7.16.1.recipe          |   4 +-
 dev-db/sqlite/sqlite-3.7.5.recipe             |   4 +-
 dev-lang/perl/perl-5.10.1.recipe              |   6 +-
 dev-libs/apr-util/apr-util-1.3.10.recipe      |  68 -------
 dev-libs/apr-util/apr_util-1.3.10.recipe      |  96 +++++++++
 dev-libs/apr/apr-1.4.2.recipe                 | 112 ++++++-----
 dev-libs/expat/expat-2.0.1.recipe             |   4 +-
 dev-libs/libxml2/libxml2-2.7.8.recipe         | 104 +++++-----
 dev-libs/openssl/openssl-1.0.0d.recipe        |   4 +-
 dev-vcs/cvs/cvs-1.12.13.1.recipe              |   6 +-
 dev-vcs/subversion/subversion-1.6.15.recipe   |   8 +-
 net-misc/neon/neon-0.29.6.recipe              |   4 +-
 sys-apps/gawk/gawk-3.1.8.recipe               |   4 +-
 sys-apps/sed/sed-4.2.1.recipe                 |   4 +-
 sys-apps/texinfo/texinfo-4.13a.recipe         |   6 +-
 sys-devel/autoconf/autoconf-2.68.recipe       |  16 +-
 sys-devel/autoconf/autoconf-2.69.recipe       |   6 +-
 sys-devel/automake/automake-1.11.1.recipe     |   8 +-
 sys-devel/automake/automake-1.13.1.recipe     |   8 +-
 .../binutils/binutils-2.17_110711.recipe      | 186 ++++++++++++++++++
 sys-devel/bison/bison-2.4.3.recipe            |   4 +-
 sys-devel/flex/flex-2.5.35.recipe             |   4 +-
 sys-devel/gcc/gcc-2.95.3_110711.recipe        | 109 +++-------
 sys-devel/libtool/libtool-2.4.recipe          |   4 +-
 sys-devel/m4/m4-1.4.16.recipe                 |   4 +-
 sys-devel/make/make-3.82.recipe               |   4 +-
 27 files changed, 480 insertions(+), 311 deletions(-)
 delete mode 100644 dev-libs/apr-util/apr-util-1.3.10.recipe
 create mode 100644 dev-libs/apr-util/apr_util-1.3.10.recipe
 create mode 100644 sys-devel/binutils/binutils-2.17_110711.recipe

diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index b920a1403..c9d58597d 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -14,7 +14,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/tar/" 
 SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
 CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe
index 5e7a48a2a..15a40b833 100644
--- a/dev-db/sqlite/sqlite-3.7.16.1.recipe
+++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="SQLite is a software library that implements a self-contained, serv
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz"
 CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="sqlite = $portVersion compat >= 3
@@ -18,7 +18,7 @@ BUILD_REQUIRES="cmd:aclocal
 	cmd:ld
 	cmd:libtoolize
 	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion"
 
 SOURCE_DIR="sqlite-autoconf-3071601"
 
diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe
index 5e4984c3a..cfc47cb59 100644
--- a/dev-db/sqlite/sqlite-3.7.5.recipe
+++ b/dev-db/sqlite/sqlite-3.7.5.recipe
@@ -9,7 +9,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
 CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -31,7 +31,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="sqlite-autoconf-3070500"
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index 09fcbfcc0..66ebd3c7a 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -17,7 +17,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.perl.org/"
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
 CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 PROVIDES="
 	perl = $portVersion compat >= 5
@@ -31,14 +31,14 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	"
 
 SOURCE_DIR="$portVersionedName"
-BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()
 {
diff --git a/dev-libs/apr-util/apr-util-1.3.10.recipe b/dev-libs/apr-util/apr-util-1.3.10.recipe
deleted file mode 100644
index 9067c8950..000000000
--- a/dev-libs/apr-util/apr-util-1.3.10.recipe
+++ /dev/null
@@ -1,68 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
-CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="apr-util = $portVersion compat >= 1
-	lib:libaprutil = $portVersion compat >= 1
-	lib:libaprutil-1 = $portVersion compat >= 1"
-REQUIRES="haiku >= $haikuVersion
-	apr >= 1.3.9
-	expat >= 2.0"
-BUILD_REQUIRES="cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
-
-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()
-{
-	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
-	aprInstallDir=$aprUtilPackageLinksDir/apr
-
-	# We need the APR sources to build APR-Util.
-	haikuporter -b -y apr-1.4.2
-	aprSourceDir=$(haikuporter -t)/dev-libs/apr/work/apr-1.4.2
-
-	rm -rf aclocal.m4
-	mkdir -p m4
-	haikuporter -b -y apr-1.4.2
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf -f
-	cd xml/expat
-	mkdir -p m4
-	echo 'AM_INIT_AUTOMAKE' >> configure.in
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf --force
-	autoheader
-	touch libtool.m4	
-	cd ../..
-	sed -i 's/\/usr\/bin\/env/\/bin\/env/' $aprSourceDir/build/gen-build.py
-	buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \
-		--prefix=$prefix
-	ln -sf $(which libtool) ./libtool 
-    ./configure $configureDirArgs \
-		--with-apr=$aprInstallDir/bin/apr-1-config
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-LICENSE="Apache v2"
-COPYRIGHT="2010 The Apache Software Foundation."
diff --git a/dev-libs/apr-util/apr_util-1.3.10.recipe b/dev-libs/apr-util/apr_util-1.3.10.recipe
new file mode 100644
index 000000000..9a0e4cbd4
--- /dev/null
+++ b/dev-libs/apr-util/apr_util-1.3.10.recipe
@@ -0,0 +1,96 @@
+SUMMARY="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
+LICENSE="Apache v2"
+COPYRIGHT="2010 The Apache Software Foundation."
+CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	apr_util = $portVersion compat >= 1
+	lib:libaprutil = $portVersion compat >= 1
+	lib:libaprutil_1 = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	apr >= 1.3.9
+	expat >= 2.0
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autoheader
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
+	aprInstallDir=$aprUtilPackageLinksDir/apr
+	expatInstallDir=$aprUtilPackageLinksDir/expat
+
+	rm -rf aclocal.m4
+	mkdir -p m4
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf -f
+	cd xml/expat
+	mkdir -p m4
+	echo 'AM_INIT_AUTOMAKE' >> configure.in
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf --force
+	autoheader
+	touch libtool.m4	
+	cd ../..
+	
+	# TODO: fix this hack!
+	cp /boot/common/bin/libtool .
+	ln -sfn $sourceDir/libtool /libtool
+	
+    ./configure $configureDirArgs \
+		--with-apr=$aprInstallDir \
+		--with-expat=$expatInstallDir
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+DESCRIPTION="
+	The mission of the Apache Portable Runtime (APR) project is to create 
+	and maintain software libraries that provide a predictable and consistent 
+	interface to underlying platform-specific implementations. The primary 
+	goal is to provide an API to which software developers may code and be 
+	assured of predictable if not identical behaviour regardless of the 
+	platform on which their software is built, relieving them of the need to 
+	code special-case conditions to work around or take advantage of 
+	platform-specific deficiencies or features.
+	
+	To give a brief overview, the primary core subsystems of APR 1.x include 
+	the following:
+	
+	- atomic operations
+	- dynamic Shared Object loading
+	- file I/O
+	- locks (mutexes, condition variables, etc)
+	- memory management (high performance allocators)
+	- memory-mapped files
+	- multicast Sockets
+	- network I/O
+	- shared memory
+	- thread and Process management
+	- various data structures (tables, hashes, priority queues, etc) 
+	"
diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe
index ceaec12a4..7a6c33b5f 100644
--- a/dev-libs/apr/apr-1.4.2.recipe
+++ b/dev-libs/apr/apr-1.4.2.recipe
@@ -1,4 +1,64 @@
 SUMMARY="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
+CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
+LICENSE="Apache v2"
+COPYRIGHT="2010 The Apache Software Foundation."
+REVISION="5"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	apr = $portVersion compat >= 1
+	lib:libapr = $portVersion compat >= 1
+	lib:libapr_1 = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	touch libtool.m4
+	aclocal -I build
+	autoconf
+	./configure $configureDirArgs
+	
+	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
+	ln -sfn $sourceDir/libtool /libtool
+	
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}
+
+
+# ----- source package -------------------------------------------------------
+
+PROVIDES_source="apr_source = $portVersion compat = $portVersion"
+
+
 DESCRIPTION="
 	The mission of the Apache Portable Runtime (APR) project is to create 
 	and maintain software libraries that provide a predictable and consistent 
@@ -24,55 +84,3 @@ DESCRIPTION="
 	- thread and Process management
 	- various data structures (tables, hashes, priority queues, etc) 
 	"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
-CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	apr = $portVersion compat >= 1
-	lib:libapr = $portVersion compat >= 1
-	lib:libapr-1 = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
-	"
-
-SOURCE_DIR="$portVersionedName"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	touch libtool.m4
-	aclocal -I build
-	autoconf
-	./configure $configureDirArgs
-	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
-	ln -sfn $sourceDir/libtool /libtool
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
-
-LICENSE="Apache v2"
-COPYRIGHT="2010 The Apache Software Foundation."
diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe
index 1288bdef6..34348d6ad 100644
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -5,7 +5,7 @@ DESCRIPTION="
 HOMEPAGE="http://expat.sourceforge.net/" 
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
 CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -24,7 +24,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"
diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe
index ba2f2cf6e..4c33f4674 100644
--- a/dev-libs/libxml2/libxml2-2.7.8.recipe
+++ b/dev-libs/libxml2/libxml2-2.7.8.recipe
@@ -1,4 +1,56 @@
 SUMMARY="The XML C parser and toolkit of Gnome"
+HOMEPAGE="http://www.xmlsoft.org/" 
+LICENSE="MIT"
+COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
+SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
+CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	libxml2 = $portVersion compat >= 2.7
+	lib:libxml2 = $portVersion compat >= 2.7
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	zlib
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make tests
+}
+
 DESCRIPTION="
 	Libxml2 is the XML C parser and toolkit developed for the Gnome project 
 	(but usable outside of the Gnome platform), it is free software available 
@@ -52,55 +104,3 @@ DESCRIPTION="
 	on but it would be far too early to make any conformance statement about 
 	it at the moment.
 	"
-HOMEPAGE="http://www.xmlsoft.org/" 
-SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
-CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	libxml2 = $portVersion compat >= 2.7
-	lib:libxml2 = $portVersion compat >= 2.7
-	"
-REQUIRES="
-	haiku >= $haikuVersion
-	zlib
-	"
-BUILD_REQUIRES="
-	$REQUIRES
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
-	"
-
-SOURCE_DIR="$portVersionedName"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork"
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make tests
-}
-
-LICENSE="MIT"
-COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe
index 2fb63d280..8822d6de8 100644
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -17,7 +17,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz"
 CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index ee3b4f102..51f245058 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/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
diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe
index 26a60ffe9..2ba1d878a 100644
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/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 \
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index bcfcd82be..fcbdb9e17 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -20,7 +20,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.webdav.org/neon/"
 SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
 CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index d1e704637..ccc6d99ba 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -14,7 +14,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/coreutils" 
 SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2"
 CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
     cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index a1a3eba63..40de789b0 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -12,7 +12,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/sed" 
 SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz"
 CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -23,7 +23,7 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:aclocal >= 1.11
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index 9fad43770..f080a7726 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -3,13 +3,13 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project."
 HOMEPAGE="http://www.gnu.org/software/texinfo/" 
 SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz"
 CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="texinfo = $portVersion compat >= 4.13
 	cmd:info = $portVersion compat >= 4.13
 	cmd:makeinfo = $portVersion compat >= 4.13
-	cmd:install-info = $portVersion compat >= 4.13
+	cmd:install_info = $portVersion compat >= 4.13
 	cmd:texi2dvi = $portVersion compat >= 4.13
 	cmd:texi2pdf = $portVersion compat >= 4.13
 	cmd:texindex = $portVersion compat >= 4.13
@@ -17,7 +17,7 @@ PROVIDES="texinfo = $portVersion compat >= 4.13
 	cmd:pdftexi2dvi = $portVersion compat >= 4.13"
 REQUIRES=""
 BUILD_REQUIRES=""
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 98c1c86f5..94892a1aa 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -8,8 +8,12 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/autoconf/" 
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2"
 CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
+LICENSE="
+	GNU GPL v2
+	GNU GPL v3"
+COPYRIGHT="1992-2010 Free Software Foundation, Inc."
 
 PROVIDES="
 	autoconf = $portVersion compat >= 2.60
@@ -35,13 +39,13 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:autoreconf >= 2.60
 	cmd:make
 	"
 
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 SOURCE_DIR="$portVersionedName"
-BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
 
 BUILD()
 {
@@ -61,6 +65,6 @@ TEST()
 	make check
 }
 
-LICENSE="GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="1992-2010 Free Software Foundation, Inc."
+# ----- source package -------------------------------------------------------
+
+PROVIDES_source="autoconf_source = $portVersion"
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index aec8de442..b418af8bd 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -6,7 +6,7 @@ DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. U
 HOMEPAGE="http://www.gnu.org/software/autoconf/" 
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz"
 CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="autoconf = $portVersion compat >= 2.60
@@ -25,12 +25,12 @@ REQUIRES="haiku >= $haikuVersion
 	cmd:perl >= 5
 	cmd:sh"
 BUILD_REQUIRES="cmd:automake >= 1.13.1"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:autoreconf >= 2.60
 	cmd:make"
 
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 SOURCE_DIR="$portVersionedName"
-BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
 
 BUILD()
 {
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index f6866ec11..77bbbef50 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -8,15 +8,15 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz"
 CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.11
 	cmd:automake = $portVersion compat >= 1.11
-	cmd:automake-1.11 = $portVersion compat >= 1.11
+	cmd:automake_1.11 = $portVersion compat >= 1.11
 	cmd:aclocal = $portVersion compat >= 1.11
-	cmd:aclocal-1.11 = $portVersion compat >= 1.11
+	cmd:aclocal_1.11 = $portVersion compat >= 1.11
 	"
 REQUIRES="
 	haiku >= $haikuVersion
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:autoconf >= 2.60
 	cmd:make
 	"
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index cf419d472..eb4ff4580 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -6,14 +6,14 @@ DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files
 HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
 CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="automake = $portVersion compat >= 1.11
 	cmd:automake = $portVersion compat >= 1.11
-	cmd:automake-1.11 = $portVersion compat >= 1.11
+	cmd:automake_1.11 = $portVersion compat >= 1.11
 	cmd:aclocal = $portVersion compat >= 1.11
-	cmd:aclocal-1.11 = $portVersion compat >= 1.11"
+	cmd:aclocal_1.11 = $portVersion compat >= 1.11"
 REQUIRES="haiku >= $haikuVersion
 	cmd:awk
 	coreutils
@@ -22,7 +22,7 @@ REQUIRES="haiku >= $haikuVersion
 	cmd:perl >= 5
 	cmd:sh"
 BUILD_REQUIRES="cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
     cmd:autoconf >= 2.60
     cmd:make
     cmd:perl >= 5.8"
diff --git a/sys-devel/binutils/binutils-2.17_110711.recipe b/sys-devel/binutils/binutils-2.17_110711.recipe
new file mode 100644
index 000000000..c89557682
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.17_110711.recipe
@@ -0,0 +1,186 @@
+SUMMARY="The GNU assembler, linker and binary utilities"
+HOMEPAGE="http://www.gnu.org/software/binutils"
+SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2006 Free Software Foundation, Inc."
+
+
+PROVIDES="
+	binutils = $portVersion compat >= 2.17
+	cmd:addr2line = $portVersion compat >= 2.17
+	cmd:ar = $portVersion compat >= 2.17
+	cmd:as = $portVersion compat >= 2.17
+	cmd:c++filt = $portVersion compat >= 2.17
+	cmd:gprof = $portVersion compat >= 2.17
+	cmd:ld = $portVersion compat >= 2.17
+	cmd:nm = $portVersion compat >= 2.17
+	cmd:objcopy = $portVersion compat >= 2.17
+	cmd:objdump = $portVersion compat >= 2.17
+	cmd:ranlib = $portVersion compat >= 2.17
+	cmd:readelf = $portVersion compat >= 2.17
+	cmd:size = $portVersion compat >= 2.17
+	cmd:strings = $portVersion compat >= 2.17
+	cmd:strip = $portVersion compat >= 2.17
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	binutils
+	gcc
+	cmd:flex
+	cmd:make
+	cmd:sed
+	cmd:tar
+	texinfo
+	"
+
+SOURCE_DIR="$portVersionedName"
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
+
+binutilsDir=$(pwd)/legacy/binutils
+relativeArchInstallDir="develop/tools/${portVersionedName}"
+archInstallDir="$prefix/$relativeArchInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+binutilsObjectsDir=$objectsDir/binutils
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch all *.info files, as newer texinfos don't like their format
+	(cd $binutilsDir; find . -name \*.info | xargs touch)
+
+	# build binutils
+	mkdir -p $binutilsObjectsDir
+	cd $binutilsObjectsDir
+	CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \
+		--prefix=$prefix --exec-prefix=$archInstallDir \
+		--bindir=$prefix/bin --libdir=$prefix/lib \
+		--includedir=$prefix/develop/headers/binutils \
+		--mandir=$prefix/documentation/man \
+		--with-docdir=$prefix/documentation/binutils \
+		--with-htmldir=$prefix/documentation/binutils \
+		--disable-nls --enable-shared=yes
+	make
+}
+
+INSTALL()
+{
+	cd $binutilsObjectsDir
+	archName=$(grep '^target_alias' Makefile | cut -d= -f2)
+	
+	make install
+	make install-html
+
+	base=$prefix
+
+	### HTML documentation ####################################
+	
+	echo "Organizing HTML documentation..."
+	html_base=$base/documentation/binutils/html
+	mkdir -p $html_base
+	cd $html_base
+
+	# libiberty	
+	makeinfo --html "$binutilsDir/libiberty/libiberty.texi"
+	ln -sf libiberty/index.html $html_base/libiberty.html
+
+	# bfd
+	mv $binutilsObjectsDir/bfd/doc/bfd.html $html_base/bfd
+	ln -sf bfd/index.html $html_base/bfd.html
+
+	# binutils
+	mv $binutilsObjectsDir/binutils/doc/binutils.html $html_base/binutils
+	ln -sf binutils/index.html $html_base/binutils.html
+	
+	# gas
+	mv $binutilsObjectsDir/gas/doc/as.html $html_base/as
+	ln -sf as/index.html $html_base/as.html
+
+	# gprof
+	mv $binutilsObjectsDir/gprof/gprof.html $html_base/gprof
+	ln -sf gprof/index.html $html_base/gprof.html
+
+	# ld
+	mv $binutilsObjectsDir/ld/ld.html $html_base/ld
+	ln -sf ld/index.html $html_base/ld.html
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# remove duplicate architecture-dependent binaries from $prefix/bin
+	cd $prefix/bin
+	rm ar as ld nm objdump ranlib strip
+	
+	# make all tools available via default paths if these are 
+	# the system binutils
+	if [ $architecture = 'x86_gcc2' ]; then
+		echo "Symlinking binaries into default path"
+		mkdir -p $prefix/bin
+		ln -sfn ../$relativeArchInstallDir/$archName/bin/* .
+	fi
+	
+	### Strip #################################################
+	
+	echo "Strip debug info"
+
+	cd $base
+	strip --strip-debug i586-pc-haiku/bin/*
+	
+	### Cleanup ###############################################
+	
+	echo "Cleanup"
+	
+	if [ -d $base/man -o -d $base/info -o -d $base/share ]; then
+		rm -rf $base/man
+		rm -rf $base/info
+		rm -rf $base/share
+	fi
+}
+
+DESCRIPTION="
+	The GNU Binutils are a collection of binary tools. The main ones are:
+	
+	    ld - the GNU linker.
+	    as - the GNU assembler.
+	
+	But they also include:
+	
+	    addr2line - Converts addresses into filenames and line numbers.
+	    ar - A utility for creating, modifying and extracting from archives.
+	    c++filt - Filter to demangle encoded C++ symbols.
+	    dlltool - Creates files for building and using DLLs.
+	    gold - A new, faster, ELF only linker, still in beta test.
+	    gprof - Displays profiling information.
+	    nlmconv - Converts object code into an NLM.
+	    nm - Lists symbols from object files.
+	    objcopy - Copys and translates object files.
+	    objdump - Displays information from object files.
+	    ranlib - Generates an index to the contents of an archive.
+	    readelf - Displays information from any ELF format object file.
+	    size - Lists the section sizes of an object or archive file.
+	    strings - Lists printable strings from files.
+	    strip - Discards symbols.
+	    windmc - A Windows compatible message compiler.
+	    windres - A compiler for Windows resource files.
+	
+	Most of these programs use BFD, the Binary File Descriptor library, to do low-level 
+	manipulation. Many of them also use the opcodes library to assemble and disassemble machine 
+	instructions.
+	
+	The binutils have been ported to most major Unix variants as well as Wintel systems, and their 
+	main reason for existence is to give the GNU system (and GNU/Linux) the facility to compile 
+	and link programs.
+	"
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index b08590afd..f3e420f0a 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -12,7 +12,7 @@ DESCRIPTION="Bison is a general-purpose parser generator that converts an annota
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz"
 CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="bison = $portVersion compat >= 2.4
@@ -20,7 +20,7 @@ PROVIDES="bison = $portVersion compat >= 2.4
 	cmd:yacc
 	lib:liby.a = $portVersion compat >= 2.4"
 REQUIRES="haiku >= $haikuVersion"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make"
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 2cc467a6b..86cc33e7a 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -6,7 +6,7 @@ DESCRIPTION="
 HOMEPAGE="http://flex.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
 CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	"
diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe
index 3d4a570f4..2f3b5ac81 100644
--- a/sys-devel/gcc/gcc-2.95.3_110711.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe
@@ -1,63 +1,52 @@
 SUMMARY="C/C++ compiler"
-DESCRIPTION="
-	Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5.
-	"
+DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5."
 HOMEPAGE="http://gcc.gnu.org"
-# TODO: Also: http://www.gnu.org/software/binutils
-SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e"
-REVISION="4"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2000 Free Software Foundation, Inc."
+SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
 	gcc = $portVersion compat >= 2.95.3
+	cmd:c++ = $portVersion compat >= 2.95.3
 	cmd:cpp = $portVersion compat >= 2.95.3
-	cmd:gcc = $portVersion compat >= 2.95.3
 	cmd:g++ = $portVersion compat >= 2.95.3
-	binutils = 2.17_110711 compat >= 2.17
-	cmd:ar = 2.17_110711 compat >= 2.17
-	cmd:as = 2.17_110711 compat >= 2.17
-	cmd:c++filt = 2.17_110711 compat >= 2.17
+	cmd:gcc = $portVersion compat >= 2.95.3
 	cmd:gcov = 1.5 compat >= 1.5
-	cmd:gprof = 2.17_110711 compat >= 2.17
-	cmd:ld = 2.17_110711 compat >= 2.17
-	cmd:nm = 2.17_110711 compat >= 2.17
-	cmd:objcopy = 2.17_110711 compat >= 2.17
-	cmd:objdump = 2.17_110711 compat >= 2.17
-	cmd:protoize = 2.17_110711 compat >= 2.17
-	cmd:ranlib = 2.17_110711 compat >= 2.17
-	cmd:readelf = 2.17_110711 compat >= 2.17
-	cmd:size = 2.17_110711 compat >= 2.17
-	cmd:strings = 2.17_110711 compat >= 2.17
-	cmd:strip = 2.17_110711 compat >= 2.17
-	cmd:unprotoize = 2.17_110711 compat >= 2.17
+	cmd:protoize = $portVersion compat >= 2.95.3
+	cmd:unprotoize = $portVersion compat >= 2.95.3
 	"
 
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	binutils
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:autoconf
-	binutils
 	gcc
 	cmd:flex
 	cmd:make
 	cmd:sed
 	cmd:tar
-	texinfo
+	cmd:makeinfo
 	"
 
 SOURCE_DIR="$portVersionedName"
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
+gccDir=$(pwd)/legacy/gcc
 gccDate=110711
 relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}"
 gccInstallDir="$prefix/$relativeGccInstallDir"
 objectsDir=$(pwd)/../${portVersionedName}-obj
-binutilsObjectsDir=$objectsDir/binutils
 gccObjectsDir=$objectsDir/gcc
-buildtoolsDir=$(pwd)/legacy
 
 BUILD()
 {
@@ -66,27 +55,13 @@ BUILD()
 	# Touch some files generated by bison, so that bison won't run to update
 	# them. Fixes issues with newer bison versions.
 	# And while at it, touch gperf target, too (as gperf may not be installed).
-	(cd $buildtoolsDir/gcc/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
+	(cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
 		cp/parse.h c-gperf.h)
 
-	# Touch all *.info files, as newer texinfos don't like their format
-	(cd $buildtoolsDir; find . -name \*.info | xargs touch)
-
-	# build binutils
-	mkdir -p $binutilsObjectsDir
-	cd $binutilsObjectsDir
-	CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/binutils/configure" \
-		--prefix=$gccInstallDir \
-		--disable-nls --enable-shared=yes
-	make
-
-	# install binutils before building gcc
-	make install
-	
 	# build gcc
-	mkdir $gccObjectsDir
+	mkdir -p $gccObjectsDir
 	cd $gccObjectsDir
-	CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/gcc/configure" \
+	CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \
 		--prefix=$gccInstallDir \
 		--disable-nls --enable-shared=yes --enable-languages=c,c++
 	make bootstrap || true
@@ -97,9 +72,6 @@ BUILD()
 
 INSTALL()
 {
-	cd $binutilsObjectsDir
-	make install
-
 	cd $gccObjectsDir
 	make install 
 
@@ -107,54 +79,29 @@ INSTALL()
 
 	### HTML documentation ####################################
 	
-	html_base=$base/html-docs
+	html_base=$prefix/documentation/packages/$portVersionedName
 	if [ ! -d "$html_base" ]; then
 		echo "Building HTML documentation..."
-		mkdir $html_base
+		mkdir -p $html_base
 		cd $html_base
 	
-		makeinfo --html "$buildtoolsDir/gcc/gcc/cpp.texi"
-		makeinfo --html "$buildtoolsDir/gcc/gcc/gcc.texi"
-		makeinfo --html "$buildtoolsDir/binutils/libiberty/libiberty.texi"
-		makeinfo --force --html "$buildtoolsDir/gcc/libio/iostream.texi" \
+		makeinfo --html "$gccDir/gcc/cpp.texi"
+		makeinfo --html "$gccDir/gcc/gcc.texi"
+		makeinfo --force --html "$gccDir/libio/iostream.texi" \
 			&& true
 				# some errors
 	
 		ln -sf cpp/index.html $html_base/cpp.html
 		ln -sf gcc/index.html $html_base/gcc.html
-		ln -sf libiberty/index.html $html_base/libiberty.html
 		ln -sf iostream/index.html $html_base/iostream.html
 	fi
-	if [ -d "$base/share/doc" ]; then
-		echo "Adding binutils HTML documentation..."
-	
-		mv $base/share/doc/as.html $html_base/as
-		mv $base/share/doc/binutils.html $html_base/binutils
-		mv $base/share/doc/gprof.html $html_base/gprof
-		mv $base/share/doc/ld.html $html_base/ld
-		#mv $base/share/doc/configure.html $html_base/
-	
-		ln -sf as/index.html $html_base/as.html
-		ln -sf binutils/index.html $html_base/binutils.html
-		ln -sf gprof/index.html $html_base/gprof.html
-		ln -sf ld/index.html $html_base/ld.html
-	fi
-	if [ ! -e "$html_base/as.html" ]; then
-		echo "binutils HTML documentation missing, see" \
-			"INSTALL-gcc2-from-source-Haiku."
-	fi
 
 	### Symlinks ##############################################
 
 	echo "Creating required symlinks"
 
-	# create symlinks to binutils binaries
-	cd $base/bin
-	for binary in ../i586-pc-haiku/bin/*; do
-		ln -sfn $binary .
-	done
-	
 	# convert to absolute links to relative ones
+	cd $base/bin
 	ln -sfn g++ c++
 	ln -sfn gcc i586-pc-haiku-gcc
 	
@@ -199,7 +146,3 @@ INSTALL()
 	ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/
 	ln -snf /boot/system/lib/libstdc++.so $base/lib/
 }
-
-LICENSE="GNU GPL v2
-	GNU LGPL v2"
-COPYRIGHT="1988-2000 Free Software Foundation, Inc."
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index b3e77bb23..b5306ea85 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -6,7 +6,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/libtool" 
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz"
 CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index 6ab48137e..6ebdc1889 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -19,7 +19,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/m4/" 
 SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
 CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index d7a7eea3c..723658692 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -12,7 +12,7 @@ DESCRIPTION="
 HOMEPAGE="http://www.gnu.org/software/make/" 
 SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
 CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 BUILD_PREREQUIRES="
-	haiku-devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	"