Date: Fri, 20 Dec 2013 14:53:26 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337021 - in branches/2014Q1/biology/grappa: . files Message-ID: <201312201453.rBKErQDF097749@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Dec 20 14:53:26 2013 New Revision: 337021 URL: http://svnweb.freebsd.org/changeset/ports/337021 Log: MFH: r337010 - Respect CC/CFLAGS PR: ports/184857 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: portmgr (implicit) Modified: branches/2014Q1/biology/grappa/Makefile (contents, props changed) branches/2014Q1/biology/grappa/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/biology/grappa/Makefile ============================================================================== --- branches/2014Q1/biology/grappa/Makefile Fri Dec 20 14:51:30 2013 (r337020) +++ branches/2014Q1/biology/grappa/Makefile Fri Dec 20 14:53:26 2013 (r337021) @@ -10,14 +10,13 @@ DISTNAME= GRAPPA20 MAINTAINER= ports@FreeBSD.org COMMENT= Genome Rearrangements Analysis and Phylogeny Software -USES= gmake -MAKE_ARGS= CC="${CC}" +USES= gmake PLIST_FILES= bin/grappa bin/invdist bin/distmat do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/grappa ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/invdist - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/distmat + (cd ${WRKSRC} && ${INSTALL_PROGRAM} grappa ${STAGEDIR}${PREFIX}/bin) + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/invdist + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/distmat .include <bsd.port.mk> Modified: branches/2014Q1/biology/grappa/files/patch-Makefile ============================================================================== --- branches/2014Q1/biology/grappa/files/patch-Makefile Fri Dec 20 14:51:30 2013 (r337020) +++ branches/2014Q1/biology/grappa/files/patch-Makefile Fri Dec 20 14:53:26 2013 (r337021) @@ -1,6 +1,42 @@ --- Makefile.orig 2004-09-22 09:09:18.000000000 -0500 +++ Makefile 2011-03-26 13:49:31.000000000 -0500 -@@ -156,8 +156,2 @@ +@@ -47,7 +47,7 @@ + endif + + # GNU C +-CC = gcc ++CC ?= gcc + + # Microsoft C + # CC = cl +@@ -62,13 +62,13 @@ + #CC = tmcc -DMPBPA + + # Default CFLAGS +-CFLAGS := -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT ++CFLAGS += -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT + + # TESTING option for CFLAGS + # CFLAGS := -DTESTING $(CFLAGS) + + ifeq ($(strip $(CC)), gcc) +-CFLAGS := -O3 -Wall -DGCC $(CFLAGS) ++CFLAGS := -Wall -DGCC $(CFLAGS) + endif + ifeq ($(strip $(CC)), pgcc) + CFLAGS := -fast $(CFLAGS) +@@ -115,7 +115,7 @@ + RELBASE = GRAPPA + RELNAME = $(RELBASE)-$(VERS_MAJ).$(VERS_MIN) + +-LIBS := -lm -lc -lpthread ++LIBS := -lm -pthread + # added this part to the end of above "-l mpi" + ifeq ($(OS), SunOS) + LIBS := -liberty -lsocket -lposix4 -lnsl ${LIBS} +@@ -154,12 +154,6 @@ + $(RM) -fr $(RELNAME) + $(LS) -l $(RELNAME).tar.gz -$(RELNAME)/%.c : %.c - -$(CP) $< $(RELNAME)/. @@ -9,3 +45,5 @@ - -$(CP) $< $(RELNAME)/. - clean: + -rm -f *.${OBJ_SUFFIX} *~ ${EXEC} ${EXEC}.${EXE_SUFFIX} ${SYM} \ + core gmon.out
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201453.rBKErQDF097749>