[pkgsrc/trunk]: pkgsrc/biology/gromacs Build with MPI support by default.

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d617b3483bc
branches:  trunk
changeset: 575539:4d617b3483bc
user:      asau <asau%pkgsrc.org@localhost>
date:      Sun May 16 12:04:03 2010 +0000

description:
Build with MPI support by default.
Introduce "mpi" option to turn the above off.
Bump PKGREVISION.

diffstat:

 biology/gromacs/Makefile         |   3 ++-
 biology/gromacs/PLIST            |   8 ++++----
 biology/gromacs/distinfo         |   3 ++-
 biology/gromacs/options.mk       |  15 ++++++++++++---
 biology/gromacs/patches/patch-ad |  15 +++++++++++++++
 5 files changed, 35 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r 4a40249c5bfa -r 4d617b3483bc biology/gromacs/Makefile
--- a/biology/gromacs/Makefile  Sun May 16 11:52:48 2010 +0000
+++ b/biology/gromacs/Makefile  Sun May 16 12:04:03 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/16 12:04:03 asau Exp $
 #
 
 DISTNAME=              gromacs-4.0.7
+PKGREVISION=           1
 CATEGORIES=            biology
 MASTER_SITES=          ftp://ftp.gromacs.org/pub/gromacs/
 
diff -r 4a40249c5bfa -r 4d617b3483bc biology/gromacs/PLIST
--- a/biology/gromacs/PLIST     Sun May 16 11:52:48 2010 +0000
+++ b/biology/gromacs/PLIST     Sun May 16 12:04:03 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/05/16 12:04:03 asau Exp $
 bin/GMXRC
 bin/GMXRC.bash
 bin/GMXRC.csh
@@ -246,9 +246,9 @@
 include/gromacs/xdrf.h
 include/gromacs/xtcio.h
 include/gromacs/xvgr.h
-lib/libgmx_d.la
-lib/libgmxana_d.la
-lib/libmd_d.la
+lib/libgmx${MPI}_d.la
+lib/libgmxana${MPI}_d.la
+lib/libmd${MPI}_d.la
 man/man1/anadock.1
 man/man1/do_dssp.1
 man/man1/editconf.1
diff -r 4a40249c5bfa -r 4d617b3483bc biology/gromacs/distinfo
--- a/biology/gromacs/distinfo  Sun May 16 11:52:48 2010 +0000
+++ b/biology/gromacs/distinfo  Sun May 16 12:04:03 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $
+$NetBSD: distinfo,v 1.2 2010/05/16 12:04:03 asau Exp $
 
 SHA1 (gromacs-4.0.7.tar.gz) = 8519bef2fa989fb487d54612b0a2d0228f228b30
 RMD160 (gromacs-4.0.7.tar.gz) = 4fa8e5c90f549ef627a98a907a166676692a4c4b
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = dcf39e862c2087bca0cd4e577438633bf70fe57f
 SHA1 (patch-ab) = 333fea1f0844f8628795f593de16c941744b11d2
 SHA1 (patch-ac) = 164a7b3e06ab4f4cc1142615c1281eec82adee9b
+SHA1 (patch-ad) = 68b37154ba466e28cad0e539e25253c901421aaa
diff -r 4a40249c5bfa -r 4d617b3483bc biology/gromacs/options.mk
--- a/biology/gromacs/options.mk        Sun May 16 11:52:48 2010 +0000
+++ b/biology/gromacs/options.mk        Sun May 16 12:04:03 2010 +0000
@@ -1,13 +1,22 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/03/15 14:08:49 asau Exp $
+# $NetBSD: options.mk,v 1.2 2010/05/16 12:04:03 asau Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gromacs
-PKG_SUPPORTED_OPTIONS+=                x11
-PKG_SUGGESTED_OPTIONS+=                x11
+PKG_SUPPORTED_OPTIONS+=                mpi x11
+PKG_SUGGESTED_OPTIONS+=                mpi x11
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS=    x11
 
+# MPI support:
+.if !empty(PKG_OPTIONS:Mmpi)
+CONFIGURE_ARGS+=       --enable-mpi
+PLIST_SUBST+=          MPI=_mpi
+.include "../../mk/mpi.buildlink3.mk"
+.else
+PLIST_SUBST+=          MPI=
+.endif
+
 # X support:
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --with-x
diff -r 4a40249c5bfa -r 4d617b3483bc biology/gromacs/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/biology/gromacs/patches/patch-ad  Sun May 16 12:04:03 2010 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/05/16 12:04:03 asau Exp $
+
+Libtool wants tag nowadays.
+
+--- src/gmxlib/nonbonded/nb_kernel_ia32_sse2/Makefile.in.orig  2010-05-15 00:44:35.000000000 +0400
++++ src/gmxlib/nonbonded/nb_kernel_ia32_sse2/Makefile.in       2010-05-15 00:49:20.000000000 +0400
+@@ -86,7 +86,7 @@
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
+ CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+-LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++LTCCASCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+ SOURCES = $(libnb_kernel_ia32_sse2_la_SOURCES)
+ DIST_SOURCES = $(libnb_kernel_ia32_sse2_la_SOURCES)