From ee02bc929faf218bdc845972cd9fb2f2818aa2fd Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 8 Jul 2023 09:33:19 +0200
Subject: [PATCH] autoconf, cleanup, change dependency for diffutils/coreutils
 (#8982)

---
 sys-devel/autoconf/autoconf-2.68.recipe    | 68 ----------------------
 sys-devel/autoconf/autoconf-2.71.recipe    | 26 +++++++--
 sys-devel/autoconf/autoconf213-2.13.recipe | 45 ++++++++++----
 sys-devel/autoconf/autoconf264-2.64.recipe | 35 +++++++----
 sys-devel/autoconf/autoconf269-2.69.recipe | 26 +++++++--
 5 files changed, 103 insertions(+), 97 deletions(-)
 delete mode 100644 sys-devel/autoconf/autoconf-2.68.recipe

diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
deleted file mode 100644
index c0ded1daf..000000000
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ /dev/null
@@ -1,68 +0,0 @@
-SUMMARY="A tool for automatically configuring source code"
-DESCRIPTION="
-GNU Autoconf is a tool for configuring source code and makefiles. Using \
-autoconf, programmers can create portable and configurable packages, because \
-the person building the package is allowed to specify various configuration \
-options.
-"
-HOMEPAGE="http://www.gnu.org/software/autoconf/"
-COPYRIGHT="1992-2010 Free Software Foundation, Inc."
-LICENSE="
-	GNU GPL v2
-	GNU GPL v3"
-REVISION="5"
-SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2"
-CHECKSUM_SHA256="c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8"
-BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
-
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	autoconf = $portVersion compat >= 2.60
-	cmd:autoconf = $portVersion compat >= 2.60
-	cmd:autoheader = $portVersion compat >= 2.60
-	cmd:autom4te = $portVersion compat >= 2.60
-	cmd:autoreconf = $portVersion compat >= 2.60
-	cmd:autoscan = $portVersion compat >= 2.60
-	cmd:autoupdate = $portVersion compat >= 2.60
-	cmd:ifnames = $portVersion compat >= 2.60
-	"
-REQUIRES="
-	haiku
-	coreutils
-	diffutils
-	cmd:awk
-	cmd:m4 >= 1.4
-	cmd:perl >= 5
-	cmd:sh
-	"
-
-PROVIDES_source="autoconf_source = $portVersion"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:automake >= 1.11
-	cmd:autoreconf >= 2.60
-	cmd:make
-	cmd:sed
-	"
-
-BUILD()
-{
-	autoreconf
-	PERL="perl" M4="m4" SED="sed" \
-		./configure $configureDirArgs
-	make -j$jobs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sys-devel/autoconf/autoconf-2.71.recipe b/sys-devel/autoconf/autoconf-2.71.recipe
index fddc93a1e..1aba658c2 100644
--- a/sys-devel/autoconf/autoconf-2.71.recipe
+++ b/sys-devel/autoconf/autoconf-2.71.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1996, 2000-2001, 2005, 2007-2017, 2020-2021 Free Software"
 LICENSE="GNU GPL v2
 	GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz"
 CHECKSUM_SHA256="431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c"
 BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
@@ -26,12 +26,30 @@ 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:ln
+	cmd:ls
+	cmd:make
 	cmd:m4 >= 1.4
-	cmd:perl >= 5
+	cmd:mkdir
+	cmd:mv
+	cmd:perl >= 5.8
+	cmd:rm
+	cmd:sed
 	cmd:sh
+	cmd:sleep
+	cmd:tr
+	cmd:uname
 	"
 
 BUILD_REQUIRES="
diff --git a/sys-devel/autoconf/autoconf213-2.13.recipe b/sys-devel/autoconf/autoconf213-2.13.recipe
index 38b76f9e8..57bed0412 100644
--- a/sys-devel/autoconf/autoconf213-2.13.recipe
+++ b/sys-devel/autoconf/autoconf213-2.13.recipe
@@ -6,33 +6,56 @@ various configuration options."
 HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1992-1998 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.gz"
 CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
 SOURCE_DIR="autoconf-$portVersion"
 
 ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	autoconf213$secondaryArchSuffix = $portVersion
-	cmd:autoconf_$portVersion$secondaryArchSuffix = $portVersion
-	cmd:autoheader_$portVersion$secondaryArchSuffix = $portVersion
-	cmd:autoreconf_$portVersion$secondaryArchSuffix = $portVersion
-	cmd:autoscan_$portVersion$secondaryArchSuffix = $portVersion
-	cmd:autoupdate_$portVersion$secondaryArchSuffix = $portVersion
-	cmd:ifnames_$portVersion$secondaryArchSuffix = $portVersion
+	cmd:autoconf_$portVersion = $portVersion
+	cmd:autoheader_$portVersion = $portVersion
+	cmd:autoreconf_$portVersion = $portVersion
+	cmd:autoscan_$portVersion = $portVersion
+	cmd:autoupdate_$portVersion = $portVersion
+	cmd:ifnames_$portVersion = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
+	cmd:awk
+	cmd:cat
+	cmd:chmod
+	cmd:cmp
+	cmd:echo
+	cmd:expr
+	cmd:fgrep
+	cmd:grep
+	cmd:hostname
+	cmd:install
+	cmd:install_info
+	cmd:ln
+	cmd:ls
+	cmd:make
+	cmd:m4 >= 1.4
+	cmd:mkdir
+	cmd:mv
+	cmd:perl >= 5.8
+	cmd:rm
+	cmd:sed
+	cmd:sh
+	cmd:sleep
+	cmd:tr
+	cmd:uname
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/sys-devel/autoconf/autoconf264-2.64.recipe b/sys-devel/autoconf/autoconf264-2.64.recipe
index 2e8ec95ad..bc7754529 100644
--- a/sys-devel/autoconf/autoconf264-2.64.recipe
+++ b/sys-devel/autoconf/autoconf264-2.64.recipe
@@ -1,16 +1,13 @@
 SUMMARY="A tool for automatically configuring source code"
-DESCRIPTION="
-GNU Autoconf is a tool for configuring source code and makefiles. Using \
+DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using \
 autoconf, programmers can create portable and configurable packages, because \
 the person building the package is allowed to specify various configuration \
-options.
-"
+options."
 HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1992-2010 Free Software Foundation, Inc."
-LICENSE="
-	GNU GPL v2
+LICENSE="GNU GPL v2
 	GNU GPL v3"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.bz2"
 CHECKSUM_SHA256="872f4cadf12e7e7c8a2414e047fdff26b517c7f1a977d72433c124d0d3acaa85"
 SOURCE_DIR="autoconf-$portVersion"
@@ -31,12 +28,30 @@ 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:ln
+	cmd:ls
+	cmd:make
 	cmd:m4 >= 1.4
-	cmd:perl >= 5
+	cmd:mkdir
+	cmd:mv
+	cmd:perl >= 5.8
+	cmd:rm
+	cmd:sed
 	cmd:sh
+	cmd:sleep
+	cmd:tr
+	cmd:uname
 	"
 
 BUILD_REQUIRES="
diff --git a/sys-devel/autoconf/autoconf269-2.69.recipe b/sys-devel/autoconf/autoconf269-2.69.recipe
index cd77c84a9..91fe51711 100644
--- a/sys-devel/autoconf/autoconf269-2.69.recipe
+++ b/sys-devel/autoconf/autoconf269-2.69.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1992-2012 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2
 	GNU GPL v3"
-REVISION="8"
+REVISION="9"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.gz"
 CHECKSUM_SHA256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
 SOURCE_DIR="autoconf-$portVersion"
@@ -28,12 +28,30 @@ 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:ln
+	cmd:ls
+	cmd:make
 	cmd:m4 >= 1.4
-	cmd:perl >= 5
+	cmd:mkdir
+	cmd:mv
+	cmd:perl >= 5.8
+	cmd:rm
+	cmd:sed
 	cmd:sh
+	cmd:sleep
+	cmd:tr
+	cmd:uname
 	"
 
 BUILD_REQUIRES="