From 39a646a2897a529d317b11944534090009f59bf6 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 5 Aug 2013 00:14:47 +0200 Subject: [PATCH] Adjust recipes to separation of buildhost and target packages --- app-arch/bzip2/bzip2-1.0.6.recipe | 6 +++--- app-arch/p7zip/p7zip-9.13.recipe | 6 +++--- app-arch/p7zip/p7zip-9.20.1.recipe | 6 +++--- app-arch/tar/tar-1.26.recipe | 2 +- app-arch/xz_utils/xz_utils-5.0.1.recipe | 6 +++--- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 6 +++--- app-editors/nano/nano-2.2.6.recipe | 8 ++++---- app-text/asciidoc/asciidoc-8.6.8.recipe | 6 +++--- app-text/htmldoc/htmldoc-1.8.27.recipe | 10 +++++----- app-text/rman/rman-3.2.recipe | 6 +++--- app-text/texi2html/texi2html-1.82.recipe | 6 +++--- dev-db/sqlite/sqlite-3.7.13.recipe | 6 +++--- dev-db/sqlite/sqlite-3.7.16.1.recipe | 10 +++++++--- dev-db/sqlite/sqlite-3.7.5.recipe | 6 +++--- dev-lang/perl/perl-5.10.1.recipe | 2 +- dev-lang/python/python-2.6.8.recipe | 2 +- dev-lang/yasm/yasm-1.1.0.recipe | 6 +++--- dev-lang/yasm/yasm-1.2.0.recipe | 6 +++--- dev-libs/apr/apr-1.4.2.recipe | 6 +++--- dev-libs/apr/apr-1.4.6.recipe | 6 +++--- dev-libs/apr_util/apr_util-1.3.10.recipe | 6 +++--- dev-libs/apr_util/apr_util-1.4.1.recipe | 10 +++++----- dev-libs/expat/expat-2.0.1.recipe | 6 +++--- dev-libs/icu/icu-4.8.1.1.recipe | 7 +++---- dev-libs/libedit/libedit-2012_06_01_3.0.recipe | 8 ++++---- dev-libs/libiconv/libiconv-1.13.1.recipe | 6 +++--- dev-libs/libpcre/libpcre-8.21.recipe | 6 +++--- dev-libs/libxml2/libxml2-2.8.0.recipe | 8 ++++---- dev-libs/openssl/openssl-1.0.0d.recipe | 9 ++++----- dev-libs/openssl/openssl-1.0.0j.recipe | 8 ++++---- dev-util/cmake/cmake-2.8.5.recipe | 6 +++--- dev-util/ctags/ctags-5.8.recipe | 6 +++--- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 8 ++++---- dev-vcs/cvs/cvs-1.12.13.1.recipe | 2 +- dev-vcs/git/git-1.7.10.2.recipe | 16 ++++++++-------- dev-vcs/mercurial/mercurial-2.2.2.recipe | 5 ++--- dev-vcs/subversion/subversion-1.6.15.recipe | 6 +++--- dev-vcs/subversion/subversion-1.6.18.recipe | 14 +++++++------- .../bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 6 +++--- .../keymapswitcher-1.2.7.10.recipe | 8 ++++---- .../keymapswitcher/keymapswitcher-1.2.7.9.recipe | 9 ++++----- haiku-apps/mkdepend/mkdepend-1.7.recipe | 4 ++-- haiku-apps/pe/pe-2.4.3_hg602.recipe | 10 +++++----- haiku-apps/vision/vision-0.9.7.r944.recipe | 6 +++--- haiku-data/be_book/be_book-2008_10_26.recipe | 2 ++ .../ca_root_certificates-2012_12_29.recipe | 2 +- .../timgmsoundfont-2004_01_24.recipe | 2 +- .../wqy_microhei/wqy_microhei-0.2.0~beta.recipe | 6 ++---- media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe | 6 ++++-- media-gfx/graphviz/graphviz-2.26.3.recipe | 7 +++---- media-libs/freetype/freetype-2.4.9.recipe | 8 ++++---- media-libs/jpeg/jpeg-9.recipe | 7 +++---- media-libs/libogg/libogg-1.3.0.recipe | 6 +++--- media-libs/libpng/libpng-1.5.12.recipe | 8 ++++---- media-libs/libtheora/libtheora-1.1.1.recipe | 12 ++++++------ media-libs/libvorbis/libvorbis-1.3.2.recipe | 8 ++++---- media-libs/libvpx/libvpx-1.0.0.recipe | 10 +++++----- media-libs/speex/speex-1.2~rc1.recipe | 8 ++++---- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 14 +++++++------- net-misc/curl/curl-7.26.0.recipe | 10 +++++----- net-misc/neon/neon-0.29.6.recipe | 12 ++++++------ net-misc/openssh/openssh-5.8p2.recipe | 7 +++---- net-misc/openssh/openssh-6.0p1.recipe | 16 ++++++++-------- .../wpa_supplicant/wpa_supplicant-0.7.3.recipe | 6 +++--- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 6 +++--- sys-apps/gawk/gawk-3.1.8.recipe | 4 ++-- sys-apps/grep/grep-2.14.recipe | 10 +++++----- sys-apps/groff/groff-1.20.1.recipe | 6 +++--- sys-apps/man/man-1.6g.recipe | 6 +++--- sys-devel/autoconf/autoconf-2.68.recipe | 4 ++-- sys-devel/autoconf/autoconf-2.69.recipe | 13 +++++++------ sys-devel/automake/automake-1.11.1.recipe | 4 ++-- sys-devel/automake/automake-1.13.1.recipe | 4 ++-- .../binutils/binutils-2.17_2013_04_21.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 6 +++--- sys-devel/flex/flex-2.5.35.recipe | 12 ++++++------ sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe | 6 +++--- sys-devel/gettext/gettext-0.18.1.1.recipe | 10 +++++----- sys-devel/jam/jam-2.5_2012_10_12.recipe | 6 +++--- sys-devel/libtool/libtool-2.4.recipe | 4 ++-- sys-devel/m4/m4-1.4.16.recipe | 2 +- sys-devel/make/make-3.82.recipe | 2 +- sys-libs/glu/glu-9.0.0.recipe | 7 +++---- sys-libs/mesa/mesa-7.8.2.recipe | 6 +++--- sys-libs/ncurses/ncurses-5.9.recipe | 8 ++++---- sys-libs/zlib/zlib-1.2.8.recipe | 7 +++---- 86 files changed, 294 insertions(+), 296 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index bb657a062..1186bf2b3 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -27,15 +27,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:ar cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe index 89d854d39..be3ab5200 100644 --- a/app-arch/p7zip/p7zip-9.13.recipe +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="p7zip_9.13" diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 8b7d6bbaf..4daffb8af 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="p7zip_9.20.1" diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 831d7a73d..45cb4f7b2 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -27,7 +27,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -36,6 +35,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:ld cmd:make + cmd:sed " defineDebugInfoPackage tar \ diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe index 1f8a52190..2985e36de 100644 --- a/app-arch/xz_utils/xz_utils-5.0.1.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe @@ -42,14 +42,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="xz-5.0.1" diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index ab8a61586..bfdafe2e3 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -52,14 +52,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " GLOBAL_WRITABLE_FILES=" settings/cdrecord keep-old diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index e57222eb7..a2f233175 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -21,16 +21,16 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoreconf cmd:gcc cmd:groff cmd:ld cmd:libtoolize cmd:make - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index 6fa1f00c2..b95ef81bf 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -21,14 +21,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 3286f627c..d3066f507 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -25,17 +25,17 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:autoconf - cmd:gcc - cmd:ld - cmd:make - cmd:sed devel:libjpeg devel:libpng devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index 670887803..8eedc8590 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -22,12 +22,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:make - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld " BUILD() diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 4ed8158c8..880766280 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -22,6 +22,9 @@ REQUIRES=" cmd:perl " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -29,9 +32,6 @@ BUILD_REQUIRES=" cmd:make cmd:perl " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index 354bcdf4d..7eb639fd8 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -25,6 +25,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -33,9 +36,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="sqlite-autoconf-3071300" diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe index 15a40b833..700c17163 100644 --- a/dev-db/sqlite/sqlite-3.7.16.1.recipe +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -11,14 +11,18 @@ PROVIDES="sqlite = $portVersion compat >= 3 lib:libsqlite = $portVersion compat >= 3 lib:libsqlite3 = $portVersion compat >= 3" REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal cmd:autoconf cmd:automake cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion" + cmd:make + " 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 c92372e50..498618e68 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -23,6 +23,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,9 +34,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - 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 5358aca53..b55724fca 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -70,13 +70,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make + cmd:sed " GLOBAL_WRITABLE_FILES=" diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index f4e72ac9c..0b4739121 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -38,7 +38,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:nano devel:libbz2 devel:libncurses devel:libssl @@ -55,6 +54,7 @@ BUILD_PREREQUIRES=" cmd:ld cmd:libtoolize cmd:make + cmd:nano " SOURCE_DIR="Python-2.6.8" diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 6be4ce273..4ae067250 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -22,14 +22,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 2f1ba2c4e..3dec155ef 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -24,14 +24,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index b381a1385..5d1a67757 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -16,6 +16,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -23,9 +26,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index a0e172c37..23dff7339 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -17,6 +17,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -24,9 +27,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe index 94928fb6b..d54f98417 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -19,6 +19,9 @@ REQUIRES=" " BUILD_REQUIRES=" $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe index 4444950fa..94bac4fa2 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -19,8 +19,11 @@ REQUIRES=" lib:libexpat " BUILD_REQUIRES=" - apr_devel >= 1.4.6 - expat_devel >= 2.0 + devel:libapr_1 >= 0.4.6 + devel:libexpat >= 1.5.2 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -29,9 +32,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 2f84eda12..471e0389b 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -20,6 +20,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index debf0e73a..0838ab3fb 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -24,15 +24,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="icu" diff --git a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe index e50e53562..464eb0158 100644 --- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -19,6 +19,10 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoreconf cmd:gcc @@ -26,10 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:sed - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="libedit-20120601-3.0" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index c58dc54e0..c18f6546c 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -22,6 +22,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -30,9 +33,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 23c99baa0..007a2ed07 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -31,6 +31,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -39,9 +42,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="pcre-$portVersion" diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index fa9501ce3..e59ff9df8 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -20,6 +20,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -27,10 +31,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index a00ea6d4d..5bc4a71bd 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -39,16 +39,15 @@ REQUIRES=" zlib >= 1.2.3 " BUILD_REQUIRES=" - $REQUIRES + zlib_devel >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - zlib_devel >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index aa565941f..829fe215e 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -39,15 +39,15 @@ REQUIRES=" lib:libz >= 1.2.3 " BUILD_REQUIRES=" + devel:libz >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - devel:libz >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index f3f111386..b5daf59c6 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -20,6 +20,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:grep cmd:ld @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index 2713f599f..b526f714f 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -16,14 +16,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 74ccd4529..0801a1019 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -19,6 +19,10 @@ REQUIRES=" lib:libiconv " BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -27,10 +31,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libiconv - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="pkg-config-0.27.1" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index cc339f193..ea07e8410 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -34,7 +34,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:nano devel:libz >= 1.1.4 " BUILD_PREREQUIRES=" @@ -43,6 +42,7 @@ BUILD_PREREQUIRES=" cmd:ld cmd:libtoolize cmd:make + cmd:nano " SOURCE_DIR="$portVersionedName" diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 80f222c05..b8c1f2e2b 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -93,6 +93,14 @@ REQUIRES_svn=" " BUILD_REQUIRES=" + devel:libcurl + devel:libexpat + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion perl python cmd:gcc @@ -102,14 +110,6 @@ BUILD_REQUIRES=" cmd:nano cmd:sed cmd:tar - devel:libcurl - devel:libexpat - devel:libssl - devel:libz - " - -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " BUILD() diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 931df8156..fb3d5d474 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -21,15 +21,14 @@ REQUIRES=" lib:libintl " BUILD_REQUIRES=" - python - cmd:gettext - cmd:nano " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + python cmd:aclocal cmd:autoconf cmd:gcc + cmd:gettext cmd:ld cmd:libtoolize cmd:make diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 1b760fcbc..7f65e4efa 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -53,6 +53,9 @@ REQUIRES=" " BUILD_REQUIRES=" $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -60,9 +63,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 744cc87af..83d3437ab 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -57,14 +57,7 @@ BUILD_REQUIRES=" expat_devel >= 2.0 libiconv_devel >= 1.13 neon_devel >= 0.29 - python sqlite_devel >= 3.4 - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make devel:libapr_1 >= 0.3 devel:libaprutil_1 >= 0.3 devel:libcrypto @@ -74,6 +67,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + python + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make " USER_SETTINGS_FILES=" diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe index 3280b1c70..dfdf309e4 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe @@ -24,15 +24,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:jam cmd:htmldoc cmd:ld cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index edb544b93..9f79f7359 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -14,14 +14,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:mkdepend " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index a4f9de944..d73ddd84a 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -14,15 +14,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES - cmd:gcc - cmd:ld - cmd:make - cmd:mkdepend " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index 582e835f2..74bf188c5 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -17,11 +17,11 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index a41ca3f67..02b7c1e90 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -27,16 +27,16 @@ REQUIRES=" lib:libpcreposix " BUILD_REQUIRES=" - cmd:bison - cmd:flex - cmd:gcc - cmd:jam - cmd:ld devel:libpcre >= 0.0.1 devel:libpcreposix >= 0.0.1 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld " USER_SETTINGS_FILES=" diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe index 5e4508b79..d8cd6b814 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " USER_SETTINGS_FILES=" diff --git a/haiku-data/be_book/be_book-2008_10_26.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe index 8dbf954b8..e80c99ba6 100644 --- a/haiku-data/be_book/be_book-2008_10_26.recipe +++ b/haiku-data/be_book/be_book-2008_10_26.recipe @@ -13,6 +13,8 @@ PROVIDES=" be_book = $portVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" coreutils " diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe index c61aa3988..68ce3cddf 100644 --- a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe +++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe @@ -20,10 +20,10 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - coreutils " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + coreutils " INSTALL() diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe index ac8081ae9..3cc3e7d4a 100644 --- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -15,9 +15,9 @@ PROVIDES=" REQUIRES=" " BUILD_REQUIRES=" - cmd:cp " BUILD_PREREQUIRES=" + cmd:cp " BUILD() diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index 05855a509..7e945a544 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -20,10 +20,8 @@ PROVIDES=" wqy_microhei = $portVersion " REQUIRES="" -BUILD_REQUIRES=" - coreutils - " -BUILD_PREREQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" SOURCE_DIR="wqy-microhei" diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index 36bcedfe6..07f31932c 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -16,8 +16,10 @@ PROVIDES=" " REQUIRES="" BUILD_REQUIRES=" - coreutils" -BUILD_PREREQUIRES="" + " +BUILD_PREREQUIRES=" + coreutils + " SOURCE_DIR="wqy-zenhei" diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index 6af6fd804..eb05ab454 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -23,7 +23,9 @@ REQUIRES=" lib:libfreetype " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoconf cmd:automake cmd:gcc @@ -31,9 +33,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 19fc8d608..0873b4164 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -17,6 +17,10 @@ REQUIRES=" lib:libz >= 1 " BUILD_REQUIRES=" + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -24,10 +28,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 208b89733..9138566d4 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -26,7 +26,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -36,9 +38,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index a2e931020..ea8def101 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -24,6 +24,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -32,9 +35,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index ec9340345..ed4d6a625 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -24,6 +24,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" + devel:libz >= 1.0.4 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,10 +35,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz >= 1.0.4 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 2d6c771de..621e03e32 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -25,6 +25,12 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -32,12 +38,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " - # Note: The build system also looks for libvorbis and SDL, but that seems - # to be needed only for building the sample player, which we don't need. -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index cf759e7ef..b810914e1 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -23,6 +23,10 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,10 +35,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index e7a33a90a..084c757ab 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -27,16 +27,16 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:yasm " # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:yasm " SOURCE_DIR="libvpx-v1.0.0" diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index 18bd26502..1b185fec9 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -30,6 +30,10 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -38,10 +42,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="speex-1.2rc1" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index 3a2c1414d..ee4c53b68 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -41,13 +41,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:pkg_config - cmd:texi2html - cmd:yasm devel:libogg devel:libspeex devel:libtheora @@ -57,6 +50,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:pkg_config + cmd:texi2html + cmd:yasm " GLOBAL_WRITABLE_FILES=" diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index f4b439e7e..ab0c00531 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -21,16 +21,16 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make devel:libssl devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index bac6ecf5b..a9cb4fd70 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -39,12 +39,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:libtoolize - cmd:gcc - cmd:ld - cmd:make devel:libncurses devel:libssl >= 1.0.0 devel:libxml2 >= 2.7.8 @@ -52,6 +46,12 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index b3b5d972c..c7c14d203 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -35,8 +35,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - $REQUIRES openssl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -45,9 +47,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 9d7a5e5aa..1212a8211 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -35,14 +35,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - cmd:pkg_config devel:libcrypto devel:libedit devel:libncurses @@ -51,6 +43,14 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config " GLOBAL_WRITABLE_FILES=" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index f783ff9b3..e6dd12837 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -21,13 +21,13 @@ REQUIRES=" openssl >= 1.0.0 " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make openssl >= 1.0.0 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName/wpa_supplicant" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index 8694426ba..e72116606 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -22,13 +22,13 @@ REQUIRES=" lib:libssl " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make devel:libssl >= 1.0.0 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index ccc6d99ba..17d2ef7ae 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -26,14 +26,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:libtoolize - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld + cmd:libtoolize cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index d6f66fa86..c8d88c150 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -25,6 +25,11 @@ REQUIRES=" lib:libintl " BUILD_REQUIRES=" + devel:libiconv + devel:libintl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -33,11 +38,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libiconv - devel:libintl - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " defineDebugInfoPackage grep \ diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 9a3d19e7b..201c3df44 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -56,6 +56,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -64,9 +67,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 242209a13..daf2ca373 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -28,6 +28,9 @@ REQUIRES=" cmd:zcat " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:groff cmd:gunzip cmd:bzip2 @@ -37,9 +40,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " GLOBAL_WRITABLE_FILES=" settings/man.conf keep-old diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 11cbe49f1..9065d079d 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -35,13 +35,13 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:automake >= 1.11 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:automake >= 1.11 cmd:autoreconf >= 2.60 cmd:make + cmd:sed " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index a81d82031..e8394bf9a 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -11,8 +11,8 @@ LICENSE=" GNU GPL v2 GNU GPL v3 " -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" -CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" +CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" @@ -36,14 +36,15 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:automake >= 1.13.1 - cmd:makeinfo - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:automake >= 1.13.1 cmd:autoreconf >= 2.60 - cmd:make" + cmd:make + cmd:makeinfo + cmd:sed + " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index d9c1e9f9e..41723ca7c 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -30,13 +30,13 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:perl >= 5.8 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make + cmd:perl >= 5.8 + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 4f5136555..ff334cbc8 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -30,14 +30,14 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:perl >= 5.8 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make cmd:makeinfo + cmd:perl >= 5.8 + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index 104d759b3..a50acb0e1 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -1,6 +1,6 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 4f81f81c6..939ccb9a8 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -29,15 +29,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:m4 cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 2d331ffae..4e919bc1c 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -22,17 +22,17 @@ REQUIRES=" cmd:m4 " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:libtoolize - cmd:make - cmd:makeinfo " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc cmd:ld + cmd:libtoolize + cmd:make + cmd:makeinfo " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe index 3625cb85b..1401edccf 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 - git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#b1ef802 + git+git://github.com/haiku/BuildtoolsPM.git#b1ef802 " REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" @@ -29,9 +29,9 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + binutils " BUILD_REQUIRES=" - binutils " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index e16d0fcf5..72395afcd 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -53,6 +53,11 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libiconv + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -61,11 +66,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:makeinfo - devel:libiconv - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe index dbf3125cf..ef31f6267 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -34,12 +34,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:make - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld " SOURCE_DIR="$portVersionedName/jam" diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 4942c01ff..a35085da5 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -31,11 +31,10 @@ REQUIRES=" cmd:tar " BUILD_REQUIRES=" - cmd:aclocal - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal cmd:autoconf >= 2.62 cmd:autoheader >= 2.62 cmd:gcc @@ -43,6 +42,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:nm cmd:ranlib + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index f62dfc58e..2e748b82f 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -32,13 +32,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index c5c7c990b..d6bb87584 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -25,13 +25,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 92bd81431..cf3384853 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -16,15 +16,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index bfde9e98c..b9c9ed443 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -25,15 +25,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:find cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="Mesa-$portVersion" diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index f257c3aef..7c2c18f3d 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -36,14 +36,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:libtool - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc cmd:grep + cmd:ld + cmd:libtool + cmd:make cmd:sed " diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index 84acc04f8..efacef3dd 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -16,7 +16,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:cmake cmd:gcc cmd:grep @@ -24,9 +26,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName"