svn commit: r504788 - in head/biology/abyss: . files

[Piotr Kubaj]

Author: pkubaj
Date: Fri Jun 21 11:43:09 2019
New Revision: 504788
URL: https://svnweb.freebsd.org/changeset/ports/504788

Log:
  biology/abyss: fix build on big-endian architectures
  
  Use new GCC from ports on GCC architectures.
  
  Merge 25eb9d2a914fb211fdfe04fcda5593f29fd23ff5, fixes build on GCC architectures.
  
  Also include sys/endian.h and use bswap32 and bswap64 for byte-swapping (PR at https://github.com/bcgsc/abyss/pull/287 ).
  
  PR:		238737
  Approved by:	yuri (maintainer), mat (mentor)
  Differential Revision:	https://reviews.freebsd.org/D20717

Added:
  head/biology/abyss/files/patch-Common_city.cc   (contents, props changed)
Modified:
  head/biology/abyss/Makefile
  head/biology/abyss/distinfo

Modified: head/biology/abyss/Makefile
==============================================================================
--- head/biology/abyss/Makefile	Fri Jun 21 11:30:18 2019	(r504787)
+++ head/biology/abyss/Makefile	Fri Jun 21 11:43:09 2019	(r504788)
@@ -6,6 +6,9 @@ PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://www.bcgsc.ca/platform/bioinfo/software/${PORTNAME}/releases/${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/bcgsc/${PORTNAME}/commit/
+PATCHFILES=	25eb9d2a914fb211fdfe04fcda5593f29fd23ff5.patch:-p1
+
 MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Assembly By Short Sequences: parallel, paired-end sequence assembler
 
@@ -21,7 +24,7 @@ LIB_DEPENDS=	libffi.so:devel/libffi \
 RUN_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
-USES=		gmake iconv:wchar_t localbase:ldflags shebangfix sqlite
+USES=		compiler:c++11-lang gmake iconv:wchar_t localbase:ldflags shebangfix sqlite
 SHEBANG_FILES=	bin/${PORTNAME}-*
 SHEBANG_LANG=	make
 make_OLD_CMD=	/usr/bin/make

Modified: head/biology/abyss/distinfo
==============================================================================
--- head/biology/abyss/distinfo	Fri Jun 21 11:30:18 2019	(r504787)
+++ head/biology/abyss/distinfo	Fri Jun 21 11:43:09 2019	(r504788)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1551061546
+TIMESTAMP = 1561103807
 SHA256 (abyss-2.1.5.tar.gz) = 65bfc8241e6ff5adf7601ae4ae93a75e3db86d6bff5d593c75aaff7f0ef41757
 SIZE (abyss-2.1.5.tar.gz) = 1201318
+SHA256 (25eb9d2a914fb211fdfe04fcda5593f29fd23ff5.patch) = 93ad66c42610c4fba8cfbe256a2ab689bf4a76974c3b97a9e1094863614ad934
+SIZE (25eb9d2a914fb211fdfe04fcda5593f29fd23ff5.patch) = 1701

Added: head/biology/abyss/files/patch-Common_city.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/abyss/files/patch-Common_city.cc	Fri Jun 21 11:43:09 2019	(r504788)
@@ -0,0 +1,13 @@
+--- Common/city.cc.orig	2018-09-21 23:44:14 UTC
++++ Common/city.cc
+@@ -65,6 +65,10 @@ static uint32 UNALIGNED_LOAD32(const char *p) {
+ #define bswap_32(x) OSSwapInt32(x)
+ #define bswap_64(x) OSSwapInt64(x)
+ 
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define bswap_32(x) bswap32(x)
++#define bswap_64(x) bswap64(x)
+ #else
+ #include <byteswap.h>
+ #endif