3 files changed, 94 insertions, 92 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 662eb06368c6..3bc0c903671e 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silktools
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.9
 CATEGORIES=	security net
 MASTER_SITES=	http://tools.netsa.cert.org/releases/ \
 		http://redundancy.redundancy.org/mirror/
@@ -28,15 +28,18 @@ MAKE_ARGS=	CC="${CC}" GCC_FLAGS="" CFLAGS_RELEASE=""
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
 
-MAN1=	rwip2cc.1 rwpmapbuild.1 mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \
-	rwbag.1 rwbagbuild.1 rwbagcat.1 rwbagtool.1 rwcat.1 rwcount.1 \
-	rwcut.1 rwfileinfo.1 rwfilter.1 rwfglob.1 rwgroup.1 rwmatch.1 \
-	rwnetmask.1 rwrandomizeip.1 rwset.1 rwsetbuild.1 rwsetcat.1 rwsort.1 \
-	rwsetintersect.1 rwsetunion.1 rwstats.1 rwswapbytes.1 rwtotal.1 \
-	rwtuc.1 rwuniq.1 rwptoflow.1 rwpmatch.1 rwpdedupe.1 rwpcut.1 \
-	rwp2yaf2silk.1 rwgeoip2ccmap.1 rwpmapcat.1 rwresolve.1 rwscan.1 \
-	rwscanquery.1 rwsetmember.1 rwsettool.1 rwsplit.1 rwdedupe.1 \
-	rwidsquery.1
+MAN1=	mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \
+	rwbag.1 rwbagbuild.1 rwbagcat.1 rwbagtool.1 \
+	rwcat.1 rwcount.1 rwcut.1 rwdedupe.1 rwfglob.1 \
+	rwfileinfo.1 rwfilter.1 rwgeoip2ccmap.1 rwgroup.1 \
+	rwidsquery.1 rwip2cc.1 rwmatch.1 \
+	rwnetmask.1 rwp2yaf2silk.1 rwpcut.1 rwpdedupe.1 \
+	rwpmapbuild.1 rwpmapcat.1 rwpmatch.1 rwptoflow.1 \
+	rwrandomizeip.1 rwresolve.1 rwscan.1 rwscanquery.1 \
+	rwset.1 rwsetbuild.1 rwsetcat.1 rwsetintersect.1 \
+	rwsetmember.1 rwsettool.1 rwsetunion.1 \
+	rwsort.1 rwsplit.1 rwstats.1 rwswapbytes.1 \
+	rwtotal.1 rwtuc.1 rwuniq.1
 
 MAN3=	addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3
 
@@ -44,8 +47,8 @@ MAN5=	sensor.conf.5 silk.conf.5
 
 MAN7=	silk.7
 
-MAN8=	rwflowpack.8 rwpackchecker.8 rwflowappend.8 rwreceiver.8 rwsender.8 \
-	flowcap.8 rwguess.8
+MAN8=	flowcap.8 rwflowappend.8 rwflowpack.8 rwguess.8 \
+		rwpackchecker.8 rwreceiver.8 rwsender.8
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 1650148e6e6a..880000f92a22 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,3 +1,3 @@
-MD5 (silk-1.1.3.tar.gz) = b5f2e258574f7db2f3b87c2c9e7dd92e
-SHA256 (silk-1.1.3.tar.gz) = 99ad875585e1623b8af993efca3f32aa5a2fdb40fcfa8f097e5c578b197e1692
-SIZE (silk-1.1.3.tar.gz) = 2233412
+MD5 (silk-1.1.9.tar.gz) = f8d5ae45474026292e0fdcfd7b1432b5
+SHA256 (silk-1.1.9.tar.gz) = 069bf7b1b23e80575a18f06fb689734eb25c41f1ea815498639b8d0fda5a266f
+SIZE (silk-1.1.9.tar.gz) = 2181147
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 8a5aa6fb29f2..57d80f622926 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -1,8 +1,7 @@
-@comment $FreeBSD$
-bin/rwdedupe
 bin/mapsid
 bin/num2dot
 bin/rwaddrcount
+bin/rwallformats
 bin/rwappend
 bin/rwbag
 bin/rwbagbuild
@@ -11,45 +10,87 @@ bin/rwbagtool
 bin/rwcat
 bin/rwcount
 bin/rwcut
-bin/rwidsquery
-bin/rwsetintersect
-bin/rwip2cc
-bin/rwpmapbuild
-bin/rwpmapcat
-bin/rwallformats
-bin/rwresolve
-bin/rwsetbuild
-bin/rwsetcat
-bin/rwsetunion
-bin/rwtuc
-bin/rwp2yaf2silk
+bin/rwdedupe
 bin/rwfglob
 bin/rwfileinfo
 bin/rwfilter
+bin/rwgeoip2ccmap
 bin/rwgroup
+bin/rwidsquery
+bin/rwip2cc
+bin/rwipfix2silk
 bin/rwmatch
 bin/rwnetmask
+bin/rwp2yaf2silk
 bin/rwpcut
 bin/rwpdedupe
-bin/rwgeoip2ccmap
+bin/rwpmapbuild
+bin/rwpmapcat
 bin/rwpmatch
 bin/rwptoflow
 bin/rwrandomizeip
+bin/rwresolve
 bin/rwrtd2split
 bin/rwscan
 bin/rwscanquery
 bin/rwset
+bin/rwsetbuild
+bin/rwsetcat
+bin/rwsetintersect
 bin/rwsetmember
 bin/rwsettool
+bin/rwsetunion
+bin/rwsilk2ipfix
 bin/rwsort
-bin/rwstats
 bin/rwsplit
+bin/rwstats
 bin/rwswapbytes
 bin/rwtotal
+bin/rwtuc
 bin/rwuniq
