Date: Fri, 15 Aug 2014 16:37:37 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364996 - in head/biology/mrbayes: . files Message-ID: <201408151637.s7FGbb2h057852@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Aug 15 16:37:37 2014 New Revision: 364996 URL: http://svnweb.freebsd.org/changeset/ports/364996 QAT: https://qat.redports.org/buildarchive/r364996/ Log: Fix build on -current by un-clobbering LDFLAGS. Also, don't mute installation commands. Modified: head/biology/mrbayes/Makefile head/biology/mrbayes/files/patch-Makefile Modified: head/biology/mrbayes/Makefile ============================================================================== --- head/biology/mrbayes/Makefile Fri Aug 15 16:21:28 2014 (r364995) +++ head/biology/mrbayes/Makefile Fri Aug 15 16:37:37 2014 (r364996) @@ -20,10 +20,10 @@ PORTEXAMPLES= adh.nex anolis.nex avian_o 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> Modified: head/biology/mrbayes/files/patch-Makefile ============================================================================== --- head/biology/mrbayes/files/patch-Makefile Fri Aug 15 16:21:28 2014 (r364995) +++ head/biology/mrbayes/files/patch-Makefile Fri Aug 15 16:37:37 2014 (r364996) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408151637.s7FGbb2h057852>