* Make perl stop installing anything in the man3 directory. It's starting

  to install things like "open.3" and "lib.3" which confuse users.  Perl
  ships with a documentation tool, "perldoc", for this purpose; create a
  MESSAGE indicating that it should be used instead.  (Perl still installs
  command line program manual pages in man1.)

* Integrate bsd.perl.mk into the perl5-base build where it should have been
  from the beginning.  The separate perl-mk pkg makes binary packages of
  perl-mk completely useless[*].  Older perl builders will not break, since
  <bsd.pkg.mk> contains fallback definitions that are evaluated at pkg
  build time.

=====

[*] bsd.perl.mk is tightly bound to the version of perl that is installed.
    The version name "perl-mk-1.1" is completely useless as a binary pkg,
    since keeping multiple binary versions of perl on a FTP server means
    that one of the perl-mk's will get clobbered.

    However, putting the current pkgsrc PERL5_DIST_VERS in the perl-mk pkg
    is also a problem, because that doesn't necessarily reflect the
    installed version of perl.  Snarfing the installed version at perl-mk
    build time would be even uglier, since you could not then walk the tree
    without perl being installed.

    The cleanest solution is to integrate bsd.perl.mk into the perl5-base
    pkg, and let those who have not upgraded perl yet use the runtime
    definitions in <bsd.pkg.mk>.

12 files changed, 38 insertions, 119 deletions

diff --git a/lang/perl5-base/Makefile b/lang/perl5-base/Makefile
index c1ea22da84d..3fc619a76a7 100644
--- a/lang/perl5-base/Makefile
+++ b/lang/perl5-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/06/07 04:25:34 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/07/09 17:10:27 tv Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
-PKGNAME=		perl-base-${PERL5_VERS}
+PKGNAME=		perl-base-${PERL5_VERS}nb1
 PERL5_PKG_VERS=		# empty
 CATEGORIES+=		lang devel
 
@@ -10,7 +10,10 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		base installation of Perl
 
-CONFLICTS=		perl-5.00* p5-CGI-2.6* p5-CGI-2.7[0-5]
+CONFLICTS=		perl-5.00* p5-CGI-2.6* p5-CGI-2.7[0-5] \
+			p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
+			p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
+			perl-mk-[0-9]*
 
 HAS_CONFIGURE=		# defined
 CONFIGURE_SCRIPT=	./Configure
@@ -87,6 +90,14 @@ post-install:
 	@strip ${PREFIX}/bin/a2p
 	@strip ${PREFIX}/bin/perl
 	${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
+	${RM} -f ${WRKDIR}/bsd.perl.mk
+	eval `${PERL5} -V:installsitelib 2>/dev/null` && \
+		echo PERL5_SITELIB=$$installsitelib >>${WRKDIR}/bsd.perl.mk
+	eval `${PERL5} -V:installsitearch 2>/dev/null` && \
+		echo PERL5_SITEARCH=$$installsitearch >>${WRKDIR}/bsd.perl.mk
+	eval `${PERL5} -V:installarchlib 2>/dev/null` && \
+		echo PERL5_ARCHLIB=$$installarchlib >>${WRKDIR}/bsd.perl.mk
+	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/
 
 test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}				\
diff --git a/lang/perl5-base/distinfo b/lang/perl5-base/distinfo
index e2a2176be41..4a1f46d065d 100644
--- a/lang/perl5-base/distinfo
+++ b/lang/perl5-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/06/07 04:25:34 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/07/09 17:10:27 tv Exp $
 
 SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
 Size (perl-5.6.1.tar.gz) = 5983695 bytes
 SHA1 (patch-aa) = e581ef24bfe84916339ab230a02e267e3100ec63
-SHA1 (patch-ab) = e34baeaf071957fa39efaa856f7e3676b9e3fd7f
+SHA1 (patch-ab) = 6e8fa455273f1102c1932ed21db2fce4122993b8
 SHA1 (patch-ac) = 574af66da47465a2b06065651ae21fc87a992553
 SHA1 (patch-ad) = cb95cbf393ea484028bb9dd7f7d835f3f6f0e156
 SHA1 (patch-ae) = 763e087a277988851dde569b59408b030867d672
diff --git a/lang/perl5-base/patches/patch-ab b/lang/perl5-base/patches/patch-ab
index 56bfa1320d1..9d3acaa0a3d 100644
--- a/lang/perl5-base/patches/patch-ab
+++ b/lang/perl5-base/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2001/06/07 04:25:34 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/07/09 17:10:28 tv Exp $
 
 --- hints/netbsd.sh.orig	Thu Feb 22 21:57:55 2001
-+++ hints/netbsd.sh	Sun May 20 15:03:24 2001
++++ hints/netbsd.sh	Mon Jul  9 11:40:02 2001
 @@ -21,7 +21,11 @@
  	if [ -f /usr/libexec/ld.elf_so ]; then
  		d_dlopen=$define
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2001/06/07 04:25:34 jlam Exp $
  		cccdlflags="-DPIC -fPIC $cccdlflags"
  		lddlflags="--whole-archive -shared $lddlflags"
  	elif [ "`uname -m`" = "pmax" ]; then
-@@ -59,14 +63,14 @@
+@@ -59,14 +63,18 @@
  d_setruid="$undef"
  
  # there's no problem with vfork.
@@ -30,6 +30,10 @@ $NetBSD: patch-ab,v 1.2 2001/06/07 04:25:34 jlam Exp $
  # Pre-empt the /usr/bin/perl question of installperl.
 -installusrbinperl='n'
 +installusrbinperl="$undef"
++
++# Don't install any manpages in man3; make user use perldoc
++# (to prevent confusion with similarly named man2/man3 pages).
++man3dir=none
  
  # Recognize the NetBSD packages collection.
 -# GDBM might be here.
