diff options
| author | sbd <sbd@pkgsrc.org> | 2013-04-01 08:00:15 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2013-04-01 08:00:15 +0000 |
| commit | b05d76315670c7a165c881cdafdf67960ddd5394 (patch) | |
| tree | 4b2c17ed137d59beb597ea6d05b0226f34478723 | |
| parent | a021665ac6a6be65462be616573be34febfce124 (diff) | |
| download | pkgsrc-b05d76315670c7a165c881cdafdf67960ddd5394.tar.gz | |
Use host_alias for file paths (as it doesn't contain '-gnu').
| -rw-r--r-- | biology/gromacs/distinfo | 4 | ||||
| -rw-r--r-- | biology/gromacs/patches/patch-aa | 33 |
2 files changed, 29 insertions, 8 deletions
diff --git a/biology/gromacs/distinfo b/biology/gromacs/distinfo index d7ebbece748..fbb165bba54 100644 --- a/biology/gromacs/distinfo +++ b/biology/gromacs/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2012/01/14 00:38:18 asau Exp $ +$NetBSD: distinfo,v 1.10 2013/04/01 08:00:15 sbd Exp $ SHA1 (gromacs-4.5.5.tar.gz) = ce4b4f9a0453dd2ffea72f28ea0bc7bb7a72f479 RMD160 (gromacs-4.5.5.tar.gz) = a3d40c3ac6ec9ee3e4607bd35afca1dd4715154e Size (gromacs-4.5.5.tar.gz) = 10398178 bytes -SHA1 (patch-aa) = 29c6683c71989621f0f41682b1c225f524a2d84f +SHA1 (patch-aa) = 60347ad02438d8e13c88c2267030b5793837a419 SHA1 (patch-ad) = 68b37154ba466e28cad0e539e25253c901421aaa SHA1 (patch-ae) = 59a5e88abeee883483b557cab1681c9a9098870f SHA1 (patch-ag) = 810d58d3ad787c9508f775674541775245402596 diff --git a/biology/gromacs/patches/patch-aa b/biology/gromacs/patches/patch-aa index 37e72b12be1..bf40b667fb1 100644 --- a/biology/gromacs/patches/patch-aa +++ b/biology/gromacs/patches/patch-aa @@ -1,12 +1,30 @@ -$NetBSD: patch-aa,v 1.2 2010/09/03 20:52:39 asau Exp $ +$NetBSD: patch-aa,v 1.3 2013/04/01 08:00:16 sbd Exp $ Allow flags to contain commas. ---- share/template/Makefile.in.orig 2010-08-10 22:56:17.000000000 +0400 -+++ share/template/Makefile.in 2010-08-11 00:14:07.000000000 +0400 -@@ -569,9 +569,9 @@ +--- share/template/Makefile.in.orig 2011-09-21 12:38:30.000000000 +0000 ++++ share/template/Makefile.in +@@ -250,11 +250,11 @@ XLIBS = -lmd@LIBSUFFIX@ -lgmx@LIBSUFFIX@ + XCC = @CC@ + @GMX_DOUBLE_FALSE@MYCFLAGS = @CFLAGS@ @INCLUDES@ -I@includedir@ + @GMX_DOUBLE_TRUE@MYCFLAGS = @CFLAGS@ @INCLUDES@ -I@includedir@ -DGMX_DOUBLE +-@GMX_DOUBLE_FALSE@template_DATA = template.c README Makefile.@host@ Makefile.pkg +-@GMX_DOUBLE_TRUE@template_DATA = template.c README Makefile.@host@_double Makefile.pkg ++@GMX_DOUBLE_FALSE@template_DATA = template.c README Makefile.@host_alias@ Makefile.pkg ++@GMX_DOUBLE_TRUE@template_DATA = template.c README Makefile.@host_alias@_double Makefile.pkg + EXTRA_DIST = template.c README Template.mak Makefile.pkg CMakeLists.txt.template + BUILT_SOURCES = gromacs +-CLEANFILES = Makefile.@host@ Makefile.@host@_double *~ \\\#* ++CLEANFILES = Makefile.@host_alias@ Makefile.@host_alias@_double *~ \\\#* + template_SOURCES = template.c + LDADD = ../../src/mdlib/libmd@LIBSUFFIX@.la ../../src/gmxlib/libgmx@LIBSUFFIX@.la + all: $(BUILT_SOURCES) +@@ -569,13 +569,13 @@ uninstall-am: uninstall-templateDATA + gromacs: + $(LN_S) $(top_srcdir)/include gromacs - Makefile.@host@ Makefile.@host@_double: Template.mak Makefile +-Makefile.@host@ Makefile.@host@_double: Template.mak Makefile ++Makefile.@host_alias@ Makefile.@host_alias@_double: Template.mak Makefile cat $(srcdir)/Template.mak | \ - sed 's,@LDFLAGS\@,$(XLDFLAGS),' | \ - sed 's,@LIBS\@,$(XLIBS),' | \ @@ -15,5 +33,8 @@ Allow flags to contain commas. + sed 's|@LIBS\@|$(XLIBS)|' | \ + sed 's|@CFLAGS\@|$(MYCFLAGS)|' | \ sed 's,@CC\@,$(XCC),' | \ - sed 's,@host\@,@host@,' >$@ +- sed 's,@host\@,@host@,' >$@ ++ sed 's,@host\@,@host_alias@,' >$@ #template.$(OBJEXT): gromacs + + clean-local: |