diff options
| author | adam <adam@pkgsrc.org> | 2005-04-01 10:25:16 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2005-04-01 10:25:16 +0000 |
| commit | ba00a0bdc865b0d2f05338ed895b4f1313228aed (patch) | |
| tree | 7810f1638d678a7ea7d3f21259d1344b82add6ff /math | |
| parent | 2a46df0c96c217c59a7e7769060e137da4505c57 (diff) | |
| download | pkgsrc-ba00a0bdc865b0d2f05338ed895b4f1313228aed.tar.gz | |
buildlink3 fix
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/buildlink3.mk | 22 | ||||
| -rw-r--r-- | math/octave/octave.mk | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk index f3659bf4bb8..b128ee0e23d 100644 --- a/math/octave/buildlink3.mk +++ b/math/octave/buildlink3.mk @@ -1,21 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.1 2005/04/01 10:15:47 adam Exp $ -# +# $NetBSD: buildlink3.mk,v 1.2 2005/04/01 10:25:16 adam Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCTAVE_CURRENT_BUILDLINK3_MK:= ${OCTAVE_CURRENT_BUILDLINK3_MK}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +OCTAVE_BUILDLINK3_MK:= ${OCTAVE_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= octave-current +BUILDLINK_DEPENDS+= octave .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave-current} -BUILDLINK_PACKAGES+= octave-current +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave} +BUILDLINK_PACKAGES+= octave -.if !empty(OCTAVE_CURRENT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.octave-current+= octave-current>=2.1.57 -BUILDLINK_RECOMMENDED.octave-current+= octave-current>=2.1.59nb1 -BUILDLINK_PKGSRCDIR.octave-current?= ../../math/octave-current -.endif # OCTAVE_CURRENT_BUILDLINK3_MK +.if !empty(OCTAVE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.octave+= octave>=2.1.69 +BUILDLINK_PKGSRCDIR.octave?= ../../math/octave +.endif # OCTAVE_BUILDLINK3_MK .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/math/octave/octave.mk b/math/octave/octave.mk index 9dc1c63e787..61ae0ebaf4d 100644 --- a/math/octave/octave.mk +++ b/math/octave/octave.mk @@ -1,11 +1,11 @@ -# $NetBSD: octave.mk,v 1.1 2005/04/01 10:15:47 adam Exp $ +# $NetBSD: octave.mk,v 1.2 2005/04/01 10:25:16 adam Exp $ .include "../../mk/bsd.prefs.mk" OCTAVE_CONFIG= ${LOCALBASE}/bin/octave-config # OCTAVE_VARS is a list of variables to define in the make environment. -# This may be overridden in an octave add-on package Makefile. +# This may be overridden in an octave add-on package Makefile. OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION # Set OCT_<var> to the value of <var> as returned by octave-config. |