From a95aa88c63f92ba96425fc50c8538a6c81f2beba Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 4 Sep 2024 20:17:07 +0800 Subject: [PATCH 1/3] autoconf: use system Perl only on Darwin, fix Linux builds Closes: https://trac.macports.org/ticket/70673 --- devel/autoconf/Portfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/devel/autoconf/Portfile b/devel/autoconf/Portfile index c04b68be352b..f18841b9fa32 100644 --- a/devel/autoconf/Portfile +++ b/devel/autoconf/Portfile @@ -44,9 +44,16 @@ post-patch { touch ${worksrcpath}/man/autoreconf.1 } -# It should be safe to use the system Perl, since the scripts only use -# core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6. -configure.perl /usr/bin/perl +if {${os.platform} eq "darwin"} { + # It should be safe to use the system Perl, since the scripts only use + # core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6. + configure.perl /usr/bin/perl +} else { + depends_build-append \ + port:perl5 + # https://trac.macports.org/ticket/70673 + configure.perl ${prefix}/bin/perl5 +} test.run yes test.env CC=${configure.cc} From 51586a7a73a9b59619dfe2986b97a02a6d13f3dc Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 4 Sep 2024 20:26:56 +0800 Subject: [PATCH 2/3] autoconf: use help2man on Linux --- devel/autoconf/Portfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devel/autoconf/Portfile b/devel/autoconf/Portfile index f18841b9fa32..61ac47d8e4a6 100644 --- a/devel/autoconf/Portfile +++ b/devel/autoconf/Portfile @@ -50,6 +50,7 @@ if {${os.platform} eq "darwin"} { configure.perl /usr/bin/perl } else { depends_build-append \ + port:help2man \ port:perl5 # https://trac.macports.org/ticket/70673 configure.perl ${prefix}/bin/perl5 From 30d891df4ccc5382dee509148bcbc5638c340def Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 4 Sep 2024 23:18:50 +0800 Subject: [PATCH 3/3] libtool: depend on help2man on non-Darwin OS --- devel/libtool/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/libtool/Portfile b/devel/libtool/Portfile index 67674f49e4ad..302c002ea7ea 100644 --- a/devel/libtool/Portfile +++ b/devel/libtool/Portfile @@ -49,7 +49,7 @@ configure.env M4=${prefix}/bin/gm4 if {${os.platform} eq "darwin"} { configure.env-append GREP=/usr/bin/grep SED=/usr/bin/sed } else { - depends_lib-append port:grep port:gsed + depends_lib-append port:grep port:gsed port:help2man } # Don't look for broken compilers (#23684, #32321).