6 files changed, 120 insertions, 38 deletions

diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 7d04c054b3f4..41c4420a8748 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.4.5.2
+PORTVERSION=	2.4.6.5
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
diff --git a/www/dansguardian-devel/distinfo b/www/dansguardian-devel/distinfo
index aa14c25f04ff..7615557cf06a 100644
--- a/www/dansguardian-devel/distinfo
+++ b/www/dansguardian-devel/distinfo
@@ -1 +1 @@
-MD5 (DansGuardian-2.4.5-2.source.tar.gz) = 7a04dc4b50795bc836ef21f1755385b4
+MD5 (DansGuardian-2.4.6-5.source.tar.gz) = 8aa42b299cd798c80ff09ed866a91b63
diff --git a/www/dansguardian-devel/files/patch-autoconf::fbsd.in b/www/dansguardian-devel/files/patch-autoconf::fbsd.in
index bf853f243dd3..3b568074a960 100644
--- a/www/dansguardian-devel/files/patch-autoconf::fbsd.in
+++ b/www/dansguardian-devel/files/patch-autoconf::fbsd.in
@@ -1,7 +1,7 @@
---- autoconf/fbsd.in.orig	Wed May 22 10:25:23 2002
-+++ autoconf/fbsd.in	Wed May 22 10:25:28 2002
-@@ -18,7 +18,7 @@
-                  dansguardian.conf config.cache Makefile logrotation weightedphraselist
+--- 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
  
  PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
 -PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
@@ -9,8 +9,33 @@
  PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
  PASSVARS += -DPIDDIR=\"${PIDDIR}\"
  
-@@ -43,39 +43,36 @@
+@@ -36,44 +36,74 @@
+ .cpp.o:
+ 	$(CPP) $(DEBUG) $(CFLAGS) -c $<
+ 
+-all:	$(OBJ) 
++all:	$(OBJ)
+ 	$(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)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/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/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/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/warezhacking || install -d $I$(CONFFILELOCATION)phraselists/warezhacking
++	@test -d $I$(CONFFILELOCATION)phraselists/weapons || install -d $I$(CONFFILELOCATION)phraselists/weapons
  	@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)
@@ -20,11 +45,7 @@
 -	cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist
 -	cp -f ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist
 -	cp -f ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist
