summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2017-12-14 15:28:30 +0000
committerSteve Wills <swills@FreeBSD.org>2017-12-14 15:28:30 +0000
commit0718e47db881737999940b312da00b465e2b082b (patch)
tree5e7dec1c9838a2f2986f7ebbebef45978aca01a3 /www
parentlang/oo2c: mark broken with new libxml2 (diff)
www/squid-devel: update to 4.0.22
While here: * add PCRE option, enabled by default * sort options * remove some comments that aren't needed PR: 224328 Submitted by: timp87@gmail.com (maintainer)
Notes
Notes: svn path=/head/; revision=456303
Diffstat (limited to 'www')
-rw-r--r--www/squid-devel/Makefile21
-rw-r--r--www/squid-devel/distinfo4
2 files changed, 13 insertions, 12 deletions
diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
index 04c4b0f5fffe..6ea76a3531b0 100644
--- a/www/squid-devel/Makefile
+++ b/www/squid-devel/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= squid
-PORTVERSION= 4.0.21
-PORTREVISION= 1
+PORTVERSION= 4.0.22
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
http://www2.us.squid-cache.org/Versions/v4/ \
@@ -19,7 +18,6 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://master.squid-cache.org/~amosjeffries/patches/:nosid
PATCH_SITE_SUBDIR= Versions/v4/changesets
-#PATCHFILES=
MAINTAINER= timp87@gmail.com
COMMENT= HTTP Caching Proxy
@@ -52,17 +50,18 @@ OPTIONS_GROUP= AUTH
OPTIONS_RADIO= FW
OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
-OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
+OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
- KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
- VIA_DB WCCP WCCPV2 DOCS EXAMPLES
+ KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
+ STACKTRACES VIA_DB WCCP WCCPV2
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
-OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF \
- FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT KQUEUE LARGEFILE \
- LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP WCCPV2 GSSAPI_BASE
+OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
+ FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
+ LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
+ WCCPV2
ARP_ACL_CONFIGURE_ENABLE= eui
AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include
@@ -108,6 +107,9 @@ FS_DISKD_VARS= STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
FS_ROCK_VARS= STORAGE_SCHEMES+=rock
NETTLE_LIB_DEPENDS= libnettle.so:security/nettle
NETTLE_CONFIGURE_OFF= --without-nettle
+PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+PCRE_CPPFLAGS= -I${LOCALBASE}/include
+PCRE_LDFLAGS= -L${LOCALBASE}/lib -lpcreposix -lpcre
SNMP_CONFIGURE_ENABLE= snmp
SSL_CONFIGURE_ENABLE= ssl
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \
@@ -309,7 +311,6 @@ post-install:
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang
-#CXXFLAGS+= -Wno-unused-private-field
CXXFLAGS+= -Wno-unknown-warning-option
CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
.endif
diff --git a/www/squid-devel/distinfo b/www/squid-devel/distinfo
index 809a38744329..690c085a45cc 100644
--- a/www/squid-devel/distinfo
+++ b/www/squid-devel/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1499897995
-SHA256 (squid4.0/squid-4.0.21.tar.xz) = 154d8ebdfdd004f113899b71325dcc401cf07ad8736701032d531c7af1908e33
-SIZE (squid4.0/squid-4.0.21.tar.xz) = 2408160
+SHA256 (squid4.0/squid-4.0.22.tar.xz) = 51b852f17c21569d53bcd098d2c55a4e0c745e9cac392cff26d92681e911a5a2
+SIZE (squid4.0/squid-4.0.22.tar.xz) = 2411692