From 151e2e16acfd7c71bfc9e518234a252ca31fe086 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 8 Jul 2023 09:44:37 +0200
Subject: [PATCH] automake, cleanup, change dependency for coreutils/diffutils
 (#8983)

---
 sys-devel/automake/automake-1.11.1.recipe    | 57 ------------------
 sys-devel/automake/automake-1.12.2.recipe    | 62 --------------------
 sys-devel/automake/automake-1.15.1.recipe    | 61 -------------------
 sys-devel/automake/automake-1.16.5.recipe    | 23 +++++++-
 sys-devel/automake/automake113-1.13.1.recipe | 23 +++++++-
 5 files changed, 40 insertions(+), 186 deletions(-)
 delete mode 100644 sys-devel/automake/automake-1.11.1.recipe
 delete mode 100644 sys-devel/automake/automake-1.12.2.recipe
 delete mode 100644 sys-devel/automake/automake-1.15.1.recipe

diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
deleted file mode 100644
index 72da053fd..000000000
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ /dev/null
@@ -1,57 +0,0 @@
-SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="
-Automake is a tool for automatically generating 'Makefile.in' files from \
-'Makefile.am' files.  'Makefile.am' is a series of 'make' macro definitions \
-(with rules occasionally thrown in).  The generated 'Makefile.in' files are \
-compatible with the GNU Makefile standards."
-HOMEPAGE="http://www.gnu.org/software/automake/"
-COPYRIGHT="2009 Free Software Foundation, Inc."
-LICENSE="GNU GPL v2"
-REVISION="5"
-SOURCE_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz"
-CHECKSUM_SHA256="b7b37c0c0f09a286cf55cad408d74aef97774d73d744c88c396ff7957045d4cb"
-
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	automake = $portVersion compat >= 1.11
-	cmd:aclocal = $portVersion compat >= 1.11
-	cmd:aclocal_1.11 = $portVersion compat >= 1.11
-	cmd:automake = $portVersion compat >= 1.11
-	cmd:automake_1.11 = $portVersion compat >= 1.11
-	"
-REQUIRES="
-	haiku
-	coreutils
-	diffutils
-	cmd:awk
-	cmd:m4 >= 1.4
-	cmd:perl >= 5.8
-	cmd:sh
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:autoconf >= 2.60
-	cmd:make
-	cmd:perl >= 5.8
-	cmd:sed
-	"
-
-BUILD()
-{
-	PERL="/bin/env perl" ./configure $configureDirArgs
-	make -j$jobs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
deleted file mode 100644
index dbd836734..000000000
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="
-Automake is a tool for automatically generating 'Makefile.in' files from \
-'Makefile.am' files.  'Makefile.am' is a series of 'make' macro definitions \
-(with rules occasionally thrown in).  The generated 'Makefile.in' files are \
-compatible with the GNU Makefile standards."
-HOMEPAGE="http://www.gnu.org/software/automake/"
-COPYRIGHT="2012 Free Software Foundation, Inc."
-LICENSE="GNU GPL v2"
-REVISION="4"
-SOURCE_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz"
-CHECKSUM_SHA256="b2eef742f42730831d1af2fe0e5b954e2b60773e2e9922ba6280cdd0ab4a5d00"
-
-ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	automake = $portVersion compat >= 1.12
-	cmd:aclocal = $portVersion compat >= 1.12
-	cmd:aclocal_1.12 = $portVersion compat >= 1.12
-	cmd:automake = $portVersion compat >= 1.12
-	cmd:automake_1.12 = $portVersion compat >= 1.12
-	"
-REQUIRES="
-	haiku
-	coreutils
-	diffutils
-	cmd:awk
-	cmd:m4 >= 1.4
-	cmd:perl >= 5.8
-	cmd:sh
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:autoconf >= 2.60
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:makeinfo
-	cmd:perl >= 5.8
-	cmd:sed
-	"
-
-BUILD()
-{
-	./bootstrap.sh
-	PERL="/bin/env perl" runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	make install-html
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-devel/automake/automake-1.15.1.recipe b/sys-devel/automake/automake-1.15.1.recipe
deleted file mode 100644
index 189d65ecf..000000000
--- a/sys-devel/automake/automake-1.15.1.recipe
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' \
-files from 'Makefile.am' files.  'Makefile.am' is a series of 'make' macro \
-definitions (with rules occasionally thrown in).  The generated 'Makefile.in' \
-files are compatible with the GNU Makefile standards."
-HOMEPAGE="http://www.gnu.org/software/automake/"
-COPYRIGHT="2013 Free Software Foundation, Inc."
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://ftp.gnu.org/gnu/automake/automake-$portVersion.tar.gz"
-CHECKSUM_SHA256="988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	automake = $portVersion compat >= 1.13
-	cmd:aclocal = $portVersion compat >= 1.13
-	cmd:aclocal_1.15 = $portVersion compat >= 1.15
-	cmd:automake = $portVersion compat >= 1.13
-	cmd:automake_1.15 = $portVersion compat >= 1.15
-	"
-REQUIRES="
-	haiku
-	coreutils
-	diffutils
-	cmd:awk
-	cmd:m4 >= 1.4
-	cmd:perl >= 5.8
-	cmd:sh
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:autoconf >= 2.60
-	cmd:find
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:makeinfo
-	cmd:perl >= 5.8
-	cmd:sed
-	"
-
-BUILD()
-{
-	./bootstrap
-	PERL="/bin/env perl" runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-devel/automake/automake-1.16.5.recipe b/sys-devel/automake/automake-1.16.5.recipe
index 289cf4ca8..d90737f8d 100644
--- a/sys-devel/automake/automake-1.16.5.recipe
+++ b/sys-devel/automake/automake-1.16.5.recipe
@@ -6,7 +6,7 @@ files are compatible with the GNU Makefile standards."
 HOMEPAGE="https://www.gnu.org/software/automake/"
 COPYRIGHT="2011-2021 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://ftpmirror.gnu.org/automake/automake-$portVersion.tar.gz
 	https://ftp.gnu.org/gnu/automake/automake-$portVersion.tar.gz"
 CHECKSUM_SHA256="07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605"
@@ -22,12 +22,29 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	coreutils
-	diffutils
 	cmd:awk
+	cmd:cat
+	cmd:chmod
+	cmd:cmp
+	cmd:echo
+	cmd:expr
+	cmd:fgrep
+	cmd:grep
+	cmd:hostname
+	cmd:install
+	cmd:install_info
+	cmd:ls
+	cmd:make
 	cmd:m4 >= 1.4
+	cmd:mkdir
+	cmd:mv
 	cmd:perl >= 5.8
+	cmd:rm
+	cmd:rmdir
+	cmd:sed
 	cmd:sh
+	cmd:sleep
+	cmd:tr
 	"
 
 BUILD_REQUIRES="
diff --git a/sys-devel/automake/automake113-1.13.1.recipe b/sys-devel/automake/automake113-1.13.1.recipe
index e932096ef..1ef7fe072 100644
--- a/sys-devel/automake/automake113-1.13.1.recipe
+++ b/sys-devel/automake/automake113-1.13.1.recipe
@@ -6,7 +6,7 @@ files are compatible with the GNU Makefile standards."
 HOMEPAGE="http://www.gnu.org/software/automake/"
 COPYRIGHT="2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
 CHECKSUM_SHA256="51bc10031847e9965c4f2c16a0a66552309ce28ea82b1afa8cef736643ebaa27"
 SOURCE_DIR="automake-$portVersion"
@@ -20,12 +20,29 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	coreutils
-	diffutils
 	cmd:awk
+	cmd:cat
+	cmd:chmod
+	cmd:cmp
+	cmd:echo
+	cmd:expr
+	cmd:fgrep
+	cmd:grep
+	cmd:hostname
+	cmd:install
+	cmd:install_info
+	cmd:ls
+	cmd:make
 	cmd:m4 >= 1.4
+	cmd:mkdir
+	cmd:mv
 	cmd:perl >= 5.8
+	cmd:rm
+	cmd:rmdir
+	cmd:sed
 	cmd:sh
+	cmd:sleep
+	cmd:tr
 	"
 
 BUILD_REQUIRES="