From 5c6be93873f2fbc6d9640637dffd957221aa7558 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Mon, 16 Aug 2004 12:13:32 +0000
Subject: USE_ICC -> WITH_ICC, and mpi support

Passed by:	portlint
---
 science/mpqc-mpich/Makefile | 2 +-
 science/mpqc/Makefile       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'science')

diff --git a/science/mpqc-mpich/Makefile b/science/mpqc-mpich/Makefile
index f701123dfc2d..e803bb92a696 100644
--- a/science/mpqc-mpich/Makefile
+++ b/science/mpqc-mpich/Makefile
@@ -15,6 +15,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich
 
 # MPICH implimentation is not thread safe
 CONFIGURE_ARGS+=	--with-libdirs="-L${LOCALBASE}/lib -L${LOCALBASE}/mpich/lib" \
-		--with-include="-I${LOCALBASE}/mpich/include" \
+		--with-include="-I${LOCALBASE}/mpich/include -I${WRKDIR}" \
 		--enable-always-use-mpi \
 		--enable-threads=no
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index f1ada800a288..b6ef27b9a934 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -18,7 +18,7 @@ DISTFILES+=	mpqc-man-${PORTVERSION}.tar.gz mpqc-html-${PORTVERSION}.tar.gz
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	The massively parallel quantum computing library and program
 
-.if defined(USE_ICC)
+.if defined(WITH_ICC)
 BUILD_DEPENDS+=  ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
 .endif
 
@@ -28,7 +28,7 @@ USE_BISON=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=259
 
-.if defined(USE_ICC)
+.if defined(WITH_ICC)
 CC=		${LOCALBASE}/intel_cc_80/bin/icc
 CXX=		${LOCALBASE}/intel_cc_80/bin/icpc
 CFLAGS=		-O3 -tpp7 -xMKW -Vaxlib
@@ -47,7 +47,7 @@ CONFIGURE_ARGS=	--with-cc=${CC} \
 		--with-cxxoptflags="${CXXFLAGS}" \
 		--with-f77optflags="${FFLAGS}" \
 		--with-include="-I${WRKDIR}"
-.if defined(USE_ICC)
+.if defined(WITH_ICC)
 CONFIGURE_ARGS+=--with-libs="-lsvml"
 .endif
 
-- 
cgit v1.2.3