svn commit: r349105 - in head/science/mpqc: . files

[Maho Nakata]

Author: maho
Date: Tue Mar 25 06:30:21 2014
New Revision: 349105
URL: http://svnweb.freebsd.org/changeset/ports/349105
QAT: https://qat.redports.org/buildarchive/r349105/

Log:
  support LDFLAGS (fixes libghemical)
  
  PR:		187801
  Submitted by:	tijl@

Modified:
  head/science/mpqc/Makefile
  head/science/mpqc/files/patch-LocalMakefile.in

Modified: head/science/mpqc/Makefile
==============================================================================
--- head/science/mpqc/Makefile	Tue Mar 25 06:26:16 2014	(r349104)
+++ head/science/mpqc/Makefile	Tue Mar 25 06:30:21 2014	(r349105)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	science parallel
 MASTER_SITES=	SF
 
@@ -59,7 +59,8 @@ CXXFLAGS=	-O3 -tpp7 -xMKW -Vaxlib
 CONFIGURE_ARGS+=--with-cc=${CC} \
 		--with-cxx=${CXX} \
 		--with-f77=${FC} \
-		--with-libdirs=-L${LOCALBASE}/lib \
+		--with-include="-I${WRKDIR} -I${LOCALBASE}/include" \
+		--with-libdirs="-L${LOCALBASE}/lib ${LDFLAGS}" \
 		--with-blas="${BLAS}" \
 		--with-lapack="${LAPACK}" \
 		--with-coptflags="${CFLAGS}" \
@@ -71,15 +72,9 @@ CONFIGURE_ARGS+=--with-cc=${CC} \
 CONFIGURE_ARGS+=--with-libs="-lsvml"
 .endif
 .if defined(WITH_MPICH)
-CONFIGURE_ARGS+=--with-libdirs="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"\
-		--enable-always-use-mpi
+CONFIGURE_ARGS+=--enable-always-use-mpi
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 .endif
-.if defined(WITH_MPICH)
-CONFIGURE_ARGS+=--with-include="-I${LOCALBASE}/include -I${WRKDIR} -I${LOCALBASE}/include"
-.else
-CONFIGURE_ARGS+=--with-include="-I${WRKDIR} -I${LOCALBASE}/include"
-.endif
 
 MPQC_COMMAND=	${PREFIX}/bin/mpqc
 

Modified: head/science/mpqc/files/patch-LocalMakefile.in
==============================================================================
--- head/science/mpqc/files/patch-LocalMakefile.in	Tue Mar 25 06:26:16 2014	(r349104)
+++ head/science/mpqc/files/patch-LocalMakefile.in	Tue Mar 25 06:30:21 2014	(r349105)
@@ -5,10 +5,10 @@
    LTLINK = $(LIBTOOL) --mode=link
    ifneq ($(BUILDID),)
 -    LTLINKLIBOPTS = -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION)
-+    LTLINKLIBOPTS = %%EXTRARPATH%% -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION)
++    LTLINKLIBOPTS = $(LDFLAGS) -rpath $(libdir) -release $(BUILDID) -version-info $(SC_SO_VERSION)
    else
 -    LTLINKLIBOPTS = -rpath $(libdir) -version-info $(SC_SO_VERSION)
-+    LTLINKLIBOPTS = %%EXTRARPATH%% -rpath $(libdir) -version-info $(SC_SO_VERSION)
++    LTLINKLIBOPTS = $(LDFLAGS) -rpath $(libdir) -version-info $(SC_SO_VERSION)
    endif
    LTLINKBINOPTS =
    LTCOMP = $(LIBTOOL) --mode=compile