3 files changed, 28 insertions, 9 deletions

diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index bd59822ece17..5649adb45af5 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.9.7.0
+PORTVERSION=	2.9.8.0
 #PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
@@ -35,6 +35,8 @@ MAN8=		dansguardian.8
 
 OPTIONS=	DG_APACHE  "Enable Apache support for access denied page" on \
 		DG_DMGR    "Enable the fancy download manager" on \
+		DG_TRICKLE "Enable the trickle download manager" on \
+		DG_CLISCAN "Enable support for CLI content scanners" off \
 		DG_CLAMD   "Enable ClamAV daemon support (clamd)" off \
 		DG_CLAMAV  "Enable ClamAV library support (libclamav)" off \
 		DG_ICAP    "Enable ICAP AV content scanner support (testing)" off \
@@ -53,9 +55,20 @@ RESTRICTED=	Redistribution and commercial download is restricted. Check ${DG_URL
 USE_APACHE=	1.3+
 .endif
 
+.if !defined(WITHOUT_DG_TRICKLE)
+CONFIGURE_ARGS+=	--enable-trickledm
+.endif
+
+.if defined(WITH_DG_CLISCAN)
+CONFIGURE_ARGS+=	--enable-commandline=yes
+PLIST_SUB+=		CLISCANCONF=""
+.else
+PLIST_SUB+=		CLISCANCONF="@comment "
+.endif
+
 .if defined(WITH_DG_CLAMAV)
 #IGNORE=		please use the clamd plugin support.  It's much more flexible, usable, tested, and just generally better
-CONFIGURE_ARGS+=	--enable-clamav=yes
+CONFIGURE_ARGS+=	--enable-clamav
 LIB_DEPENDS+=		clamav.1:${PORTSDIR}/security/clamav
 PLIST_SUB+=		CLAMAVCONF=""
 .else
@@ -63,7 +76,7 @@ PLIST_SUB+=		CLAMAVCONF="@comment "
 .endif
 
 .if defined(WITH_DG_CLAMD)
-CONFIGURE_ARGS+=	--enable-clamd=yes
+CONFIGURE_ARGS+=	--enable-clamd
 RUN_DEPENDS+=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
 PLIST_SUB+=		CLAMDCONF=""
 .else
@@ -86,7 +99,7 @@ PLIST_SUB+=		KAVDCONF=""
 PLIST_SUB+=		KAVDCONF="@comment "
 .endif
 
-.if defined(WITH_DG_CLAMD) || defined(WITH_DG_CLAMAV) || defined(WITH_DG_ICAP) || defined(WITH_DG_KASP)
+.if defined(WITH_DG_CLAMD) || defined(WITH_DG_CLAMAV) || defined(WITH_DG_ICAP) || defined(WITH_DG_KASP) || defined(WITH_CLISCANCONF)
 PLIST_SUB+=		SCANNERS=""
 .else
 PLIST_SUB+=		SCANNERS="@comment "
diff --git a/www/dansguardian-devel/distinfo b/www/dansguardian-devel/distinfo
index 6e428b57f84f..fe563a26178e 100644
--- a/www/dansguardian-devel/distinfo
+++ b/www/dansguardian-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dansguardian-2.9.7.0.tar.gz) = ab487a567065fa3f58981b31e2faa7a8
-SHA256 (dansguardian-2.9.7.0.tar.gz) = fb11b1827632f973a591362e6323ed52866e2a97a6681f4d3317106ead0f79a6
-SIZE (dansguardian-2.9.7.0.tar.gz) = 431030
+MD5 (dansguardian-2.9.8.0.tar.gz) = 2171456df5f04d038c31a34f3a9ddabe
+SHA256 (dansguardian-2.9.8.0.tar.gz) = dd112f1169b7469f015b15425a879a01d83311d7659ea763e3913e149e5288f4
+SIZE (dansguardian-2.9.8.0.tar.gz) = 444242
diff --git a/www/dansguardian-devel/pkg-plist b/www/dansguardian-devel/pkg-plist
index 1d2a4eb11dbe..b56e6876a8ab 100644
--- a/www/dansguardian-devel/pkg-plist
+++ b/www/dansguardian-devel/pkg-plist
@@ -163,6 +163,7 @@ etc/dansguardian/lists/phraselists/games/weighted
 etc/dansguardian/lists/phraselists/goodphrases/weighted_general
 etc/dansguardian/lists/phraselists/goodphrases/weighted_general_danish
 etc/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch
+etc/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
 etc/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
 etc/dansguardian/lists/phraselists/goodphrases/weighted_news
 etc/dansguardian/lists/phraselists/goodphrases/exception
@@ -183,18 +184,21 @@ etc/dansguardian/lists/phraselists/nudism/weighted
 etc/dansguardian/lists/phraselists/peer2peer/weighted
 etc/dansguardian/lists/phraselists/personals/weighted
 etc/dansguardian/lists/phraselists/personals/weighted_portuguese
+etc/dansguardian/lists/phraselists/pornography/banned
+etc/dansguardian/lists/phraselists/pornography/banned_portuguese
 etc/dansguardian/lists/phraselists/pornography/weighted
+etc/dansguardian/lists/phraselists/pornography/weighted_chinese
 etc/dansguardian/lists/phraselists/pornography/weighted_danish
 etc/dansguardian/lists/phraselists/pornography/weighted_dutch
 etc/dansguardian/lists/phraselists/pornography/weighted_french
 etc/dansguardian/lists/phraselists/pornography/weighted_german
 etc/dansguardian/lists/phraselists/pornography/weighted_italian
+etc/dansguardian/lists/phraselists/pornography/weighted_japanese
+etc/dansguardian/lists/phraselists/pornography/weighted_malay
 etc/dansguardian/lists/phraselists/pornography/weighted_norgwegian
 etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
 etc/dansguardian/lists/phraselists/pornography/weighted_russian
 etc/dansguardian/lists/phraselists/pornography/weighted_spanish
-etc/dansguardian/lists/phraselists/pornography/banned
-etc/dansguardian/lists/phraselists/pornography/banned_portuguese
 etc/dansguardian/lists/phraselists/proxies/weighted
 etc/dansguardian/lists/phraselists/sport/weighted
 etc/dansguardian/lists/phraselists/violence/weighted
@@ -228,10 +232,12 @@ etc/dansguardian/lists/exceptionregexpurllist
 %%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusurllist
 etc/dansguardian/downloadmanagers/default.conf
 etc/dansguardian/downloadmanagers/fancy.conf
+etc/dansguardian/downloadmanagers/trickle.conf
 %%CLAMAVCONF%%etc/dansguardian/contentscanners/clamav.conf
 %%CLAMDCONF%%etc/dansguardian/contentscanners/clamdscan.conf
 %%KAVDCONF%%etc/dansguardian/contentscanners/kavdscan.conf
 %%ICAPCONF%%etc/dansguardian/contentscanners/icapscan.conf
+%%CLISCANCONF%%etc/dansguardian/contentscanners/commandlinescan.conf
 etc/dansguardian/dansguardian.conf
 etc/dansguardian/dansguardianf1.conf
 @dirrm %%DATADIR%%/scripts