Update to latest development snapshot.

Submitted by:	fcash@bigfoot.com (maintainer)

6 files changed, 371 insertions, 113 deletions

diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 25336eb97319..2083f672777a 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.4.6.5
+PORTVERSION=	2.7.6.7
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
 
 MAINTAINER=	fcash@bigfoot.com
-COMMENT=	A fast, simple web content filter for Squid proxy servers
+COMMENT=	A fast, feature-rich web content filter for Squid proxy servers
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid:install \
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install
 
-WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}
+
+CONFLICTS=	dansguardian*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -35,9 +37,16 @@ MAN8=		dansguardian.8
 
 NO_CDROM=	"Commercial download is restricted.  Check ${DG_URL} for more info"
 NO_PACKAGE=	"Redistribution is restricted.  Check ${DG_URL} for more info"
+RESTRICTED=	${NO_PACKAGE}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 500000 || defined(WITH_GCC3)
+CONFIGURE_ARGS+=	--gccver=3
+.else
+CONFIGURE_ARGS+=	--gccver=2
+.endif
+
 .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
diff --git a/www/dansguardian-devel/distinfo b/www/dansguardian-devel/distinfo
index 7615557cf06a..8e809a89af7e 100644
--- a/www/dansguardian-devel/distinfo
+++ b/www/dansguardian-devel/distinfo
@@ -1 +1 @@
-MD5 (DansGuardian-2.4.6-5.source.tar.gz) = 8aa42b299cd798c80ff09ed866a91b63
+MD5 (DansGuardian-2.7.6-7.source.tar.gz) = fc36f029745f78f6fa37d54fb143f7e7
diff --git a/www/dansguardian-devel/files/patch-autoconf::fbsd.in b/www/dansguardian-devel/files/patch-autoconf::fbsd.in
index 3b568074a960..f24b2cb5d96d 100644
--- a/www/dansguardian-devel/files/patch-autoconf::fbsd.in
+++ b/www/dansguardian-devel/files/patch-autoconf::fbsd.in
@@ -1,15 +1,15 @@
---- autoconf/fbsd.in-orig	Mon Oct 21 15:01:20 2002
-+++ autoconf/fbsd.in	Mon Oct 21 15:04:42 2002
-@@ -19,7 +19,7 @@
-                  bannedphraselist exceptionphraselist
+--- autoconf/fbsd.in.orig	Sat Jan  3 12:08:29 2004
++++ autoconf/fbsd.in	Thu Jan  8 13:08:56 2004
+@@ -21,7 +21,7 @@
+ 		 logrotate.dansguardian dansguardianf1.conf
  
  PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
--PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
-+PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
+-#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
++#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
  PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
- PASSVARS += -DPIDDIR=\"${PIDDIR}\"
+ #PASSVARS += -DPIDDIR=\"${PIDDIR}\"
  
-@@ -36,44 +36,74 @@
+@@ -38,61 +38,140 @@
  .cpp.o:
  	$(CPP) $(DEBUG) $(CFLAGS) -c $<
  
@@ -22,30 +22,53 @@
  	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
  	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
 +	@test -d $I$(CONFFILELOCATION)phraselists/chat || install -d $I$(CONFFILELOCATION)phraselists/chat
-+	@test -d $I$(CONFFILELOCATION)phraselists/drugadvocasy || install -d $I$(CONFFILELOCATION)phraselists/drugadvocasy
++	@test -d $I$(CONFFILELOCATION)phraselists/drugadvocacy || install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy
 +	@test -d $I$(CONFFILELOCATION)phraselists/dutchbadwords || install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords
 +	@test -d $I$(CONFFILELOCATION)phraselists/frenchbadwords || install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords
 +	@test -d $I$(CONFFILELOCATION)phraselists/gambling || install -d $I$(CONFFILELOCATION)phraselists/gambling
++	@test -d $I$(CONFFILELOCATION)phraselists/germanpornography || install -d $I$(CONFFILELOCATION)phraselists/germanpornography
 +	@test -d $I$(CONFFILELOCATION)phraselists/goodphrases || install -d $I$(CONFFILELOCATION)phraselists/goodphrases
 +	@test -d $I$(CONFFILELOCATION)phraselists/gore || install -d $I$(CONFFILELOCATION)phraselists/gore
 +	@test -d $I$(CONFFILELOCATION)phraselists/illegaldrugs || install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs
 +	@test -d $I$(CONFFILELOCATION)phraselists/intolerance || install -d $I$(CONFFILELOCATION)phraselists/intolerance
++	@test -d $I$(CONFFILELOCATION)phraselists/italianbadwords || install -d $I$(CONFFILELOCATION)phraselists/italianbadwords
 +	@test -d $I$(CONFFILELOCATION)phraselists/legaldrugs || install -d $I$(CONFFILELOCATION)phraselists/legaldrugs
 +	@test -d $I$(CONFFILELOCATION)phraselists/personals || install -d $I$(CONFFILELOCATION)phraselists/personals
 +	@test -d $I$(CONFFILELOCATION)phraselists/pornography || install -d $I$(CONFFILELOCATION)phraselists/pornography
-+	@test -d $I$(CONFFILELOCATION)phraselists/violence || install -d $I$(CONFFILELOCATION)phraselists/violence/
++	@test -d $I$(CONFFILELOCATION)phraselists/violence || install -d $I$(CONFFILELOCATION)phraselists/violence
 +	@test -d $I$(CONFFILELOCATION)phraselists/warezhacking || install -d $I$(CONFFILELOCATION)phraselists/warezhacking
 +	@test -d $I$(CONFFILELOCATION)phraselists/weapons || install -d $I$(CONFFILELOCATION)phraselists/weapons
+ 	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
++	@test -d $I$(CONFFILELOCATION)languages/arspanish || install -d $I$(CONFFILELOCATION)languages/arspanish
++	@test -d $I$(CONFFILELOCATION)languages/bulgarian || install -d $I$(CONFFILELOCATION)languages/bulgarian
++	@test -d $I$(CONFFILELOCATION)languages/chinesebig5 || install -d $I$(CONFFILELOCATION)languages/chinesebig5
++	@test -d $I$(CONFFILELOCATION)languages/chinesegb2312 || install -d $I$(CONFFILELOCATION)languages/chineseb2312
++	@test -d $I$(CONFFILELOCATION)languages/czech || install -d $I$(CONFFILELOCATION)languages/czech
++	@test -d $I$(CONFFILELOCATION)languages/danish || install -d $I$(CONFFILELOCATION)languages/danish
++	@test -d $I$(CONFFILELOCATION)languages/french || install -d $I$(CONFFILELOCATION)languages/french
++	@test -d $I$(CONFFILELOCATION)languages/german || install -d $I$(CONFFILELOCATION)languages/german
++	@test -d $I$(CONFFILELOCATION)languages/german2 || install -d $I$(CONFFILELOCATION)languages/german2
++	@test -d $I$(CONFFILELOCATION)languages/indonesian || install -d $I$(CONFFILELOCATION)languages/indonesian
++	@test -d $I$(CONFFILELOCATION)languages/italian || install -d $I$(CONFFILELOCATION)languages/italian
++	@test -d $I$(CONFFILELOCATION)languages/lithuanian || install -d $I$(CONFFILELOCATION)languages/lithuanian
++	@test -d $I$(CONFFILELOCATION)languages/mxspanish || install -d $I$(CONFFILELOCATION)languages/mxspanish
++	@test -d $I$(CONFFILELOCATION)languages/polish || install -d $I$(CONFFILELOCATION)languages/polish
++	@test -d $I$(CONFFILELOCATION)languages/portuguese || install -d $I$(CONFFILELOCATION)languages/portuguese
++	@test -d $I$(CONFFILELOCATION)languages/turkish || install -d $I$(CONFFILELOCATION)languages/turkish
++	@test -d $I$(CONFFILELOCATION)languages/ukenglish || install -d $I$(CONFFILELOCATION)languages/ukenglish
  	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
- 	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
 -	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
--	@test -d $I$(BINARYLOCATION) || /usr/sbin/install -d $I$(BINARYLOCATION)
+-	@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
@@ -53,71 +76,117 @@
 -	cp -f ./bannedurllist $I$(CONFFILELOCATION)bannedurllist
 -	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 ./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
