Modify lang/perl5 and lang/perl58 to install man3 pages again. However,

we install them into a private directory under the the normal Perl
installation and configure Perl so that site-specific Perl man3 pages
are installed into a private directory within site_perl.  This avoids
manpage conflicts between 3rd-party modules, the standard Perl library,
and other packages.

The changes implement some unfinished work that is alluded to in the
MakeMaker.pm module by allowing "installsiteman{1,3}dir" to be set
during the configuration process and are used to provide default values
for INSTALLSITEMAN{1,3}DIR during the Perl module build/install process.

Bump PKGREVISIONs for lang/perl5 and lang/perl58.

8 files changed, 220 insertions, 28 deletions

diff --git a/lang/perl5/MESSAGE b/lang/perl5/MESSAGE
deleted file mode 100644
index 53b5cf5c810..00000000000
--- a/lang/perl5/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:08 wiz Exp $
-
-Note: Perl no longer installs manual pages for Perl library functions,
-such as "open" or "Data::Dumper", into section 3 of the system manual
-("man3").
-
-Use the "perldoc" program instead to obtain documentation for Perl
-library functions.
-
-===========================================================================
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index c43e04989b8..f547d120fda 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2003/03/14 19:37:43 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2003/05/27 21:57:25 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES+=		lang devel
 
 MAINTAINER=		jlam@netbsd.org
@@ -31,6 +31,15 @@ CONFIGURE_ARGS+=	-Uusemymalloc
 CONFIGURE_ARGS+=	-Uinstallusrbinperl
 TEST_TARGET=		test
 
+# Install Perl man3 pages into a private directory under the the normal
+# Perl installation.  Also install site-specific Perl man3 pages into a
+# private directory within site_perl.  This avoids manpage conflicts
+# between 3rd-party modules, the standard Perl library, and other
+# packages.
+#
+CONFIGURE_ARGS+=	-Dman3dir="${PERL5_PRIVLIB}/man/man3"
+CONFIGURE_ARGS+=	-Dinstallsiteman3dir="${PERL5_SITEPERL}/man/man3"
+
 .include "../../mk/bsd.prefs.mk"
 
 MKPIC?=			yes
@@ -39,6 +48,7 @@ MKPIC?=			yes
 # dependencies.  If this isn't defined, then use the perl defaults for the
 # particular operating system.
 #
+LIBSWANTED.FreeBSD=	m crypt
 LIBSWANTED.NetBSD=	m crypt
 LIBSWANTED.SunOS=	m crypt dl socket nsl
 
@@ -91,16 +101,16 @@ CFLAGS=
 CONFIGURE_ARGS+=	-Duseshrplib
 .endif
 
