From owner-svn-ports-all@FreeBSD.ORG  Mon Oct 22 12:05:14 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C7562740;
 Mon, 22 Oct 2012 12:05:14 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 9534E8FC0A;
 Mon, 22 Oct 2012 12:05:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9MC5EBn006424;
 Mon, 22 Oct 2012 12:05:14 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MC5Esn006421;
 Mon, 22 Oct 2012 12:05:14 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201210221205.q9MC5Esn006421@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Mon, 22 Oct 2012 12:05:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306271 - head/www/squidguard
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 12:05:14 -0000

Author: madpilot
Date: Mon Oct 22 12:05:13 2012
New Revision: 306271
URL: http://svn.freebsd.org/changeset/ports/306271

Log:
  - Add OPTION to choose which version of squid to depend on
  - Trim Makefile headers [1]
  
  PORTREVISION not bumped since there is no functional change or
  dependency change with default options.
  
  Requested by:	Rainer Duffner <rainer@ultra-secure.de> and many others in the past
  Approved by:	Dan Larsson <dl@tyfon.net> (creator) [1]
  Feature safe:	yes

Modified:
  head/www/squidguard/Makefile   (contents, props changed)

Modified: head/www/squidguard/Makefile
==============================================================================
--- head/www/squidguard/Makefile	Mon Oct 22 12:04:02 2012	(r306270)
+++ head/www/squidguard/Makefile	Mon Oct 22 12:05:13 2012	(r306271)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    squidGuard
-# Date created:        5 June 2000
-# Whom:                dl@tyfon.net
-#
 # $FreeBSD$
-#
 
 PORTNAME=	squidGuard
 PORTVERSION=	1.4
@@ -22,8 +17,6 @@ COMMENT=	A fast redirector for squid
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-
 USE_BDB=	40+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db-inc=${BDB_INCLUDE_DIR} \
@@ -51,14 +44,26 @@ SUB_LIST=	PORTNAME=${PORTNAME} \
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	DNS_BL DOCS LDAP QUOTE_STRING SAMPLE_BL
-OPTIONS_DEFAULT=	SAMPLE_BL
+OPTIONS_SINGLE=		SV
+OPTIONS_SINGLE_SV=	SQUID27 SQUID31
+OPTIONS_DEFAULT=	SAMPLE_BL SQUID27
 
 SAMPLE_BL_DESC=	Install sample blacklists
 DNS_BL_DESC=	Enable DNS based blacklists
 QUOTE_STRING_DESC=	Add quoted string patch
+SQUID27_DESC=	Depend on Squid 2.7.x
+SQUID31_DESC=	Depend on Squid 3.1.x
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MSQUID27}
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+.endif
+
+.if ${PORT_OPTIONS:MSQUID31}
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid31
+.endif
+
 .if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--with-ldap
 USE_OPENLDAP=		yes