DansGuardian 2.8.0-0 has been released as the new stable version. New features since 2.6.x include:

- Changed process model from fork-on-connect to fork-pool.  This dramatically improves the performance and allows it to scale to many more concurrent users.
- Improved internationalisation language file support.
- Image replacement for advert removal.
- Added support for fully qualified addresses in banned and exception IP lists.
- Added URL Greylists.
- Added filter group support so different filtering settings can be used for different groups of users.
- Added a '-g' gentle restart that does not kill current connections but filter group config is re-read.
- Ident now uses X-Forwarded-For when DansGuardian is configured to use it.
- Added a temporal denied page bypass facility.
- It is no longer needed to run as root to bind to a low port.

PR:		ports/69625
Submitted by:	Freddie Cash (maintainer)

8 files changed, 142 insertions, 57 deletions

diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index b8570480e5ba..f859e73f22ec 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.6.1.13
+PORTVERSION=	2.8.0.0
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
@@ -20,10 +20,10 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
-CONFLICTS=	dansguardian-2.7*
+CONFLICTS=	dansguardian-2.[67]*
 LATEST_LINK=	dansguardian
 
-WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=/sbin/ \
 		--sysconfdir=/etc/dansguardian/ \
@@ -34,8 +34,8 @@ CONFIGURE_ARGS=	--bindir=/sbin/ \
 		--piddir=/var/run/
 MAN8=		dansguardian.8
 
-OPTIONS=	DG_GCC3 "Compile using GCC 3.x on FreeBSD 4.x." off \
-		DG_PHRASELISTS "Install new phraselists." off
+OPTIONS=	DG_GCC3 "Compile using GCC 3.3 on FreeBSD 4.x." off \
+		DG_PHRASELISTS "Install new phraselists. (Overwrites existing.)" off
 
 DG_URL=		http://dansguardian.org/index.php?page=copyright2
 CONFDIR=	${PREFIX}/etc/dansguardian
@@ -48,15 +48,15 @@ RESTRICTED=	${NO_PACKAGE}
 
 # On FreeBSD 4.x, user can choose which GCC version to use
 .if ${OSVERSION} > 500000 || defined(WITH_DG_GCC3)
-USE_GCC=	3
 CONFIGURE_ARGS+=	--gccver=3
+USE_GCC=		3.3
 .else
 CONFIGURE_ARGS+=	--gccver=2
 .endif
 
 # User needs to manually download the distfile
-.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
-IGNORE=	"Commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
+.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})) && !defined(PACKAGE_BUILDING)
+IGNORE="Commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
 .endif
 
 post-extract:
diff --git a/www/dansguardian/distinfo b/www/dansguardian/distinfo
index 82fdf50e18b5..987879aeddb0 100644
--- a/www/dansguardian/distinfo
+++ b/www/dansguardian/distinfo
@@ -1,2 +1,2 @@
-MD5 (DansGuardian-2.6.1-13.source.tar.gz) = d45bdfd96020b9a9cc24a856d9362f75
-SIZE (DansGuardian-2.6.1-13.source.tar.gz) = 156619
+MD5 (DansGuardian-2.8.0-0.source.tar.gz) = 1bd5ffdf4140fad379e8392403ea7694
+SIZE (DansGuardian-2.8.0-0.source.tar.gz) = 192166
diff --git a/www/dansguardian/files/dansguardian.sh b/www/dansguardian/files/dansguardian.sh
index f0c7c4473faf..ed4cc7df02a0 100644
--- a/www/dansguardian/files/dansguardian.sh
+++ b/www/dansguardian/files/dansguardian.sh
@@ -13,9 +13,9 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-dansguardian_enable="NO"
-dansguardian_flags=""
-dansguardian_pidfile="/var/run/dansguardian.pid"
+dansguardian_enable=${dansguardian_enable:-"NO"}
+dansguardian_flags=${dansguardian_flags:-""}
+dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"
 
 . %%RC_SUBR%%
 
