From root@sd73.bc.ca  Tue Mar  6 00:12:57 2007
Return-Path: <root@sd73.bc.ca>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D47D416A402
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Mar 2007 00:12:57 +0000 (UTC)
	(envelope-from root@sd73.bc.ca)
Received: from smtp.sd73.bc.ca (smtp.sd73.bc.ca [142.24.13.140])
	by mx1.freebsd.org (Postfix) with ESMTP id AD81213C481
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Mar 2007 00:12:57 +0000 (UTC)
	(envelope-from root@sd73.bc.ca)
Received: from localhost (localhost [127.0.0.1])
	by localhost.sd73.bc.ca (Postfix) with ESMTP id 605391A000B2C;
	Mon,  5 Mar 2007 15:47:59 -0800 (PST)
Received: from smtp.sd73.bc.ca ([127.0.0.1])
	by localhost (smtp.sd73.bc.ca [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id VMAsa5NR9bfH; Mon,  5 Mar 2007 15:47:52 -0800 (PST)
Received: from freebsd-vm1.sd73.bc.ca (s159.sbo [192.168.0.159])
	by smtp.sd73.bc.ca (Postfix) with ESMTP id 638FB1A000B25;
	Mon,  5 Mar 2007 15:47:52 -0800 (PST)
Received: by freebsd-vm1.sd73.bc.ca (Postfix, from userid 0)
	id 7B2CC17B81F; Mon,  5 Mar 2007 17:55:52 -0800 (PST)
Message-Id: <20070306015552.7B2CC17B81F@freebsd-vm1.sd73.bc.ca>
Date: Mon,  5 Mar 2007 17:55:52 -0800 (PST)
From: Freddie Cash <fcash@.sd73.bc.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc: fcash@webmail.sd73.bc.ca
Subject: [PATCH] www/dansguardian: remove support and checks for FreeBSD 4.x/GCC 2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: fcash@sd73.bc.ca

>Number:         109957
>Category:       ports
>Synopsis:       [PATCH] www/dansguardian: remove support and checks for FreeBSD 4.x/GCC 2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    shaun
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 06 00:20:02 GMT 2007
>Closed-Date:    Wed Apr 11 02:27:07 GMT 2007
>Last-Modified:  Wed Apr 11 02:30:04 GMT 2007
>Originator:     Freddie Cash
>Release:        FreeBSD 6.1-RELEASE-p11 i386
>Organization:
School District 73
>Environment:
System: FreeBSD freebsd-vm1.sd73.bc.ca 6.1-RELEASE-p11 FreeBSD 6.1-RELEASE-p11 #0: Thu Jan 18 02:00:14 PST 2007
>Description:
Remove checks and support for FreeBSD 4.x in the port Makefile.

Port maintainer (fcash@sd73.bc.ca) is cc'd.

Generated with FreeBSD Port Tools 0.77 so hopefully this comes through correctly.

>How-To-Repeat:
>Fix:

----- begin patch-1.diff -----
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/Makefile /usr/ports/www/dansguardian/Makefile
--- /usr/ports/www/dansguardian.orig/Makefile	Sat Sep  2 23:35:31 2006
+++ /usr/ports/www/dansguardian/Makefile	Mon Mar  5 15:57:14 2007
@@ -3,11 +3,10 @@
 # Whom:					Freddie Cash <fcash@sd73.bc.ca>
 #
 # $FreeBSD: ports/www/dansguardian/Makefile,v 1.24 2006/09/03 06:35:31 kris Exp $
-#
 
 PORTNAME=	dansguardian
 PORTVERSION=	2.8.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	${PORTNAME}-${PORTVERSION}.source
@@ -19,7 +18,7 @@
 
 USE_RC_SUBR=	dansguardian.sh
 
-CONFLICTS=	dansguardian-2.[67]*
+CONFLICTS=	dansguardian-2.[67]* dansguardian-devel-2.9*
 LATEST_LINK=	dansguardian
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -30,7 +29,8 @@
 		--mandir=/man/ \
 		--logdir=/var/log/ \
 		--cgidir=/www/cgi-bin/ \
-		--piddir=/var/run/
+		--piddir=/var/run/ \
+		--gccver=3
 
 MAN8=		dansguardian.8
 NOMANCOMPRESSED=	yes
@@ -45,13 +45,6 @@
 
 .include <bsd.port.pre.mk>
 
-# Set which version of GCC to compile the port with
-.if ${OSVERSION} > 500000
-CONFIGURE_ARGS+=	--gccver=3
-.else
-CONFIGURE_ARGS+=	--gccver=2
-.endif
-
 .if !defined(WITHOUT_DG_APACHE)
 USE_APACHE=	1.3+
 .endif
@@ -77,10 +70,6 @@
 .else
 	@${ECHO_MSG} "===>   Skipping installation of phraselists."
 .endif
-
-# Install startup script
-#	@${ECHO_MSG} "===>   Installing startup script into ${PREFIX}/etc/rc.d"
-#	@${INSTALL_SCRIPT} ${WRKSRC}/dansguardian.sh ${PREFIX}/etc/rc.d/start-dg.sh
 
 # Display post-install message
 	@${CAT} pkg-message
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/distinfo /usr/ports/www/dansguardian/distinfo
--- /usr/ports/www/dansguardian.orig/distinfo	Thu Oct  6 11:28:23 2005
+++ /usr/ports/www/dansguardian/distinfo	Mon Mar  5 16:00:20 2007
@@ -1,2 +1,3 @@
 MD5 (dansguardian-2.8.0.6.source.tar.gz) = aa619607198f37a528dbb65e4a503beb
+SHA256 (dansguardian-2.8.0.6.source.tar.gz) = f4d51b805e979369896906b49a388bf102f56cf0755acc9cb1ec2e4176aac34b
 SIZE (dansguardian-2.8.0.6.source.tar.gz) = 212737
----- end patch-1.diff -----

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->shaun 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 6 00:20:09 UTC 2007 
Responsible-Changed-Why:  
shaun@ wants to have sparc64 and 4.x PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109957 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Mar 6 00:20:17 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109957 
State-Changed-From-To: feedback->closed 
State-Changed-By: shaun 
State-Changed-When: Wed Apr 11 02:19:29 UTC 2007 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109957 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109957: commit references a PR
Date: Wed, 11 Apr 2007 02:26:58 +0000 (UTC)

 shaun       2007-04-11 02:26:53 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/dansguardian     Makefile distinfo 
   Log:
   - Add SHA256 checksum.
   - Remove FreeBSD 4.x checks.
   
   PR:             ports/109957
   Submitted by:   Freddie Cash <fcash@.sd73.bc.ca> (maintainer)
   
   Revision  Changes    Path
   1.25      +2 -12     ports/www/dansguardian/Makefile
   1.14      +1 -0      ports/www/dansguardian/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
