From 8f13d28af60d1365bdfea033bb9219edaa115a30 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 27 Mar 2013 23:31:02 +0000
Subject: [PATCH] Update the packages required for bootstrapping

* Also declare a resolvable named like the package, even if
  similarly named cmd:* resolvable is declared.
* Add cmd: namespace to resolvables in [BUILD_[PRE]]REQUIRES
  where appropriate. For some reason I thought that didn't
  work (resulting in an error building the package), but
  apparently I was mistaken.
* A few smaller fixes in [BUILD_[PRE]]REQUIRES.
---
 dev-lang/perl/perl-5.10.1.bep          | 11 ++++++-----
 sys-apps/texinfo/texinfo-4.13a.bep     | 11 ++++++-----
 sys-devel/autoconf/autoconf-2.68.bep   | 19 ++++++++++---------
 sys-devel/automake/automake-1.11.1.bep | 13 +++++++------
 sys-devel/bison/bison-2.4.3.bep        | 12 ++++++------
 sys-devel/flex/flex-2.5.35.bep         | 15 ++++++++-------
 sys-devel/gcc/gcc-2.95.3_110711.bep    | 11 ++++++-----
 sys-devel/libtool/libtool-2.4.bep      | 21 +++++++++++----------
 sys-devel/m4/m4-1.4.16.bep             |  9 +++++----
 sys-devel/make/make-3.82.bep           |  9 +++++----
 10 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep
index 460d86b99..4101df1ef 100644
--- a/dev-lang/perl/perl-5.10.1.bep
+++ b/dev-lang/perl/perl-5.10.1.bep
@@ -4,14 +4,15 @@ HOMEPAGE="http://www.perl.org/"
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
 REVISION="2"
 STATUS_HAIKU="stable"
-PROVIDES="cmd:perl = $portVersion compat >= 5
+PROVIDES="perl = $portVersion compat >= 5
+	cmd:perl = $portVersion compat >= 5
 	lib:libperl = $portVersion compat >= 5"
 REQUIRES="haiku >= $haikuVersion"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	make
-	sed"
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed"
 CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
 
 SOURCE_DIR="$portVersionedName"
diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.bep
index 43438e1dd..74e817a85 100644
--- a/sys-apps/texinfo/texinfo-4.13a.bep
+++ b/sys-apps/texinfo/texinfo-4.13a.bep
@@ -6,7 +6,8 @@ CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:info = $portVersion compat >= 4.13
+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:texi2dvi = $portVersion compat >= 4.13
@@ -17,10 +18,10 @@ PROVIDES="cmd:info = $portVersion compat >= 4.13
 REQUIRES=""
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	libtoolize
-	make"
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make"
 
 SOURCE_DIR="texinfo-4.13"
 
diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep
index 0e337854d..e38df7694 100644
--- a/sys-devel/autoconf/autoconf-2.68.bep
+++ b/sys-devel/autoconf/autoconf-2.68.bep
@@ -9,7 +9,8 @@ CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:autoconf = $portVersion compat >= 2.68
+PROVIDES="autoconf = $portVersion compat >= 2.68
+	cmd:autoconf = $portVersion compat >= 2.68
 	cmd:autoheader = $portVersion compat >= 2.68
 	cmd:autom4te = $portVersion compat >= 2.68
 	cmd:autoreconf = $portVersion compat >= 2.68
@@ -17,17 +18,17 @@ PROVIDES="cmd:autoconf = $portVersion compat >= 2.68
 	cmd:autoupdate = $portVersion compat >= 2.68
 	cmd:ifnames = $portVersion compat >= 2.68"
 REQUIRES="haiku >= $haikuVersion
-	awk
+	cmd:awk
 	coreutils
 	diffutils
-	m4 >= 1.4
-	make
-	perl >= 5
-	sh"
-BUILD_REQUIRES="automake >= 1.11"
+	cmd:m4 >= 1.4
+	cmd:make
+	cmd:perl >= 5
+	cmd:sh"
+BUILD_REQUIRES="cmd:automake >= 1.11"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	autoreconf >= 2.68
-	sed"
+	cmd:autoreconf >= 2.68
+	cmd:sed"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep
index 5c5743034..601e4dc80 100644
--- a/sys-devel/automake/automake-1.11.1.bep
+++ b/sys-devel/automake/automake-1.11.1.bep
@@ -9,19 +9,20 @@ CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:automake = $portVersion compat >= 1.11
+PROVIDES="automake = $portVersion compat >= 1.11
+	cmd:automake = $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"
 REQUIRES="haiku >= $haikuVersion
-	awk
+	cmd:awk
 	coreutils
 	diffutils