-+	install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian
-+	install -o root -g wheel -m 644 ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf
-+	install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist
-+	install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist
-+	install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist
-+	install -o root -g wheel -m 644 ./phraselists/chat/weighted $I$(CONFFILELOCATION)phraselists/chat/weighted
-+	install -o root -g wheel -m 644 ./phraselists/drugadvocasy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocasy/weighted
-+	install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted
-+	install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted
-+	install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned
-+	install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted
-+	install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception
-+	install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted
-+	install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted
-+	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned
-+	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted
-+	install -o root -g wheel -m 644 ./phraselists/intolerance/banned $I$(CONFFILELOCATION)phraselists/intolerance/banned
-+	install -o root -g wheel -m 644 ./phraselists/intolerance/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted
-+	install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted
-+	install -o root -g wheel -m 644 ./phraselists/personals/weighted $I$(CONFFILELOCATION)phraselists/personals/weighted
-+	install -o root -g wheel -m 644 ./phraselists/pornography/banned $I$(CONFFILELOCATION)phraselists/pornography/banned
-+	install -o root -g wheel -m 644 ./phraselists/pornography/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted
-+	install -o root -g wheel -m 644 ./phraselists/violence/weighted $I$(CONFFILELOCATION)phraselists/violence/weighted
-+	install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted
-+	install -o root -g wheel -m 644 ./phraselists/weapons/weighted $I$(CONFFILELOCATION)phraselists/weapons/weighted
-+	install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist
-+	install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist
-+	install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist
-+	install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist
-+	install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist
-+	install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist
-+	install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist
-+	install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist
-+	install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist
-+	install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist
-+	install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist
-+	install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics
-+	install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html
-+	install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)start-dg.sh
-+	install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
- 	chmod o+x $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
++	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
++	install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist.dist
++	install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist.dist
++	install -o root -g wheel -m 644 ./phraselists/chat/weighted $I$(CONFFILELOCATION)phraselists/chat/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/drugadvocacy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned.dist
++	install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/germanpornography/weighted $I$(CONFFILELOCATION)phraselists/germanpornography/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception.dist
++	install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned.dist
++	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/intolerance/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/italianbadwords/weighted $I$(CONFFILELOCATION)phraselists/italianbadwords/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/personals/weighted $I$(CONFFILELOCATION)phraselists/personals/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/pornography/banned $I$(CONFFILELOCATION)phraselists/pornography/banned.dist
++	install -o root -g wheel -m 644 ./phraselists/pornography/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/violence/weighted $I$(CONFFILELOCATION)phraselists/violence/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted.dist
++	install -o root -g wheel -m 644 ./phraselists/weapons/weighted $I$(CONFFILELOCATION)phraselists/weapons/weighted.dist
++	install -o root -g wheel -m 644 ./languages/ReadMe $I$(CONFFILELOCATION)languages/ReadMe
++	install -o root -g wheel -m 644 ./languages/arspanish/messages $I$(CONFFILELOCATION)languages/arspanish/messages
++	install -o root -g wheel -m 644 ./languages/arspanish/template.html $I$(CONFFILELOCATION)languages/arspanish/template.html
++	install -o root -g wheel -m 644 ./languages/bulgarian/messages $I$(CONFFILELOCATION)languages/bulgarian/messages
++	install -o root -g wheel -m 644 ./languages/bulgarian/template.html $I$(CONFFILELOCATION)languages/bulgarian/template.html
++	install -o root -g wheel -m 644 ./languages/chinesebig5/messages $I$(CONFFILELOCATION)languages/chinesebig5/messages
++	install -o root -g wheel -m 644 ./languages/chinesebig5/template.html $I$(CONFFILELOCATION)languages/chinesebig5/template.html
++	install -o root -g wheel -m 644 ./languages/chinesegb2312/messages $I$(CONFFILELOCATION)languages/chineseb2312/messages
++	install -o root -g wheel -m 644 ./languages/chinesegb2312/template.html $I$(CONFFILELOCATION)languages/chineseb2312/template.html
++	install -o root -g wheel -m 644 ./languages/czech/messages $I$(CONFFILELOCATION)languages/czech/messages
++	install -o root -g wheel -m 644 ./languages/czech/template.html $I$(CONFFILELOCATION)languages/czech/template.html
++	install -o root -g wheel -m 644 ./languages/danish/messages $I$(CONFFILELOCATION)languages/danish/messages
++	install -o root -g wheel -m 644 ./languages/danish/template.html $I$(CONFFILELOCATION)languages/danish/template.html
++	install -o root -g wheel -m 644 ./languages/french/messages $I$(CONFFILELOCATION)languages/french/messages
++	install -o root -g wheel -m 644 ./languages/french/template.html $I$(CONFFILELOCATION)languages/french/template.html
++	install -o root -g wheel -m 644 ./languages/german/messages $I$(CONFFILELOCATION)languages/german/messages
++	install -o root -g wheel -m 644 ./languages/german/template.html $I$(CONFFILELOCATION)languages/german/template.html
++	install -o root -g wheel -m 644 ./languages/german2/messages $I$(CONFFILELOCATION)languages/german2/messages
++	install -o root -g wheel -m 644 ./languages/german2/template.html $I$(CONFFILELOCATION)languages/german2/template.html
++	install -o root -g wheel -m 644 ./languages/indonesian/messages $I$(CONFFILELOCATION)languages/indonesian/messages
++	install -o root -g wheel -m 644 ./languages/indonesian/template.html $I$(CONFFILELOCATION)languages/indonesian/template.html
++	install -o root -g wheel -m 644 ./languages/italian/messages $I$(CONFFILELOCATION)languages/italian/messages
++	install -o root -g wheel -m 644 ./languages/italian/template.html $I$(CONFFILELOCATION)languages/italian/template.html
++	install -o root -g wheel -m 644 ./languages/lithuanian/messages $I$(CONFFILELOCATION)languages/lithuanian/messages
++	install -o root -g wheel -m 644 ./languages/lithuanian/template.html $I$(CONFFILELOCATION)languages/lithuanian/template.html
++	install -o root -g wheel -m 644 ./languages/mxspanish/messages $I$(CONFFILELOCATION)languages/mxspanish/messages
++	install -o root -g wheel -m 644 ./languages/mxspanish/template.html $I$(CONFFILELOCATION)languages/mxspanish/template.html
++	install -o root -g wheel -m 644 ./languages/polish/messages $I$(CONFFILELOCATION)languages/polish/messages
++	install -o root -g wheel -m 644 ./languages/polish/template.html $I$(CONFFILELOCATION)languages/polish/template.html
++	install -o root -g wheel -m 644 ./languages/portuguese/messages $I$(CONFFILELOCATION)languages/portuguese/messages
++	install -o root -g wheel -m 644 ./languages/portuguese/template.html $I$(CONFFILELOCATION)languages/portuguese/template.html
++	install -o root -g wheel -m 644 ./languages/turkish/messages $I$(CONFFILELOCATION)languages/turkish/messages
++	install -o root -g wheel -m 644 ./languages/turkish/template.html $I$(CONFFILELOCATION)languages/turkish/template.html
++	install -o root -g wheel -m 644 ./languages/ukenglish/messages $I$(CONFFILELOCATION)languages/ukenglish/messages
++	install -o root -g wheel -m 644 ./languages/ukenglish/template.html $I$(CONFFILELOCATION)languages/ukenglish/template.html
++	install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist.dist
++	install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist.dist
++	install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist.dist
++	install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist.dist
++	install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist.dist
++	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 ./transparent1x1.gif $I$(CONFFILELOCATION)transparent1x1.gif
++	install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)start-dg.sh
++	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
-+	touch $I$(LOGLOCATION)dansguardian.log
-+	chown $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)dansguardian.log
++	@test -f $I$(LOGLOCATION)dansguardian.log || install -o root -g wheel -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log
  
  uninstall:
  	rm -f $(BINARYLOCATION)dansguardian
