Index: Makefile
===================================================================
RCS file: /cvs/ports/www/dansguardian/Makefile,v
retrieving revision 1.7
diff -N -u Makefile
--- Makefile	23 May 2008 14:32:08 -0000	1.7
+++ Makefile	20 Apr 2009 02:02:51 -0000
@@ -1,44 +1,40 @@
-# $OpenBSD: Makefile,v 1.7 2008/05/23 14:32:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2009/04/18 14:42:41 sthen Exp $
 
-COMMENT=	true web content filtering for all
-DISTNAME=	dansguardian-2.9.8.5
-PKGNAME=	${DISTNAME}p3
-CATEGORIES=	www net
+COMMENT =	content scanning web filter
+DISTNAME =	dansguardian-2.10.0.3
+CATEGORIES =	www net
 
-HOMEPAGE=	http://www.dansguardian.org/
+HOMEPAGE =	http://www.dansguardian.org/
 
-MAINTAINER=	Bartosz Kuzma <bartosz.kuzma@gmail.com>
+MAINTAINER =	Bartosz Kuzma <bartosz.kuzma@gmail.com>
 
 # GPLv2+
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m stdc++ z
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
+WANTLIB =		c m stdc++ z
+
 # This is deliberately not downloaded directly from the author's
 # master site, since although it is GPL code, the author only
 # grants commercial users permission to download it *once* from
 # official sources. http://dansguardian.org/?page=copyright2
-MASTER_SITES=		http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES =		http://spacehopper.org/mirrors/
 
-LIB_DEPENDS=		pcre.>=1,pcreposix.>=1::devel/pcre
+LIB_DEPENDS =		pcre.>=1,pcreposix.>=1::devel/pcre \
+			execinfo::devel/libexecinfo
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-proxygroup=_dansguardian \
-		--with-proxyuser=_dansguardian
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS =	--localstatedir=/var \
+			--with-proxygroup=_dansguardian \
+			--with-proxyuser=_dansguardian \
+			--enable-segv-backtrace \
+			--enable-clamd
 
