svn commit: r414423 - head/www/squid

[Matthew Seaman]

Author: matthew
Date: Sun May  1 20:31:28 2016
New Revision: 414423
URL: https://svnweb.freebsd.org/changeset/ports/414423

Log:
  Add conflicts against the new squid-devel port
  
  Rework transparent proxy / firewall related options
  
  PR:		203860
  Submitted by:	timp87 at gmail.com (maintainer)

Modified:
  head/www/squid/Makefile

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Sun May  1 20:27:56 2016	(r414422)
+++ head/www/squid/Makefile	Sun May  1 20:31:28 2016	(r414423)
@@ -2,6 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.5.17
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
@@ -25,6 +26,8 @@ COMMENT=	HTTP Caching Proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS=	squid*-4.*
+
 BROKEN_powerpc64=	Does not build
 
 USES=		compiler cpe perl5 shebangfix tar:xz
@@ -44,21 +47,21 @@ SUB_FILES+=	pkg-install pkg-message
 
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	AUTH
-OPTIONS_RADIO=	SMB
+OPTIONS_RADIO=	SMB FW
 OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SQL
 OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4
+OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
 OPTIONS_DEFINE=	ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
 		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
 		KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
-		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
+		VIA_DB WCCP WCCPV2 DOCS EXAMPLES
 
 OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
 		FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
-		LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
-		GSSAPI_BASE
+		LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP WCCPV2 GSSAPI_BASE
 
 ARP_ACL_CONFIGURE_ENABLE=	eui
 AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include