7 files changed, 49 insertions, 121 deletions

diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index c0c2932cc992..7444dc18b2d6 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -6,41 +6,45 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.2.7.1
+PORTVERSION=	2.2.8.0
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
-DISTNAME=	DansGuardian-2.2.7-1.source
+DISTNAME=	DansGuardian-2.2.8-0.source
 
 MAINTAINER=	fcash@bigfoot.com
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
 
-WRKSRC=		${WRKDIR}/DansGuardian-2.2.7
+WRKSRC=		${WRKDIR}/DansGuardian-2.2.8
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--bindir=/sbin/ \
 		--sysconfdir=/etc/dansguardian/ \
 		--sysvdir=/etc/rc.d/ \
 		--mandir=/man/ \
-		--logdir=/squid/logs/ \
+		--logdir=/var/log/ \
 		--cgidir=/www/cgi-bin/ \
 		--piddir=/var/run/
 
 DG_URL=		http://dansguardian.org/index.php?page=copyright2
 
 .if defined(WITHOUT_PICS)
-CONFIGURE_ARGS+= --without-pics-filter
+CONFIGURE_ARGS+=	--without-pics-filter
 .endif
 
 MAN8=		dansguardian.8
-MANCOMPRESSED=	no
 
 NO_CDROM=	"Commercial download is restricted.  Check ${DG_URL} for more info"
 NO_PACKAGE=	"Redistribution is restricted.  Check ${DG_URL} for more info"
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+.include <bsd.port.pre.mk>
+
+.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
 FORBIDDEN="Commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
 .endif
 
-.include <bsd.port.mk>
+post-install:
+	@${CAT} pkg-message
+
+.include <bsd.port.post.mk>
diff --git a/www/dansguardian/distinfo b/www/dansguardian/distinfo
index 37e727b7bc3a..af338d02c839 100644
--- a/www/dansguardian/distinfo
+++ b/www/dansguardian/distinfo
@@ -1 +1 @@
-MD5 (DansGuardian-2.2.7-1.source.tar.gz) = f2157a54a2a07d78323e2cc64072ff6e
+MD5 (DansGuardian-2.2.8-0.source.tar.gz) = 36eab61ddb5639d1aaed677a6da764e6
diff --git a/www/dansguardian/files/patch-ConnectionHandler.cpp b/www/dansguardian/files/patch-ConnectionHandler.cpp
deleted file mode 100644
index 493611d4d5b3..000000000000
--- a/www/dansguardian/files/patch-ConnectionHandler.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ConnectionHandler.cpp.orig	Tue Mar 26 08:22:34 2002
-+++ ConnectionHandler.cpp	Tue Mar 26 08:25:12 2002
-@@ -293,7 +293,9 @@
- 
-                         checkme.checkphrase(docbodyblock, dblen, options);
- 
-+#ifndef WITHOUT_PICS_FILTER
-                         checkme.checkPICS(docbodyblock, dblen, options);
-+#endif
-                     } catch (exception& e) {}
-                     delete[] docbodyblock;
-                 }
diff --git a/www/dansguardian/files/patch-autoconf::fbsd.in b/www/dansguardian/files/patch-autoconf::fbsd.in
index 46a0d1c638f8..a6c194edb2ca 100644
--- a/www/dansguardian/files/patch-autoconf::fbsd.in
+++ b/www/dansguardian/files/patch-autoconf::fbsd.in
@@ -1,5 +1,5 @@
---- autoconf/fbsd.in.orig	Thu Mar 14 16:54:40 2002
-+++ autoconf/fbsd.in	Tue Mar 26 09:29:25 2002
+--- autoconf/fbsd.in.orig	Tue Apr  2 11:51:15 2002
++++ autoconf/fbsd.in	Tue Apr  2 11:54:12 2002
 @@ -17,7 +17,7 @@
                   dansguardian.conf config.cache Makefile logrotation
  
@@ -9,19 +9,20 @@
  PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
  PASSVARS += -DPIDDIR=\"${PIDDIR}\"
  
