summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2005-04-11 08:04:41 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2005-04-11 08:04:41 +0000
commitf2fc2d60ae226a1b8d5411fb4aab91ea92be6f91 (patch)
treee9a77f53d4fe679665594e718ad34b49668507cc /math
parent- Fix non-root installation (diff)
Assist getting more ports working on AMD64 by obeying the
Ports Collection documentation and use 'ARCH' rather than 'MACHINE_ARCH'.
Notes
Notes: svn path=/head/; revision=132992
Diffstat (limited to 'math')
-rw-r--r--math/PDL/Makefile2
-rw-r--r--math/atlas-devel/Makefile4
-rw-r--r--math/atlas/Makefile4
-rw-r--r--math/blitz++/Makefile2
-rw-r--r--math/ccmath/Makefile2
-rw-r--r--math/dislin/Makefile8
-rw-r--r--math/fftw/Makefile2
-rw-r--r--math/freefem++/Makefile2
-rw-r--r--math/freemat/Makefile2
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/gsl/Makefile2
-rw-r--r--math/linux-dislin/Makefile8
-rw-r--r--math/netcdf/Makefile2
-rw-r--r--math/orpie/Makefile2
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/sdpa/Makefile2
-rw-r--r--math/tvmet/Makefile2
-rw-r--r--math/yacas/Makefile2
18 files changed, 26 insertions, 26 deletions
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 66499691ab2e..48c1678ca98e 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -52,7 +52,7 @@ pre-extract:
.include <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} == "alpha"
+.if ${ARCH} == "alpha"
BROKEN= test script t/flexraw.t fails all 26 tests
.endif
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index 0af4bb2dbaf9..ec3d1f20848f 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -43,11 +43,11 @@ post-patch:
@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \
-e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \
${WRKSRC}/config.c
-.if (${MACHINE_ARCH} == "alpha")
+.if (${ARCH} == "alpha")
@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch)
.endif
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${ARCH} == "sparc64"
PICFLAG?= -fPIC
.else
PICFLAG?= -fpic
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 2d15ddfb9914..fd1303f720f7 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -42,11 +42,11 @@ post-patch:
@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \
-e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \
${WRKSRC}/config.c
-.if (${MACHINE_ARCH} == "alpha")
+.if (${ARCH} == "alpha")
@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch)
.endif
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${ARCH} == "sparc64"
PICFLAG?= -fPIC
.else
PICFLAG?= -fpic
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index bfaa60a3a669..9ef1efe9e537 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -26,7 +26,7 @@ MAKE_ARGS= NOPORTDOCS=yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen
MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index b92b4717c757..1722490d7f5f 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -17,7 +17,7 @@ COMMENT= A mathematics library with many different functions
INSTALLS_SHLIB= yes
post-configure:
-.if (${MACHINE_ARCH} != "i386")
+.if (${ARCH} != "i386")
(cd ${WRKSRC} && ${SH} non_intel.sh)
.endif
diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index cc31541939b3..dd17d2107dd2 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -9,10 +9,10 @@ PORTNAME= dislin
PORTVERSION= 8.2
PORTREVISION= 1
CATEGORIES= math linux
-MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/
+MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${ARCH}/
PKGNAMEPREFIX= linux-
EXTRACT_SUFX= .linux.tar.gz
-DIST_SUBDIR= ${MACHINE_ARCH}
+DIST_SUBDIR= ${ARCH}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific data plotting package
@@ -26,8 +26,8 @@ NO_BUILD= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${DISLIN_DIR}/lib
-MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH}
-PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${ARCH}
PKGMESSAGE= ${WRKDIR}/pkg-message
DISLIN_DIR= ${PREFIX}/dislin
PROGRAMS= clink disaps disdrv disdrv_nw disdrv_w disgif dishlp dishpj \
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 09669bee10c1..576543679e7e 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -25,7 +25,7 @@ FFTW_SUFIX=
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --enable-shared
INSTALLS_SHLIB= yes
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 850e54081253..f09ad478bba7 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -33,7 +33,7 @@ USE_GCC= 3.4
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-download \
--with-blas="${LIBBLAS}" \
--with-amd="-lamd" \
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 1ec306227dd1..d646d58ad34b 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack \
USE_GL= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-blas="${lib_blas}"
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${THRDFLG}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${THRDLIB}"
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 3028f31bc7b0..a6e6f46fc38f 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -17,7 +17,7 @@ COMMENT= A command-driven interactive function plotting program
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-tutorial \
--without-linux-vga \
--with-lasergnu
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 7065e7f02dd9..ea312f9fdcb5 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -21,7 +21,7 @@ COMMENT= The GNU Scientific Library - mathematical libs
INSTALLS_SHLIB= yes
USE_INC_LIBTOOL_VER=13
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split'
MAN1= gsl-config.1 gsl-randist.1 gsl-histogram.1
diff --git a/math/linux-dislin/Makefile b/math/linux-dislin/Makefile
index cc31541939b3..dd17d2107dd2 100644
--- a/math/linux-dislin/Makefile
+++ b/math/linux-dislin/Makefile
@@ -9,10 +9,10 @@ PORTNAME= dislin
PORTVERSION= 8.2
PORTREVISION= 1
CATEGORIES= math linux
-MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/
+MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${ARCH}/
PKGNAMEPREFIX= linux-
EXTRACT_SUFX= .linux.tar.gz
-DIST_SUBDIR= ${MACHINE_ARCH}
+DIST_SUBDIR= ${ARCH}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific data plotting package
@@ -26,8 +26,8 @@ NO_BUILD= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${DISLIN_DIR}/lib
-MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH}
-PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${ARCH}
PKGMESSAGE= ${WRKDIR}/pkg-message
DISLIN_DIR= ${PREFIX}/dislin
PROGRAMS= clink disaps disdrv disdrv_nw disdrv_w disgif dishlp dishpj \
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
index b907ef08a76a..3631bcf086b0 100644
--- a/math/netcdf/Makefile
+++ b/math/netcdf/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
CONFLICTS= hdf-4.*
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran"
INSTALLS_SHLIB= yes
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index 60c509cc5e80..ec37373121f8 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gsl.6:${PORTSDIR}/math/gsl
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 437a380a465d..5f54cfa607a7 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
USE_LIBLTDL= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GDINCDIR="${LOCALBASE}/include" \
diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile
index b827ea8fae09..1452fb9c9440 100644
--- a/math/sdpa/Makefile
+++ b/math/sdpa/Makefile
@@ -46,7 +46,7 @@ CBLAS= -lcblas -lf77blas -latlas -lg2c
.if defined(WITH_OPTIMIZED_FLAGS)
CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
-.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" )
+.if (${ARCH} == "i386" && !${ARCH} == "amd64" )
CFLAGS+= -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
CXXFLAGS+= -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
.endif # i386
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 2bfe065c1a8e..6f43cb5af9a7 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -17,7 +17,7 @@ COMMENT= Tiny Vector and Matrix template library
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
MAN1= tvmet-config.1
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 9e494e5d5c19..885e5cab35d7 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gsl.6:${PORTSDIR}/math/gsl
USE_PERL5_BUILD= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes