Add email, commandline and clamd options. Enable email by default.

Bump PKGREVISION to 7

5 files changed, 58 insertions, 8 deletions

diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index e17b681d0b3..e2bdc24c1fc 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/07/09 06:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2016/09/19 13:20:43 sborrill Exp $
 
 DISTNAME=	dansguardian-2.12.0.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dansguardian/}
 EXTRACT_SUFX=	.tar.bz2
@@ -62,8 +62,8 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/${d}
 INSTALLATION_DIRS+=	${EGDIR}/${d}
 .endfor
 
-EGFILES!=		cat ${.CURDIR}/files/configfiles
-.for f in ${EGFILES}
+EGFILES!=		cat ${.CURDIR}/files/configfiles ${EGFILES_LIST}
+.for f in ${EGFILES} ${EGFILES_EXTRA}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
diff --git a/www/dansguardian/PLIST b/www/dansguardian/PLIST
index b7ff18e81f5..ba608413e9f 100644
--- a/www/dansguardian/PLIST
+++ b/www/dansguardian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/28 14:13:25 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/09/19 13:20:43 sborrill Exp $
 man/man8/dansguardian.8
 sbin/dansguardian
 share/dansguardian/blockedflash.swf
@@ -100,6 +100,8 @@ share/examples/dansguardian/authplugins/ident.conf
 share/examples/dansguardian/authplugins/ip.conf
 share/examples/dansguardian/authplugins/proxy-basic.conf
 share/examples/dansguardian/authplugins/proxy-digest.conf
+${PLIST.cli}share/examples/dansguardian/contentscanners/commandlinescan.conf
+${PLIST.clamd}share/examples/dansguardian/contentscanners/clamdscan.conf
 share/examples/dansguardian/dansguardian.conf
 share/examples/dansguardian/dansguardianf1.conf
 share/examples/dansguardian/downloadmanagers/default.conf
@@ -117,6 +119,10 @@ share/examples/dansguardian/lists/bannedurllist
 share/examples/dansguardian/lists/blacklists/ads/domains
 share/examples/dansguardian/lists/blacklists/ads/urls
 share/examples/dansguardian/lists/contentregexplist
+${PLIST.avscan}share/examples/dansguardian/lists/contentscanners/exceptionvirusextensionlist
+${PLIST.avscan}share/examples/dansguardian/lists/contentscanners/exceptionvirusmimetypelist
+${PLIST.avscan}share/examples/dansguardian/lists/contentscanners/exceptionvirussitelist
+${PLIST.avscan}share/examples/dansguardian/lists/contentscanners/exceptionvirusurllist
 share/examples/dansguardian/lists/downloadmanagers/managedextensionlist
 share/examples/dansguardian/lists/downloadmanagers/managedmimetypelist
 share/examples/dansguardian/lists/exceptionextensionlist
diff --git a/www/dansguardian/files/configdirs b/www/dansguardian/files/configdirs
index 01ffdb34e44..97ce2d78b03 100644
--- a/www/dansguardian/files/configdirs
+++ b/www/dansguardian/files/configdirs
@@ -1,4 +1,6 @@
+contentscanners
 lists
+lists/contentscanners
 lists/phraselists
 lists/phraselists/badwords
 lists/phraselists/chat
diff --git a/www/dansguardian/files/configfiles.avscan b/www/dansguardian/files/configfiles.avscan
new file mode 100644
index 00000000000..243caedd52b
--- /dev/null
+++ b/www/dansguardian/files/configfiles.avscan
@@ -0,0 +1,4 @@
+lists/contentscanners/exceptionvirusextensionlist
+lists/contentscanners/exceptionvirusmimetypelist
+lists/contentscanners/exceptionvirussitelist
+lists/contentscanners/exceptionvirusurllist
diff --git a/www/dansguardian/options.mk b/www/dansguardian/options.mk
index 857d50af787..33d5a8c1076 100644
--- a/www/dansguardian/options.mk
+++ b/www/dansguardian/options.mk
@@ -1,11 +1,49 @@
-# $NetBSD: options.mk,v 1.1 2014/10/14 14:41:17 prlw1 Exp $
+# $NetBSD: options.mk,v 1.2 2016/09/19 13:20:43 sborrill Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dansguardian
-PKG_SUPPORTED_OPTIONS=	debug
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS=	debug email commandline clamd
+PKG_SUGGESTED_OPTIONS=	email
 
 .include "../../mk/bsd.options.mk"
 
+##
+## switch on debug build mode
+##
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--with-dgdebug
 .endif
+
+##
+## Enables reporting by email
+##
+.if !empty(PKG_OPTIONS:Memail)
+CONFIGURE_ARGS+=	--enable-email
+.endif
+
+# PLIST.avscan is shared between content scanners
+PLIST_VARS+=		avscan
+##
+## Enable command line content scanner
+##
+PLIST_VARS+=		cli
+.if !empty(PKG_OPTIONS:Mcommandline)
+CONFIGURE_ARGS+=	--enable-commandline
+PLIST.cli=		yes
+PLIST.avscan=		yes
+EGFILES_EXTRA+=		contentscanners/commandlinescan.conf
+.endif
+
+##
+## Enable ClamD content scanner
+##
+PLIST_VARS+=		clamd
+.if !empty(PKG_OPTIONS:Mclamd)
+CONFIGURE_ARGS+=	--enable-clamd
+PLIST.clamd=		yes
+PLIST.avscan=		yes
+EGFILES_EXTRA+=		contentscanners/clamdscan.conf
+.endif
+
+.if !empty(PLIST.avscan)
+EGFILES_LIST+=		${.CURDIR}/files/configfiles.avscan
+.endif