Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Dec 2017 15:28:30 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456303 - head/www/squid-devel
Message-ID:  <201712141528.vBEFSUpT034239@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Thu Dec 14 15:28:30 2017
New Revision: 456303
URL: https://svnweb.freebsd.org/changeset/ports/456303

Log:
  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)

Modified:
  head/www/squid-devel/Makefile
  head/www/squid-devel/distinfo

Modified: head/www/squid-devel/Makefile
==============================================================================
--- head/www/squid-devel/Makefile	Thu Dec 14 15:01:21 2017	(r456302)
+++ head/www/squid-devel/Makefile	Thu Dec 14 15:28:30 2017	(r456303)
@@ -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
 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

Modified: head/www/squid-devel/distinfo
==============================================================================
--- head/www/squid-devel/distinfo	Thu Dec 14 15:01:21 2017	(r456302)
+++ head/www/squid-devel/distinfo	Thu Dec 14 15:28:30 2017	(r456303)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712141528.vBEFSUpT034239>