diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2014-08-15 16:37:37 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-08-15 16:37:37 +0000 |
| commit | 00b0c72489152ddd8766b48e2e82efbbc841c96a (patch) | |
| tree | 8353972556961b81494cd19d30b047fce51850bd /biology | |
| parent | - Switch to USES=libtool, drop .la files (diff) | |
Fix build on -current by un-clobbering LDFLAGS. Also, don't
mute installation commands.
Notes
Notes:
svn path=/head/; revision=364996
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/mrbayes/Makefile | 4 | ||||
| -rw-r--r-- | biology/mrbayes/files/patch-Makefile | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/biology/mrbayes/Makefile b/biology/mrbayes/Makefile index ffdc52d736ad..51ac13fd745f 100644 --- a/biology/mrbayes/Makefile +++ b/biology/mrbayes/Makefile @@ -20,10 +20,10 @@ PORTEXAMPLES= adh.nex anolis.nex avian_ovomucoids.nex bglobin.nex \ cynmix.nex kim.nex primates.nex replicase.nex do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mb ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/mb ${STAGEDIR}${PREFIX}/bin/ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for file in ${PORTEXAMPLES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} .endfor .include <bsd.port.mk> diff --git a/biology/mrbayes/files/patch-Makefile b/biology/mrbayes/files/patch-Makefile index eb99e4b74905..afa3b9c35d87 100644 --- a/biology/mrbayes/files/patch-Makefile +++ b/biology/mrbayes/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2005-12-23 01:13:06.000000000 +0900 -+++ Makefile 2007-12-11 11:35:36.000000000 +0900 +--- Makefile.orig 2005-12-22 11:13:06.000000000 -0500 ++++ Makefile 2014-08-15 12:36:02.000000000 -0400 @@ -19,7 +19,7 @@ # set compiler for the non-MPI version (mpicc will be used for the MPI @@ -9,3 +9,12 @@ # set to yes if you want to use the readline library (make sure you have it # installed on your machine) +@@ -67,7 +67,7 @@ + + LIBS += -lm + +-LDFLAGS = $(CFLAGS) ++LDFLAGS += $(CFLAGS) + LDLIBS = $(LIBS) + + OBJECTS = bayes.o command.o mbmath.o mcmc.o model.o plot.o sump.o sumt.o |