diff options
| author | jlam <jlam> | 2005-05-19 15:35:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-19 15:35:41 +0000 |
| commit | 7d24c62d6e44bd71d2accdb96842323d72626b46 (patch) | |
| tree | 48ea54284bc90872e38bd367465deeea74c25b02 | |
| parent | 085920c84d7c779e510324923eabe863b0442750 (diff) | |
| download | pkgsrc-7d24c62d6e44bd71d2accdb96842323d72626b46.tar.gz | |
PERL5_PKGSRCDIR is no longer defined under the new tools framework.
Modify this bulk-build workaround by not checking for PERL5_PKGSRCDIR,
and instead just relying on the presence or absence of ${PERL5}.
| -rw-r--r-- | devel/p5-Test-Harness/depends.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/p5-Test-Harness/depends.mk b/devel/p5-Test-Harness/depends.mk index 01ce91d7d05..542fca36b3b 100644 --- a/devel/p5-Test-Harness/depends.mk +++ b/devel/p5-Test-Harness/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.4 2005/05/12 06:04:09 jlam Exp $ +# $NetBSD: depends.mk,v 1.5 2005/05/19 15:35:41 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -10,11 +10,11 @@ # packages, and thus refuses to build the packages depending on # this package when it fails... # -# Fix this for now by noting that if there is no PERL5 installed, -# and PERL5_PKGSRCDIR has not been set, then a sufficiently new -# perl will be installed, so the DEPENDS line is not needed... -# This hack should be removed when the bulk-build dependency- -# tracking has been fixed. -.if exists(${PERL5}) || defined(PERL5_PKGSRCDIR) +# Fix this for now by noting that if there is no PERL5 installed, then +# a sufficiently new perl will be installed, so the DEPENDS line is +# not needed... This hack should be removed when the bulk-build +# dependency- tracking has been fixed. +# +.if defined(PERL5) && exists(${PERL5}) DEPENDS+= {perl{,-thread}>=5.8.3,p5-Test-Harness-[0-9]*}:../../devel/p5-Test-Harness .endif |