- Remove WITH_DG_CLAMAV option since it's deprecated by devs, users must use

  CLAMD option instead
- No need to bump PORTREVISION since it was off by default

Submitted by:	maintainer (by email)

4 files changed, 2 insertions, 22 deletions

diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index ce4a1510c348..0f23156e3491 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -38,7 +38,6 @@ OPTIONS=	DG_APACHE  "Enable Apache support for access denied page" 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 \
 		DG_KASP    "Enable Kaspersky AV support (testing)" off \
 		DG_NTLM    "Enable NTLM authentication plugin" off \
@@ -73,14 +72,6 @@ PLIST_SUB+=		CLISCANCONF=""
 PLIST_SUB+=		CLISCANCONF="@comment "
 .endif
 
-.if defined(WITH_DG_CLAMAV)
-CONFIGURE_ARGS+=	--enable-clamav
-LIB_DEPENDS+=		clamav.5:${PORTSDIR}/security/clamav
-PLIST_SUB+=		CLAMAVCONF=""
-.else
-PLIST_SUB+=		CLAMAVCONF="@comment "
-.endif
-
 .if defined(WITH_DG_CLAMD)
 CONFIGURE_ARGS+=	--enable-clamd
 RUN_DEPENDS+=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
@@ -103,7 +94,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) || defined(WITH_CLISCANCONF)
+.if defined(WITH_DG_CLAMD) || 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/pkg-plist b/www/dansguardian-devel/pkg-plist
index 94e20e1ebc05..95dd170f66e1 100644
--- a/www/dansguardian-devel/pkg-plist
+++ b/www/dansguardian-devel/pkg-plist
@@ -278,7 +278,6 @@ etc/dansguardian/lists/exceptionregexpurllist
 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
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index 6c8cfb6f1778..8deedeac23ae 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -35,7 +35,6 @@ OPTIONS=	APACHE  "Enable Apache support for access denied page" on \
 		TRICKLE "Enable the trickle download manager" on \
 		CLISCAN "Enable support for CLI content scanners" off \
 		CLAMD   "Enable ClamAV daemon support (clamd)" off \
-		CLAMAV  "Enable ClamAV library support (libclamav)" off \
 		ICAP    "Enable ICAP AV content scanner support (testing)" off \
 		KAV     "Enable Kaspersky AV support (testing)" off \
 		NTLM    "Enable NTLM authentication plugin" off \
@@ -67,14 +66,6 @@ PLIST_SUB+=		CLISCANCONF=""
 PLIST_SUB+=		CLISCANCONF="@comment "
 .endif
 
-.if defined(WITH_CLAMAV)
-CONFIGURE_ARGS+=	--enable-clamav
-LIB_DEPENDS+=		clamav.5:${PORTSDIR}/security/clamav
-PLIST_SUB+=		CLAMAVCONF=""
-.else
-PLIST_SUB+=		CLAMAVCONF="@comment "
-.endif
-
 .if defined(WITH_CLAMD)
 CONFIGURE_ARGS+=	--enable-clamd
 RUN_DEPENDS+=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
@@ -97,7 +88,7 @@ PLIST_SUB+=		KAVDCONF=""
 PLIST_SUB+=		KAVDCONF="@comment "
 .endif
 
-.if defined(WITH_CLAMD) || defined(WITH_CLAMAV) || defined(WITH_ICAP) || defined(WITH_KAV) || defined(WITH_CLISCAN)
+.if defined(WITH_CLAMD) || defined(WITH_ICAP) || defined(WITH_KAV) || defined(WITH_CLISCAN)
 PLIST_SUB+=		SCANNERS=""
 .else
 PLIST_SUB+=		SCANNERS="@comment "
diff --git a/www/dansguardian/pkg-plist b/www/dansguardian/pkg-plist
index ecf5554b6e91..8d5d76e02fc1 100644
--- a/www/dansguardian/pkg-plist
+++ b/www/dansguardian/pkg-plist
@@ -279,7 +279,6 @@ etc/dansguardian/lists/exceptionregexpurllist
 %%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusurllist
 etc/dansguardian/downloadmanagers/default.conf
 etc/dansguardian/downloadmanagers/fancy.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