-@@ -81,7 +111,7 @@
+ 	rm -f $(SYSVLOCATION)dansguardian
  	rm -f $(CGIBINLOCATION)dansguardian.pl
- 	rm -f $(MANUALFILES)man8/dansguardian.8.gz
+-	rm -f $(MANUALFILES)man8/dansguardian.8.gz
++	rm -f $(MANUALFILES)man8/dansguardian.8*
  	rm -fr $(CONFFILELOCATION)
 -	rm -fr $(LOGLOCATION)
+-	if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f $(LOGROTATELOCATION)dansguardian; fi
 +	rm -f $(LOGLOCATION)dansguardian.log
  
  clean:
diff --git a/www/dansguardian-devel/files/patch-configure b/www/dansguardian-devel/files/patch-configure
index 6a846144307b..605147dd127d 100644
--- a/www/dansguardian-devel/files/patch-configure
+++ b/www/dansguardian-devel/files/patch-configure
@@ -1,11 +1,107 @@
---- configure-orig	Mon Oct 21 10:42:02 2002
-+++ configure	Mon Oct 21 10:42:15 2002
-@@ -2676,7 +2676,7 @@
+--- configure.orig	Thu Jan  8 11:48:38 2004
++++ configure	Thu Jan  8 11:53:04 2004
+@@ -2543,7 +2543,7 @@
  $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
  $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
  $extendedecho "MANUALFILES = \${PREFIX}$mandir" >>Makefile
 -$extendedecho "LOGLOCATION = \${PREFIX}$logdir" >>Makefile
-+$extendedecho "LOGLOCATION = $logdir" >>Makefile
++$extendedecho "LOGLOCATION = \$logdir" >>Makefile
+ $extendedecho "LOGROTATELOCATION = \${PREFIX}$logrotatedir" >>Makefile
  echo "PROXYUSER = $runas_usr" >>Makefile
  echo "PROXYGROUP = $runas_grp" >>Makefile
- echo "PIDDIR = $piddir" >>Makefile
+@@ -2708,27 +2708,6 @@
+                         rm -f dansguardian.bsdv
+                 fi
+                 cat autoconf/bsdv.in > dansguardian.bsdv
+-                $extendedecho "        [ -x $prefixdir$bindir\c" >> dansguardian.bsdv
+-                $extendedecho "dansguardian ] && $prefixdir$bindir\c" >> dansguardian.bsdv
+-                echo "dansguardian > /dev/null && $extendedecho ' dansguardian\c'" >> dansguardian.bsdv
+-                echo "        ;;" >> dansguardian.bsdv
+-                echo "stop)" >> dansguardian.bsdv
+-                $extendedecho "        $prefixdir$bindir\c" >> dansguardian.bsdv
+-                echo "dansguardian -q" >> dansguardian.bsdv
+-                $extendedecho "        [ -r /tmp/\c" >> dansguardian.bsdv
+-                echo ".dguardianipc ] && $extendedecho ' dansguardian\c'" >> dansguardian.bsdv
+-                echo "        rm -f /tmp/.dguardianipc" >> dansguardian.bsdv
+-                echo "        ;;" >> dansguardian.bsdv
+-                echo "restart)" >> dansguardian.bsdv
+-                echo "        \$0 stop" >> dansguardian.bsdv
+-                echo "        \$0 start" >> dansguardian.bsdv
+-                echo "        ;;" >> dansguardian.bsdv
+-                echo "*)" >> dansguardian.bsdv
+-                echo "        echo \"Usage: `basename \$0` {start|stop|restart}\" >&2" >> dansguardian.bsdv
+-                echo "        ;;" >> dansguardian.bsdv
+-                echo "esac" >> dansguardian.bsdv
+-                echo "exit 0" >> dansguardian.bsdv
+-                chmod u+x dansguardian.bsdv
+ 	;;
+ 	NetBSD*)
+ 		if [ -f dansguardian.bsdv ]; then
+@@ -2875,7 +2854,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
+@@ -3362,9 +3341,9 @@
+ echo "#!/bin/sh" >logrotation
+ echo "# DansGuardian logrotation script for version 2.7.6" >>logrotation
+ echo "" >>logrotation
+-echo "LOG_DIR=$prefixdir$logdir" >>logrotation
++echo "LOG_DIR=$logdir" >>logrotation
+ echo "NUM_LOGS=4" >>logrotation
+-echo "LOG=\$LOG_DIR/access.log" >>logrotation
++echo "LOG=\$LOG_DIR/dansguardian.log" >>logrotation
+ echo "" >>logrotation
+ 
+ case `uname -s` in
+@@ -3380,7 +3359,7 @@
+ 	;;
+ 	FreeBSD*)
+ 	        $extendedecho "$prefixdir$sysvdir\c" >>logrotation
+-	        echo "dansguardian.sh stop > /dev/null" >>logrotation
++	        echo "start-dg.sh stop > /dev/null" >>logrotation
+ 	        echo "" >>logrotation
+ 	;;
+ 	NetBSD*)
+@@ -3437,7 +3416,7 @@
+ 	;;
+ 	FreeBSD*)
+ 	        $extendedecho "$prefixdir$sysvdir\c" >>logrotation
+-	        echo "dansguardian.sh start > /dev/null" >>logrotation
++	        echo "start-dg.sh start > /dev/null" >>logrotation
+ 	        echo "" >>logrotation
+ 	;;
+ 	NetBSD*)
+@@ -3464,8 +3443,8 @@
+ 	rm -f logrotate.dansguardian
+ fi
+ 
+-$extendedecho "$prefixdir$logdir\c" >>logrotate.dansguardian
+-echo "access.log {" >>logrotate.dansguardian
++$extendedecho "$logdir\c" >>logrotate.dansguardian
++echo "dansguardian.log {" >>logrotate.dansguardian
+ echo "  rotate 4" >>logrotate.dansguardian
+ echo "  weekly" >>logrotate.dansguardian
+ echo "  sharedscripts" >>logrotate.dansguardian
+@@ -3481,7 +3460,7 @@
+ 	;;
+ 	FreeBSD*)
+ 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
+-	        echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian
++	        echo "start-dg.sh stop > /dev/null" >>logrotate.dansguardian
+ 	;;
+ 	NetBSD*)
+ 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
+@@ -3512,7 +3491,7 @@
+ 	;;
+ 	FreeBSD*)
+ 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
+-	        echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian
++	        echo "start-dg.sh start > /dev/null" >>logrotate.dansguardian
+ 	;;
+ 	NetBSD*)
+ 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
diff --git a/www/dansguardian-devel/pkg-descr b/www/dansguardian-devel/pkg-descr
index 5157af6dd12e..14a53fa594b0 100644
--- a/www/dansguardian-devel/pkg-descr
+++ b/www/dansguardian-devel/pkg-descr
@@ -11,8 +11,12 @@ It filters using multiple methods, including:
   - POST filtering
   - user and source IP filtering
 