-FLAVORS=clamav
-FLAVOR?=
-
-.if ${FLAVOR:L:Mclamav}
-WANTLIB+=	bz2 gmp iconv pthread
-LIB_DEPENDS+=	clamav.>=1::security/clamav
-CONFIGURE_ARGS+=--enable-clamav
-.endif
-
-FAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples \
-		rel_group=_dansguardian rel_user=_dansguardian
+FAKE_FLAGS +=		DGCONFDIR=${PREFIX}/share/examples/dansguardian \
+			rel_group=_dansguardian rel_user=_dansguardian
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/dansguardian/distinfo,v
retrieving revision 1.1.1.1
diff -N -u distinfo
--- distinfo	7 Jun 2007 13:16:14 -0000	1.1.1.1
+++ distinfo	20 Apr 2009 02:02:51 -0000
@@ -1,5 +1,5 @@
-MD5 (dansguardian-2.9.8.5.tar.gz) = 35f9c0ee535bd8e93b0d30fe7c60a09e
-RMD160 (dansguardian-2.9.8.5.tar.gz) = d63337e728331d658d7a2941549b8132dbbd467e
-SHA1 (dansguardian-2.9.8.5.tar.gz) = 69a96319532d3d3afec8cf52bb67b52b78fa65dc
-SHA256 (dansguardian-2.9.8.5.tar.gz) = 614a9287b852996bf56aff62e39324e86e091dba388de99bc2b608a626084e62
-SIZE (dansguardian-2.9.8.5.tar.gz) = 469549
+MD5 (dansguardian-2.10.0.3.tar.gz) = aMjpqXo7WNJGehnLFdtVmQ==
+RMD160 (dansguardian-2.10.0.3.tar.gz) = Q3x5lndtSRk5aFypAkpKdIUdig4=
+SHA1 (dansguardian-2.10.0.3.tar.gz) = 2kc9eYnaNj4h+zR7GjmL19JInVE=
+SHA256 (dansguardian-2.10.0.3.tar.gz) = QZvob0cq0KaaihWFemRicayXOdKb2Da+kVny2VXluWM=
+SIZE (dansguardian-2.10.0.3.tar.gz) = 512695
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/Attic/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -N -u patches/patch-Makefile_in
--- patches/patch-Makefile_in	7 Jun 2007 13:16:14 -0000	1.1.1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/06/07 13:16:14 aanriot Exp $
---- Makefile.in.orig	Tue Jun  5 22:44:43 2007
-+++ Makefile.in	Tue Jun  5 22:45:05 2007
-@@ -588,7 +588,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-exec-am:
- 
Index: patches/patch-configs_contentscanners_clamav_conf_in
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/Attic/patch-configs_contentscanners_clamav_conf_in,v
retrieving revision 1.1
diff -N -u patches/patch-configs_contentscanners_clamav_conf_in
--- patches/patch-configs_contentscanners_clamav_conf_in	21 Apr 2008 18:32:06 -0000	1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configs_contentscanners_clamav_conf_in,v 1.1 2008/04/21 18:32:06 mbalmer Exp $
---- configs/contentscanners/clamav.conf.in.orig	Mon Apr 21 20:22:55 2008
-+++ configs/contentscanners/clamav.conf.in	Mon Apr 21 20:23:15 2008
-@@ -33,9 +33,6 @@ maxfiles = 1000
- #maxrecursionlevel - The maximum number of archives within archives
- maxreclevel = 5
- 
--#maxratio - maxmimum compression ratio to avoid archive bombs
--maxratio = 200
--
- exceptionvirusmimetypelist = '@DGCONFDIR@/lists/contentscanners/exceptionvirusmimetypelist'
- exceptionvirusextensionlist = '@DGCONFDIR@/lists/contentscanners/exceptionvirusextensionlist'
- exceptionvirussitelist = '@DGCONFDIR@/lists/contentscanners/exceptionvirussitelist'
Index: patches/patch-configs_contentscanners_clamdscan_conf_in
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/patch-configs_contentscanners_clamdscan_conf_in,v
diff -N -u patches/patch-configs_contentscanners_clamdscan_conf_in
--- /dev/null	20 Apr 2009 02:02:52 -0000
+++ patches/patch-configs_contentscanners_clamdscan_conf_in	20 Apr 2009 02:02:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configs_contentscanners_clamdscan_conf_in,v 1.1 2009/04/18 14:42:41 sthen Exp $
+--- configs/contentscanners/clamdscan.conf.in.orig	Sat Apr 18 15:35:34 2009
++++ configs/contentscanners/clamdscan.conf.in	Sat Apr 18 15:35:50 2009
+@@ -1,7 +1,7 @@
+ plugname = 'clamdscan'
+ 
+ # edit this to match the location of your ClamD UNIX domain socket
+-#clamdudsfile = '/var/run/clamav/clamd.sock'
++clamdudsfile = '/tmp/clamd.socket'
+ 
+ # If this string is set, the text it contains shall be removed from the
+ # beginning of filenames when passing them to ClamD.
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/Attic/patch-configure,v
retrieving revision 1.1.1.1
diff -N -u patches/patch-configure
--- patches/patch-configure	7 Jun 2007 13:16:14 -0000	1.1.1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,11 +0,0 @@
---- configure.orig	Mon Mar 19 18:08:15 2007
-+++ configure	Tue Jun  5 21:46:48 2007
-@@ -9978,7 +9978,7 @@ echo "$as_me: error: libClamAV support enabled, but cl
- 	CLAMAV_LIBS=`clamav-config --libs`
- 	CLAMAV_PREFIX=`clamav-config --prefix`
- 
--	LIBS="${CLAMAV_LIBS} -lclamav ${LIBS}"
-+	LIBS="${CLAMAV_LIBS} -lclamav -pthread ${LIBS}"
- 		CPPFLAGS="${CPPFLAGS} -I${CLAMAV_PREFIX}/include"
- 
- 
Index: patches/patch-data_Makefile_in
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/patch-data_Makefile_in,v
retrieving revision 1.1.1.1
diff -N -u patches/patch-data_Makefile_in
--- patches/patch-data_Makefile_in	7 Jun 2007 13:16:14 -0000	1.1.1.1
+++ patches/patch-data_Makefile_in	20 Apr 2009 02:02:51 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-data_Makefile_in,v 1.1.1.1 2007/06/07 13:16:14 aanriot Exp $
---- data/Makefile.in.orig	Tue Jun  5 22:23:28 2007
-+++ data/Makefile.in	Tue Jun  5 22:24:22 2007
-@@ -498,7 +498,6 @@ uninstall-info: uninstall-info-recursive
+$OpenBSD: patch-data_Makefile_in,v 1.2 2009/04/18 14:42:41 sthen Exp $
+--- data/Makefile.in.orig	Tue Jan 20 11:15:29 2009
++++ data/Makefile.in	Wed Apr 15 22:42:03 2009
+@@ -490,7 +490,6 @@ uninstall-am: uninstall-local
  
  install-data-local: 
  	$(mkinstalldirs) $(DESTDIR)$(DATATOPDIR) && \