+PERL5_PRIVLIB?=		${PREFIX}/lib/perl5/${PERL5_DIST_VERS}
 PERL5_ARCHLIB=		${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_SITEPERL?=	${PREFIX}/lib/perl5/site_perl
 PERL5_SITEARCH=		${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_PACKLIST=		${PERL5_ARCHLIB}/.packlist
+PLIST_SUBST+=		PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
 
 # It's tough to guess which hints file will be used, so add our modifications
 # to all of them:
 #
-# - Don't install any manpages in man3; make user use perldoc (to prevent
-#   confusion/conflicts with similarly named man2/man3 pages).
-#
 # - Explicitly set the local compiler search paths to contain only the
 #   pkgsrc-controlled directories.
 #
@@ -109,7 +119,6 @@ pre-configure:
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
 		( ${ECHO} '';						\
-		  ${ECHO} 'man3dir=none';				\
 		  ${ECHO} 'locincpth="${LOCINCPATH}"';			\
 		  ${ECHO} 'loclibpth="${LOCLIBPATH}"';			\
 		  ${ECHO} 'ldflags="${LOCLIBRPATHFLAGS} $$ldflags"';	\
diff --git a/lang/perl5/PLIST b/lang/perl5/PLIST
index e0b89418900..096629c7876 100644
--- a/lang/perl5/PLIST
+++ b/lang/perl5/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/27 21:57:25 jlam Exp $
 share/mk/bsd.perl.mk
 @unexec ${RM} -f %D/${PERL5_ARCHLIB}/perllocal.pod
+@unexec ${RMDIR} -p %D/${PERL5_SITEPERL}/man/man3 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/${PERL5_SITEPERL}/man 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/${PERL5_SITEPERL} 2>/dev/null || ${TRUE}
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 7bda3c9e27b..87f2abb32bb 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.14 2003/02/27 14:05:01 grant Exp $
+$NetBSD: distinfo,v 1.15 2003/05/27 21:57:25 jlam Exp $
 
 SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
 Size (perl-5.6.1.tar.gz) = 5983695 bytes
-SHA1 (patch-aa) = a92ec22c251a3b54d042fdcf6e2cfe6b128873c8
+SHA1 (patch-aa) = c03ddd0a6c9d738cb523cbc8fb104217cc3870a1
 SHA1 (patch-ab) = 67f1f3fd8664e15449996e4c5fbe138a0c1d6def
 SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691
 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2
 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285
 SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c
-SHA1 (patch-ag) = 6f25b4799994279172bc756ede9f13506e9b1c28
+SHA1 (patch-ag) = 3ffe02cc745234b067c991b66024c17864f5babe
 SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589
 SHA1 (patch-aj) = 4da55b4bb1e1607fde7a3d9510ca3d6a90f8c10b
 SHA1 (patch-ak) = 7aa35848111a62c608e792f025b7095513d7041b
+SHA1 (patch-al) = 96b68e38900053109caeb10326cce6e17f58dcab
+SHA1 (patch-am) = 57af2f39327951e321fcb6985aa2d74c090278c6
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index 9972518edbf..ea5afbf9403 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.22 2001/10/01 07:05:11 jlam Exp $
+$NetBSD: patch-aa,v 1.23 2003/05/27 21:57:25 jlam Exp $
 
 --- Configure.orig	Sun Mar 18 22:03:33 2001
-+++ Configure
-@@ -6598,7 +6598,7 @@
++++ Configure	Tue May 27 15:23:10 2003
+@@ -891,6 +891,8 @@
+ sitelib=''
+ sitelib_stem=''
+ sitelibexp=''
++installsiteman1dir=''
++installsiteman3dir=''
+ siteprefix=''
+ siteprefixexp=''
+ sizesize=''
+@@ -6598,7 +6600,7 @@
  	esac
  	for thisflag in $ldflags; do
  		case "$thisflag" in
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.22 2001/10/01 07:05:11 jlam Exp $
  			case " $dflt " in
  			*" $thisflag "*) ;;
  			*) dflt="$dflt $thisflag" ;;
-@@ -6807,9 +6807,12 @@
+@@ -6807,9 +6809,12 @@
  	aix)
  		# We'll set it in Makefile.SH...
  		;;
@@ -25,7 +34,43 @@ $NetBSD: patch-aa,v 1.22 2001/10/01 07:05:11 jlam Exp $
  	freebsd)
  		xxx="-Wl,-R$shrpdir"
  		;;
-@@ -14719,7 +14722,7 @@
+@@ -6966,6 +6971,17 @@
+ 	;;
+ esac
+ 
++case "$installsiteman1dir" in
++'')	dflt="$installman1dir" ;;
++*)	dflt="$installsiteman1dir" ;;
++esac
++set installsiteman1dir installsiteman1dir none
++eval $prefixit
++fn=d~+
++rp="Where do the site-specific manual pages (source) go?"
++. ./getfile
++installsiteman1dir="$ans"
++
+ : see if we can have long filenames
+ echo " "
+ first=123456789abcdef
+@@ -7090,6 +7106,17 @@
+ 	;;
+ esac
+ 
++case "$installsiteman3dir" in
++'')	dflt="$installman3dir" ;;
++*)	dflt="$installsiteman3dir" ;;
++esac
++set installsiteman3dir installsiteman3dir none
++eval $prefixit
++fn=d~+
++rp="Where do the site-specific library man pages (source) go?"
++. ./getfile
++installsiteman3dir="$ans"
++
+ : see if we have to deal with yellow pages, now NIS.
+ if $test -d /usr/etc/yp || $test -d /etc/yp; then
+ 	if $test -f /usr/etc/nibindd; then
+@@ -14719,7 +14746,7 @@
  eval $inhdr
  
  : see if this is a ieeefp.h system