+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://backup.dansguardian.org
 
 - Freddie Cash
-fcash@bigfoot.com
+fcash@sd73.bc.ca
diff --git a/www/dansguardian-devel/pkg-plist b/www/dansguardian-devel/pkg-plist
index bbf6d10845a5..8cd22fd3bde4 100644
--- a/www/dansguardian-devel/pkg-plist
+++ b/www/dansguardian-devel/pkg-plist
@@ -1,69 +1,150 @@
 @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
 @exec mkdir -p etc/dansguardian/phraselists
 @exec mkdir -p etc/dansguardian/phraselists/chat
-@exec mkdir -p etc/dansguardian/phraselists/drugadvocasy
+@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
 @exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
 @exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
 @exec mkdir -p etc/dansguardian/phraselists/gambling
+@exec mkdir -p etc/dansguardian/phraselists/germanpornography
 @exec mkdir -p etc/dansguardian/phraselists/goodphrases
 @exec mkdir -p etc/dansguardian/phraselists/gore
 @exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
 @exec mkdir -p etc/dansguardian/phraselists/intolerance
+@exec mkdir -p etc/dansguardian/phraselists/italianbadwords
 @exec mkdir -p etc/dansguardian/phraselists/legaldrugs
 @exec mkdir -p etc/dansguardian/phraselists/personals
 @exec mkdir -p etc/dansguardian/phraselists/pornography
 @exec mkdir -p etc/dansguardian/phraselists/violence
 @exec mkdir -p etc/dansguardian/phraselists/warezhacking
 @exec mkdir -p etc/dansguardian/phraselists/weapons
