Remove hack from MM_Unix.pm and simply set man1dir to 'none' in

installperl to prevent man page installation of the perl man pages.

3 files changed, 9 insertions, 12 deletions

diff --git a/gnu/usr.bin/perl/config.over b/gnu/usr.bin/perl/config.over
index a415dc64732..4bde9a2fa1f 100644
--- a/gnu/usr.bin/perl/config.over
+++ b/gnu/usr.bin/perl/config.over
@@ -1,7 +1,7 @@
 #
 # Override default paths when building in the OpenBSD src tree
 #
-# $OpenBSD: config.over,v 1.13 2005/02/18 17:46:02 millert Exp $
+# $OpenBSD: config.over,v 1.14 2008/10/12 19:15:31 millert Exp $
 #
 
 # We use a different architecture name than the default
@@ -38,13 +38,13 @@ sitelib="${installsitelib}:/usr/libdata/perl5/site_perl"
 sitelibexp="${sitelib}"
 
 # We install the man pages ourselves until installman gets smarter
-man1dir=''
-man1direxp=''
-installman1dir=''
+man1dir='/usr/share/man/man1'
+man1direxp='/usr/share/man/man1'
+installman1dir='/usr/share/man/man1'
 man1ext='1'
-man3dir=''
-man3direxp=''
-installman3dir=''
+man3dir='/usr/share/man/man3p'
+man3direxp='/usr/share/man/man3p'
+installman3dir='/usr/share/man/man3p'
 man3ext='3p'
 siteman1dir='/usr/local/man/man1'
 siteman1direxp='/usr/local/man/man1'
diff --git a/gnu/usr.bin/perl/installperl b/gnu/usr.bin/perl/installperl
index 7c5bd2170bc..318e4661f60 100644
--- a/gnu/usr.bin/perl/installperl
+++ b/gnu/usr.bin/perl/installperl
@@ -211,7 +211,7 @@ my $installprivlib = "$destdir$Config{installprivlib}";
 my $installarchlib = "$destdir$Config{installarchlib}";
 my $installsitelib = "$destdir$Config{installsitelib}";
 my $installsitearch = "$destdir$Config{installsitearch}";
-my $installman1dir = "$destdir$Config{installman1dir}";
+my $installman1dir = "none";
 my $man1ext = $Config{man1ext};
 my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.
diff --git a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm
index bc2d057eeb2..691a890eb36 100644
--- a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm
+++ b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm
@@ -1323,10 +1323,7 @@ sub init_MANPODS {
     # Set up names of manual pages to generate from pods
     foreach my $man (qw(MAN1 MAN3)) {
 	if ( $self->{"${man}PODS"}
-	     # Cannot check INSTALL${man}DIR on OpenBSD since we
-	     # have that set to "none" to prevent installation of
-	     # the main perl man pages.  Use INST_${man}DIR instead
-             or $self->{"INST_${man}DIR"} =~ /^(none|\s*)$/
+             or $self->{"INSTALL${man}DIR"} =~ /^(none|\s*)$/
         ) {
             $self->{"${man}PODS"} ||= {};
         }