@@ -28,3 +28,4 @@ load_rc_config $name
 pidfile="${dansguardian_pidfile}"
 
 run_rc_command "$1"
+
diff --git a/www/dansguardian/files/patch-autoconf::fbsd.in b/www/dansguardian/files/patch-autoconf::fbsd.in
index a1af4e8d58f2..b8bff5dd55ae 100644
--- a/www/dansguardian/files/patch-autoconf::fbsd.in
+++ b/www/dansguardian/files/patch-autoconf::fbsd.in
@@ -1,39 +1,26 @@
---- autoconf/fbsd.in.orig	Wed Apr 14 08:06:42 2004
-+++ autoconf/fbsd.in	Wed May  5 15:12:36 2004
-@@ -20,13 +20,13 @@
- 		 logrotate.dansguardian
- 
- PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
--PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
-+PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
- PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
- PASSVARS += -DPIDDIR=\"${PIDDIR}\"
- 
- #Some advanced options:
--WARNING = -Wall
--OPTIMISE = -O2
-+#WARNING = -Wall
-+OPTIMISE = ${CXXFLAGS}
- #DEBUG += -DDGDEBUG
- #STATIC = -static
- 
-@@ -41,43 +41,32 @@
+--- autoconf/fbsd.in.orig	Tue Jun 29 10:21:27 2004
++++ autoconf/fbsd.in	Tue Jun 29 10:23:52 2004
+@@ -43,48 +43,37 @@
  	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
  
  install:
 -	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
  	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
 -	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
  	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
 -	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
 -	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
  	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+-	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+-	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
 -	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
 -	cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf
 -	cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist
 -	cp -f ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist
 -	cp -f ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist
 -	cp -f -R ./phraselists/* $I$(CONFFILELOCATION)phraselists/
+-	cp -f -R ./languages/* $I$(CONFFILELOCATION)languages/
 -	cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist
 -	cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserlist
 -	cp -f ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist
@@ -42,22 +29,27 @@
 -	cp -f ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist
 -	cp -f ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist
 -	cp -f ./contentregexplist $I$(CONFFILELOCATION)contentregexplist
+-	cp -f ./greysitelist $I$(CONFFILELOCATION)greysitelist
+-	cp -f ./greyurllist $I$(CONFFILELOCATION)greyurllist
 -	cp -f ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist
 -	cp -f ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist
 -	cp -f ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist
 -	cp -f ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist
 -	cp -f ./pics $I$(CONFFILELOCATION)pics
--	cp -f ./template.html $I$(CONFFILELOCATION)template.html
--	cp -f ./messages $I$(CONFFILELOCATION)messages
+-	cp -f ./transparent1x1.gif $I$(CONFFILELOCATION)transparent1x1.gif
 -	cp -f ./logrotation $I$(CONFFILELOCATION)logrotation
 -	cp -f ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian.sh
 -	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
 -	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
 -	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
--	chown -R $(PROXYUSER).$(PROXYGROUP) $I$(LOGLOCATION)
+-	chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)
 -	chmod -R u+wr $I$(LOGLOCATION)
 -	chmod u+wrx $I$(LOGLOCATION)
 -	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
++	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
++	cp -fR ./languages/* $I$(CONFFILELOCATION)languages/
++	install -o root -g wheel -m 644 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist.dist
++	install -o root -g wheel -m 644 ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf.dist
 +	install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian
 +	install -o root -g wheel -m 644 ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf.dist
 +	install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist.dist
@@ -71,13 +63,14 @@
 +	install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist.dist
 +	install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist.dist
 +	install -o root -g wheel -m 644 ./contentregexplist $I$(CONFFILELOCATION)contentregexplist.dist
++	install -o root -g wheel -m 644 ./greysitelist $I$(CONFFILELOCATION)greysitelist.dist
++	install -o root -g wheel -m 644 ./greyurllist $I$(CONFFILELOCATION)greyurllist.dist
 +	install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist.dist
 +	install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist.dist
 +	install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist.dist
 +	install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist.dist
 +	install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics.dist
-+	install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html.dist
-+	install -o root -g wheel -m 644 ./messages $I$(CONFFILELOCATION)messages.dist
++	install -o root -g wheel -m 644 ./transparent1x1.gif $I$(CONFFILELOCATION)transparent1x1.gif
 +	install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl.dist
 +	install -o root -g wheel -m 644 ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8
 +	install -o nobody -g nogroup -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log
diff --git a/www/dansguardian/files/patch-configure b/www/dansguardian/files/patch-configure
index 003d7042b3c3..ef0968964c91 100644
--- a/www/dansguardian/files/patch-configure
+++ b/www/dansguardian/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May  5 14:46:40 2004
-+++ configure	Wed May  5 14:47:23 2004
-@@ -2540,7 +2540,7 @@
+--- configure.orig	Wed Apr 28 09:36:01 2004
++++ configure	Thu May  6 10:56:21 2004
+@@ -2543,7 +2543,7 @@
  $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
  $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
  $extendedecho "MANUALFILES = \${PREFIX}$mandir" >>Makefile
@@ -9,3 +9,12 @@
  $extendedecho "LOGROTATELOCATION = \${PREFIX}$logrotatedir" >>Makefile
  echo "PROXYUSER = $runas_usr" >>Makefile
  echo "PROXYGROUP = $runas_grp" >>Makefile
+@@ -2896,7 +2896,7 @@
+ echo "# Log file location" >>dansguardian.conf
+ echo "# " >>dansguardian.conf
+ echo "# Defines the log directory and filename." >>dansguardian.conf
+-echo "#loglocation = '/var/log/dansguardian/access.log'" >>dansguardian.conf
++echo "loglocation = '/var/log/dansguardian.log'" >>dansguardian.conf
+ echo "" >>dansguardian.conf
+ echo "" >>dansguardian.conf
+ echo "# Network Settings" >>dansguardian.conf
diff --git a/www/dansguardian/pkg-descr b/www/dansguardian/pkg-descr
index f8f26189f10c..14a53fa594b0 100644
--- a/www/dansguardian/pkg-descr
+++ b/www/dansguardian/pkg-descr
@@ -1,23 +1,22 @@
 DansGuardian is a web content filtering proxy for Linux, FreeBSD, OpenBSD,
-and Solaris. It relies on a proxy server, for all fetching.  The preferred
-proxy is Squid, however, DansGuardian should work with any proxy server.
+and Solaris. It relies on a proxy server, such as Squid, for all fetching;
+however, DansGuardian should work with any proxy server.
 
 It filters using multiple methods, including:
   - URL and domain filtering
-  - textual content filtering
+  - content phrase filtering
   - PICS filtering
-  - MIME-type filtering
+  - MIME filtering
   - file extension filtering
   - POST filtering
-  - user filtering
-  - client IP filtering
-  - exception lists for most of the above
+  - user and source IP filtering
 
-Running make with WITHOUT_PICS=yes will disable the PICS filtering.  All
-other filtering is controlled via the configuration file.
+This version also includes support for filter groups (simple ACLs),
+pre-emptive blocking, improved URL caches,  and fork pooling for
+improved performance under heavy load.
 
 WWW: http://dansguardian.org
-WWW: http://dansguardian.intmain.org
+WWW: http://backup.dansguardian.org
 
 - Freddie Cash
 fcash@sd73.bc.ca
diff --git a/www/dansguardian/pkg-message b/www/dansguardian/pkg-message
index 147882643e04..c629acc57ad0 100644
--- a/www/dansguardian/pkg-message
+++ b/www/dansguardian/pkg-message
@@ -6,5 +6,5 @@
        page for instructions on setting up log rotation and compression.
 
        WARNING:  This port uses RCng.  Please read the comments in the startup
-       script.
+       script for instructions on enabling the daemon.
 *******************************************************************************
diff --git a/www/dansguardian/pkg-plist b/www/dansguardian/pkg-plist
index b766b2ff59ba..a184a09971e5 100644
--- a/www/dansguardian/pkg-plist
+++ b/www/dansguardian/pkg-plist
@@ -1,12 +1,32 @@
 @exec mkdir -p etc/dansguardian
+@exec mkdir -p etc/dansguardian/languages
+@exec mkdir -p etc/dansguardian/languages/arspanish
+@exec mkdir -p etc/dansguardian/languages/bulgarian
+@exec mkdir -p etc/dansguardian/languages/chinesebig5
+@exec mkdir -p etc/dansguardian/languages/chineseb2312
+@exec mkdir -p etc/dansguardian/languages/czech
+@exec mkdir -p etc/dansguardian/languages/danish
+@exec mkdir -p etc/dansguardian/languages/french
+@exec mkdir -p etc/dansguardian/languages/german
+@exec mkdir -p etc/dansguardian/languages/german2
+@exec mkdir -p etc/dansguardian/languages/indonesian
+@exec mkdir -p etc/dansguardian/languages/italian
+@exec mkdir -p etc/dansguardian/languages/lithuanian
+@exec mkdir -p etc/dansguardian/languages/mxspanish
+@exec mkdir -p etc/dansguardian/languages/polish
+@exec mkdir -p etc/dansguardian/languages/portuguese
+@exec mkdir -p etc/dansguardian/languages/turkish
+@exec mkdir -p etc/dansguardian/languages/ukenglish
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/chat
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
+%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/frenchpornography
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/gambling
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/germanpornography
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/goodphrases
+%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/googlesearches
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/gore
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
 %%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/intolerance
@@ -27,21 +47,66 @@ etc/dansguardian/bannedurllist.dist
 etc/dansguardian/banneduserlist.dist
 etc/dansguardian/contentregexplist.dist
 etc/dansguardian/dansguardian.conf.dist
+etc/dansguardian/dansguardianf1.conf.dist
 etc/dansguardian/exceptioniplist.dist
 etc/dansguardian/exceptionphraselist.dist
 etc/dansguardian/exceptionsitelist.dist
 etc/dansguardian/exceptionurllist.dist
 etc/dansguardian/exceptionuserlist.dist
-etc/dansguardian/messages.dist
+etc/dansguardian/filtergroupslist.dist
+etc/dansguardian/greysitelist.dist
+etc/dansguardian/greyurllist.dist
+etc/dansguardian/pics.dist
+etc/dansguardian/transparent1x1.gif
+etc/dansguardian/weightedphraselist.dist
+etc/dansguardian/languages/ReadMe
+etc/dansguardian/languages/arspanish/messages
+etc/dansguardian/languages/arspanish/template.html
+etc/dansguardian/languages/bulgarian/messages
+etc/dansguardian/languages/bulgarian/template.html
+etc/dansguardian/languages/chinesebig5/messages
+etc/dansguardian/languages/chinesebig5/template.html
+etc/dansguardian/languages/chinesegb2312/messages
+etc/dansguardian/languages/chinesegb2312/template.html
+etc/dansguardian/languages/czech/messages
+etc/dansguardian/languages/czech/template.html
+etc/dansguardian/languages/danish/messages
+etc/dansguardian/languages/danish/template.html
+etc/dansguardian/languages/dutch/messages
+etc/dansguardian/languages/dutch/template.html
+etc/dansguardian/languages/french/messages
+etc/dansguardian/languages/french/template.html
+etc/dansguardian/languages/german/messages
+etc/dansguardian/languages/german/template.html
+etc/dansguardian/languages/german2/messages
+etc/dansguardian/languages/german2/template.html
+etc/dansguardian/languages/indonesian/messages
+etc/dansguardian/languages/indonesian/template.html
+etc/dansguardian/languages/italian/messages
+etc/dansguardian/languages/italian/template.html
+etc/dansguardian/languages/lithuanian/messages
+etc/dansguardian/languages/lithuanian/template.html
+etc/dansguardian/languages/mxspanish/messages
+etc/dansguardian/languages/mxspanish/template.html
+etc/dansguardian/languages/polish/messages
+etc/dansguardian/languages/polish/template.html
+etc/dansguardian/languages/portuguese/messages
+etc/dansguardian/languages/portuguese/template.html
+etc/dansguardian/languages/turkish/messages
+etc/dansguardian/languages/turkish/template.html
+etc/dansguardian/languages/ukenglish/messages
+etc/dansguardian/languages/ukenglish/template.html
 %%PHRASELISTS%%etc/dansguardian/phraselists/chat/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/drugadvocacy/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/dutchbadwords/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/frenchbadwords/weighted
+%%PHRASELISTS%%etc/dansguardian/phraselists/frenchpornography/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/gambling/banned
 %%PHRASELISTS%%etc/dansguardian/phraselists/gambling/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/germanpornography/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/goodphrases/exception
 %%PHRASELISTS%%etc/dansguardian/phraselists/goodphrases/weighted
+%%PHRASELISTS%%etc/dansguardian/phraselists/googlesearches/banned
 %%PHRASELISTS%%etc/dansguardian/phraselists/gore/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/illegaldrugs/banned
 %%PHRASELISTS%%etc/dansguardian/phraselists/illegaldrugs/weighted
@@ -54,19 +119,37 @@ etc/dansguardian/messages.dist
 %%PHRASELISTS%%etc/dansguardian/phraselists/violence/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/warezhacking/weighted
 %%PHRASELISTS%%etc/dansguardian/phraselists/weapons/weighted
-etc/dansguardian/pics.dist
-etc/dansguardian/template.html.dist
-etc/dansguardian/weightedphraselist.dist
 etc/rc.d/start-dg.sh
 sbin/dansguardian
 www/cgi-bin/dansguardian.pl.dist
+@dirrm etc/dansguardian/languages/arspanish
+@dirrm etc/dansguardian/languages/bulgarian
+@dirrm etc/dansguardian/languages/chinesebig5
+@dirrm etc/dansguardian/languages/chinesegb2312
+@dirrm etc/dansguardian/languages/czech
+@dirrm etc/dansguardian/languages/danish
+@dirrm etc/dansguardian/languages/dutch
+@dirrm etc/dansguardian/languages/french
+@dirrm etc/dansguardian/languages/german
+@dirrm etc/dansguardian/languages/german2
+@dirrm etc/dansguardian/languages/indonesian
+@dirrm etc/dansguardian/languages/italian
+@dirrm etc/dansguardian/languages/lithuanian
+@dirrm etc/dansguardian/languages/mxspanish
+@dirrm etc/dansguardian/languages/polish
+@dirrm etc/dansguardian/languages/portuguese
+@dirrm etc/dansguardian/languages/turkish
+@dirrm etc/dansguardian/languages/ukenglish
+@dirrm etc/dansguardian/languages
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/chat
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/drugadvocacy
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/dutchbadwords
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/frenchbadwords
+%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/frenchpornography
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/gambling
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/germanpornography
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/goodphrases
+%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/googlesearches
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/gore
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/illegaldrugs
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/intolerance
@@ -79,5 +162,5 @@ www/cgi-bin/dansguardian.pl.dist
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/weapons
 %%PHRASELISTS%%@dirrm etc/dansguardian/phraselists
 @dirrm etc/dansguardian
-@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually
+@unexec echo If permanently deleting this package, /var/log/dansguardian.log  must be removed manually
 @unexec echo If permanently deleting this package, custom configuration files must be removed manually