-sbin/dansguardian
-etc/dansguardian/bannedextensionlist
-etc/dansguardian/bannediplist
-etc/dansguardian/bannedphraselist
-etc/dansguardian/bannedmimetypelist
-etc/dansguardian/bannedregexpurllist
-etc/dansguardian/bannedsitelist
-etc/dansguardian/bannedurllist
-etc/dansguardian/banneduserlist
-etc/dansguardian/dansguardian.conf
-etc/dansguardian/exceptionphraselist
-etc/dansguardian/exceptionurllist
-etc/dansguardian/exceptionuserlist
-etc/dansguardian/exceptionsitelist
-etc/dansguardian/exceptioniplist
-etc/dansguardian/phraselists/chat/weighted
-etc/dansguardian/phraselists/drugadvocasy/weighted
-etc/dansguardian/phraselists/dutchbadwords/weighted
-etc/dansguardian/phraselists/frenchbadwords/weighted
-etc/dansguardian/phraselists/gambling/banned
-etc/dansguardian/phraselists/gambling/weighted
-etc/dansguardian/phraselists/goodphrases/exception
-etc/dansguardian/phraselists/goodphrases/weighted
-etc/dansguardian/phraselists/gore/weighted
-etc/dansguardian/phraselists/illegaldrugs/banned
-etc/dansguardian/phraselists/illegaldrugs/weighted
-etc/dansguardian/phraselists/intolerance/banned
-etc/dansguardian/phraselists/intolerance/weighted
-etc/dansguardian/phraselists/legaldrugs/weighted
-etc/dansguardian/phraselists/personals/weighted
-etc/dansguardian/phraselists/pornography/banned
-etc/dansguardian/phraselists/pornography/weighted
-etc/dansguardian/phraselists/violence/weighted
-etc/dansguardian/phraselists/warezhacking/weighted
-etc/dansguardian/phraselists/weapons/weighted
-etc/dansguardian/pics
-etc/dansguardian/template.html
-etc/dansguardian/weightedphraselist
+etc/dansguardian/bannedextensionlist.dist
+etc/dansguardian/bannediplist.dist
+etc/dansguardian/bannedmimetypelist.dist
+etc/dansguardian/bannedphraselist.dist
+etc/dansguardian/bannedregexpurllist.dist
+etc/dansguardian/bannedsitelist.dist
+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/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/chineseb2312/messages
+etc/dansguardian/languages/chineseb2312/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/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
+etc/dansguardian/phraselists/chat/weighted.dist
+etc/dansguardian/phraselists/drugadvocacy/weighted.dist
+etc/dansguardian/phraselists/dutchbadwords/weighted.dist
+etc/dansguardian/phraselists/frenchbadwords/weighted.dist
+etc/dansguardian/phraselists/gambling/banned.dist
+etc/dansguardian/phraselists/gambling/weighted.dist
+etc/dansguardian/phraselists/germanpornography/weighted.dist
+etc/dansguardian/phraselists/goodphrases/exception.dist
+etc/dansguardian/phraselists/goodphrases/weighted.dist
+etc/dansguardian/phraselists/gore/weighted.dist
+etc/dansguardian/phraselists/illegaldrugs/banned.dist
+etc/dansguardian/phraselists/illegaldrugs/weighted.dist
+etc/dansguardian/phraselists/intolerance/weighted.dist
+etc/dansguardian/phraselists/italianbadwords/weighted.dist
+etc/dansguardian/phraselists/legaldrugs/weighted.dist
+etc/dansguardian/phraselists/personals/weighted.dist
+etc/dansguardian/phraselists/pornography/banned.dist
+etc/dansguardian/phraselists/pornography/weighted.dist
+etc/dansguardian/phraselists/violence/weighted.dist
+etc/dansguardian/phraselists/warezhacking/weighted.dist
+etc/dansguardian/phraselists/weapons/weighted.dist
 etc/rc.d/start-dg.sh
-www/cgi-bin/dansguardian.pl
+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/chineseb2312
+@dirrm etc/dansguardian/languages/czech
+@dirrm etc/dansguardian/languages/danish
+@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
 @dirrm etc/dansguardian/phraselists/chat
-@dirrm etc/dansguardian/phraselists/drugadvocasy
+@dirrm etc/dansguardian/phraselists/drugadvocacy
 @dirrm etc/dansguardian/phraselists/dutchbadwords
 @dirrm etc/dansguardian/phraselists/frenchbadwords
 @dirrm etc/dansguardian/phraselists/gambling
+@dirrm etc/dansguardian/phraselists/germanpornography
 @dirrm etc/dansguardian/phraselists/goodphrases
 @dirrm etc/dansguardian/phraselists/gore
 @dirrm etc/dansguardian/phraselists/illegaldrugs
 @dirrm etc/dansguardian/phraselists/intolerance
+@dirrm etc/dansguardian/phraselists/italianbadwords
 @dirrm etc/dansguardian/phraselists/legaldrugs
 @dirrm etc/dansguardian/phraselists/personals
 @dirrm etc/dansguardian/phraselists/pornography
@@ -72,5 +153,4 @@ www/cgi-bin/dansguardian.pl
 @dirrm etc/dansguardian/phraselists/weapons
 @dirrm etc/dansguardian/phraselists
 @dirrm etc/dansguardian
-@cwd /
-var/log/dansguardian.log
+@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually