ports/70226: [maint update] www/dansguardian to version 2.8.0.2

[Freddie Cash]

>Number:         70226
>Category:       ports
>Synopsis:       [maint update]  www/dansguardian to version 2.8.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 09 19:00:41 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Freddie Cash
>Release:        
>Organization:
School District 73, Kamloops, BC, Canada
>Environment:
System: FreeBSD spark.sd73.bc.ca 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Aug 3 15:56:18 PDT 2004 root at spark.sd73.bc.ca:/usr/obj/usr/src/sys/S
System: FreeBSD phoenix.sd73.bc.ca 4.10-RELEASE FreeBSD 4.10-RELEASE #10: Tue Jun 8 15:01:38 PDT 2004 root at phoenix.sd73.bc.ca:/usr/obj/usr/sr

>Description:
Minor bug fix release, mostly related to documentation and included phraselists.
Also changed the naming scheme of the source tarball to all-lowercase and using period instead of hyphen in version numbers.
Also removed the "Compile with GCC 3" option as it never really worked correctly anyway.  Just set the --gccver configure parameter based on

>How-To-Repeat:

>Fix:
The patch below has been tested on 5.2-CURRENT (Aug 3) and 4.10-RELEASE.

--- dansguardian.diff begins here ---
diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
--- dansguardian.orig/Makefile	Mon Aug  9 11:28:34 2004
+++ dansguardian/Makefile	Mon Aug  9 11:33:24 2004
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.8.0.0
+PORTVERSION=	2.8.0.2
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
-DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
+DISTNAME=	${PORTNAME}-${PORTVERSION}.source
 
 MAINTAINER=	fcash at sd73.bc.ca
 COMMENT=	A fast, feature-rich web content filter for Squid proxy servers
@@ -18,12 +18,12 @@
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 
 USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 CONFLICTS=	dansguardian-2.[67]*
 LATEST_LINK=	dansguardian
 
-WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=/sbin/ \
 		--sysconfdir=/etc/dansguardian/ \
@@ -46,10 +46,9 @@
 
 .include <bsd.port.pre.mk>
 
-# On FreeBSD 4.x, user can choose which GCC version to use
-.if ${OSVERSION} > 500000 || defined(WITH_DG_GCC3)
+# Set which version of GCC to compile the port with
+.if ${OSVERSION} > 500000
 CONFIGURE_ARGS+=	--gccver=3
-USE_GCC=		3.3
 .else
 CONFIGURE_ARGS+=	--gccver=2
 .endif
diff -ruN dansguardian.orig/distinfo dansguardian/distinfo
--- dansguardian.orig/distinfo	Mon Aug  9 11:28:34 2004
+++ dansguardian/distinfo	Mon Aug  9 11:28:37 2004
@@ -1,2 +1,2 @@
-MD5 (DansGuardian-2.8.0-0.source.tar.gz) = 1bd5ffdf4140fad379e8392403ea7694
-SIZE (DansGuardian-2.8.0-0.source.tar.gz) = 192166
+MD5 (dansguardian-2.8.0.2.source.tar.gz) = 94e967f97930739de6c531ec4db67d48
+SIZE (dansguardian-2.8.0.2.source.tar.gz) = 192297
diff -ruN dansguardian.orig/files/dansguardian.sh dansguardian/files/dansguardian.sh
--- dansguardian.orig/files/dansguardian.sh	Mon Aug  9 11:28:34 2004
+++ dansguardian/files/dansguardian.sh	Mon Aug  9 11:28:37 2004
@@ -13,9 +13,9 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-dansguardian_enable=${dansguardian_enable:-"NO"}
-dansguardian_flags=${dansguardian_flags:-""}
-dansguardian_pidfile=${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%%
 
@@ -23,9 +23,9 @@
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/dansguardian"
 
-load_rc_config $name
+load_rc_config ${name}
 
 pidfile="${dansguardian_pidfile}"
 
-run_rc_command "$1"
+run_rc_command "${1}"
 
--- dansguardian.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
 >Release;	FreeBSD 5.2-CURRENT i386