perl5: Fix build under Haiku R1/beta2

And fix functionality of modules. tested with devel/p5-gettext.

5 files changed, 72 insertions, 5 deletions

diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 28f13f2ba80..e1f527f582b 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.168 2021/01/25 09:33:19 wiz Exp $
+$NetBSD: distinfo,v 1.169 2021/03/15 14:23:12 ryoon Exp $
 
 SHA1 (perl-5.32.1.tar.xz) = 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e
 RMD160 (perl-5.32.1.tar.xz) = ad9013fa389e3e73940c90b7d4ffd542a0cafc70
@@ -9,10 +9,13 @@ SHA1 (patch-Makefile.SH) = 56203aea57c429a94760f039a978463b8859b0a9
 SHA1 (patch-Safe.pm) = bfeefb82d4cfe991e3a9a90cd87b894c9f4cc337
 SHA1 (patch-caretx.c) = b76b4175a58123fa4dfd2adf36b2207dcb6cf65a
 SHA1 (patch-cflags.SH) = e940e4452768ccc1bdf21d435094e7efffceb925
+SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm) = 79e5aeccfa272ca5ec08bffc616d8053ae90ac51
 SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Unix.pm) = 3a2b39c9eb903e68ef7d03ae448c51c147c19aa1
+SHA1 (patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t) = 9b0e7ab85fdab4887b1754599a8879bd7d9f36cc
+SHA1 (patch-ext_Errno_Errno__pm.PL) = 74fa9e2f9e7ed00aed8be33f91c24a06cc025a9c
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_linux.sh) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
 SHA1 (patch-hints_solaris__2.sh) = 364a28ca57dbabe1f902b601e336532996db6a0e
-SHA1 (patch-installperl) = 0ad5988b7cadfb13d9646a59a57f6cf884a6238a
+SHA1 (patch-installperl) = b129d64cc17b898b44fe6282b8b1df36e342d0ef
 SHA1 (patch-numeric.c) = 53dc8da40ad21d97072e8e2000f0a16c3353ff41
diff --git a/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm b/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm
new file mode 100644
index 00000000000..2b440f7d2c4
--- /dev/null
+++ b/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm
@@ -0,0 +1,16 @@
+$NetBSD: patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm,v 1.1 2021/03/15 14:23:12 ryoon Exp $
+
+* Fix libperl.so reference.
+
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm.orig	2020-12-18 10:04:35.000000000 +0000
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+@@ -49,8 +49,7 @@ libperl.a equivalent to be linked to dyn
+ sub init_linker {
+     my($self) = shift;
+ 
+-    $self->{PERL_ARCHIVE} ||=
+-      File::Spec->catdir('$(PERL_INC)',$Config{libperl});
++    $self->{PERL_ARCHIVE} ||= '';
+     $self->{PERL_ARCHIVEDEP} ||= '';
+     $self->{PERL_ARCHIVE_AFTER} ||= '';
+     $self->{EXPORT_LIST}  ||= '';
diff --git a/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t b/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t
new file mode 100644
index 00000000000..1e5c0e9a21e
--- /dev/null
+++ b/lang/perl5/patches/patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t
@@ -0,0 +1,16 @@
+$NetBSD: patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t,v 1.1 2021/03/15 14:23:12 ryoon Exp $
+
+* Fix libperl.so reference.
+
+--- cpan/ExtUtils-MakeMaker/t/MM_BeOS.t.orig	2020-12-18 10:04:35.000000000 +0000
++++ cpan/ExtUtils-MakeMaker/t/MM_BeOS.t
+@@ -38,8 +38,7 @@ my $MM = bless { NAME => "Foo" }, 'MM';
+ 
+ # init_linker
+ {
+-    my $libperl = File::Spec->catfile('$(PERL_INC)',
+-                                      $Config{libperl} || 'libperl.a' );
++    my $libperl = '';
+     my $export  = '';
+     my $after   = '';
+     $MM->init_linker;
diff --git a/lang/perl5/patches/patch-ext_Errno_Errno__pm.PL b/lang/perl5/patches/patch-ext_Errno_Errno__pm.PL
new file mode 100644
index 00000000000..b9771ea1050
--- /dev/null
+++ b/lang/perl5/patches/patch-ext_Errno_Errno__pm.PL
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_Errno_Errno__pm.PL,v 1.3 2021/03/15 14:23:12 ryoon Exp $
+
+* Fix build under Haiku R1/beta2.
+
+--- ext/Errno/Errno_pm.PL.orig	2020-12-18 10:04:36.000000000 +0000
++++ ext/Errno/Errno_pm.PL
+@@ -143,7 +143,7 @@ sub get_files {
+ 	$file{$linux_errno_h} = 1;
+     } elsif ($^O eq 'haiku') {
+ 	# hidden in a special place
+-	$file{'/boot/develop/headers/posix/errno.h'} = 1;
++	$file{'/boot/system/develop/headers/posix/errno.h'} = 1;
+ 
+     } elsif ($^O eq 'vos') {
+ 	# avoid problem where cpp returns non-POSIX pathnames
diff --git a/lang/perl5/patches/patch-installperl b/lang/perl5/patches/patch-installperl
index 613f69680a6..5b6188f0a21 100644
--- a/lang/perl5/patches/patch-installperl
+++ b/lang/perl5/patches/patch-installperl
@@ -1,8 +1,11 @@
-$NetBSD: patch-installperl,v 1.1 2019/04/23 09:27:46 adam Exp $
+$NetBSD: patch-installperl,v 1.2 2021/03/15 14:23:12 ryoon Exp $
 
---- installperl.orig	2014-05-26 13:34:20.000000000 +0000
+Haiku part: From:
+https://github.com/haikuports/haikuports/blob/master/dev-lang/perl/patches/perl-5.32.0.patchset
+
+--- installperl.orig	2020-12-18 09:58:48.000000000 +0000
 +++ installperl
-@@ -332,7 +332,6 @@ $do_installprivlib = 0 if $versiononly &
+@@ -336,7 +336,6 @@ $do_installprivlib = 0 if $versiononly &
  mkpath($installprivlib);
  mkpath($installarchlib);
  mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
@@ -10,3 +13,17 @@ $NetBSD: patch-installperl,v 1.1 2019/04/23 09:27:46 adam Exp $
  
  if (-d 'lib') {
      find({no_chdir => 1, wanted => \&installlib}, 'lib')
+@@ -382,6 +381,13 @@ elsif ($Is_Cygwin) { # On Cygwin symlink
+ 
+     # AIX needs perl.exp installed as well.
+     push(@corefiles,'perl.exp') if $^O eq 'aix';
++
++    # Haiku requires haikuish.h.
++    if ($^O eq 'haiku') {
++        # Haiku needs haikuish.h installed as well.
++        mkpath("$installarchlib/CORE/haiku", $opts{verbose}, 0777);
++        push(@corefiles,'haiku/haikuish.h');
++    }
+ }
+ 
+