From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 16 19:50:04 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F199516A423 for ; Fri, 16 Dec 2005 19:50:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0434F43D55 for ; Fri, 16 Dec 2005 19:50:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBGJo2dn083650 for ; Fri, 16 Dec 2005 19:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBGJo2Wj083649; Fri, 16 Dec 2005 19:50:02 GMT (envelope-from gnats) Resent-Date: Fri, 16 Dec 2005 19:50:02 GMT Resent-Message-Id: <200512161950.jBGJo2Wj083649@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Freddie Cash Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FF9516A41F for ; Fri, 16 Dec 2005 19:48:11 +0000 (GMT) (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 3E0C343D6B for ; Fri, 16 Dec 2005 19:48:10 +0000 (GMT) (envelope-from root@sd73.bc.ca) Received: from localhost (localhost [127.0.0.1]) by localhost.sd73.bc.ca (Postfix) with ESMTP id 508B68A0028 for ; Fri, 16 Dec 2005 11:47:52 -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 71315-01-72; Fri, 16 Dec 2005 11:47:50 -0800 (PST) Received: from imap.sd73.bc.ca (smtp.sd73.bc.ca [10.10.10.15]) by smtp.sd73.bc.ca (Postfix) with ESMTP id 41DC08A003B; Fri, 16 Dec 2005 11:47:50 -0800 (PST) Received: by imap.sd73.bc.ca (Postfix, from userid 0) id 8FD0718CCBD; Fri, 16 Dec 2005 11:48:02 -0800 (PST) Message-Id: <20051216194802.8FD0718CCBD@imap.sd73.bc.ca> Date: Fri, 16 Dec 2005 11:48:02 -0800 (PST) From: Freddie Cash To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: fcash@imap.sd73.bc.ca Subject: ports/90513: port-update: www/dansguardian Makefile cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Freddie Cash List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2005 19:50:04 -0000 >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@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@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 @@ -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: