From 56eb96022b829642b0d217ac44924812b8bee7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 18 Oct 2015 13:57:20 +0200 Subject: [PATCH] Rename ncurses_bootstrap to ncurses6_bootstrap. * Debugger and ftp depend on the libedit build feature. --- build/jam/images/definitions/minimum | 4 ++-- build/jam/repositories/HaikuPortsCross/arm | 6 +++--- build/jam/repositories/HaikuPortsCross/ppc | 6 +++--- build/jam/repositories/HaikuPortsCross/x86 | 10 +++++----- build/jam/repositories/HaikuPortsCross/x86_64 | 6 +++--- build/jam/repositories/HaikuPortsCross/x86_gcc2 | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 604b47682b..c59356338d 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -8,7 +8,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures driveinfo dstcheck dumpcatalog eject error fdinfo ffm filepanel finddir findpaths fortune fstrim - ftp ftpd + ftp@libedit ftpd getarch groupadd groupdel groupmod hd hey ideinfo@ide idestatus@ide ifconfig iroster isvolume @@ -39,7 +39,7 @@ SYSTEM_APPS = [ FFilterByBuildFeatures AboutSystem ActivityMonitor BootManager@x86,x86_64 CharacterMap - Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup + Debugger@libedit DeskCalc Devices DiskProbe DiskUsage DriveSetup Expander NetworkStatus ProcessController diff --git a/build/jam/repositories/HaikuPortsCross/arm b/build/jam/repositories/HaikuPortsCross/arm index fbc045735f..40ea10b3c6 100644 --- a/build/jam/repositories/HaikuPortsCross/arm +++ b/build/jam/repositories/HaikuPortsCross/arm @@ -28,8 +28,8 @@ BootstrapPackageRepository HaikuPortsCross icu_bootstrap_devel-54.1-1 m4_bootstrap-1.4.16-1 make_bootstrap-3.82-1 - ncurses_bootstrap-6.0-1 - ncurses_bootstrap_devel-6.0-1 + ncurses6_bootstrap-6.0-1 + ncurses6_bootstrap_devel-6.0-1 python_bootstrap-2.7.6-1 sed_bootstrap-4.2.1-1 texinfo_bootstrap-4.13a-1 @@ -57,7 +57,7 @@ BootstrapPackageRepository HaikuPortsCross libsolv_bootstrap m4_bootstrap make_bootstrap - ncurses_bootstrap + ncurses6_bootstrap python_bootstrap sed_bootstrap texinfo_bootstrap diff --git a/build/jam/repositories/HaikuPortsCross/ppc b/build/jam/repositories/HaikuPortsCross/ppc index cee55a2442..eccf1cb728 100644 --- a/build/jam/repositories/HaikuPortsCross/ppc +++ b/build/jam/repositories/HaikuPortsCross/ppc @@ -28,8 +28,8 @@ BootstrapPackageRepository HaikuPortsCross icu_bootstrap_devel-54.1-1 m4_bootstrap-1.4.16-1 make_bootstrap-3.82-1 - ncurses_bootstrap-6.0-1 - ncurses_bootstrap_devel-6.0-1 + ncurses6_bootstrap-6.0-1 + ncurses6_bootstrap_devel-6.0-1 python_bootstrap-2.7.6-1 sed_bootstrap-4.2.1-1 texinfo_bootstrap-4.13a-1 @@ -57,7 +57,7 @@ BootstrapPackageRepository HaikuPortsCross m4_bootstrap make_bootstrap mawk_bootstrap - ncurses_bootstrap + ncurses6_bootstrap python_bootstrap sed_bootstrap texinfo_bootstrap diff --git a/build/jam/repositories/HaikuPortsCross/x86 b/build/jam/repositories/HaikuPortsCross/x86 index 49d712972e..9e430c36f1 100644 --- a/build/jam/repositories/HaikuPortsCross/x86 +++ b/build/jam/repositories/HaikuPortsCross/x86 @@ -31,8 +31,8 @@ BootstrapPackageRepository HaikuPortsCross icu_bootstrap_devel-54.1-1 m4_bootstrap-1.4.16-1 make_bootstrap-3.82-1 - ncurses_bootstrap-6.0-1 - ncurses_bootstrap_devel-6.0-1 + ncurses6_bootstrap-6.0-1 + ncurses6_bootstrap_devel-6.0-1 python_bootstrap-2.7.6-1 sed_bootstrap-4.2.1-1 texinfo_bootstrap-4.13a-1 @@ -47,8 +47,8 @@ BootstrapPackageRepository HaikuPortsCross freetype_bootstrap_x86_gcc2_devel-2.4.9-1 icu_bootstrap_x86_gcc2-4.8.1.1-1 icu_bootstrap_x86_gcc2_devel-4.8.1.1-1 - ncurses_bootstrap_x86_gcc2-6.0-1 - ncurses_bootstrap_x86_gcc2_devel-6.0-1 + ncurses6_bootstrap_x86_gcc2-6.0-1 + ncurses6_bootstrap_x86_gcc2_devel-6.0-1 zlib_bootstrap_x86_gcc2-1.2.8-2 zlib_bootstrap_x86_gcc2_devel-1.2.8-2 }@ # secondary_x86_gcc2 @@ -77,7 +77,7 @@ BootstrapPackageRepository HaikuPortsCross libsolv_bootstrap m4_bootstrap make_bootstrap - ncurses_bootstrap + ncurses6_bootstrap python_bootstrap sed_bootstrap texinfo_bootstrap diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 b/build/jam/repositories/HaikuPortsCross/x86_64 index 4f8dfd7666..3f44b7bffa 100644 --- a/build/jam/repositories/HaikuPortsCross/x86_64 +++ b/build/jam/repositories/HaikuPortsCross/x86_64 @@ -29,8 +29,8 @@ BootstrapPackageRepository HaikuPortsCross less_bootstrap-451-1 m4_bootstrap-1.4.16-1 make_bootstrap-3.82-1 - ncurses_bootstrap-6.0-1 - ncurses_bootstrap_devel-6.0-1 + ncurses6_bootstrap-6.0-1 + ncurses6_bootstrap_devel-6.0-1 python_bootstrap-2.7.6-1 sed_bootstrap-4.2.1-1 texinfo_bootstrap-4.13a-1 @@ -59,7 +59,7 @@ BootstrapPackageRepository HaikuPortsCross libsolv_bootstrap m4_bootstrap make_bootstrap - ncurses_bootstrap + ncurses6_bootstrap python_bootstrap sed_bootstrap texinfo_bootstrap diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 b/build/jam/repositories/HaikuPortsCross/x86_gcc2 index a872e9abdb..5079a4420a 100644 --- a/build/jam/repositories/HaikuPortsCross/x86_gcc2 +++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2 @@ -31,8 +31,8 @@ BootstrapPackageRepository HaikuPortsCross icu_bootstrap_devel-54.1-1 m4_bootstrap-1.4.16-1 make_bootstrap-3.82-1 - ncurses_bootstrap-6.0-1 - ncurses_bootstrap_devel-6.0-1 + ncurses6_bootstrap-6.0-1 + ncurses6_bootstrap_devel-6.0-1 python_bootstrap-2.7.6-1 sed_bootstrap-4.2.1-1 texinfo_bootstrap-4.13a-1 @@ -77,7 +77,7 @@ BootstrapPackageRepository HaikuPortsCross libsolv_bootstrap m4_bootstrap make_bootstrap - ncurses_bootstrap + ncurses6_bootstrap python_bootstrap sed_bootstrap texinfo_bootstrap