ports/90513: port-update: www/dansguardian Makefile cleanup

[Freddie Cash]

>Number:         90513
>Category:       ports
>Synopsis:       port-update:  www/dansguardian Makefile cleanup
>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:   Fri Dec 16 19:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Freddie Cash
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
School District 73
>Environment:
System: FreeBSD imap.sd73.bc.ca 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Nov 4 10:41:38 PST 2005 root at imap.sd73.bc.ca:/usr/obj/usr/src/sys/IMAP i386


>Description:
Clean up the port Makefile and make the Apache dependency optional (thanks to the new bsd.apache.mk macros).

DansGuardian 2.6+ has support for an HTML template for the access denied page, which makes Apache optional (only needed if you want the more functional cgi-based denied pages).

This update makes the Apache dependency optional using the CONFIG and USE_APACHE macros.  Several users have asked for this, and now it's easy to do.  :)

>How-To-Repeat:

>Fix:

--- dansguardian.diff begins here ---
diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
--- dansguardian.orig/Makefile	Fri Dec 16 10:44:32 2005
+++ dansguardian/Makefile	Fri Dec 16 10:59:30 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	dansguardian
 PORTVERSION=	2.8.0.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	${PORTNAME}-${PORTVERSION}.source
@@ -14,8 +15,7 @@
 MAINTAINER=	fcash at sd73.bc.ca
 COMMENT=	A fast, feature-rich web content filter for Squid proxy servers
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
 
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
@@ -36,15 +36,15 @@
 MAN8=		dansguardian.8
 NOMANCOMPRESSED=	yes
 
-OPTIONS=	DG_GCC3 "Compile using GCC 3.3 on FreeBSD 4.x." off \
-		DG_PHRASELISTS "Install new phraselists. (Overwrites existing.)" off
+OPTIONS=	DG_APACHE "Enable Apache support." on \
+		DG_PHRASELISTS "Install new phraselists over the old ones." off
 
 DG_URL=		http://dansguardian.org/index.php?page=copyright2
 CONFDIR=	${PREFIX}/etc/dansguardian
 
 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}
+RESTRICTED=	"${NO_PACKAGE}"
 
 .include <bsd.port.pre.mk>
 
@@ -53,6 +53,10 @@
 CONFIGURE_ARGS+=	--gccver=3
 .else
 CONFIGURE_ARGS+=	--gccver=2
+.endif
+
+.if defined(WITH_DG_APACHE)
+USE_APACHE=     1.3+
 .endif
 
 # User needs to manually download the distfile
--- dansguardian.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: