From ea18d090b4d53d531b6357763a668e6a12f80f37 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 6 Aug 2005 06:18:44 +0000
Subject: Update lang/perl5 to 5.8.7.  Changes from version 5.8.6 include
 updates for many "core" modules, UTF-8 and Unicode bugfixes, and ithreads
 bugfixes.

The major changes are in the pkgsrc infrastructure to handle Perl and
Perl modules.  All pkgsrc-installed Perl modules are now installed in
"vendor" directories, and the perl interpreter has been modifed to
search for libraries in the following order: site, vendor, perl.  The
Perl library is stored in a directory that is named for the Perl ABI
version associated with the Perl release, so any updates of Perl to
newer versions can be done "in-place" as long as Perl ABI version
remains the same.  All Perl scripts and man pages are stored in
locations that won't conflict between site, vendor, and perl modules,
and a new utility perllink(1) now manages symlinks to those scripts
and man pages under the usual ${LOCALBASE}/bin and ${LOCALBASE}/man/man1.

PERL5_SITEPREFIX may be set to the prefix where local, site-specific
modules will be installed, e.g. PERL5_SITEPREFIX=/usr/local.  Note
that modules installed here are completely unmanaged by pkgsrc.

Update the buildlink and tool dependencies on perl to require perl>=5.8.7
to reflect the new locations for Perl modules and the Perl shared
library.
---
 mk/tools/perl.mk    | 8 +-------
 mk/tools/replace.mk | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk
index 0ca5bbe668a..9d026870bdb 100644
--- a/mk/tools/perl.mk
+++ b/mk/tools/perl.mk
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.18 2005/05/22 02:30:53 jlam Exp $
+# $NetBSD: perl.mk,v 1.19 2005/08/06 06:18:45 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,12 +49,6 @@
 # includes find-prefix.mk.
 #
 .  include "../../lang/perl5/vars.mk"
-
-# Substitute for PERL5_* variables in PLISTs.
-PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
-PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
-PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
-
 .else
 #
 # Some packages want the path to the perl tool, even if they don't have
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index d894e908923..19e019264f3 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.122 2005/07/26 20:00:50 jlam Exp $
+# $NetBSD: replace.mk,v 1.123 2005/08/06 06:18:45 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -861,7 +861,7 @@ TOOLS_PATH.pax=			${TOOLS_PREFIX.pax}/bin/pax
 MAKEFLAGS+=			TOOLS_IGNORE.perl=
 .  elif !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS])
 .    include "../../lang/perl5/version.mk"
-TOOLS_DEPENDS.perl?=		{perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl5
+TOOLS_DEPENDS.perl?=		perl>=${PERL5_REQD}:../../lang/perl5
 TOOLS_CREATE+=			perl
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.perl=perl
 TOOLS_PATH.perl=		${TOOLS_PREFIX.perl}/bin/perl
@@ -873,7 +873,7 @@ TOOLS_PATH.perl=		${TOOLS_PREFIX.perl}/bin/perl
 MAKEFLAGS+=			TOOLS_IGNORE.pod2man=
 .  elif !empty(_TOOLS_USE_PKGSRC.pod2man:M[yY][eE][sS])
 .    include "../../lang/perl5/version.mk"
-TOOLS_DEPENDS.perl?=		{perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl5
+TOOLS_DEPENDS.perl?=		perl>=${PERL5_REQD}:../../lang/perl5
 TOOLS_CREATE+=			pod2man
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pod2man=perl
 TOOLS_PATH.pod2man=		${TOOLS_PREFIX.pod2man}/bin/pod2man
-- 
cgit v1.2.3