Index: patches/patch-doc_dansguardian_8
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/Attic/patch-doc_dansguardian_8,v
retrieving revision 1.1
diff -N -u patches/patch-doc_dansguardian_8
--- patches/patch-doc_dansguardian_8	29 Aug 2007 09:17:04 -0000	1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_dansguardian_8,v 1.1 2007/08/29 09:17:04 aanriot Exp $
---- doc/dansguardian.8.orig	Sat Aug 25 15:04:00 2007
-+++ doc/dansguardian.8	Sat Aug 25 15:08:38 2007
-@@ -3,7 +3,7 @@
- .SH NAME
- DansGuardian 2
- .SH SYNOPSIS
--/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
-+\fBdansguardian\fP [\fIoptions\fP]
- .SH DESCRIPTION
- An Introduction
- 
Index: patches/patch-src_contentscanners_clamav_cpp
===================================================================
RCS file: /cvs/ports/www/dansguardian/patches/Attic/patch-src_contentscanners_clamav_cpp,v
retrieving revision 1.1
diff -N -u patches/patch-src_contentscanners_clamav_cpp
--- patches/patch-src_contentscanners_clamav_cpp	21 Apr 2008 18:32:06 -0000	1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_contentscanners_clamav_cpp,v 1.1 2008/04/21 18:32:06 mbalmer Exp $
---- src/contentscanners/clamav.cpp.orig	Mon Apr 21 20:20:39 2008
-+++ src/contentscanners/clamav.cpp	Mon Apr 21 20:21:22 2008
-@@ -273,13 +273,9 @@ int clamavinstance::init(void* args)
- 	if (limits.maxreclevel < 1) {
- 		limits.maxreclevel = 5;
- 	}
--	limits.maxratio = cv["maxratio"].toInteger();
--	if (limits.maxratio < 1) {
--		limits.maxratio = 200;
--	}
- #ifdef DGDEBUG
- 	std::cerr << "maxfiles: " << limits.maxfiles << " maxfilesize: " << limits.maxfilesize
--		<< " maxreclevel: " << limits.maxreclevel << " maxratio: " << limits.maxratio << std::endl;
-+		<< " maxreclevel: " << limits.maxreclevel << std::endl;
- #endif
- 
- 	// load virus database
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/dansguardian/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -N -u pkg/PLIST
--- pkg/PLIST	7 Jun 2007 13:16:14 -0000	1.1.1.1
+++ pkg/PLIST	20 Apr 2009 02:02:52 -0000
@@ -1,11 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/07 13:16:14 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/04/18 14:42:41 sthen Exp $
+@conflict dansguardian-*-clamav
+@pkgpath www/dansguardian,clamav
 @newgroup _dansguardian:588
 @newuser _dansguardian:588:588:daemon:DansGuardian:/nonexistent:/sbin/nologin
 @man man/man8/dansguardian.8
