5 files changed, 13 insertions, 29 deletions

diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index d81dcfd8f55a..e15e3d029f8f 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	avida
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	c-s@c-s.li
 COMMENT=	Avida is an auto-adaptive genetic system designed for ALife research
 
+LICENSE=	GPLv2
+
 USE_CMAKE=	yes
 USE_GCC=	4.2+
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
+MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*
 
@@ -27,7 +27,6 @@ post-extract:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/work/avida ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/work/avida-viewer ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/work/*.cfg ${WRKSRC}/work/*.org ${DATADIR}
 .if !defined(NOPORTDOCS)
diff --git a/biology/avida/distinfo b/biology/avida/distinfo
index 43af8be95154..a7334b7a48fd 100644
--- a/biology/avida/distinfo
+++ b/biology/avida/distinfo
@@ -1,3 +1,3 @@
-MD5 (avida-2.8.1-src.tar.gz) = 99d9405921a23df1813e34c96106cd47
-SHA256 (avida-2.8.1-src.tar.gz) = 554a82081f550e49f795ecda34d6e19a91239e8dc500b6590f46d08839179ef7
-SIZE (avida-2.8.1-src.tar.gz) = 1609168
+MD5 (avida-2.10.0-src.tar.gz) = d8d79afe8d19cc3d1f4c8ebb515dd59b
+SHA256 (avida-2.10.0-src.tar.gz) = 351d87dad2a35eb005b466dc0e7731195b4a824edbbde7818ef633b5803319db
+SIZE (avida-2.10.0-src.tar.gz) = 5657331
diff --git a/biology/avida/files/patch-source-main-cTaskLib.cc b/biology/avida/files/patch-source-main-cTaskLib.cc
deleted file mode 100644
index e250c4a81844..000000000000
--- a/biology/avida/files/patch-source-main-cTaskLib.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/main/cTaskLib.cc.orig	2007-09-05 23:53:07.000000000 +0400
-+++ source/main/cTaskLib.cc	2008-10-13 19:32:10.000000000 +0400
-@@ -41,8 +41,8 @@
- // Various workarounds for Visual Studio shortcomings
- #if AVIDA_PLATFORM(WINDOWS)
- # define llabs(x) _abs64(x)
--# define log2(x) (log(x)/log(2.0))
- #endif
-+# define log2(x) (log(x)/log(2.0))
- 
- static const double dCastPrecision = 100000.0;
- 
diff --git a/biology/avida/pkg-descr b/biology/avida/pkg-descr
index 794bcd14fa07..3c95c2b7c2ea 100644
--- a/biology/avida/pkg-descr
+++ b/biology/avida/pkg-descr
@@ -10,4 +10,4 @@ evolutionary adaptation, general traits of living systems (such as
 self-organization), and other issues pertaining to theoretical or
 evolutionary biology and dynamic systems.
 
-WWW: http://dllab.caltech.edu/avida/
+WWW: http://avida.devosoft.org/
diff --git a/biology/avida/pkg-plist b/biology/avida/pkg-plist
index dd71eb55626a..3fbded9633f8 100644
--- a/biology/avida/pkg-plist
+++ b/biology/avida/pkg-plist
@@ -1,15 +1,12 @@
 bin/avida
-bin/avida-viewer
 %%DATADIR%%/analyze.cfg
 %%DATADIR%%/avida.cfg
-%%DATADIR%%/default-classic.org
-%%DATADIR%%/default-sex-classic.org
-%%DATADIR%%/default-smt.org
+%%DATADIR%%/default-heads-sex.org
+%%DATADIR%%/default-heads.org
 %%DATADIR%%/default-transsmt.org
 %%DATADIR%%/environment.cfg
 %%DATADIR%%/events.cfg
-%%DATADIR%%/instset-classic.cfg
-%%DATADIR%%/instset-sex-classic.cfg
-%%DATADIR%%/instset-smt.cfg
+%%DATADIR%%/instset-heads-sex.cfg
+%%DATADIR%%/instset-heads.cfg
 %%DATADIR%%/instset-transsmt.cfg
 @dirrm %%DATADIR%%