diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/R/Makefile | 6 | ||||
-rw-r--r-- | math/calc/Makefile | 4 | ||||
-rw-r--r-- | math/dcdflib.c/Makefile | 4 | ||||
-rw-r--r-- | math/ess/Makefile | 6 | ||||
-rw-r--r-- | math/fftw/Makefile | 4 | ||||
-rw-r--r-- | math/fftw2/Makefile | 4 | ||||
-rw-r--r-- | math/gap/Makefile | 6 | ||||
-rw-r--r-- | math/gap/gap.package.mk | 4 | ||||
-rw-r--r-- | math/gnumeric/Makefile | 4 | ||||
-rw-r--r-- | math/guppi/Makefile | 4 | ||||
-rw-r--r-- | math/octave-current/Makefile | 6 | ||||
-rw-r--r-- | math/octave-current/octave.mk | 15 | ||||
-rw-r--r-- | math/octave-forge/Makefile | 6 | ||||
-rw-r--r-- | math/octave/Makefile | 4 | ||||
-rw-r--r-- | math/octave/octave.mk | 3 | ||||
-rw-r--r-- | math/p5-Math-Pari/Makefile | 4 | ||||
-rw-r--r-- | math/pari/Makefile | 8 | ||||
-rw-r--r-- | math/pspp/Makefile | 4 | ||||
-rw-r--r-- | math/py-Scientific/Makefile | 10 | ||||
-rw-r--r-- | math/py-pytables/Makefile | 4 | ||||
-rw-r--r-- | math/scilab/Makefile | 16 | ||||
-rw-r--r-- | math/scilab/buildlink3.mk | 6 | ||||
-rw-r--r-- | math/snns/Makefile | 4 | ||||
-rw-r--r-- | math/tochnog/Makefile | 4 | ||||
-rw-r--r-- | math/xgap/Makefile | 4 | ||||
-rw-r--r-- | math/xmgr/Makefile | 4 | ||||
-rw-r--r-- | math/yacas/Makefile | 4 |
27 files changed, 75 insertions, 77 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index 5a070b1cc61..5613a6cef0b 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2005/12/01 23:11:26 joerg Exp $ +# $NetBSD: Makefile,v 1.76 2005/12/05 20:50:36 rillig Exp $ DISTNAME= R-2.1.1 PKGREVISION= 1 @@ -49,7 +49,7 @@ CONFIGURE_ENV+= ac_cv_lib_blas_dgemm_=yes CONFIGURE_ENV+= GETWD=${TOOLS_PWD_CMD:Q} CONFIGURE_ENV+= lt_cv_path_LD=${LD:Q} -CONFIGURE_ENV+= lt_cv_path_SED="${TOOLS_SED}" +CONFIGURE_ENV+= lt_cv_path_SED=${TOOLS_SED:Q} # Package assumes it can append to files (specifically DESCRIPTION) that have # been installed SHAREMODE @@ -67,7 +67,7 @@ R_PAPERSIZE?= A4 .if (${R_PAPERSIZE} == "Letterdj") R_PAPERSIZE= Letter .endif -CONFIGURE_ENV+= R_PAPERSIZE="${R_PAPERSIZE}" +CONFIGURE_ENV+= R_PAPERSIZE=${R_PAPERSIZE:Q} # These macros are used during the build, so strip off the -o,-g flags. # diff --git a/math/calc/Makefile b/math/calc/Makefile index fcf2669c4ae..9d5e0e48d75 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/08/28 04:25:30 uebayasi Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:36 rillig Exp $ DISTNAME= calc-2.02f PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Advanced Calculator for GNU Emacs .include "../../mk/emacs.mk" -MAKE_ENV+= EMACS=${EMACS_FLAVOR} +MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q} USE_MAKEINFO= YES INFO_FILES= calc.info diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile index f973e883dd7..90b7ef54765 100644 --- a/math/dcdflib.c/Makefile +++ b/math/dcdflib.c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/08/26 22:22:47 reed Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:36 rillig Exp $ DISTNAME= dcdflib.c-1.1 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Library of C Routines for Cumulative Distribution Functions WRKSRC= ${WRKDIR}/dcdflib.c/src DIST_SUBDIR= ${PKGNAME_NOREV} -MAKE_ENV+= LIBOWN=${LIBOWN} LIBGRP=${LIBGRP} +MAKE_ENV+= LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q} INSTALLATION_DIRS= include share/doc/dcdflib.c diff --git a/math/ess/Makefile b/math/ess/Makefile index f4a07fe0a31..f5f3291bbba 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:36 rillig Exp $ DISTNAME= ess-5.1.24 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -9,7 +9,7 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://software.biostat.washington.edu/statsoft/ess/ COMMENT= Emacs Speaks Statistics -MAKEFLAGS+= EMACS=${EMACS_BIN} +MAKEFLAGS+= EMACS=${EMACS_BIN:Q} USE_MAKEINFO= YES USE_TOOLS+= perl @@ -25,7 +25,7 @@ INFO_FILES= ess.info INSTALLATION_DIRS= ${INFODIR} MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/ess -PLIST_SUBST+= INFODIR=${INFODIR} +PLIST_SUBST+= INFODIR=${INFODIR:Q} do-install: ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ess diff --git a/math/fftw/Makefile b/math/fftw/Makefile index b79acd6383f..f8d16f9ab32 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:36 rillig Exp $ .if (${MACHINE_ARCH} == "powerpc") DISTNAME= fftw-3.0.1-fma @@ -20,7 +20,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= fftw.pc.in GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS+= --enable-shared USE_LANGUAGES= fortran USE_TOOLS+= gmake INFO_FILES= fftw3.info diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile index 28ff7dc9c16..2744eaf17d2 100644 --- a/math/fftw2/Makefile +++ b/math/fftw2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:36 rillig Exp $ DISTNAME= fftw-2.1.5 PKGNAME= fftw2-2.1.5 @@ -14,7 +14,7 @@ COMMENT= Collection of fast C routines to compute DFTs PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS+= --enable-shared .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+= --enable-i386-hacks .endif diff --git a/math/gap/Makefile b/math/gap/Makefile index 78d5afa1b85..4ab0bbfa66e 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/15 18:27:52 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:36 rillig Exp $ # DISTNAME= gap4r3 @@ -23,13 +23,13 @@ LICENSE= no-commercial-use USE_TOOLS+= gtar GNU_CONFIGURE= yes -CONFIGURE_ENV+= PREFIX=${PREFIX} +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} BUILD_TARGET= default GAP_DIRECTORY= ${PREFIX}/lib/gap4.3 GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC} -PLIST_SUBST= GAP_PLATFORM=${GAP_PLATFORM} +PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM:Q} INSTALLATION_DIRS= bin diff --git a/math/gap/gap.package.mk b/math/gap/gap.package.mk index bbdddc7d77e..14a6a9d19e8 100644 --- a/math/gap/gap.package.mk +++ b/math/gap/gap.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: gap.package.mk,v 1.12 2005/10/23 22:27:07 rillig Exp $ +# $NetBSD: gap.package.mk,v 1.13 2005/12/05 20:50:36 rillig Exp $ # # Set GAP_PKG_NAME in your Makefile. More may appear here later. @@ -11,4 +11,4 @@ GAP_PKG_ROOT= ${GAP_DIRECTORY}/pkg GAP_PKG_DIRECTORY= ${GAP_PKG_ROOT}/${GAP_PKG_NAME} GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC} -PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM} +PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM:Q} diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 1c409d06a90..ceeaa91fc0a 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2005/11/25 21:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2005/12/05 20:50:36 rillig Exp $ # DISTNAME= gnumeric-1.4.3 @@ -19,7 +19,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-python -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_VERSIONS_ACCEPTED= 24 23 GCONF2_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \ gnumeric-plugins.schemas diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 3f6dc9a91e0..a5f57141874 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/10/22 13:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:36 rillig Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -16,7 +16,7 @@ COMMENT= Plot program with integrated statistics capabilities # only left here for gnucash # works only with gnumeric-1.0.x (gnome1 based) -CONFIGURE_ARGS= --disable-gnumeric +CONFIGURE_ARGS+= --disable-gnumeric USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 1da62482d6d..9ecce2fa3c4 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/07/09 18:39:30 kristerw Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:36 rillig Exp $ DISTNAME= octave-${OCTAVE_VER} PKGNAME= octave-current-${OCTAVE_VER} @@ -30,7 +30,7 @@ USE_MAKEINFO= yes USE_TOOLS+= gmake perl GNU_CONFIGURE= yes -GCC_REQD= 3.0 +GCC_REQD+= 3.0 USE_LANGUAGES= c c++ fortran # needed for loading of shared objects such as those in the @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-shared .include "options.mk" GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM} -PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR} +PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q} INFO_FILES= octave.info liboctave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \ diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk index 17a148ab85c..2e623babc5f 100644 --- a/math/octave-current/octave.mk +++ b/math/octave-current/octave.mk @@ -1,21 +1,20 @@ -# $NetBSD: octave.mk,v 1.3 2005/04/01 10:15:19 adam Exp $ +# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:37 rillig 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. .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE}) -. if exists(${OCTAVE_CONFIG}) +. if exists(${OCTAVE_CONFIG}) . for _var_ in ${OCTAVE_VARS} . if !defined(OCT_${_var_}) -OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} -. endif +OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} +. endif . endfor -. undef _var_ -. endif -.endif +. endif +.endif diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index cfee039de0a..ea52673ff21 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/08/04 13:12:21 adam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:37 rillig Exp $ DISTNAME= octave-forge-2005.06.13 CATEGORIES= math @@ -19,7 +19,7 @@ BUILD_TARGET= # empty TEST_DIRS= ${WRKSRC} TEST_TARGET= check -GCC_REQD= 3.0 +GCC_REQD+= 3.0 USE_LANGUAGES= c c++ fortran .include "../../math/octave/octave.mk" @@ -27,7 +27,7 @@ USE_LANGUAGES= c c++ fortran PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${LOCALBASE}\///} PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${LOCALBASE}\///} PLIST_SUBST+= OCT_LOCALVERARCHLIBDIR=${OCT_LOCALVERARCHLIBDIR:S/${LOCALBASE}\///} -PLIST_SUBST+= OCT_VERSION=${OCT_VERSION} +PLIST_SUBST+= OCT_VERSION=${OCT_VERSION:Q} MESSAGE_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR} MESSAGE_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR} diff --git a/math/octave/Makefile b/math/octave/Makefile index 91e547d145c..6e4021c9b6a 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2005/11/29 13:11:05 adam Exp $ +# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:36 rillig Exp $ DISTNAME= octave-${OCTAVE_VER} CATEGORIES= math @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --enable-dl .include "options.mk" GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM} -PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR} +PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q} INFO_FILES= octave.info liboctave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \ diff --git a/math/octave/octave.mk b/math/octave/octave.mk index f652010302c..8bf35e3874a 100644 --- a/math/octave/octave.mk +++ b/math/octave/octave.mk @@ -1,4 +1,4 @@ -# $NetBSD: octave.mk,v 1.3 2005/08/04 13:15:13 adam Exp $ +# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:36 rillig Exp $ .include "../../mk/bsd.prefs.mk" @@ -16,6 +16,5 @@ OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} . endif . endfor -. undef _var_ . endif .endif diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile index b69dea29cd4..c28d2cd7efc 100644 --- a/math/p5-Math-Pari/Makefile +++ b/math/p5-Math-Pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/06 06:19:23 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= Math-Pari-2.010501 @@ -15,7 +15,7 @@ COMMENT= Perl5 interface to the pari math library # XXX: to use or not to use... #DEPENDS+= gnuplot-[0-9]*:../../graphics/gnuplot -GCC_REQD= 2.95 +GCC_REQD+= 2.95 MAKE_ENV+= MP_NOGNUPLOT=1 PERL5_PACKLIST= auto/Math/Pari/.packlist #TEST_TARGET= # the tests need looking at diff --git a/math/pari/Makefile b/math/pari/Makefile index e072af8bd9a..e4d28e67eff 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/11/11 18:50:24 tonio Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:37 rillig Exp $ DISTNAME= pari-2.1.6 CATEGORIES= math @@ -20,9 +20,9 @@ CONFIGURE_SCRIPT= ${WRKSRC}/Configure CONFIGURE_ARGS+= --graphic=X11 CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} -CONFIGURE_ENV+= PERL5=${PERL5} -CONFIGURE_ENV+= X11BASE=${X11BASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} +CONFIGURE_ENV+= PERL5=${PERL5:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} TEST_TARGET= test-compat bench diff --git a/math/pspp/Makefile b/math/pspp/Makefile index de1bdf1f412..df96bed3732 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:30 tv Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= pspp-0.3.0 @@ -22,7 +22,7 @@ BUILD_USES_MSGFMT= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes CPPFLAGS+= -Dunix=1 -CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} INFO_FILES= pspp.info diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index 44b7b69b343..37f3b118d48 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:37 rillig Exp $ DISTNAME= ScientificPython-2.4.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} @@ -13,16 +13,16 @@ COMMENT= Python modules for scientific computing CONFLICTS+= py-Scientific-* -BUILDLINK_DEPENDS.python20= python20>=2.0.1nb1 -BUILDLINK_DEPENDS.python21= python21>=2.1.1nb1 +BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb1 +BUILDLINK_DEPENDS.python21+= python21>=2.1.1nb1 PYDISTUTILSPKG= yes PYBINMODULE= yes -MAKE_ENV+= NETCDF_PREFIX=${LOCALBASE} +MAKE_ENV+= NETCDF_PREFIX=${LOCALBASE:Q} EVAL_PREFIX+= NETCDFPREFIX=netcdf MPICHPREFIX=mpich -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/} post-build: diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile index 99bbbea01b2..c30ca7ace60 100644 --- a/math/py-pytables/Makefile +++ b/math/py-pytables/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= pytables-0.9.1 @@ -15,7 +15,7 @@ PYDISTUTILSPKG= yes PYSETUPBUILDARGS= --hdf5=${BUILDLINK_PREFIX.hdf5} PYSETUPINSTALLARGS= --hdf5=${BUILDLINK_PREFIX.hdf5} PYTHON_VERSIONS_ACCEPTED= 24 23 22 -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} post-extract: cd ${WRKSRC}/utils; \ diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 5f2269378ec..998869e1526 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2005/10/26 04:09:37 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.67 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= ${SCIBASE}-src @@ -37,14 +37,14 @@ CONFIGURE_ENV+= TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh CONFIGURE_ENV+= TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh # override HOME to avoid picking up a bad ${HOME}/.scilab during the build -MAKE_ENV+= HOME=${WRKSRC} -MAKE_ENV+= PVM_ROOT=${PVM_ROOT} -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} +MAKE_ENV+= HOME=${WRKSRC:Q} +MAKE_ENV+= PVM_ROOT=${PVM_ROOT:Q} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} PVM_ROOT?= ${LOCALBASE}/pvm3 -CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT} -CONFIGURE_ENV+= X11BASE=${X11BASE} -PLIST_SUBST+= SCIBASE=${SCIBASE} +CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +PLIST_SUBST+= SCIBASE=${SCIBASE:Q} UNWRAP_FILES+= Makemex config/configuration config/Makeso.incl @@ -107,7 +107,7 @@ GCC_REQD+= 2.95.3 # the "SCI=0 && unset SCI" is done because some of the tests really will # fail if SCI is set to anything. -MAKE_ENV+= SCI=${WRKSRC} +MAKE_ENV+= SCI=${WRKSRC:Q} do-test: cd ${WRKSRC}/tests && \ ${MAKE_ENV} ${MAKE_PROGRAM} tests 2>&1 | \ diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk index 7beaa3d01ef..d39dabe85a6 100644 --- a/math/scilab/buildlink3.mk +++ b/math/scilab/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2005/10/26 04:09:37 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/12/05 20:50:37 rillig Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -24,8 +24,8 @@ BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl .include "../../x11/tk/buildlink3.mk" SCI= ${BUILDLINK_DIR}/lib/scilab-3.1.1 -CONFIGURE_ENV+= SCI=${SCI} -MAKE_ENV+= SCI=${SCI} +CONFIGURE_ENV+= SCI=${SCI:Q} +MAKE_ENV+= SCI=${SCI:Q} SCIVERSION= 3.1.1 diff --git a/math/snns/Makefile b/math/snns/Makefile index ffda57bdd2d..82374b9155f 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/17 04:49:47 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:37 rillig Exp $ DISTNAME= SNNSv4.2 PKGNAME= snns-4.2 @@ -10,7 +10,7 @@ HOMEPAGE= http://www-ra.informatik.uni-tuebingen.de/SNNS/ COMMENT= Software simulator for neural networks GNU_CONFIGURE= YES -CONFIGURE_ARGS= --enable-global +CONFIGURE_ARGS+= --enable-global XGUILOADPATH= ${PREFIX}/share/snns diff --git a/math/tochnog/Makefile b/math/tochnog/Makefile index 5eedf534a24..1a828dc1d4f 100644 --- a/math/tochnog/Makefile +++ b/math/tochnog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:20 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:37 rillig Exp $ DISTNAME= tochnog-20010429 CATEGORIES= math @@ -15,7 +15,7 @@ EXTRACT_ONLY= tn.tar.gz MAKEFILE= makefile BUILD_TARGET= netbsd -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} INSTALLATION_DIRS= bin diff --git a/math/xgap/Makefile b/math/xgap/Makefile index 08f40732367..2447f714d17 100644 --- a/math/xgap/Makefile +++ b/math/xgap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:20 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= xgap4r16 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${GAP_PKG_NAME} GNU_CONFIGURE= YES BUILD_TARGET= default -CONFIGURE_ENV+= GAP_DIRECTORY=${GAP_DIRECTORY} +CONFIGURE_ENV+= GAP_DIRECTORY=${GAP_DIRECTORY:Q} GAP_PKG_NAME= xgap diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index c0ca0b539a2..04c468c965e 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:37 rillig Exp $ DISTNAME= xmgr-4.1.2 PKGREVISION= 1 @@ -14,7 +14,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://plasma-gate.weizmann.ac.il/Xmgr/ COMMENT= Powerful XY plotting tool for workstations or X-terminals using X -BUILD_DEPENDS= bison-[0-9]*:../../devel/bison +BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_X11BASE= YES USE_LANGUAGES= fortran diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 5fa2d5b00e0..da3ef64e1ca 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/10/25 17:55:56 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:37 rillig Exp $ # DISTNAME= yacas-1.0.59 @@ -6,7 +6,7 @@ CATEGORIES= math MASTER_SITES= http://yacas.sourceforge.net/backups/ MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://yacas.sourceforge.net +HOMEPAGE= http://yacas.sourceforge.net/ COMMENT= Yet Another Computer Algebra System USE_LANGUAGES= c c++ |