-sbin/dansguardian
+@bin sbin/dansguardian
 share/dansguardian/
 share/dansguardian/dansguardian.pl
 share/dansguardian/languages/
+share/dansguardian/languages/arspanish/
+share/dansguardian/languages/arspanish/fancydmtemplate.html
+share/dansguardian/languages/arspanish/messages
+share/dansguardian/languages/arspanish/template.html
 share/dansguardian/languages/bulgarian/
 share/dansguardian/languages/bulgarian/fancydmtemplate.html
 share/dansguardian/languages/bulgarian/messages
@@ -54,10 +60,22 @@
 share/dansguardian/languages/italian/fancydmtemplate.html
 share/dansguardian/languages/italian/messages
 share/dansguardian/languages/italian/template.html
+share/dansguardian/languages/japanese/
+share/dansguardian/languages/japanese/fancydmtemplate.html
+share/dansguardian/languages/japanese/messages
+share/dansguardian/languages/japanese/template.html
 share/dansguardian/languages/lithuanian/
 share/dansguardian/languages/lithuanian/fancydmtemplate.html
 share/dansguardian/languages/lithuanian/messages
 share/dansguardian/languages/lithuanian/template.html
+share/dansguardian/languages/malay/
+share/dansguardian/languages/malay/fancydmtemplate.html
+share/dansguardian/languages/malay/messages
+share/dansguardian/languages/malay/template.html
+share/dansguardian/languages/mxspanish/
+share/dansguardian/languages/mxspanish/fancydmtemplate.html
+share/dansguardian/languages/mxspanish/messages
+share/dansguardian/languages/mxspanish/template.html
 share/dansguardian/languages/polish/
 share/dansguardian/languages/polish/fancydmtemplate.html
 share/dansguardian/languages/polish/messages
@@ -105,6 +123,13 @@
 share/dansguardian/scripts/solaris-init
 share/dansguardian/scripts/systemv-init
 share/dansguardian/transparent1x1.gif
+share/doc/dansguardian/
+share/doc/dansguardian/AuthPlugins
+share/doc/dansguardian/ContentScanners
+share/doc/dansguardian/DownloadManagers
+share/doc/dansguardian/FAQ
+share/doc/dansguardian/FAQ.html
+share/doc/dansguardian/Plugins
 share/examples/dansguardian/
 @sample ${SYSCONFDIR}/dansguardian/
 share/examples/dansguardian/authplugins/
@@ -115,6 +140,12 @@
 @sample ${SYSCONFDIR}/dansguardian/authplugins/ip.conf
 share/examples/dansguardian/authplugins/proxy-basic.conf
 @sample ${SYSCONFDIR}/dansguardian/authplugins/proxy-basic.conf
+share/examples/dansguardian/authplugins/proxy-digest.conf
+@sample ${SYSCONFDIR}/dansguardian/authplugins/proxy-digest.conf
+share/examples/dansguardian/contentscanners/
+@sample ${SYSCONFDIR}/dansguardian/contentscanners/
+share/examples/dansguardian/contentscanners/clamdscan.conf
+@sample ${SYSCONFDIR}/dansguardian/contentscanners/clamdscan.conf
 share/examples/dansguardian/dansguardian.conf
 @sample ${SYSCONFDIR}/dansguardian/dansguardian.conf
 share/examples/dansguardian/dansguardianf1.conf
@@ -139,6 +170,8 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/bannedmimetypelist
 share/examples/dansguardian/lists/bannedphraselist
 @sample ${SYSCONFDIR}/dansguardian/lists/bannedphraselist
