From a088631dc653d604f8551916430366ff43b24750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 4 Feb 2020 16:39:44 +0100
Subject: [PATCH] build/repositories: Fix m68k HaikuPorts and Cross

Change-Id: I0ebdd096558a6f060d6bcd56807903f1496e8ed6
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2211
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
---
 build/jam/repositories/HaikuPorts/m68k      | 55 ++++++++++++++++-----
 build/jam/repositories/HaikuPortsCross/m68k | 48 ++++++++++++++++--
 2 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/build/jam/repositories/HaikuPorts/m68k b/build/jam/repositories/HaikuPorts/m68k
index 5e182a6bf6..68b7402b54 100644
--- a/build/jam/repositories/HaikuPorts/m68k
+++ b/build/jam/repositories/HaikuPorts/m68k
@@ -1,30 +1,60 @@
 RemotePackageRepository HaikuPorts
 	: m68k
-	: http://packages.haiku-os.org/haikuports/master/repo/m68k
+	: https://eu.hpkg.haiku-os.org/haikuports/master/build-packages
 	:
 	# architecture "any" packages
-	be_book-2008_10_26-1
-	ca_root_certificates-2015_02_25-1
-	dejavu-2.34-1
-	texi2html-1.82-2
-	timgmsoundfont-2004_01_24-4
-	vl_gothic-20141206-1
-	wqy_microhei-0.2.0~beta-3
+	be_book-2008_10_26-3
+	ca_root_certificates-2020_01_01-1
+	gnu_efi_kernel-3.0.9-1
+	haikuporter-1.2.3-2
+	noto-20170920-4
+	timgmsoundfont-fixed-5
+	wqy_microhei-0.2.0~beta-4
 	:
 	# repository architecture packages
 	# primary architecture (m68k)
-
+	bash-4.4.023-1
+	binutils-2.28.1_2017_08_05-1
+	bison-3.0.5-1
+	coreutils-8.22-1
+	curl-7.40.0-1
+	curl_devel-7.40.0-1
+	expat-2.1.0-1
+	expat_devel-2.1.0-1
+	findutils-4.6.0-1
+	flex-2.5.35-1
+	freetype-2.6.3-1
+	freetype_devel-2.6.3-1
+	gawk-3.1.8-2
+	gcc-8.3.0_2019_05_24-3
+	gcc_syslibs_devel-8.3.0_2019_05_24-3
+	gcc_syslibs-8.3.0_2019_05_24-3
+	icu-57.1-2
+	icu_devel-57.1-2
+	less-451-1
+	libsolv-0.3.0_haiku_2014_12_22-1
+	libsolv_devel-0.3.0_haiku_2014_12_22-1
+	m4-1.4.16-1
+	make-4.1-2
+	ncurses6-6.0-1
+	ncurses6_devel-6.0-1
+	python-2.7.6-1
+	sed-4.2.1-1
+	texinfo-4.13a-1
+	zlib-1.2.11-1
+	zlib_devel-1.2.11-1
 	:
-
 	# source packages
 	apr
 	autoconf
 	automake
+	bash
 #	bepdf
 	binutils
 	bison
 	bzip2
 	cdrtools
+	coreutils
 	cmake
 	ctags
 	curl
@@ -32,8 +62,10 @@ RemotePackageRepository HaikuPorts
 	doxygen
 	expat
 #	ffmpeg
+	findutils
 	flex
 	freetype
+	gawk
 	gcc
 	gettext
 	git
@@ -47,6 +79,7 @@ RemotePackageRepository HaikuPorts
 	jam
 	jpeg
 	keymapswitcher
+	less
 	libedit
 	libiconv
 #	libogg
@@ -65,7 +98,7 @@ RemotePackageRepository HaikuPorts
 	mesa
 	mkdepend
 	nano
-	ncurses
+	ncurses6
 	neon
 	openssh
 	openssl
diff --git a/build/jam/repositories/HaikuPortsCross/m68k b/build/jam/repositories/HaikuPortsCross/m68k
index 6f57116464..6def8e6c92 100644
--- a/build/jam/repositories/HaikuPortsCross/m68k
+++ b/build/jam/repositories/HaikuPortsCross/m68k
@@ -3,17 +3,42 @@ BootstrapPackageRepository HaikuPortsCross
 	:
 	# architecture "any" packages
 	haikuporter-0-1
+	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_05_24-1
-	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
+	gcc_bootstrap-8.3.0_2019_05_24-3
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-3
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-3
 
 	:
 	# repository architecture packages (stage 1)
+	bash_bootstrap-4.4.023-1
 	binutils_bootstrap-2.28.1_2017_08_05-1
+	bison_bootstrap-3.0.5-1
+	coreutils_bootstrap-8.22-1
+	curl_bootstrap-7.40.0-1
+	curl_bootstrap_devel-7.40.0-1
+	expat_bootstrap-2.1.0-1
+	expat_bootstrap_devel-2.1.0-1
+	findutils_bootstrap-4.6.0-1
+	flex_bootstrap-2.5.35-1
+	freetype_bootstrap-2.6.3-1
+	freetype_bootstrap_devel-2.6.3-1
+	gawk_bootstrap-3.1.8-2
+	grep_bootstrap-2.14-1
+	icu_bootstrap-57.1-2
+	icu_bootstrap_devel-57.1-2
+	less_bootstrap-451-1
+	m4_bootstrap-1.4.16-1
+	make_bootstrap-4.1-2
+	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
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
+
 	:
 	# repository architecture packages (stage 2)
 	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
@@ -21,9 +46,26 @@ BootstrapPackageRepository HaikuPortsCross
 
 	:
 	# source packages
+	bash_bootstrap
 	binutils_bootstrap
+	bison_bootstrap
+	coreutils_bootstrap
+	curl_bootstrap
+	expat_bootstrap
+	findutils_bootstrap
+	flex_bootstrap
+	freetype_bootstrap
+	gawk_bootstrap
 	gcc_bootstrap
+	grep_bootstrap
+	less_bootstrap
 	libsolv_bootstrap
+	m4_bootstrap
+	make_bootstrap
+	ncurses6_bootstrap
+	python_bootstrap
+	sed_bootstrap
+	texinfo_bootstrap
 	zlib_bootstrap
 	:
 	# debuginfo packages