diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-29 06:52:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-29 06:52:23 +0000 |
| commit | 2d4275db0b4a5e6d9cb25474c280da6a126070ae (patch) | |
| tree | 6f777e76a1155b543a96b32ac47eadb61bcc33a4 /mk | |
| parent | 725e1527a60bf1038307f1cae6fdec27d09b982a (diff) | |
| download | pkgsrc-2d4275db0b4a5e6d9cb25474c280da6a126070ae.tar.gz | |
Make lang/perl58 the default perl package installed when a package needs
Perl as a dependency.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e8290e7345a..defc9c5d1d9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1428 2004/03/29 06:49:04 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1429 2004/03/29 06:52:23 jlam Exp $ # # This file is in the public domain. # @@ -279,21 +279,6 @@ _PERL5_STRICTEST_REQD= ${_version_} .endfor _PERL5_REQD= ${_PERL5_STRICTEST_REQD} -# _PERL58_PATTERNS contains perl versions >=5.8.0 but before 6.0. -_PERL58_PATTERNS= 5.8* 5.9* 5.[1-9][0-9]* - -_NEED_PERL58?= no -.for _pattern_ in ${_PERL58_PATTERNS} -. if !empty(_PERL5_REQD:M${_pattern_}) -_NEED_PERL58= yes -. endif -.endfor -.if !empty(_NEED_PERL58:M[yY][eE][sS]) -PERL5_PKGSRCDIR?= ../../lang/perl58 -.else -PERL5_PKGSRCDIR?= ../../lang/perl5 -.endif - # Convert USE_PERL5 to be two-valued: either "build" or "run" to denote # whether we want a build-time or run-time dependency on perl. # @@ -305,6 +290,7 @@ USE_PERL5:= run _PERL5_DEPMETHOD= DEPENDS . endif _PERL5_DEPENDS= perl>=${_PERL5_REQD} +PERL5_PKGSRCDIR?= ../../lang/perl58 . if !defined(BUILDLINK_DEPENDS.perl) ${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR} . endif |