- Update to 3.13.0

- Use py3kplist to fix plist when using python 3
- Add several options, remove STATIC from default options as it looks useless

PR:		213543
Approved by:	maintainer timeout (15 days)

3 files changed, 37 insertions, 22 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 55a6d4e8ed66..34b8f7b1c66c 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	silktools
-PORTVERSION=	3.11.0.1
+PORTVERSION=	3.13.0
 CATEGORIES=	security net
-MASTER_SITES=	http://tools.netsa.cert.org/releases/ \
-		http://redundancy.redundancy.org/mirror/
+MASTER_SITES=	http://tools.netsa.cert.org/releases/
 DISTNAME=	silk-${PORTVERSION}
 
 MAINTAINER=	torres.73a@gmail.com
@@ -14,33 +13,51 @@ COMMENT=	Tools for large-scale network capture analysis
 LICENSE=	GPLR GPLv2
 LICENSE_COMB=	multi
 LICENSE_NAME_GPLR=	Government Purpose License Rights
-LICENSE_FILE_GPLR=	${WRKSRC}/doc/LICENSE.txt
-LICENSE_FILE_GPLv2=	${WRKSRC}/doc/GPL.txt
+LICENSE_FILE_GPLR=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS_GPLR=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
-		libfixbuf.so:net/libfixbuf
+LIB_DEPENDS=	libfixbuf.so:net/libfixbuf
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
+CONFIGURE_ARGS=	--enable-packing-tools
 USE_LDCONFIG=	yes
-USES=		gmake perl5 pkgconfig libtool
-USE_PERL5=	build
+USES=		gmake libtool perl5 pkgconfig
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	IPV6 LOCALTIME PYTHON STATIC
-OPTIONS_DEFAULT=	PYTHON STATIC
+OPTIONS_DEFINE=	ADNS CARES GNUTLS IPV6 LOCALTIME LZO PYTHON SNAPPY STATIC
+OPTIONS_DEFAULT=	LZO PYTHON
 OPTIONS_SUB=	yes
 
+ADNS_CONFIGURE_WITH=	adns=${LOCALBASE}
+ADNS_DESC=	Asynchronous DNS resolution via adns
+ADNS_LIB_DEPENDS=	libadns.so:dns/adns
+
+CARES_CONFIGURE_WITH=	c-ares=${LOCALBASE}
+CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
+
 IPV6_CONFIGURE_ENABLE=	ipv6
 IPV6_DESC=	Support for analysis of flow records containing IPv6 addresses
+
+GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
 LOCALTIME_DESC=	Use localtime instead of UTC
 LOCALTIME_CONFIGURE_ENABLE=	localtime
+
+LZO_CONFIGURE_WITH=	lzo=${LOCALBASE}
+LZO_DESC=	LZO compression support
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+
 PYTHON_CONFIGURE_WITH=	python
 PYTHON_USES=	python
+PYTHON_USE=	python=py3kplist
+
+SNAPPY_CONFIGURE_WITH=	snappy=${LOCALBASE}
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+
 STATIC_CONFIGURE_ENABLE=	static
 
 .include <bsd.port.mk>
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 1f0535aa39df..8e3a0a98c73e 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (silk-3.11.0.1.tar.gz) = 436e80d76f6f254b40e2ba8e0968c190fc1f4fc8611cd5576f9a41c348f55435
-SIZE (silk-3.11.0.1.tar.gz) = 5296636
+TIMESTAMP = 1476338123
+SHA256 (silk-3.13.0.tar.gz) = 79e5c052040836092df588a4dc325c2701f8ab13d5113838248b9d9ad9bc86e1
+SIZE (silk-3.13.0.tar.gz) = 5213321
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 97342ba4c55d..299fe136a9e0 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -35,7 +35,6 @@ bin/rwptoflow
 bin/rwrandomizeip
 bin/rwrecgenerator
 bin/rwresolve
-bin/rwrtd2split
 bin/rwscan
 bin/rwscanquery
 bin/rwset
@@ -76,7 +75,6 @@ include/silk/skdllist.h
 include/silk/skheader.h
 include/silk/skheap.h
 include/silk/skipaddr.h
-include/silk/skipfix.h
 include/silk/skipset.h
 include/silk/sklog.h
 include/silk/skmempool.h
@@ -91,21 +89,20 @@ include/silk/sktempfile.h
 include/silk/skthread.h
 include/silk/sktimer.h
 include/silk/sktracemsg.h
-include/silk/skunique.h
 include/silk/skvector.h
 include/silk/utils.h
 %%STATIC%%lib/libflowsource.a
 lib/libflowsource.so
-lib/libflowsource.so.13
-lib/libflowsource.so.13.0.0
+lib/libflowsource.so.14
+lib/libflowsource.so.14.0.1
 %%STATIC%%lib/libsilk-thrd.a
 lib/libsilk-thrd.so
 lib/libsilk-thrd.so.5
-lib/libsilk-thrd.so.5.1.2
+lib/libsilk-thrd.so.5.1.3
 %%STATIC%%lib/libsilk.a
 lib/libsilk.so
-lib/libsilk.so.19
-lib/libsilk.so.19.0.0
+lib/libsilk.so.21
+lib/libsilk.so.21.0.0
 %%STATIC%%lib/silk/app-mismatch.a
 lib/silk/app-mismatch.so
 %%STATIC%%lib/silk/conficker-c.a