From 51ecc7d46f7b05842efb553704d23f03a41f646b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 19:09:54 +0000 Subject: [PATCH] Update beps WRT *DEPENDS/*REQUIRES changes Also add/remove some dependencies that seemed missing/superfluous. --- dev-lang/perl/perl-5.10.1.bep | 8 +++++--- sys-devel/autoconf/autoconf-2.68.bep | 7 ++++--- sys-devel/automake/automake-1.11.1.bep | 5 +++-- sys-devel/bison/bison-2.4.3.bep | 7 ++++--- sys-devel/flex/flex-2.5.35.bep | 9 +++++---- sys-devel/libtool/libtool-2.4.bep | 9 +++++---- sys-devel/m4/m4-1.4.16.bep | 7 ++++--- sys-devel/make/make-3.82.bep | 8 ++++---- 8 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 75667f0bf..460d86b99 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -6,10 +6,12 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + make + sed" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index f7272bb6a..0e337854d 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -16,16 +16,17 @@ PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 cmd:autoscan = $portVersion compat >= 2.68 cmd:autoupdate = $portVersion compat >= 2.68 cmd:ifnames = $portVersion compat >= 2.68" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion awk coreutils diffutils m4 >= 1.4 + make perl >= 5 sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion +BUILD_REQUIRES="automake >= 1.11" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion autoreconf >= 2.68 - automake >= 1.11 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 7919f2f15..5c5743034 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -13,14 +13,15 @@ PROVIDES="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" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion awk coreutils diffutils m4 >= 1.4 perl >= 5 sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + 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 cffd599e4..8859e3179 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -18,11 +18,12 @@ STATUS_HAIKU="stable" PROVIDES="cmd:bison = $portVersion compat >= 2.4 cmd:yacc lib:liby.a = $portVersion compat >= 2.4" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + 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 a4b05b456..134c3cdd6 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -10,14 +10,15 @@ STATUS_HAIKU="stable" PROVIDES="cmd:flex = $portVersion compat >= 2.5 lib:libfl.a = $portVersion compat >= 2.5 lib:libfl_pic.a = $portVersion compat >= 2.5" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion - aclocal >= 1.11 +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="aclocal >= 1.11 autoconf >= 2.68 automake >= 1.11 + libtoolize >= 2.4" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc ld - libtoolize >= 2.4" + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index bfac9b959..f6f83ed35 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -11,14 +11,15 @@ PROVIDES="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" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion aclocal >= 1.11.1 automake >= 1.11.1" -BUILD_DEPEND="haiku-devel >= $haikuVersion - autoconf >= 2.68 - autoheader >= 2.68 +BUILD_REQUIRES="autoconf >= 2.68 + autoheader >= 2.68" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc ld + make nm sed" diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 5f7751f5f..e0626c428 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -7,10 +7,11 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index e3667b86f..6013137ca 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -9,11 +9,11 @@ STATUS_HAIKU="broken" # on other packages (e.g. perl) PROVIDES="cmd:make = $portVersion compat >= 3.82" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="libtool" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld - libtool" + ld" SOURCE_DIR="$portVersionedName"