From owner-svn-ports-all@freebsd.org Thu Jun 9 01:39:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA7A1B6E5FD; Thu, 9 Jun 2016 01:39:59 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C76291774; Thu, 9 Jun 2016 01:39:59 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u591dxM0013712; Thu, 9 Jun 2016 01:39:59 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u591dwSj013709; Thu, 9 Jun 2016 01:39:58 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201606090139.u591dwSj013709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Thu, 9 Jun 2016 01:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416575 - in head/biology/diamond: . 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2016 01:40:00 -0000 Author: matthew Date: Thu Jun 9 01:39:58 2016 New Revision: 416575 URL: https://svnweb.freebsd.org/changeset/ports/416575 Log: Update to 0.8.5 PR: 209611 Submitted by: jrm@ftfl.ca (maintainer) Modified: head/biology/diamond/Makefile head/biology/diamond/distinfo head/biology/diamond/files/patch-CMakeLists.txt Modified: head/biology/diamond/Makefile ============================================================================== --- head/biology/diamond/Makefile Thu Jun 9 00:30:54 2016 (r416574) +++ head/biology/diamond/Makefile Thu Jun 9 01:39:58 2016 (r416575) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= diamond -PORTVERSION= 0.7.12 +PORTVERSION= 0.8.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= biology MAINTAINER= jrm@ftfl.ca @@ -12,11 +11,9 @@ COMMENT= BLAST-compatible local sequenc LICENSE= BSD2CLAUSE -LIB_DEPENDS= libboost_system.so:devel/boost-libs - ONLY_FOR_ARCHS= amd64 -USES= cmake:outsource +USES= cmake:outsource compiler:c++11-lang CFLAGS+= -DNDEBUG @@ -25,4 +22,8 @@ GH_ACCOUNT= bbuchfink PLIST_FILES= bin/diamond +.if ! defined(PACKAGE_BUILDING) +CXXFLAGS+=-march=native +.endif + .include Modified: head/biology/diamond/distinfo ============================================================================== --- head/biology/diamond/distinfo Thu Jun 9 00:30:54 2016 (r416574) +++ head/biology/diamond/distinfo Thu Jun 9 01:39:58 2016 (r416575) @@ -1,2 +1,3 @@ -SHA256 (bbuchfink-diamond-v0.7.12_GH0.tar.gz) = 16f8f618e4e5e81071ef8b66dc39685a1e969434ddeff3d88fa01091971b662f -SIZE (bbuchfink-diamond-v0.7.12_GH0.tar.gz) = 1826614 +TIMESTAMP = 1464949238 +SHA256 (bbuchfink-diamond-v0.8.5_GH0.tar.gz) = 8ba092647af7c980ddd83acc6686acd2ba18744774c669027859dbaec644fda3 +SIZE (bbuchfink-diamond-v0.8.5_GH0.tar.gz) = 203133 Modified: head/biology/diamond/files/patch-CMakeLists.txt ============================================================================== --- head/biology/diamond/files/patch-CMakeLists.txt Thu Jun 9 00:30:54 2016 (r416574) +++ head/biology/diamond/files/patch-CMakeLists.txt Thu Jun 9 01:39:58 2016 (r416575) @@ -1,33 +1,15 @@ ---- CMakeLists.txt.orig 2016-03-29 09:23:52 UTC +--- CMakeLists.txt.orig 2016-05-29 16:12:02 UTC +++ CMakeLists.txt -@@ -9,6 +9,7 @@ if(BUILD_STATIC) +@@ -9,12 +9,6 @@ if(BUILD_STATIC) set(CMAKE_EXE_LINKER_FLAGS "-static") endif() -+FIND_PACKAGE(Threads REQUIRED) - find_package(Boost - 1.53.0 REQUIRED - COMPONENTS program_options timer iostreams thread -@@ -16,9 +17,6 @@ find_package(Boost - - find_package(ZLIB REQUIRED) - --set(CMAKE_BUILD_TYPE Release) --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-uninitialized") +-include(CheckCXXCompilerFlag) +-CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCHNATIVE) +-if(COMPILER_SUPPORTS_MARCHNATIVE) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +-endif() - - add_subdirectory("src/algo/blast/core") - include_directories( - "${CMAKE_SOURCE_DIR}/src" -@@ -29,6 +27,11 @@ add_executable(diamond src/main.cpp - src/basic/options.cpp - src/util/tinythread.cpp) - --target_link_libraries(diamond blast_core ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) -+target_link_libraries(diamond blast_core ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARY}) + find_package(ZLIB REQUIRED) + find_package(Threads REQUIRED) - install(TARGETS diamond DESTINATION bin) -+ -+get_cmake_property(_variableNames VARIABLES) -+foreach (_variableName ${_variableNames}) -+ message(STATUS "${_variableName}=${${_variableName}}") -+endforeach()