* 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>.

5 files changed, 0 insertions, 106 deletions

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