summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-10 22:59:26 +0000
committerjlam <jlam>2006-07-10 22:59:26 +0000
commit7fd04c2d697a38cf4109746e272bd0be03a1e3d5 (patch)
treecb614cea1d624a5581e700c292825cf7d5a200cb /math
parent8314447c092c2e6ff0650ddef13b4934c318e4db (diff)
downloadpkgsrc-7fd04c2d697a38cf4109746e272bd0be03a1e3d5.tar.gz
Completely nuke the concept of PKG_PHASE from pkgsrc except for the
purposes of caching MAKEVARS within bsd.pkg.mk and bsd.makevars.mk.
Diffstat (limited to 'math')
-rw-r--r--math/octave-current/octave.mk16
-rw-r--r--math/octave/octave.mk16
2 files changed, 14 insertions, 18 deletions
diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk
index 449af13f75c..3dc36f38b0d 100644
--- a/math/octave-current/octave.mk
+++ b/math/octave-current/octave.mk
@@ -1,4 +1,4 @@
-# $NetBSD: octave.mk,v 1.5 2006/01/06 22:41:48 adam Exp $
+# $NetBSD: octave.mk,v 1.6 2006/07/10 22:59:26 jlam Exp $
.include "../../mk/bsd.prefs.mk"
@@ -9,12 +9,10 @@ OCTAVE_CONFIG= ${LOCALBASE}/bin/octave-config
OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION
# Set OCT_<var> to the value of <var> as returned by octave-config.
-.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-. if exists(${OCTAVE_CONFIG})
-. for var in ${OCTAVE_VARS}
-. if !defined(OCT_${var})
-OCT_${var}!= ${OCTAVE_CONFIG} -p ${var}
-. endif
-. endfor
-. endif
+.if exists(${OCTAVE_CONFIG})
+. for var in ${OCTAVE_VARS}
+. if !defined(OCT_${var})
+OCT_${var}!= ${OCTAVE_CONFIG} -p ${var}
+. endif
+. endfor
.endif
diff --git a/math/octave/octave.mk b/math/octave/octave.mk
index 8bf35e3874a..7ffcdaaac46 100644
--- a/math/octave/octave.mk
+++ b/math/octave/octave.mk
@@ -1,4 +1,4 @@
-# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:36 rillig Exp $
+# $NetBSD: octave.mk,v 1.5 2006/07/10 22:59:26 jlam Exp $
.include "../../mk/bsd.prefs.mk"
@@ -9,12 +9,10 @@ OCTAVE_CONFIG= ${LOCALBASE}/bin/octave-config
OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION
# Set OCT_<var> to the value of <var> as returned by octave-config.
-.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-. if exists(${OCTAVE_CONFIG})
-. for _var_ in ${OCTAVE_VARS}
-. if !defined(OCT_${_var_})
-OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_}
-. endif
-. endfor
-. endif
+.if exists(${OCTAVE_CONFIG})
+. for _var_ in ${OCTAVE_VARS}
+. if !defined(OCT_${_var_})
+OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_}
+. endif
+. endfor
.endif