 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.44 2015/02/19 01:10:23 taca Exp $
+# $NetBSD: Makefile,v 1.45 2015/05/04 09:13:34 adam Exp $
-DISTNAME=	squid-3.5.2
+DISTNAME=	squid-3.5.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		ftp://ftp.squid-cache.org/pub/squid/ \
 		http://ftp.nluug.nl/internet/squid/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl:run gmake

 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.31 2015/02/19 01:10:23 taca Exp $
+$NetBSD: distinfo,v 1.32 2015/05/04 09:13:34 adam Exp $
-SHA1 (squid-3.5.2.tar.xz) = 9c546d72df741c9ddaa6da87baa2112503bcbb45
+SHA1 (squid-3.5.4.tar.xz) = 71a04a5f7c4c38464a8a08ae1089c47abcea0e49
-RMD160 (squid-3.5.2.tar.xz) = 57d93f15987adea3789219d633d9d9e7b1dc8b63
+RMD160 (squid-3.5.4.tar.xz) = 3bf031032aa131ebb58c859d56740e29e7a290a9
-Size (squid-3.5.2.tar.xz) = 2282116 bytes
+Size (squid-3.5.4.tar.xz) = 2289772 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
-SHA1 (patch-configure) = 2e9b7570bfc58285c5288075af35a283852c7492
+SHA1 (patch-configure) = 4e658ac4722695f52412f77e168f31a2f523bb1b
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
 SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f

 @@ -1,27 +1,27 @@
-# $NetBSD: options.mk,v 1.15 2015/01/22 09:32:49 obache Exp $
+# $NetBSD: options.mk,v 1.16 2015/05/04 09:13:34 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
 		squid-backend-rock squid-backend-ufs squid-carp squid-unlinkd \
 		squid-kerberos-helper squid-ldap-helper squid-pam-helper
 PKG_OPTIONS_LEGACY_OPTS+=	diskd:squid-backend-diskd \
 	null:squid-backend-null ufs:squid-backend-ufs \
 	linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \
 	pf-transparent:squid-pf unlinkd:squid-unlinkd \
 	arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp
 PLIST_VARS+=	diskd snmp unlinkd
-PLIST_VARS+=	ba_LDAP ba_NCSA ba_NIS ba_PAM ba_getpwnam
+PLIST_VARS+=	ba_LDAP ba_NCSA ba_PAM ba_getpwnam
 PLIST_VARS+=	da_file da_LDAP
 PLIST_VARS+=	na_sml_lm
 PLIST_VARS+=	ta_kerberos
 PLIST_VARS+=	eacl_file_userip eacl_LDAP_group eacl_unix_group
 PLIST_VARS+=	ssl
 PKG_SUGGESTED_OPTIONS=	inet6 snmp ssl squid-backend-diskd squid-carp \
 		squid-pam-helper squid-unlinkd
 .include "../../mk/bsd.prefs.mk"
 .if !empty(OPSYS:MLinux)
 PKG_SUPPORTED_OPTIONS+=	squid-netfilter
 @@ -49,27 +49,28 @@ PKG_SUGGESTED_OPTIONS+=	squid-pf
 .if ${OPSYS} == "Darwin"
 PKG_SUPPORTED_OPTIONS+=	squid-ipfw
 PKG_SUGGESTED_OPTIONS+=	squid-ipfw
 .endif
 # limited platform support squid-arp-acl
 .if !empty(OPSYS:MFreeBSD) || !empty(OPSYS:MNetBSD) || !empty(OPSYS:MOpenBSD) || !empty(OPSYS:MLinux) || !empty(OPSYS:MSunOS)
 PKG_SUPPORTED_OPTIONS+=	squid-arp-acl
 .endif
 .include "../../mk/bsd.options.mk"
 SQUID_BACKENDS?=		ufs
-SQUID_BASIC_AUTH_HELPERS?=	NCSA NIS getpwnam
+# Note: NIS helper cannot be build; it requires crypt.h header file.
 SQUID_BASIC_AUTH_HELPERS?=	NCSA getpwnam
 SQUID_DIGEST_AUTH_HELPERS?=	file
 SQUID_NTLM_AUTH_HELPERS?=	fake smb_lm
 SQUID_EXTERNAL_ACL_HELPERS?=	file_userip unix_group
 # squid's code has preference as:
 #	squid-ipf > squid-pf > squid-netfilter
 # So, options.mk introduce preference as:
 #	squid-netfilter > squid-pf > squid-ipf
 .if !empty(PKG_OPTIONS:Msquid-netfilter)
 CONFIGURE_ARGS+=	--enable-linux-netfilter
 .elif !empty(PKG_OPTIONS:Msquid-pf)
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .elif !empty(PKG_OPTIONS:Msquid-ipf)

 @@ -1,42 +1,24 @@
-$NetBSD: patch-configure,v 1.5 2015/01/22 11:38:58 obache Exp $
+$NetBSD: patch-configure,v 1.6 2015/05/04 09:13:35 adam Exp $
 * int64_t GNU atomic operations are used, check them instead.
 * Portability fix.
---- configure.orig	2015-01-13 12:54:26.000000000 +0000
+--- configure.orig	2015-05-01 11:29:25.000000000 +0000
 +++ configure
-@@ -20128,8 +20128,14 @@ $as_echo "cross-compiler cant tell" >&6;
+@@ -32733,7 +32733,7 @@ done
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -    int n = 0;
 +$ac_includes_default
 +#ifdef HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
 +#ifdef HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +    int64_t n = 0;
  int
  main ()
@@ -32600,7 +32606,7 @@ done
  ## Please see the COPYING and CONTRIBUTORS files for details.
  ##
 -if test "x$with_krb5" == "xyes"; then
 +if test "x$with_krb5" = "xyes"; then
    BUILD_HELPER="kerberos"
  fi
-@@ -33141,7 +33147,7 @@ done
+@@ -33292,7 +33292,7 @@ done
  ## Please see the COPYING and CONTRIBUTORS files for details.
  ##
 -if test "x$with_krb5" == "xyes"; then
 +if test "x$with_krb5" = "xyes"; then
    BUILD_HELPER="kerberos_ldap_group"
    if test "x$with_apple_krb5" = "xyes" ; then
-   squid_cv_check_sasl="auto"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5