From 6b02d1b35c173832c085697cf76aa156d04ad843 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 11 Apr 2005 08:04:41 +0000
Subject: Assist getting more ports working on AMD64 by obeying the Ports
 Collection documentation and use 'ARCH' rather than 'MACHINE_ARCH'.

---
 biology/avida/Makefile           | 2 +-
 biology/deft/files/Makefile.deft | 2 +-
 biology/garlic/Makefile          | 2 +-
 biology/libgenome/Makefile       | 2 +-
 biology/migrate/Makefile         | 2 +-
 biology/mopac/Makefile           | 2 +-
 biology/platon/Makefile          | 2 +-
 biology/treepuzzle/Makefile      | 2 +-
 biology/xdrawchem/Makefile       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'biology')

diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index 825a3dc3b317..6985cb872843 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Avida is an auto-adaptive genetic system designed for ALife research
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-standard-prefix --datadir=${DATADIR} --enable-viewer
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 
diff --git a/biology/deft/files/Makefile.deft b/biology/deft/files/Makefile.deft
index 18e8684be2e5..7860a06f654a 100644
--- a/biology/deft/files/Makefile.deft
+++ b/biology/deft/files/Makefile.deft
@@ -4,7 +4,7 @@
 TARGET = DeFT.exec
 FFLAGS += -w -O3
 CFLAGS += -w -O3
-.if ${MACHINE_ARCH} == "i386"
+.if ${ARCH} == "i386"
 FFLAGS += -malign-double
 CFLAGS += -malign-double
 .endif
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index 6c24973fcf6e..89784ea2f707 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -26,7 +26,7 @@ ALL_TARGET=	# empty
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
-.if (${MACHINE_ARCH} == "i386")
+.if (${ARCH} == "i386")
 CFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3
 .endif # i386
 .endif
diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile
index b6f3ffa28cf5..4f5e3125bf6b 100644
--- a/biology/libgenome/Makefile
+++ b/biology/libgenome/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Toolkit for developing bioinformatic related software in C++
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_REINPLACE=	yes
 USE_INC_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile
index a2d2d78e74b2..d012d994a1d2 100644
--- a/biology/migrate/Makefile
+++ b/biology/migrate/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A program to estimate population sizes and migration rates
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
 MAN1=		migrate.1
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index e3131868117a..088e0da8f505 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -35,7 +35,7 @@ MAKE_ARGS+=	FC=ftn77
 MAKE_ARGS+=	FC=f77
 .endif
 MAKE_ARGS+=	FFLAGS="${FFLAGS} -w" CFLAGS="${CFLAGS} -I${PREFIX}/include"
-.if ${MACHINE_ARCH} == "i386"
+.if ${ARCH} == "i386"
 FFLAGS+=	-malign-double
 .endif
 
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index f22e06fd0246..df07f27b4197 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -30,7 +30,7 @@ TESTDATADIR=	ABSORB_EXAMPLE ABSTOMPA_EXAMPLE ABSTOMPA_TEST ADDSYM_EXAMPLE \
 		ASYM_EXAMPLE DELABS_EXAMPLE MULABS_EXAMPLE PSICOR_EXAMPLE \
 		SQUEEZE_EXAMPLE
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${ARCH} == "alpha"
 BROKEN=	"/usr/libexec/elf/ld: platon.o: .got subsegment exceeds 64K (size 88552)"
 .endif
 
diff --git a/biology/treepuzzle/Makefile b/biology/treepuzzle/Makefile
index f114797909b6..98d0a706d9ec 100644
--- a/biology/treepuzzle/Makefile
+++ b/biology/treepuzzle/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	jan.lentfer@web.de
 COMMENT=	Maximum likelihood phylogeny reconstruction using quartets
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	bin/puzzle
 
 pre-configure:
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 0cbd10be3183..4f0b3c460015 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Chemical drawing program
 LIB_DEPENDS=	openbabel.0:${PORTSDIR}/science/openbabel
 
 CFLAGS+=	-O0
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 QTCFGLIBS+=	${PTHREAD_LIBS}
-- 
cgit