diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2003-07-27 07:31:27 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2003-07-27 07:31:27 +0000 |
| commit | f7e89e5ee1ed480960215c3749fd1727e4eda67d (patch) | |
| tree | bfa4ef6da6429a09bd50c9864e488df752bdf3b5 /science | |
| parent | - link with libcipher (diff) | |
Unbreak by clean-ups.
For unbreak:
a) location of .include "${.CURDIR}/../mpqc/Makefile"
is just after the BUILD_DEPENDS to avoid override.
For clean-ups:
1) ${F77}->${FC}
2) Use ${LOCALBASE} for CONFIGURE_ARGS for mpqc-mpich
3) ${MASTERDIR}/files -> ${FILESDIR}
4) remove LIB_DEPENDS for mpqc-mpich (redundant)
Reported by: bento's log
Reviewed by: okazaki and sf
Diffstat (limited to 'science')
| -rw-r--r-- | science/mpqc-mpich/Makefile | 10 | ||||
| -rw-r--r-- | science/mpqc/Makefile | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/science/mpqc-mpich/Makefile b/science/mpqc-mpich/Makefile index 68694e6ab390..2e5315a3c9d8 100644 --- a/science/mpqc-mpich/Makefile +++ b/science/mpqc-mpich/Makefile @@ -7,16 +7,14 @@ MASTERDIR= ${.CURDIR}/../mpqc/ -.include "${.CURDIR}/../mpqc/Makefile" - PKGNAMESUFFIX= -mpich -LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack \ - atlas:${PORTSDIR}/math/atlas BUILD_DEPENDS= ${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich +.include "${.CURDIR}/../mpqc/Makefile" + # MPICH implimentation is not thread safe -CONFIGURE_ARGS+= --with-libdirs="-L${PREFIX}/lib -L${PREFIX}/mpich/lib" \ - --with-include="-I${PREFIX}/mpich/include" \ +CONFIGURE_ARGS+= --with-libdirs="-L${LOCALBASE}/lib -L${LOCALBASE}/mpich/lib" \ + --with-include="-I${LOCALBASE}/mpich/include" \ --enable-always-use-mpi \ --enable-threads=no diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile index 05c960ce2a4e..4806cd2f3dce 100644 --- a/science/mpqc/Makefile +++ b/science/mpqc/Makefile @@ -20,13 +20,11 @@ COMMENT= The massively parallel quantum computing library and program LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack \ atlas:${PORTSDIR}/math/atlas -.include <bsd.port.pre.mk> - USE_BISON= yes USE_AUTOCONF= yes CONFIGURE_ARGS= --with-cc=${CC} \ --with-cxx=${CXX} \ - --with-f77=${F77} \ + --with-f77=${FC} \ --with-libdirs=-L${LOCALBASE}/lib \ --with-blas="-lf77blas -latlas" \ --with-lapack="-lalapack -lcblas" \ @@ -39,7 +37,8 @@ ALL_TARGET= # empty PLIST_SUB+= VERSION=${PORTVERSION} MPQC_COMMAND= ${PREFIX}/bin/mpqc -.include "${MASTERDIR}/files/manpages" +.include <bsd.port.pre.mk> +.include "${FILESDIR}/manpages" .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double @@ -59,7 +58,7 @@ do-install: @cd ${WRKDIR}/${PORTNAME}-man-${PORTVERSION}/man3/ ; ${TAR} -chf - . | \ ${TAR} -xf - -C ${PREFIX}/man/man3/ @${MKDIR} ${PREFIX}/share/mpqc/ref - @cd ${WRKDIR}/ref/ && ${TAR} -chf - . | \ + @cd ${WRKDIR}/ref/ ; ${TAR} -chf - . | \ ${TAR} -xf - -C ${PREFIX}/share/mpqc/ref post-install: |