-	m4 >= 1.4
-	perl >= 5
-	sh"
+	cmd:m4 >= 1.4
+	cmd:perl >= 5
+	cmd:sh"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	make"
+	cmd:make"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep
index 8859e3179..2c99d2368 100644
--- a/sys-devel/bison/bison-2.4.3.bep
+++ b/sys-devel/bison/bison-2.4.3.bep
@@ -15,15 +15,15 @@ CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:bison = $portVersion compat >= 2.4
+PROVIDES="bison = $portVersion compat >= 2.4
+	cmd:bison = $portVersion compat >= 2.4
 	cmd:yacc
 	lib:liby.a = $portVersion compat >= 2.4"
-REQUIRES="haiku >= $haikuVersion
-	sh"
+REQUIRES="haiku >= $haikuVersion"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	make"
+	cmd:gcc
+	cmd:ld
+	cmd:make"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep
index 134c3cdd6..2b77fbc15 100644
--- a/sys-devel/flex/flex-2.5.35.bep
+++ b/sys-devel/flex/flex-2.5.35.bep
@@ -7,18 +7,19 @@ CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:flex = $portVersion compat >= 2.5
+PROVIDES="flex = $portVersion compat >= 2.5
+	cmd:flex = $portVersion compat >= 2.5
 	lib:libfl.a = $portVersion compat >= 2.5
 	lib:libfl_pic.a = $portVersion compat >= 2.5"
 REQUIRES="haiku >= $haikuVersion"
 BUILD_REQUIRES="aclocal >= 1.11
-	autoconf >= 2.68
-	automake >= 1.11
-	libtoolize >= 2.4"
+	cmd:autoconf >= 2.68
+	cmd:automake >= 1.11
+	cmd:libtoolize >= 2.4"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	make"
+	cmd:gcc
+	cmd:ld
+	cmd:make"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.bep
index 74402967c..1b2bf7bc0 100644
--- a/sys-devel/gcc/gcc-2.95.3_110711.bep
+++ b/sys-devel/gcc/gcc-2.95.3_110711.bep
@@ -6,7 +6,8 @@ SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:cpp = $portVersion compat >= 2.95.3
+PROVIDES="gcc = $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
@@ -29,10 +30,10 @@ PROVIDES="cmd:cpp = $portVersion compat >= 2.95.3
 
 REQUIRES="haiku >= $haikuVersion"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	binutils
-	gcc
-	make
-	texinfo"
+	cmd:binutils
+	cmd:gcc
+	cmd:make
+	cmd:texinfo"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep
index f6f83ed35..0c21d9366 100644
--- a/sys-devel/libtool/libtool-2.4.bep
+++ b/sys-devel/libtool/libtool-2.4.bep
@@ -7,21 +7,22 @@ CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:libtool = $portVersion compat >= 2.4
+PROVIDES="libtool = $portVersion compat >= 2.4
+	cmd:libtool = $portVersion compat >= 2.4
 	cmd:libtoolize = $portVersion compat >= 2.4
 	lib:libltdl.a = 7.3.0 compat >= 7
 	lib:libltdl = 7.3.0 compat >= 7"
 REQUIRES="haiku >= $haikuVersion
-	aclocal >= 1.11.1
-	automake >= 1.11.1"
-BUILD_REQUIRES="autoconf >= 2.68
-	autoheader >= 2.68"
+	cmd:aclocal >= 1.11.1
+	cmd:automake >= 1.11.1"
+BUILD_REQUIRES="cmd:autoconf >= 2.68
+	cmd:autoheader >= 2.68"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	make
-	nm
-	sed"
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:nm
+	cmd:sed"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep
index e0626c428..257c5db60 100644
--- a/sys-devel/m4/m4-1.4.16.bep
+++ b/sys-devel/m4/m4-1.4.16.bep
@@ -6,12 +6,13 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
 REVISION="2"
 STATUS_HAIKU="stable"
 
-PROVIDES="cmd:m4 = $portVersion compat >= 1.4"
+PROVIDES="m4 = $portVersion compat >= 1.4
+	cmd:m4 = $portVersion compat >= 1.4"
 REQUIRES="haiku >= $haikuVersion"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld
-	make"
+	cmd:gcc
+	cmd:ld
+	cmd:make"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep
index 6013137ca..029333bbe 100644
--- a/sys-devel/make/make-3.82.bep
+++ b/sys-devel/make/make-3.82.bep
@@ -8,12 +8,13 @@ STATUS_HAIKU="broken"
 	# make-3.82 has problems/incompatibilities when doing 'make install DESTDIR'
 	# on other packages (e.g. perl)
 
-PROVIDES="cmd:make = $portVersion compat >= 3.82"
+PROVIDES="make = $portVersion compat >= 3.82
+	cmd:make = $portVersion compat >= 3.82"
 REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="libtool"
+BUILD_REQUIRES="cmd:libtoolize"
 BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	gcc
-	ld"
+	cmd:gcc
+	cmd:ld"
 
 SOURCE_DIR="$portVersionedName"