[pkgsrc/trunk]: pkgsrc/math/octave buildlink3 fix

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/358e33830289
branches:  trunk
changeset: 491930:358e33830289
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Apr 01 10:25:16 2005 +0000

description:
buildlink3 fix

diffstat:

 math/octave/buildlink3.mk |  22 ++++++++++------------
 math/octave/octave.mk     |   4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diffs (52 lines):

diff -r fee9bc524eb6 -r 358e33830289 math/octave/buildlink3.mk
--- a/math/octave/buildlink3.mk Fri Apr 01 10:22:40 2005 +0000
+++ b/math/octave/buildlink3.mk Fri Apr 01 10:25:16 2005 +0000
@@ -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 -r fee9bc524eb6 -r 358e33830289 math/octave/octave.mk
--- a/math/octave/octave.mk     Fri Apr 01 10:22:40 2005 +0000
+++ b/math/octave/octave.mk     Fri Apr 01 10:25:16 2005 +0000
@@ -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.