2 files changed, 22 insertions, 0 deletions

diff --git a/lang/perl5.16/files/patch-freebsd.sh b/lang/perl5.16/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.16/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.16/files/use.perl
+++ b/lang/perl5.16/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";