-%%IPFIX%%bin/rwipfix2silk
-%%IPFIX%%bin/rwsilk2ipfix
-sbin/rwguess
+include/silk/bagtree.h
+include/silk/convert-cflowd.h
+include/silk/dynlib.h
+include/silk/flowcap-source.h
+include/silk/gnu_getopt.h
+include/silk/hashlib.h
+include/silk/heaplib.h
+include/silk/iochecks.h
+include/silk/ipfixsource.h
+include/silk/iptree.h
+include/silk/libflowsource.h
+include/silk/libsksetbag.h
+include/silk/multiqueue.h
+include/silk/pdusource.h
+include/silk/probeconf.h
+include/silk/redblack.h
+include/silk/rwflowpack.h
+include/silk/rwpack.h
+include/silk/rwrec.h
+include/silk/silk.h
+include/silk/silk_config.h
+include/silk/silk_files.h
+include/silk/skdaemon.h
+include/silk/skdeque.h
+include/silk/skdllist.h
+include/silk/skheader.h
+include/silk/skiobuf.h
+include/silk/skipfix.h
+include/silk/sklinkedlist.h
+include/silk/sklog.h
+include/silk/skmsg.h
+include/silk/skpolldir.h
+include/silk/skprefixmap.h
+include/silk/skprintnets.h
+include/silk/sksite.h
+include/silk/skstream.h
+include/silk/skstringmap.h
+include/silk/skthread.h
+include/silk/sktimer.h
+include/silk/sktransfer.h
+include/silk/skvector.h
+include/silk/utils.h
+include/silk/v5pdu.h
 lib/libflowsource.a
 lib/libflowsource.la
 lib/libflowsource.so
@@ -70,6 +111,10 @@ lib/libsilk.a
 lib/libsilk.la
 lib/libsilk.so
 lib/libsilk.so.1
+lib/libskipfix.a
+lib/libskipfix.la
+lib/libskipfix.so
+lib/libskipfix.so.1
 lib/libskmsg.a
 lib/libskmsg.la
 lib/libskmsg.so
@@ -83,85 +128,39 @@ lib/silk/ccfilter.so
 lib/silk/cutmatch.a
 lib/silk/cutmatch.la
 lib/silk/cutmatch.so
-lib/silk/flowrate.so
-lib/silk/flowrate.la
 lib/silk/flowrate.a
-lib/silk/packlogic-generic.so
-lib/silk/packlogic-generic.la
+lib/silk/flowrate.la
+lib/silk/flowrate.so
 lib/silk/packlogic-generic.a
-lib/silk/packlogic-twoway.so
-lib/silk/packlogic-twoway.la
+lib/silk/packlogic-generic.la
+lib/silk/packlogic-generic.so
 lib/silk/packlogic-twoway.a
+lib/silk/packlogic-twoway.la
+lib/silk/packlogic-twoway.so
 lib/silk/pmapfilter.a
 lib/silk/pmapfilter.la
 lib/silk/pmapfilter.so
-%%IPFIX%%lib/libskipfix.so.1
-%%IPFIX%%lib/libskipfix.so
-%%IPFIX%%lib/libskipfix.la
-%%IPFIX%%lib/libskipfix.a
 sbin/flowcap
+sbin/rwflowappend
 sbin/rwflowpack
+sbin/rwguess
 sbin/rwpackchecker
-sbin/rwflowappend
 sbin/rwreceiver
 sbin/rwsender
+share/silk/addrtype-templ.txt
 share/silk/etc/flowcap.conf
-share/silk/etc/rwflowpack.conf
 share/silk/etc/init.d/flowcap
-share/silk/etc/init.d/rwflowpack
 share/silk/etc/init.d/rwflowappend
+share/silk/etc/init.d/rwflowpack
 share/silk/etc/init.d/rwreceiver
 share/silk/etc/init.d/rwsender
 share/silk/etc/rwflowappend.conf
+share/silk/etc/rwflowpack.conf
 share/silk/etc/rwreceiver.conf
 share/silk/etc/rwsender.conf
-share/silk/addrtype-templ.txt
-share/silk/update-sensor-conf
 share/silk/generic-silk.conf
 share/silk/twoway-silk.conf
-include/silk/bagtree.h
-include/silk/convert-cflowd.h
-include/silk/dynlib.h
-include/silk/flowcap-source.h
-include/silk/gnu_getopt.h
-include/silk/hashlib.h
-include/silk/heaplib.h
-include/silk/iochecks.h
-include/silk/ipfixsource.h
-include/silk/iptree.h
-include/silk/libflowsource.h
-include/silk/libsksetbag.h
-include/silk/multiqueue.h
-include/silk/pdusource.h
-include/silk/probeconf.h
-include/silk/redblack.h
-include/silk/rwflowpack.h
-include/silk/rwpack.h
-include/silk/rwrec.h
-include/silk/skheader.h
-include/silk/silk.h
-include/silk/silk_config.h
-include/silk/silk_files.h
-include/silk/skdaemon.h
-include/silk/skdeque.h
-include/silk/skdllist.h
-include/silk/skiobuf.h
-include/silk/skipfix.h
-include/silk/sklinkedlist.h
-include/silk/sklog.h
-include/silk/skmsg.h
-include/silk/skpolldir.h
-include/silk/skprefixmap.h
-include/silk/skprintnets.h
-include/silk/sksite.h
-include/silk/skstream.h
-include/silk/skstringmap.h
-include/silk/skthread.h
-include/silk/sktimer.h
-include/silk/sktransfer.h
-include/silk/skvector.h
-include/silk/utils.h
-include/silk/v5pdu.h
+share/silk/update-sensor-conf
 @dirrmtry share/silk/etc/init.d
 @dirrmtry share/silk/etc
 @dirrmtry share/silk