From owner-svn-ports-head@FreeBSD.ORG Fri Aug 15 16:37:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8206744D; Fri, 15 Aug 2014 16:37:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5370B27BF; Fri, 15 Aug 2014 16:37:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7FGbc2R057855; Fri, 15 Aug 2014 16:37:38 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FGbb2h057852; Fri, 15 Aug 2014 16:37:37 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201408151637.s7FGbb2h057852@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 15 Aug 2014 16:37:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364996 - in head/biology/mrbayes: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2014 16:37:38 -0000 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 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