diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-10 02:18:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-10 02:18:04 +0000 |
| commit | 2bbee7b9c9cd35ce4c14679aecf1335bfead9b7a (patch) | |
| tree | d04e13b52e47b6eb9a068a7ca204a5b109b6771b /lang | |
| parent | d9fab8848dc464d532a27a81bcc8642c55f973b0 (diff) | |
| download | pkgsrc-2bbee7b9c9cd35ce4c14679aecf1335bfead9b7a.tar.gz | |
Turn PERL5_REQD into a list of values, the highest of which will be used
to choose the correct Perl dependency.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/libperl/buildlink2.mk | 4 | ||||
| -rw-r--r-- | lang/libperl/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/perl5/buildlink2.mk | 6 | ||||
| -rw-r--r-- | lang/perl5/buildlink3.mk | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lang/libperl/buildlink2.mk b/lang/libperl/buildlink2.mk index 9a2a939dfb3..8883ea33188 100644 --- a/lang/libperl/buildlink2.mk +++ b/lang/libperl/buildlink2.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/10/19 01:52:30 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2004/02/10 02:18:04 jlam Exp $ .if !defined(LIBPERL5_BUILDLINK2_MK) LIBPERL5_BUILDLINK2_MK= # defined -LIBPERL5_REQD?= ${PERL5_REQD} +LIBPERL5_REQD?= ${_PERL5_REQD} BUILDLINK_PACKAGES+= libperl BUILDLINK_DEPENDS.libperl?= {libperl>=${LIBPERL5_REQD},perl>=5.8.0} BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk index cbb8422756c..c06ec5a6f70 100644 --- a/lang/libperl/buildlink3.mk +++ b/lang/libperl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 02:18:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libperl BUILDLINK_DEPENDS.libperl+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0} BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl -LIBPERL5_REQD?= ${PERL5_REQD} +LIBPERL5_REQD?= ${_PERL5_REQD} . include "../../lang/perl5/buildlink3.mk" .endif # LIBPERL_BUILDLINK3_MK diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk index 6e709de4325..57867038698 100644 --- a/lang/perl5/buildlink2.mk +++ b/lang/perl5/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2004/02/10 02:18:04 jlam Exp $ .if !defined(PERL5_BUILDLINK2_MK) PERL5_BUILDLINK2_MK= # defined @@ -7,9 +7,9 @@ USE_PERL5?= run .include "../../mk/bsd.prefs.mk" -PERL5_REQD?= 5.0 +PERL5_REQD+= 5.0 BUILDLINK_PACKAGES+= perl -BUILDLINK_DEPENDS.perl?= perl>=${PERL5_REQD} +BUILDLINK_DEPENDS.perl?= perl>=${_PERL5_REQD} BUILDLINK_PKGSRCDIR.perl?= ${PERL5_PKGSRCDIR} .if ${USE_PERL5} == "build" diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 17b4d4f6e46..a2849b4d4c7 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2004/02/10 02:18:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ @@ -7,9 +7,9 @@ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ . include "../../mk/bsd.prefs.mk" USE_PERL5?= run -PERL5_REQD?= 5.0 +PERL5_REQD+= 5.0 -BUILDLINK_DEPENDS.perl+= perl>=${PERL5_REQD} +BUILDLINK_DEPENDS.perl+= perl>=${_PERL5_REQD} BUILDLINK_PKGSRCDIR.perl?= ${PERL5_PKGSRCDIR} . if !empty(USE_PERL5:M[bB][uU][iI][lL][dD]) |