@@ -34,3 +79,12 @@ $NetBSD: patch-aa,v 1.22 2001/10/01 07:05:11 jlam Exp $
  eval $inhdr
  
  : see if this is a libutil.h system
+@@ -16145,6 +16172,8 @@
+ installsitearch='$installsitearch'
+ installsitebin='$installsitebin'
+ installsitelib='$installsitelib'
++installsiteman1dir='$installsiteman1dir'
++installsiteman3dir='$installsiteman3dir'
+ installstyle='$installstyle'
+ installusrbinperl='$installusrbinperl'
+ installvendorarch='$installvendorarch'
diff --git a/lang/perl5/patches/patch-ag b/lang/perl5/patches/patch-ag
index 11c52e9c5f3..39597e6e039 100644
--- a/lang/perl5/patches/patch-ag
+++ b/lang/perl5/patches/patch-ag
@@ -1,7 +1,18 @@
-$NetBSD: patch-ag,v 1.7 2001/10/14 19:55:48 jlam Exp $
+$NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $
 
 --- lib/ExtUtils/MM_Unix.pm.orig	Thu Mar 15 10:25:20 2001
-+++ lib/ExtUtils/MM_Unix.pm	Mon Oct  1 03:51:12 2001
++++ lib/ExtUtils/MM_Unix.pm	Tue May 27 17:03:53 2003
+@@ -604,8 +604,8 @@
+ 	      INST_HTMLSITELIBDIR INSTALLHTMLSITELIBDIR
+ 	      INST_HTMLSCRIPTDIR  INSTALLHTMLSCRIPTDIR
+ 	      INST_HTMLLIBDIR                    HTMLEXT
+-	      INST_MAN1DIR        INSTALLMAN1DIR MAN1EXT
+-	      INST_MAN3DIR        INSTALLMAN3DIR MAN3EXT
++	      INST_MAN1DIR        INSTALLMAN1DIR INSTALLSITEMAN1DIR	MAN1EXT
++	      INST_MAN3DIR        INSTALLMAN3DIR INSTALLSITEMAN3DIR	MAN3EXT
+ 	      /) {
+ 	next unless defined $self->{$tmp};
+ 	push @m, "$tmp = $self->{$tmp}\n";
 @@ -1059,6 +1059,22 @@
      my($ldfrom) = '$(LDFROM)';
      $armaybe = 'ar' if ($^O eq 'dec_osf' and $armaybe eq ':');
@@ -34,3 +45,42 @@ $NetBSD: patch-ag,v 1.7 2001/10/14 19:55:48 jlam Exp $
      push @m, '
  	$(CHMOD) $(PERM_RWX) $@
  ';
+@@ -1888,7 +1904,9 @@
+     }
+     for $install_variable (qw/
+ 			   INSTALLMAN1DIR
++			   INSTALLSITEMAN1DIR
+ 			   INSTALLMAN3DIR
++			   INSTALLSITEMAN3DIR
+ 			   /)
+     {
+ 	$self->prefixify($install_variable,$search_prefix,$replace_prefix);
+@@ -1898,6 +1916,8 @@
+     # installed
+     $self->{INSTALLMAN1DIR} = $Config::Config{installman1dir}
+ 	unless defined $self->{INSTALLMAN1DIR};
++    $self->{INSTALLSITEMAN1DIR} = $Config::Config{installsiteman1dir}
++	unless defined $self->{INSTALLSITEMAN1DIR};
+     unless (defined $self->{INST_MAN1DIR}){
+ 	if ($self->{INSTALLMAN1DIR} =~ /^(none|\s*)$/){
+ 	    $self->{INST_MAN1DIR} = $self->{INSTALLMAN1DIR};
+@@ -1909,6 +1929,8 @@
+ 
+     $self->{INSTALLMAN3DIR} = $Config::Config{installman3dir}
+ 	unless defined $self->{INSTALLMAN3DIR};
++    $self->{INSTALLSITEMAN3DIR} = $Config::Config{installsiteman3dir}
++	unless defined $self->{INSTALLSITEMAN3DIR};
+     unless (defined $self->{INST_MAN3DIR}){
+ 	if ($self->{INSTALLMAN3DIR} =~ /^(none|\s*)$/){
+ 	    $self->{INST_MAN3DIR} = $self->{INSTALLMAN3DIR};
+@@ -2153,8 +2175,8 @@
+ 		$(INST_SCRIPT) $(INSTALLSCRIPT) \
+ 		$(INST_HTMLLIBDIR) $(INSTALLHTMLSITELIBDIR) \
+ 		$(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
+-		$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
+-		$(INST_MAN3DIR) $(INSTALLMAN3DIR)
++		$(INST_MAN1DIR) $(INSTALLSITEMAN1DIR) \
++		$(INST_MAN3DIR) $(INSTALLSITEMAN3DIR)
+ 	}.$self->{NOECHO}.q{$(WARN_IF_OLD_PACKLIST) \
+ 		}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
+ 
diff --git a/lang/perl5/patches/patch-al b/lang/perl5/patches/patch-al
new file mode 100644
index 00000000000..b178ce8899d
--- /dev/null
+++ b/lang/perl5/patches/patch-al
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.1 2003/05/27 21:57:26 jlam Exp $
+
+--- lib/ExtUtils/MM_VMS.pm.orig	Thu Feb 22 21:57:55 2001
++++ lib/ExtUtils/MM_VMS.pm	Tue May 27 17:08:08 2003
+@@ -512,6 +512,7 @@
+             INSTALLARCHLIB INSTALLSCRIPT INSTALLBIN PERL_LIB PERL_ARCHLIB
+             PERL_INC PERL_SRC FULLEXT INST_MAN1DIR INSTALLMAN1DIR
+             INST_MAN3DIR INSTALLMAN3DIR INSTALLSITELIB INSTALLSITEARCH
++            INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR
+             SITELIBEXP SITEARCHEXP ] ) {
+ 	next unless defined $self->{$macro};
+ 	$self->{$macro} = $self->fixpath($self->{$macro},1);
+@@ -603,7 +604,7 @@
+ ';
+ 
+     for $tmp (qw/
+-	      INST_MAN1DIR INSTALLMAN1DIR MAN1EXT INST_MAN3DIR INSTALLMAN3DIR MAN3EXT
++	      INST_MAN1DIR INSTALLMAN1DIR INSTALLSITEMAN1DIR MAN1EXT INST_MAN3DIR INSTALLMAN3DIR INSTALLSITEMAN3DIR MAN3EXT
+ 	      /) {
+ 	next unless defined $self->{$tmp};
+ 	push @m, "$tmp = $self->{$tmp}\n";
+@@ -1806,8 +1807,8 @@
+ 	$(NOECHO) $(PERL) -e "print '$(INST_ARCHLIB) $(INSTALLSITEARCH) '" >>.MM_tmp
+ 	$(NOECHO) $(PERL) -e "print '$(INST_BIN) $(INSTALLBIN) '" >>.MM_tmp
+ 	$(NOECHO) $(PERL) -e "print '$(INST_SCRIPT) $(INSTALLSCRIPT) '" >>.MM_tmp
+-	$(NOECHO) $(PERL) -e "print '$(INST_MAN1DIR) $(INSTALLMAN1DIR) '" >>.MM_tmp
+-	$(NOECHO) $(PERL) -e "print '$(INST_MAN3DIR) $(INSTALLMAN3DIR) '" >>.MM_tmp
++	$(NOECHO) $(PERL) -e "print '$(INST_MAN1DIR) $(INSTALLSITEMAN1DIR) '" >>.MM_tmp
++	$(NOECHO) $(PERL) -e "print '$(INST_MAN3DIR) $(INSTALLSITEMAN3DIR) '" >>.MM_tmp
+ 	$(MOD_INSTALL) <.MM_tmp
+ 	$(NOECHO) Delete/NoLog/NoConfirm .MM_tmp;
+ 	$(NOECHO) $(WARN_IF_OLD_PACKLIST) ].$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q[
diff --git a/lang/perl5/patches/patch-am b/lang/perl5/patches/patch-am
new file mode 100644
index 00000000000..52df8e14849
--- /dev/null
+++ b/lang/perl5/patches/patch-am
@@ -0,0 +1,53 @@
+$NetBSD: patch-am,v 1.1 2003/05/27 21:57:26 jlam Exp $
+
+--- lib/ExtUtils/MakeMaker.pm.orig	Thu Feb 22 21:57:55 2001
++++ lib/ExtUtils/MakeMaker.pm	Tue May 27 17:18:40 2003
+@@ -193,7 +193,8 @@
+     INC INCLUDE_EXT INSTALLARCHLIB INSTALLBIN INSTALLDIRS INSTALLHTMLPRIVLIBDIR
+     INSTALLHTMLSCRIPTDIR INSTALLHTMLSITELIBDIR INSTALLMAN1DIR
+     INSTALLMAN3DIR INSTALLPRIVLIB INSTALLSCRIPT INSTALLSITEARCH
+-    INSTALLSITELIB INST_ARCHLIB INST_BIN INST_EXE INST_LIB
++    INSTALLSITELIB INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR
++    INST_ARCHLIB INST_BIN INST_EXE INST_LIB
+     INST_HTMLLIBDIR INST_HTMLSCRIPTDIR
+     INST_MAN1DIR INST_MAN3DIR INST_SCRIPT LDFROM LIB LIBPERL_A LIBS
+     LINKTYPE MAKEAPERL MAKEFILE MAN1PODS MAN3PODS MAP_TARGET MYEXTLIB
+@@ -960,8 +961,8 @@
+     INST_HTMLSCRIPTDIR            INSTALLHTMLSCRIPTDIR
+     INST_BIN			  INSTALLBIN
+     INST_SCRIPT                   INSTALLSCRIPT
+-    INST_MAN1DIR                  INSTALLMAN1DIR
+-    INST_MAN3DIR                  INSTALLMAN3DIR
++    INST_MAN1DIR        INSTALLMAN1DIR        INSTALLSITEMAN1DIR
++    INST_MAN3DIR        INSTALLMAN3DIR        INSTALLSITEMAN3DIR
+ 
+ The INSTALL... macros in turn default to their %Config
+ ($Config{installprivlib}, $Config{installarchlib}, etc.) counterparts.
+@@ -1391,8 +1392,8 @@
+ 
+ =item INSTALLMAN3DIR
+ 
+-This directory gets the man pages at 'make install' time. Defaults to
+-$Config{installman3dir}.
++This directory gets the man pages at 'make install' time if
++INSTALLDIRS=perl. Defaults to $Config{installman3dir}.
+ 
+ =item INSTALLPRIVLIB
+ 
+@@ -1413,6 +1414,16 @@
+ 
+ Used by 'make install', which copies files from INST_LIB to this
+ directory if INSTALLDIRS is set to site (default).
++
++=item INSTALLSITEMAN1DIR
++
++This directory gets the man pages at 'make install' time if
++INSTALLDIRS=site. Defaults to $Config{installsiteman1dir}.
++
++=item INSTALLSITEMAN3DIR
++
++This directory gets the man pages at 'make install' time if
++INSTALLDIRS=site. Defaults to $Config{installsiteman3dir}.
+ 
+ =item INST_ARCHLIB
+