Update to 3.3.0.

7 files changed, 35 insertions, 25 deletions

diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 30a35bd4b31b..264912172365 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yara
-PORTVERSION=	2.1.0
+PORTVERSION=	3.3.0
 CATEGORIES=	security
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,8 +10,8 @@ COMMENT=	Python bindings for yara
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	plusvic
-GH_TAGNAME=	v2.1.0
-GH_COMMIT=	6530e73
+GH_TAGNAME=	v3.3.0
+GH_COMMIT=	85e913e
 
 LIB_DEPENDS=	libyara.so:${PORTSDIR}/security/yara
 
diff --git a/security/py-yara/distinfo b/security/py-yara/distinfo
index 7ca775c91550..91fabbda9fac 100644
--- a/security/py-yara/distinfo
+++ b/security/py-yara/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yara-2.1.0.tar.gz) = 5172e17864dacc1f166504ea5c569b19a4594f11ab4ae323e00e981a13be902e
-SIZE (yara-2.1.0.tar.gz) = 590302
+SHA256 (yara-3.3.0.tar.gz) = c2cd05deeedd36489f1d464e8cb86e0de261483cd2fcb5278bada7cdc0e4238f
+SIZE (yara-3.3.0.tar.gz) = 7634925
diff --git a/security/py-yara/files/patch-yara-python__setup.py b/security/py-yara/files/patch-yara-python__setup.py
deleted file mode 100644
index 9eccfd8a403b..000000000000
--- a/security/py-yara/files/patch-yara-python__setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./yara-python/setup.py.orig	2013-12-29 00:44:57.000000000 -0500
-+++ ./yara-python/setup.py	2013-12-29 00:48:55.000000000 -0500
-@@ -9,4 +9,5 @@
-         sources=['yara-python.c'],
-         libraries=['yara'],
-         include_dirs=['../windows/include', '../libyara'],
-+        library_dirs=['%%LOCALBASE%%/lib'],
-     )])
diff --git a/security/yara/Makefile b/security/yara/Makefile
index e355898baf27..77e667fdef4c 100644
--- a/security/yara/Makefile
+++ b/security/yara/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yara
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	3.3.0
 CATEGORIES=	security
 
 MAINTAINER=	wxs@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT=	Malware identification and classification tool
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	plusvic
-GH_TAGNAME=	v2.1.0
-GH_COMMIT=	6530e73
+GH_TAGNAME=	v3.3.0
+GH_COMMIT=	85e913e
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -19,6 +18,5 @@ USES=		libtool
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 AUTOMAKE_ARGS=	-a -c -f
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/security/yara/distinfo b/security/yara/distinfo
index 7ca775c91550..91fabbda9fac 100644
--- a/security/yara/distinfo
+++ b/security/yara/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yara-2.1.0.tar.gz) = 5172e17864dacc1f166504ea5c569b19a4594f11ab4ae323e00e981a13be902e
-SIZE (yara-2.1.0.tar.gz) = 590302
+SHA256 (yara-3.3.0.tar.gz) = c2cd05deeedd36489f1d464e8cb86e0de261483cd2fcb5278bada7cdc0e4238f
+SIZE (yara-3.3.0.tar.gz) = 7634925
diff --git a/security/yara/files/patch-libyara__proc.c b/security/yara/files/patch-libyara__proc.c
index de2b805f9792..f6cc96af2dc1 100644
--- a/security/yara/files/patch-libyara__proc.c
+++ b/security/yara/files/patch-libyara__proc.c
@@ -1,6 +1,6 @@
---- ./libyara/proc.c.orig	2013-12-26 09:01:02.000000000 -0500
-+++ ./libyara/proc.c	2013-12-28 15:26:52.000000000 -0500
-@@ -141,10 +141,9 @@
+--- libyara/proc.c.orig	2015-02-10 12:43:13 UTC
++++ libyara/proc.c
+@@ -140,10 +140,9 @@ int yr_process_get_memory(
  
  #else
  
diff --git a/security/yara/pkg-plist b/security/yara/pkg-plist
index 3a0e86200981..bf509d9fec6b 100644
--- a/security/yara/pkg-plist
+++ b/security/yara/pkg-plist
@@ -1,9 +1,29 @@
 bin/yara
 bin/yarac
 include/yara.h
+include/yara/ahocorasick.h
+include/yara/arena.h
+include/yara/atoms.h
+include/yara/compiler.h
+include/yara/error.h
+include/yara/exec.h
+include/yara/filemap.h
+include/yara/hash.h
+include/yara/libyara.h
+include/yara/limits.h
+include/yara/modules.h
+include/yara/object.h
+include/yara/re.h
+include/yara/rules.h
+include/yara/scan.h
+include/yara/sizedstr.h
+include/yara/strutils.h
+include/yara/types.h
+include/yara/utils.h
 lib/libyara.a
 lib/libyara.so
-lib/libyara.so.2
-lib/libyara.so.2.1.0
+lib/libyara.so.3
+lib/libyara.so.3.3.0
+lib/pkgconfig/yara.pc
 man/man1/yara.1.gz
 man/man1/yarac.1.gz