diff --git a/lang/perl5-base/pkg/MESSAGE b/lang/perl5-base/pkg/MESSAGE
new file mode 100644
index 00000000000..7e14e9d7211
--- /dev/null
+++ b/lang/perl5-base/pkg/MESSAGE
@@ -0,0 +1,11 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2001/07/09 17:10:28 tv 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-base/pkg/PLIST b/lang/perl5-base/pkg/PLIST
index a55d821ee30..b9fd9f3f038 100644
--- a/lang/perl5-base/pkg/PLIST
+++ b/lang/perl5-base/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2000/09/06 10:54:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/09 17:10:28 tv Exp $
+share/mk/bsd.perl.mk
 @unexec rm -f %D/${PERL5_ARCHLIB}/perllocal.pod
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index f7b47011cf6..f173534d858 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/06/07 04:25:33 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2001/07/09 17:10:27 tv Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -12,7 +12,6 @@ COMMENT=		Practical Extraction and Report Language
 
 DEPENDS+=		perl-base>=${PERL5_DIST_VERS}:../../lang/perl5-base
 DEPENDS+=		p5-CGI>=2.75.2:../../www/p5-CGI
-DEPENDS+=		perl-mk-1.1:../../pkgtools/perl-mk
 
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		# defined
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3a956063c7d..f956abc67c3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.782 2001/07/07 17:10:36 dmcmahill Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.783 2001/07/09 17:10:25 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -182,7 +182,6 @@ PERL5_REQD?=		5.0
 .if defined(USE_PERL5)
 DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 .if exists(${PERL5})
-BUILD_DEPENDS+=		perl-mk-1.1:../../pkgtools/perl-mk
 .if exists(${LOCALBASE}/share/mk/bsd.perl.mk)
 .include "${LOCALBASE}/share/mk/bsd.perl.mk"
 .elif !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
diff --git a/pkgtools/perl-mk/Makefile b/pkgtools/perl-mk/Makefile
deleted file mode 100644
index ad146a0b13d..00000000000
--- a/pkgtools/perl-mk/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/04/22 06:25:18 jlam Exp $
-#
-
-DISTNAME=	perl-mk-1.1
-CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	wiz@netbsd.org
-COMMENT=	Note installed perl version for bsd.pkg.mk speedup
-
-# for backwards compatibility, and since we want to be included by the
-# perl meta-package, we can't just use USE_PERL5
-DEPENDS+=	perl-{5.0*,5.6.0nb[12],base-5.[6-9]*}:../../lang/perl5-base
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	# defined
-NO_CONFIGURE=	# defined
-NO_PATCH=	# defined
-NO_BUILD=	# defined
-
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
-pre-install:
-	${SED}	-e "s|@RM@|${RM}|g"					\
-		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED}	-e "s|@RM@|${RM}|g"					\
-		-e "s|@PERL5@|${PERL5}|g"				\
-		${PKGDIR}/INSTALL > ${INSTALL_FILE}
-
-# The argument to the INSTALL script is misnamed in this case.  We are
-# actually installing a bsd.perl.mk file, but we'd like to generate it at
-# install-time to ensure that the values for the various PERL5_* variables
-# are consistent with the installed Perl version.  But there is no "INSTALL"
-# target for the INSTALL script, so do the work in the "POST-INSTALL" target.
-#
-do-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/perl-mk/pkg/DEINSTALL b/pkgtools/perl-mk/pkg/DEINSTALL
deleted file mode 100644
index 370c5bfc909..00000000000
--- a/pkgtools/perl-mk/pkg/DEINSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/04/22 06:25:19 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-RM="@RM@"
-
-BSD_PERL_MK=${PKG_PREFIX}/share/mk/bsd.perl.mk
-
-case ${STAGE} in
-DEINSTALL)
-	# Remove generated bsd.perl.mk
-	#
-	${RM} -f ${BSD_PERL_MK}
-	;;
-
-POST-DEINSTALL)
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/pkgtools/perl-mk/pkg/DESCR b/pkgtools/perl-mk/pkg/DESCR
deleted file mode 100644
index bea5a6ef418..00000000000
--- a/pkgtools/perl-mk/pkg/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Installs a support file to speed up bsd.pkg.mk operation on perl packages.
diff --git a/pkgtools/perl-mk/pkg/INSTALL b/pkgtools/perl-mk/pkg/INSTALL
deleted file mode 100644
index 46a0e5793f3..00000000000
--- a/pkgtools/perl-mk/pkg/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/04/22 06:25:19 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-PERL5="@PERL5@"
-RM="@RM@"
-
-BSD_PERL_MK=${PKG_PREFIX}/share/mk/bsd.perl.mk
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	# Generate bsd.perl.mk with hardcoded values for PERL5_* make
-	# variables for optimization purposes.
-	#
-	${RM} -f ${BSD_PERL_MK}
-	eval `${PERL5} -V:installsitelib 2>/dev/null`
-	echo PERL5_SITELIB=${installsitelib} >> ${BSD_PERL_MK}
-	eval `${PERL5} -V:installsitearch 2>/dev/null`
-	echo PERL5_SITEARCH=${installsitearch} >> ${BSD_PERL_MK}
-	eval `${PERL5} -V:installarchlib 2>/dev/null`
-	echo PERL5_ARCHLIB=${installarchlib} >> ${BSD_PERL_MK}
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/pkgtools/perl-mk/pkg/PLIST b/pkgtools/perl-mk/pkg/PLIST
deleted file mode 100644
index f48f44adce3..00000000000
--- a/pkgtools/perl-mk/pkg/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2001/04/22 06:25:19 jlam Exp $
-@comment this plist intentionally left empty