summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2004-01-19 23:50:20 +0000
committerjlam <jlam>2004-01-19 23:50:20 +0000
commit652e7b0bc1f04389f41e096d68338326dd81a7a1 (patch)
tree636ad622b41a1f96b524cb7c77371d1adbf6587b
parentef1228ef628b52bc7a6c11eeab4e64c1bbab6bfa (diff)
downloadpkgsrc-652e7b0bc1f04389f41e096d68338326dd81a7a1.tar.gz
If PERL5_REQD is at least 5.8, then set BUILDLINK_PKGSRCDIR.perl properly
to point to ../../lang/perl58. This fixes PR 23573 and PR 24031.
-rw-r--r--lang/perl5/buildlink2.mk4
-rw-r--r--lang/perl5/buildlink3.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk
index f1331158263..6074c678e05 100644
--- a/lang/perl5/buildlink2.mk
+++ b/lang/perl5/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/13 07:12:01 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/01/19 23:50:20 jlam Exp $
.if !defined(PERL5_BUILDLINK2_MK)
PERL5_BUILDLINK2_MK= # defined
@@ -10,7 +10,7 @@ USE_PERL5?= run
PERL5_REQD?= 5.0
BUILDLINK_PACKAGES+= perl
BUILDLINK_DEPENDS.perl?= perl>=${PERL5_REQD}
-BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
+BUILDLINK_PKGSRCDIR.perl?= ${PERL5_PKGSRCDIR}
.if ${USE_PERL5} == "build"
BUILDLINK_DEPMETHOD.perl?= build
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index baa80d348ce..5300e0a1eab 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/19 13:01:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/19 23:50:20 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ USE_PERL5?= run
PERL5_REQD?= 5.0
BUILDLINK_DEPENDS.perl?= perl>=${PERL5_REQD}
-BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
+BUILDLINK_PKGSRCDIR.perl?= ${PERL5_PKGSRCDIR}
. if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
BUILDLINK_DEPMETHOD.perl?= build