+share/examples/dansguardian/lists/bannedregexpheaderlist
+@sample ${SYSCONFDIR}/dansguardian/lists/bannedregexpheaderlist
 share/examples/dansguardian/lists/bannedregexpurllist
 @sample ${SYSCONFDIR}/dansguardian/lists/bannedregexpurllist
 share/examples/dansguardian/lists/bannedsitelist
@@ -155,6 +188,16 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/blacklists/ads/urls
 share/examples/dansguardian/lists/contentregexplist
 @sample ${SYSCONFDIR}/dansguardian/lists/contentregexplist
+share/examples/dansguardian/lists/contentscanners/
+@sample ${SYSCONFDIR}/dansguardian/lists/contentscanners/
+share/examples/dansguardian/lists/contentscanners/exceptionvirusextensionlist
+@sample ${SYSCONFDIR}/dansguardian/lists/contentscanners/exceptionvirusextensionlist
+share/examples/dansguardian/lists/contentscanners/exceptionvirusmimetypelist
+@sample ${SYSCONFDIR}/dansguardian/lists/contentscanners/exceptionvirusmimetypelist
+share/examples/dansguardian/lists/contentscanners/exceptionvirussitelist
+@sample ${SYSCONFDIR}/dansguardian/lists/contentscanners/exceptionvirussitelist
+share/examples/dansguardian/lists/contentscanners/exceptionvirusurllist
+@sample ${SYSCONFDIR}/dansguardian/lists/contentscanners/exceptionvirusurllist
 share/examples/dansguardian/lists/downloadmanagers/
 @sample ${SYSCONFDIR}/dansguardian/lists/downloadmanagers/
 share/examples/dansguardian/lists/downloadmanagers/managedextensionlist
@@ -165,6 +208,8 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/exceptionextensionlist
 share/examples/dansguardian/lists/exceptionfilesitelist
 @sample ${SYSCONFDIR}/dansguardian/lists/exceptionfilesitelist
+share/examples/dansguardian/lists/exceptionfileurllist
+@sample ${SYSCONFDIR}/dansguardian/lists/exceptionfileurllist
 share/examples/dansguardian/lists/exceptioniplist
 @sample ${SYSCONFDIR}/dansguardian/lists/exceptioniplist
 share/examples/dansguardian/lists/exceptionmimetypelist
@@ -183,6 +228,14 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/greysitelist
 share/examples/dansguardian/lists/greyurllist
 @sample ${SYSCONFDIR}/dansguardian/lists/greyurllist
+share/examples/dansguardian/lists/headerregexplist
+@sample ${SYSCONFDIR}/dansguardian/lists/headerregexplist
+share/examples/dansguardian/lists/logregexpurllist
+@sample ${SYSCONFDIR}/dansguardian/lists/logregexpurllist
+share/examples/dansguardian/lists/logsitelist
+@sample ${SYSCONFDIR}/dansguardian/lists/logsitelist
+share/examples/dansguardian/lists/logurllist
+@sample ${SYSCONFDIR}/dansguardian/lists/logurllist
 share/examples/dansguardian/lists/phraselists/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/
 share/examples/dansguardian/lists/phraselists/badwords/
@@ -203,10 +256,22 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/chat/weighted
 share/examples/dansguardian/lists/phraselists/chat/weighted_italian
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/chat/weighted_italian
+share/examples/dansguardian/lists/phraselists/conspiracy/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/conspiracy/
+share/examples/dansguardian/lists/phraselists/conspiracy/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/conspiracy/weighted
+share/examples/dansguardian/lists/phraselists/domainsforsale/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/domainsforsale/
+share/examples/dansguardian/lists/phraselists/domainsforsale/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/domainsforsale/weighted
 share/examples/dansguardian/lists/phraselists/drugadvocacy/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/drugadvocacy/
 share/examples/dansguardian/lists/phraselists/drugadvocacy/weighted
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/drugadvocacy/weighted
+share/examples/dansguardian/lists/phraselists/forums/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/forums/
+share/examples/dansguardian/lists/phraselists/forums/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/forums/weighted
 share/examples/dansguardian/lists/phraselists/gambling/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/gambling/
 share/examples/dansguardian/lists/phraselists/gambling/banned
