svn commit: r374991 - head/www/squid

[Kevin Lo]

Author: kevlo
Date: Sat Dec 20 06:45:05 2014
New Revision: 374991
URL: https://svnweb.freebsd.org/changeset/ports/374991
QAT: https://qat.redports.org/buildarchive/r374991/

Log:
  Add security/nettle dependency and fix pkg-plist.
  Squid detects libnettle when available and uses it without yet forcing
  it as a required dependency.

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

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Sat Dec 20 03:45:28 2014	(r374990)
+++ head/www/squid/Makefile	Sat Dec 20 06:45:05 2014	(r374991)
@@ -2,6 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.4.10
+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}/ \
@@ -46,8 +47,8 @@ SUB_FILES+=	pkg-install pkg-message
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
 		AUTH_SQL CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \
-		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE \
-		LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
+		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
 
 # Note: FS_FCOSS was removed from OPTIONS, it is broken and only experimental
@@ -90,6 +91,8 @@ IPV6_CONFIGURE_ENABLE=		ipv6
 KQUEUE_CONFIGURE_ENABLE=	kqueue
 LARGEFILE_CONFIGURE_WITH=	large-files
 LAX_HTTP_CONFIGURE_ENABLE=	http-violations
+NETTLE_LIB_DEPENDS=		libnettle.so:${PORTSDIR}/security/nettle
+NETTLE_CONFIGURE_OFF=		--without-nettle
 SNMP_CONFIGURE_ENABLE=		snmp
 SSL_CONFIGURE_ENABLE=		ssl
 SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
@@ -129,6 +132,7 @@ ICMP_DESC=		ICMP pinging and network mea
 IDENT_DESC=		Ident lookups (RFC 931)
 KQUEUE_DESC=		Kqueue(2) support
 LARGEFILE_DESC=		Support large (>2GB) cache and log files
+NETTLE_DESC=		Nettle MD5 algorithm support
 SNMP_DESC=		SNMP support
 SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
 SSL_DESC=		SSL gatewaying support

Modified: head/www/squid/pkg-plist
==============================================================================
--- head/www/squid/pkg-plist	Sat Dec 20 03:45:28 2014	(r374990)
+++ head/www/squid/pkg-plist	Sat Dec 20 06:45:05 2014	(r374991)
@@ -2119,7 +2119,6 @@ sbin/purge
 sbin/squid
 sbin/squidclient
 @dir /var/log/squid
- at dir /var/run/squid
 @dir /var/squid/cache
 @dir /var/squid/logs
 @dir /var/squid