-@@ -29,7 +29,7 @@
- 
- 
- CFLAGS = $(OPTIMISE) $(WARNING)
--DGCFLAGS = $(OPTIMISE) $(PASSVARS) -lz $(STATIC)
-+DGCFLAGS = $(OPTIMISE) $(PASSVARS) $(PICS_FLAG) -lz $(STATIC)
- 
+@@ -34,36 +34,31 @@
  .cpp.o:
  	$(CPP) $(DEBUG) $(CFLAGS) -c $<
-@@ -44,26 +44,24 @@
- 	@test -d $(MANUALFILES)man8/ || install -d $(MANUALFILES)man8/
- 	@test -d $(LOGLOCATION) || install -d $(LOGLOCATION)
- 	@test -d $(BINARYLOCATION) || /usr/sbin/install -d $(BINARYLOCATION)
+ 
+ all:	$(OBJ) 
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+ 	@test -d $(SYSVLOCATION) || install -d $(SYSVLOCATION)
+ 	@test -d $(CONFFILELOCATION) || install -d $(CONFFILELOCATION)
+ 	@test -d $(CGIBINLOCATION) || install -d $(CGIBINLOCATION)
+-	@test -d $(MANUALFILES)man8/ || install -d $(MANUALFILES)man8/
+-	@test -d $(LOGLOCATION) || install -d $(LOGLOCATION)
+-	@test -d $(BINARYLOCATION) || /usr/sbin/install -d $(BINARYLOCATION)
 -	cp -f ./dansguardian $(BINARYLOCATION)dansguardian
 -	cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
 -	cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphraselist
@@ -42,6 +43,7 @@
 -	chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)
 -	chmod -R u+wr $(LOGLOCATION)
 -	chmod u+wrx $(LOGLOCATION)
++	@test -d $(BINARYLOCATION) || install -d $(BINARYLOCATION)
 +	@install -m 755 -o root -g wheel ./dansguardian $(BINARYLOCATION)dansguardian
 +	@install -m 644 -o root -g wheel ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
 +	@install -m 644 -o root -g wheel ./bannedphraselist $(CONFFILELOCATION)bannedphraselist
@@ -54,7 +56,6 @@
 +	@install -m 644 -o root -g wheel ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist
 +	@install -m 644 -o root -g wheel ./exceptioniplist $(CONFFILELOCATION)exceptioniplist
 +	@install -m 644 -o root -g wheel ./pics $(CONFFILELOCATION)pics
-+	@install -m 755 -o root -g wheel ./logrotation $(CONFFILELOCATION)logrotation
 +	@install -m 755 -o root -g wheel ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh
 +	@install -m 755 -o root -g wheel ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl
 +	@install -m 644 -o root -g wheel ./dansguardian.8 $(MANUALFILES)man8/dansguardian.8
@@ -63,7 +64,7 @@
  
  uninstall:
  	rm -f $(BINARYLOCATION)dansguardian
-@@ -71,7 +69,7 @@
+@@ -71,7 +66,7 @@
  	rm -f $(CGIBINLOCATION)dansguardian.pl
  	rm -f $(MANUALFILES)man8/dansguardian.8.gz
  	rm -fr $(CONFFILELOCATION)
diff --git a/www/dansguardian/files/patch-configure b/www/dansguardian/files/patch-configure
index bbef89706147..fc9087458d6d 100644
--- a/www/dansguardian/files/patch-configure
+++ b/www/dansguardian/files/patch-configure
@@ -1,85 +1,11 @@
---- configure.orig	Thu Mar 14 16:54:40 2002
-+++ configure	Tue Mar 26 08:58:45 2002
-@@ -43,6 +43,7 @@
- mandir='/usr/man/'
- logdir='/var/log/dansguardian/'
- piddir='/var/run/'
-+with_pics_filter="yes"
- 
- 
- case `uname -s` in
-@@ -112,7 +113,10 @@
-   --runas_usr=USER        run as user DEFAULT [$runas_usr]
-   --runas_grp=GROUP       run as group DEFAULT [$runas_grp]
-   --piddir=DIR            pid file in DIR [$piddir] (ignores prefix)
-   --prefix=DIR            prefix root path DEFAULT [$prefixdir] (no trailing /)
-+Features and packages:
-+  --without-pics-filter   Disables PICS/ICRA filtering
-+
- Do not forget the heading *and* trailing / except for prefix which only needs
- a heading /
- EOF
-@@ -2668,6 +2672,13 @@
+--- configure.orig	Tue Apr  2 09:15:26 2002
++++ configure	Tue Apr  2 09:29:41 2002
+@@ -2667,7 +2667,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
+ echo "PROXYUSER = $runas_usr" >>Makefile
  echo "PROXYGROUP = $runas_grp" >>Makefile
  echo "PIDDIR = $piddir" >>Makefile
