Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Aug 2015 12:18:41 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r393581 - in head/biology/mummer: . files
Message-ID:  <201508051218.t75CIfJL001967@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Aug  5 12:18:41 2015
New Revision: 393581
URL: https://svnweb.freebsd.org/changeset/ports/393581

Log:
  Fix build on mips by properly respecting compiler and flags

Added:
  head/biology/mummer/files/
  head/biology/mummer/files/patch-Makefile   (contents, props changed)
Modified:
  head/biology/mummer/Makefile

Modified: head/biology/mummer/Makefile
==============================================================================
--- head/biology/mummer/Makefile	Wed Aug  5 12:15:57 2015	(r393580)
+++ head/biology/mummer/Makefile	Wed Aug  5 12:18:41 2015	(r393581)
@@ -22,15 +22,6 @@ DOCUMENTS=	COPYRIGHT INSTALL LICENSE REA
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-extract:
-	@${REINPLACE_CMD} -e 's,type perl,type ${LOCALBASE}/bin/perl,' ${WRKSRC}/scripts/Makefile
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
-	@${REINPLACE_CMD} -e 's,type gcc,type clang,' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's,type g++,type clang++,' ${WRKSRC}/Makefile
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin

Added: head/biology/mummer/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/mummer/files/patch-Makefile	Wed Aug  5 12:18:41 2015	(r393581)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2015-08-05 01:03:53 UTC
++++ Makefile
+@@ -35,16 +35,11 @@ SCRIPT_DIR    := $(TOP_DIR)/scripts
+ TIGR_SRC_DIR  := $(TOP_DIR)/src/tigr
+ KURTZ_SRC_DIR := $(TOP_DIR)/src/kurtz
+ 
+-CC   := $(filter /%,$(shell /bin/sh -c 'type gcc'))
+-CXX  := $(filter /%,$(shell /bin/sh -c 'type g++'))
+ SED  := $(filter /%,$(shell /bin/sh -c 'type sed'))
+ CSH  := $(filter /%,$(shell /bin/sh -c 'type csh'))
+-PERL := $(filter /%,$(shell /bin/sh -c 'type perl'))
++PERL := ${LOCALBASE}/bin/perl
+ AR   := $(filter /%,$(shell /bin/sh -c 'type ar'))
+ 
+-CXXFLAGS = -O3
+-CFLAGS = -O3
+-LDFLAGS  =
+ 
+ FLATS = ACKNOWLEDGEMENTS COPYRIGHT INSTALL LICENSE Makefile README ChangeLog
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508051218.t75CIfJL001967>