aboutsummaryrefslogtreecommitdiffstats
path: root/biology
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-08-16 00:37:37 +0800
committeradamw <adamw@FreeBSD.org>2014-08-16 00:37:37 +0800
commit697355d35110fe23f3569cef10c87f91d7fbbd58 (patch)
tree8353972556961b81494cd19d30b047fce51850bd /biology
parentcec60e6b0dc8b88e89ae0ad7911b8da2d4ebd4e7 (diff)
downloadfreebsd-ports-graphics-697355d35110fe23f3569cef10c87f91d7fbbd58.tar.gz
freebsd-ports-graphics-697355d35110fe23f3569cef10c87f91d7fbbd58.tar.zst
freebsd-ports-graphics-697355d35110fe23f3569cef10c87f91d7fbbd58.zip
Fix build on -current by un-clobbering LDFLAGS. Also, don't
mute installation commands.
Diffstat (limited to 'biology')
-rw-r--r--biology/mrbayes/Makefile4
-rw-r--r--biology/mrbayes/files/patch-Makefile13
2 files changed, 13 insertions, 4 deletions
diff --git a/biology/mrbayes/Makefile b/biology/mrbayes/Makefile
index ffdc52d736a..51ac13fd745 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 eb99e4b7490..afa3b9c35d8 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