- 
-+case "${with_pics_filter}" in
-+	no)
-+		$extendedecho "  Turning off PICS/ICRA filtering."
-+		$extendedecho "\n\${PICS_FLAG} = -DWITHOUT_PICS_FILTER" >> Makefile
-+	;;
-+esac
-+
- case `uname -s` in
- 	SunOS*)
- 		echo "#undef __BSD" >autoconf/platform.h
-@@ -2740,31 +2751,24 @@
-                 chmod u+x dansguardian.bsdv
- 	;;
- 	FreeBSD*)
--		if [ -f dansguardian.bsdv ]; then
--                        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
-+		cat autoconf/bsdv.in > dansguardian.bsdv
-+		$extendedecho "\t[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian > /dev/null && echo -n \" dansguardian\"" >> dansguardian.bsdv
-+		$extendedecho "\t;;" >> dansguardian.bsdv
-+		$extendedecho "stop)" >> dansguardian.bsdv
-+		$extendedecho "\t/usr/local/sbin/dansguardian -q" >> dansguardian.bsdv
-+		$extendedecho "\t[ -r /tmp/.dguardianipc ] && echo -n \" dansguardian\"" >> dansguardian.bsdv
-+		$extendedecho "\trm -f /tmp/.dguardianipc" >> dansguardian.bsdv
-+		$extendedecho "\t;;" >> dansguardian.bsdv
-+		$extendedecho "restart)" >> dansguardian.bsdv
-+		$extendedecho "\t\$0 stop" >> dansguardian.bsdv
-+		$extendedecho "\t\$0 start" >> dansguardian.bsdv
-+		$extendedecho "\t;;" >> dansguardian.bsdv
-+		$extendedecho "*)" >> dansguardian.bsdv
-+		$extendedecho "\techo \"Usage: \$0 {start|stop|restart}\" >&2" >> dansguardian.bsdv
-+		$extendedecho "\t;;" >> dansguardian.bsdv
-+		$extendedecho "esac" >> dansguardian.bsdv
-+		$extendedecho "exit 0" >> dansguardian.bsdv
-+
- 	;;
- 	Linux*)
- 		if [ -f dansguardian.sysv ]; then
diff --git a/www/dansguardian/pkg-message b/www/dansguardian/pkg-message
new file mode 100644
index 000000000000..992beccce6d1
--- /dev/null
+++ b/www/dansguardian/pkg-message
@@ -0,0 +1,8 @@
+===>   Please Note:
+
+*******************************************************************************
+       This port has placed a log file in /var/log/ named dansguardian.log
+       This log file can get quite large.  Please read the newsyslog(8) man
+       page for instructions on setting up log rotation and compression.
+*******************************************************************************
+
diff --git a/www/dansguardian/pkg-plist b/www/dansguardian/pkg-plist
index 2a3909ca830d..f6c8a9188faf 100644
--- a/www/dansguardian/pkg-plist
+++ b/www/dansguardian/pkg-plist
@@ -10,8 +10,9 @@ etc/dansguardian/exceptionsitelist
 etc/dansguardian/exceptionuserlist
 etc/dansguardian/exceptioniplist
 etc/dansguardian/pics
-etc/dansguardian/logrotation
+etc/rc.d/dansguardian.sh
 sbin/dansguardian
-squid/logs/dansguardian.log
 www/cgi-bin/dansguardian.pl
 @dirrm etc/dansguardian
+@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually
+