@@ -235,6 +300,8 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch
 share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
+share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_polish
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/goodphrases/weighted_general_polish
 share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
 share/examples/dansguardian/lists/phraselists/goodphrases/weighted_news
@@ -249,6 +316,10 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/gore/weighted
 share/examples/dansguardian/lists/phraselists/gore/weighted_portuguese
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/gore/weighted_portuguese
+share/examples/dansguardian/lists/phraselists/idtheft/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/idtheft/
+share/examples/dansguardian/lists/phraselists/idtheft/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/idtheft/weighted
 share/examples/dansguardian/lists/phraselists/illegaldrugs/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/illegaldrugs/
 share/examples/dansguardian/lists/phraselists/illegaldrugs/banned
@@ -273,6 +344,10 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/malware/
 share/examples/dansguardian/lists/phraselists/malware/weighted
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/malware/weighted
+share/examples/dansguardian/lists/phraselists/music/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/music/
+share/examples/dansguardian/lists/phraselists/music/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/music/weighted
 share/examples/dansguardian/lists/phraselists/news/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/news/
 share/examples/dansguardian/lists/phraselists/news/weighted
@@ -315,8 +390,10 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_japanese
 share/examples/dansguardian/lists/phraselists/pornography/weighted_malay
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_malay
-share/examples/dansguardian/lists/phraselists/pornography/weighted_norgwegian
-@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_norgwegian
+share/examples/dansguardian/lists/phraselists/pornography/weighted_norwegian
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_norwegian
+share/examples/dansguardian/lists/phraselists/pornography/weighted_polish
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_polish
 share/examples/dansguardian/lists/phraselists/pornography/weighted_portuguese
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/pornography/weighted_portuguese
 share/examples/dansguardian/lists/phraselists/pornography/weighted_russian
@@ -327,10 +404,34 @@
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/proxies/
 share/examples/dansguardian/lists/phraselists/proxies/weighted
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/proxies/weighted
+share/examples/dansguardian/lists/phraselists/rta/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/rta/
+share/examples/dansguardian/lists/phraselists/rta/banned
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/rta/banned
+share/examples/dansguardian/lists/phraselists/safelabel/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/safelabel/
+share/examples/dansguardian/lists/phraselists/safelabel/banned
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/safelabel/banned
+share/examples/dansguardian/lists/phraselists/secretsocieties/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/secretsocieties/
+share/examples/dansguardian/lists/phraselists/secretsocieties/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/secretsocieties/weighted
 share/examples/dansguardian/lists/phraselists/sport/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/sport/
 share/examples/dansguardian/lists/phraselists/sport/weighted
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/sport/weighted
+share/examples/dansguardian/lists/phraselists/translation/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/translation/
+share/examples/dansguardian/lists/phraselists/translation/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/translation/weighted
+share/examples/dansguardian/lists/phraselists/travel/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/travel/
+share/examples/dansguardian/lists/phraselists/travel/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/travel/weighted
+share/examples/dansguardian/lists/phraselists/upstreamfilter/
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/upstreamfilter/
+share/examples/dansguardian/lists/phraselists/upstreamfilter/weighted
+@sample ${SYSCONFDIR}/dansguardian/lists/phraselists/upstreamfilter/weighted
 share/examples/dansguardian/lists/phraselists/violence/
 @sample ${SYSCONFDIR}/dansguardian/lists/phraselists/violence/
 share/examples/dansguardian/lists/phraselists/violence/weighted
@@ -361,4 +462,3 @@
 @owner _dansguardian
 @group _dansguardian
 @sample /var/log/dansguardian/
-%%clamav%%