--	cp -f ./weightedphraselist.goodwords $I$(CONFFILELOCATION)weightedphraselist.goodwords
--	cp -f ./weightedphraselist.personals $I$(CONFFILELOCATION)weightedphraselist.personals
--	cp -f ./weightedphraselist.pornsites $I$(CONFFILELOCATION)weightedphraselist.pornsites
--	cp -f ./weightedphraselist.pornwords $I$(CONFFILELOCATION)weightedphraselist.pornwords
--	cp -f ./weightedphraselist.warez $I$(CONFFILELOCATION)weightedphraselist.warez
+-	cp -f -R ./phraselists/* $I$(CONFFILELOCATION)phraselists/
 -	cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist
 -	cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserlist
 -	cp -f ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist
@@ -41,17 +62,31 @@
 -	cp -f ./logrotation $I$(CONFFILELOCATION)logrotation
 -	cp -f ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian.sh
 -	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
-+	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
 +	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 ./weightedphraselist.goodwords $I$(CONFFILELOCATION)weightedphraselist.goodwords
-+	install -o root -g wheel -m 644 ./weightedphraselist.personals $I$(CONFFILELOCATION)weightedphraselist.personals
-+	install -o root -g wheel -m 644 ./weightedphraselist.pornsites $I$(CONFFILELOCATION)weightedphraselist.pornsites
-+	install -o root -g wheel -m 644 ./weightedphraselist.pornwords $I$(CONFFILELOCATION)weightedphraselist.pornwords
-+	install -o root -g wheel -m 644 ./weightedphraselist.warez $I$(CONFFILELOCATION)weightedphraselist.warez
++	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
@@ -65,7 +100,7 @@
 +	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)dansguardian.sh
++	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
 -	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
@@ -73,12 +108,12 @@
 -	chmod -R u+wr $I$(LOGLOCATION)
 -	chmod u+wrx $I$(LOGLOCATION)
 +	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
++	touch $I$(LOGLOCATION)dansguardian.log
++	chown $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)dansguardian.log
  
  uninstall:
  	rm -f $(BINARYLOCATION)dansguardian
-@@ -83,7 +80,7 @@
+@@ -81,7 +111,7 @@
  	rm -f $(CGIBINLOCATION)dansguardian.pl
  	rm -f $(MANUALFILES)man8/dansguardian.8.gz
  	rm -fr $(CONFFILELOCATION)
diff --git a/www/dansguardian-devel/files/patch-configure b/www/dansguardian-devel/files/patch-configure
index a2468bfdf6e0..6a846144307b 100644
--- a/www/dansguardian-devel/files/patch-configure
+++ b/www/dansguardian-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr  2 12:45:16 2002
-+++ configure	Tue Apr  2 12:46:34 2002
-@@ -2663,7 +2663,7 @@
+--- configure-orig	Mon Oct 21 10:42:02 2002
++++ configure	Mon Oct 21 10:42:15 2002
+@@ -2676,7 +2676,7 @@
  $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
  $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
  $extendedecho "MANUALFILES = \${PREFIX}$mandir" >>Makefile
diff --git a/www/dansguardian-devel/files/patch-dansguardian.8 b/www/dansguardian-devel/files/patch-dansguardian.8
index 757d264c0962..6a0f9d231d1b 100644
--- a/www/dansguardian-devel/files/patch-dansguardian.8
+++ b/www/dansguardian-devel/files/patch-dansguardian.8
@@ -1,11 +1,11 @@
---- dansguardian.8.orig	Tue Apr  2 12:38:51 2002
-+++ dansguardian.8	Tue Apr  2 12:39:12 2002
+--- dansguardian.8-orig	Mon Oct 21 10:39:49 2002
++++ dansguardian.8	Mon Oct 21 10:40:22 2002
 @@ -3,7 +3,7 @@
  .SH NAME
  DansGuardian 2
  .SH SYNOPSIS
 -/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
-+/usr/local/etc/rc.d/dansguardian [stop|start|restart]
++/usr/local/etc/rc.d/start-dg [stop|start|restart]
  .SH DESCRIPTION
  A Introduction
  
diff --git a/www/dansguardian-devel/pkg-plist b/www/dansguardian-devel/pkg-plist
index 0e5aacb5cf8f..bbf6d10845a5 100644
--- a/www/dansguardian-devel/pkg-plist
+++ b/www/dansguardian-devel/pkg-plist
@@ -1,29 +1,76 @@
 @exec mkdir -p etc/dansguardian
+@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/dutchbadwords
+@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
+@exec mkdir -p etc/dansguardian/phraselists/gambling
+@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/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/bannedmimetypelist
 etc/dansguardian/bannedphraselist
+etc/dansguardian/bannedmimetypelist
 etc/dansguardian/bannedregexpurllist
 etc/dansguardian/bannedsitelist
 etc/dansguardian/bannedurllist
 etc/dansguardian/banneduserlist
 etc/dansguardian/dansguardian.conf
-etc/dansguardian/exceptioniplist
 etc/dansguardian/exceptionphraselist
-etc/dansguardian/exceptionsitelist
 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/weightedphraselist.goodwords
-etc/dansguardian/weightedphraselist.personals
-etc/dansguardian/weightedphraselist.pornsites
-etc/dansguardian/weightedphraselist.pornwords
-etc/dansguardian/weightedphraselist.warez
-etc/rc.d/dansguardian.sh
-sbin/dansguardian
+etc/rc.d/start-dg.sh
 www/cgi-bin/dansguardian.pl
+@dirrm etc/dansguardian/phraselists/chat
+@dirrm etc/dansguardian/phraselists/drugadvocasy
+@dirrm etc/dansguardian/phraselists/dutchbadwords
+@dirrm etc/dansguardian/phraselists/frenchbadwords
+@dirrm etc/dansguardian/phraselists/gambling
+@dirrm etc/dansguardian/phraselists/goodphrases
+@dirrm etc/dansguardian/phraselists/gore
+@dirrm etc/dansguardian/phraselists/illegaldrugs
+@dirrm etc/dansguardian/phraselists/intolerance
+@dirrm etc/dansguardian/phraselists/legaldrugs
+@dirrm etc/dansguardian/phraselists/personals
+@dirrm etc/dansguardian/phraselists/pornography
+@dirrm etc/dansguardian/phraselists/violence
+@dirrm etc/dansguardian/phraselists/warezhacking
+@dirrm etc/dansguardian/phraselists/weapons
+@dirrm etc/dansguardian/phraselists
 @dirrm etc/dansguardian
 @cwd /
 var/log/dansguardian.log