diff options
| author | jlam <jlam> | 2005-06-24 06:43:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-24 06:43:43 +0000 |
| commit | ea8f8b396fcf875bc0284bb5efce01eb11bf7e1b (patch) | |
| tree | 666a7e5cc344f7ca6390ba1b81aaa8b1490d242a /mk | |
| parent | a79879c6a9b573cab439ada6363b6b2f5c8c30f7 (diff) | |
| download | pkgsrc-ea8f8b396fcf875bc0284bb5efce01eb11bf7e1b.tar.gz | |
Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update
lang/perl5 to perl-5.8.6nb4. Modify packages that referred to
lang/perl58 to point to lang/perl5 instead.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
| -rw-r--r-- | mk/platform/Interix.mk | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index d9a60680472..d1a012a7ade 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.82 2005/06/04 20:56:48 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.83 2005/06/24 06:43:44 jlam Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -179,7 +179,7 @@ bulk-cache: .else @${ECHO_MSG} "BULK> Extracting database for SPECIFIC_PKGS subset of pkgsrc" @${ECHO_MSG} " along with their dependencies" -.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl58 pkgtools/pkglint +.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl5 pkgtools/pkglint cd ${PKGSRCDIR}/${__tmp__} && ${SETENV} BMAKE=${MAKE} AWK=${AWK} EXPR=${EXPR} ${SH} ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE} .endfor @${ECHO_MSG} "BULK> Extracting dependency tree file" diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index da242216446..cba085ce3d0 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.35 2005/06/01 18:14:23 jlam Exp $ +# $NetBSD: Interix.mk,v 1.36 2005/06/24 06:43:44 jlam Exp $ # # Variable definitions for the Interix operating system. @@ -23,7 +23,7 @@ # libtool-base 0x50000000 0x6fffffff 0x00040000 2048 # netpbm 0x6b000000 0x6cffffff 0x00100000 32 # openssl 0x5e000000 0x5fffffff 0x00100000 32 -# perl58 * +# perl5 * # python22 * # python23 * # python24 * diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index f118cffc8f1..fb7570d1057 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.102 2005/06/23 20:39:39 jlam Exp $ +# $NetBSD: replace.mk,v 1.103 2005/06/24 06:43:45 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -849,11 +849,11 @@ TOOLS_${_TOOLS_VARNAME.pax}= ${TOOLS_REAL_CMD.pax} .endif .if !defined(TOOLS_IGNORE.perl) && !empty(_USE_TOOLS:Mperl) -. if !empty(PKGPATH:Mlang/perl58) +. if !empty(PKGPATH:Mlang/perl5) 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/perl58 +TOOLS_DEPENDS.perl?= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl5 TOOLS_CREATE+= perl TOOLS_FIND_PREFIX+= TOOLS_PREFIX.perl=perl TOOLS_REAL_CMD.perl= ${TOOLS_PREFIX.perl}/bin/perl |