2 files changed, 20 insertions, 26 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 7e640d2d7a57..9a3248b35974 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -15,14 +15,12 @@ DISTNAME=	silk-${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Tools for large-scale network capture analysis
 
-LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo
-
-# Optional PySiLK support is awaiting a fix for the USE_PYTHON
-# chicken/egg issue
-OPTIONS=	IPFIX "Enable IPFIX support" off
+LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo \
+				fixbuf:${PORTSDIR}/net/libfixbuf
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
+CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools --with-python
+USE_PYTHON=	YES
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" GCC_FLAGS="" CFLAGS_RELEASE=""
 USE_LDCONFIG=	yes
@@ -32,16 +30,17 @@ 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 rwpcut.1 rwpdedupe.1 rwpmapbuild.1 \
-	rwpmapcat.1 rwpmatch.1 rwptoflow.1 \
+	rwip2cc.1 rwmatch.1 rwnetmask.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 rwcompare.1 silk_config.1
+	rwtotal.1 rwtuc.1 rwuniq.1 rwcompare.1 silk_config.1 \
+	rwipfix2silk.1 rwp2yaf2silk.1 rwsilk2ipfix.1 rwidsquery.1
 
-MAN3=	addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3
+MAN3=	addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3 pysilk.3 \
+		silkpython.3
 
 MAN5=	sensor.conf.5 silk.conf.5
 
@@ -52,14 +51,6 @@ MAN8=	flowcap.8 rwflowappend.8 rwflowpack.8 rwguess.8 \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_IPFIX)
-LIB_DEPENDS+=	fixbuf:${PORTSDIR}/net/libfixbuf
-MAN1+=	rwipfix2silk.1 rwsilk2ipfix.1 rwp2yaf2silk.1
-PLIST_SUB=	IPFIX=""
-.else
-PLIST_SUB=	IPFIX="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 0fd12395dd8a..92562c25ada8 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -19,10 +19,10 @@ bin/rwgeoip2ccmap
 bin/rwgroup
 bin/rwidsquery
 bin/rwip2cc
-%%IPFIX%%bin/rwipfix2silk
+bin/rwipfix2silk
 bin/rwmatch
 bin/rwnetmask
-%%IPFIX%%bin/rwp2yaf2silk
+bin/rwp2yaf2silk
 bin/rwpcut
 bin/rwpdedupe
 bin/rwpmapbuild
@@ -41,7 +41,7 @@ bin/rwsetintersect
 bin/rwsetmember
 bin/rwsettool
 bin/rwsetunion
-%%IPFIX%%bin/rwsilk2ipfix
+bin/rwsilk2ipfix
 bin/rwsort
 bin/rwsplit
 bin/rwstats
@@ -102,10 +102,10 @@ lib/libsilk.a
 lib/libsilk.la
 lib/libsilk.so
 lib/libsilk.so.4
-%%IPFIX%%lib/libskipfix.a
-%%IPFIX%%lib/libskipfix.la
-%%IPFIX%%lib/libskipfix.so
-%%IPFIX%%lib/libskipfix.so.2
+lib/libskipfix.a
+lib/libskipfix.la
+lib/libskipfix.so
+lib/libskipfix.so.2
 lib/libskmsg.a
 lib/libskmsg.la
 lib/libskmsg.so
@@ -137,6 +137,9 @@ lib/silk/packlogic-twoway.so
 lib/silk/pmapfilter.a
 lib/silk/pmapfilter.la
 lib/silk/pmapfilter.so
+lib/silk/silkpython.so
+lib/silk/silkpython.la
+lib/silk/silkpython.a
 lib/silk/uniq-distproto.a
 lib/silk/uniq-distproto.la
 lib/silk/uniq-distproto.so