svn commit: r368421 - in head/www: squid squid33

[John Marino]

Author: marino
Date: Thu Sep 18 06:58:47 2014
New Revision: 368421
URL: http://svnweb.freebsd.org/changeset/ports/368421
QAT: https://qat.redports.org/buildarchive/r368421/

Log:
  www/squid and www/squid33: Fix plist error depending on selected options
  
  PR:		193717
  Reported by:	kib@
  Fixed by:	timp87 (gmail)

Modified:
  head/www/squid/Makefile
  head/www/squid/pkg-plist
  head/www/squid33/Makefile
  head/www/squid33/pkg-plist

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Thu Sep 18 04:41:04 2014	(r368420)
+++ head/www/squid/Makefile	Thu Sep 18 06:58:47 2014	(r368421)
@@ -2,6 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.4.7
+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}/ \

Modified: head/www/squid/pkg-plist
==============================================================================
--- head/www/squid/pkg-plist	Thu Sep 18 04:41:04 2014	(r368420)
+++ head/www/squid/pkg-plist	Thu Sep 18 06:58:47 2014	(r368421)
@@ -2067,13 +2067,13 @@ libexec/squid/basic_radius_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
 libexec/squid/cachemgr.cgi
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
+%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
 %%SSL%%libexec/squid/cert_valid.pl
 libexec/squid/digest_file_auth
 libexec/squid/diskd
 %%DNS_HELPER%%libexec/squid/dnsserver
 libexec/squid/ext_file_userip_acl
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
+%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
 %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
 %%AUTH_SQL%%libexec/squid/ext_sql_session_acl
 libexec/squid/ext_time_quota_acl

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Thu Sep 18 04:41:04 2014	(r368420)
+++ head/www/squid33/Makefile	Thu Sep 18 06:58:47 2014	(r368421)
@@ -3,6 +3,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.3.${SQUID_STABLE_VER}
+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}/ \

Modified: head/www/squid33/pkg-plist
==============================================================================
--- head/www/squid33/pkg-plist	Thu Sep 18 04:41:04 2014	(r368420)
+++ head/www/squid33/pkg-plist	Thu Sep 18 06:58:47 2014	(r368421)
@@ -2066,12 +2066,12 @@ libexec/squid/basic_radius_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
 libexec/squid/cachemgr.cgi
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
+%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
 libexec/squid/digest_file_auth
 libexec/squid/diskd
 %%DNS_HELPER%%libexec/squid/dnsserver
 libexec/squid/ext_file_userip_acl
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
+%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
 %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
 %%AUTH_SQL%%libexec/squid/ext_sql_session_acl
 libexec/squid/ext_time_quota_acl