Remove squid27 package. It is squid-2.7.STABLE9 which isn't supported

any more.

20 files changed, 0 insertions, 894 deletions

diff --git a/www/squid27/DESCR b/www/squid27/DESCR
deleted file mode 100644
index 9a00667e917..00000000000
--- a/www/squid27/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Squid is a fully-featured HTTP/1.0 proxy which is almost (but not
-quite - we're getting there!) HTTP/1.1 compliant. Squid offers a rich
-access control, authorization and logging environment to develop web
-proxy and content serving applications.
-
-This is current stable release.
diff --git a/www/squid27/MESSAGE b/www/squid27/MESSAGE
deleted file mode 100644
index cc8d92cdb78..00000000000
--- a/www/squid27/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2009/11/02 15:45:01 taca Exp $
-
-Since Squid 2.7 dosen't enlarge the maximum number of open files for
-the process, you should carefully check the default value of it and
-please consider to set appropriate value to "max_filedescriptors"
-parameter in ${PKG_SYSCONFDIR}/squid.conf.
-
-===========================================================================
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
deleted file mode 100644
index 2f19cbb7945..00000000000
--- a/www/squid27/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2013/04/02 15:42:22 taca Exp $
-
-DISTNAME=	squid-2.7.STABLE9
-PKGREVISION=	5
-
-PKGNAME=	${DISTNAME:S/STABLE//}
-CATEGORIES=	www
-MASTER_SITES=	${SQUID_MASTER_SITES} \
-		http://www.squid-cache.org/Versions/v2/2.7/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www.squid-cache.org/
-COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=		perl
-GNU_CONFIGURE=		yes
-MESSAGE_SRC=		../squid/MESSAGE MESSAGE
-
-.include "../../www/squid/Makefile.squid"
-
-CONFIGURE_ARGS+=	--enable-auth=basic,digest,ntlm
-
-.include "options.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/squid27/PLIST b/www/squid27/PLIST
deleted file mode 100644
index e58cc6e60e4..00000000000
--- a/www/squid27/PLIST
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/16 13:47:19 sborrill Exp $
-${PLIST.coss}bin/cossdump
-bin/squidclient
-libexec/cachemgr.cgi
-${PLIST.da_ldap}libexec/digest_ldap_auth
-${PLIST.da_password}libexec/digest_pw_auth
-${PLIST.diskd}libexec/diskd-daemon
-${PLIST.na_fakeauth}libexec/fakeauth_auth
-${PLIST.ba_getpwnam}libexec/getpwname_auth
-${PLIST.eacl_ip_user}libexec/ip_user_check
-libexec/logfile-daemon
-${PLIST.ba_MSNT}libexec/msnt_auth
-${PLIST.ba_NCSA}libexec/ncsa_auth
-${PLIST.na_SMB}libexec/ntlm_auth
-${PLIST.ba_PAM}libexec/pam_auth
-libexec/pinger
-${PLIST.ba_LDAP}libexec/squid_ldap_auth
-${PLIST.eacl_ldap_group}libexec/squid_ldap_group
-${PLIST.eacl_unix_group}libexec/squid_unix_group
-${PLIST.unlinkd}libexec/unlinkd
-${PLIST.ba_YP}libexec/yp_auth
-man/man8/cachemgr.cgi.8
-${PLIST.ba_NCSA}man/man8/ncsa_auth.8
-${PLIST.ba_PAM}man/man8/pam_auth.8
-man/man8/squid.8
-${PLIST.ba_LDAP}man/man8/squid_ldap_auth.8
-${PLIST.eacl_ldap_group}man/man8/squid_ldap_group.8
-${PLIST.eacl_unix_group}man/man8/squid_unix_group.8
-sbin/squid
-share/doc/squid/ChangeLog
-share/doc/squid/README.FreeBSD
-share/doc/squid/README.NetBSD
-share/doc/squid/README.OpenBSD
-share/doc/squid/README.Solaris
-share/doc/squid/RELEASENOTES.html
-share/doc/squid/debug-sections.txt
-share/examples/rc.d/squid
-share/examples/squid/cachemgr.conf
-share/examples/squid/mime.conf
-share/examples/squid/msntauth.conf
-share/examples/squid/squid.conf
-share/squid/mib.txt
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
deleted file mode 100644
index 08a19fcd162..00000000000
--- a/www/squid27/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.15 2012/12/19 02:18:50 taca Exp $
-
-SHA1 (squid-2.7.STABLE9.tar.bz2) = bd389da9b74fd338e358f6b3f83bd3a1ed4d4f6f
-RMD160 (squid-2.7.STABLE9.tar.bz2) = bfa7c3dc3ede68646603f3379de35f44d7d8e97d
-Size (squid-2.7.STABLE9.tar.bz2) = 1351366 bytes
-SHA1 (patch-aa) = e6b112b463b1bc996490c99b91945361f0c2506a
-SHA1 (patch-ab) = 0d8e73eab50a54bd9c8662ee418c0640f30fdeea
-SHA1 (patch-ac) = 175bc741bb2adc6b5f3452c6a8d25e594e7c3acd
-SHA1 (patch-ad) = 24e7303aa3160a3e675da333737eade458c5c197
-SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
-SHA1 (patch-af) = d8bfc5e92988ffa37d39c799e62176974fb9c27a
-SHA1 (patch-ag) = b375ecb8eefb4059642450fd25a0ec8e0d74efd7
-SHA1 (patch-ah) = c1c22c57e5e63d0d0756202224d156e47413a4d8
-SHA1 (patch-ai) = a227e6fc622f1bda3fa49406b4d588c1f1f78430
-SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e
-SHA1 (patch-ak) = 64c858cc1167ad4a62ed20948ce1c1d844ecae22
-SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff
-SHA1 (patch-am) = c31f27816578a05a909c4e64a646919d35e04c42
-SHA1 (patch-tools_cachemgr.c) = 203d19b4bc202cc1fbe4f8165e6eb4a968ccdbaf
diff --git a/www/squid27/options.mk b/www/squid27/options.mk
deleted file mode 100644
index 8673dc0aafb..00000000000
--- a/www/squid27/options.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/04/02 15:42:22 taca Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
-PKG_SUPPORTED_OPTIONS=	snmp ssl \
-		squid-backend-aufs squid-backend-coss squid-backend-null \
-		squid-backend-ufs squid-carp squid-unlinkd \
-		squid-ldap-helper squid-pam-helper
-
-PKG_OPTIONS_LEGACY_OPTS=	aufs:squid-backend-aufs \
-	coss:squid-backend-coss 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+=	coss diskd snmp unlinkd
-PLIST_VARS+=	ba_LDAP ba_MSNT ba_NCSA ba_PAM ba_YP ba_getpwnam
-PLIST_VARS+=	da_ldap da_password
-PLIST_VARS+=	na_SMB na_fakeauth
-PLIST_VARS+=	eacl_ip_user eacl_ldap_group eacl_unix_group
-
-#
-# most of options are enabled by default except aufs.  aufs backend isn't
-# tested well.
-PKG_SUGGESTED_OPTIONS=	squid-backend-coss squid-carp snmp ssl \
-			squid-pam-helper squid-unlinkd
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:MLinux)
-PKG_SUPPORTED_OPTIONS+=	squid-netfilter
-.endif
-
-# some release of NetBSD lacks <ipl.h> header of IP Filter 4.x
-.if ${OPSYS} != "NetBSD" || ${OS_VERSION:M[01].*} || exists(/usr/include/netinet/ipl.h)
-PKG_SUPPORTED_OPTIONS+=	squid-ipf
-.endif
-
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
-PKG_SUPPORTED_OPTIONS+=	squid-pf
-.endif
-
-.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD") && \
-	!empty(PKG_SUPPORTED_OPTIONS:Msquid-ipf)
-PKG_SUGGESTED_OPTIONS+=	squid-ipf
-.endif
-
-.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+=	squid-pf
-.endif
-
-.if ${OPSYS} == "Darwin"
-PKG_SUPPORTED_OPTIONS+=	squid-ipfw
-PKG_SUGGESTED_OPTIONS+=	squid-ipfw
-.endif
-
-# Darwin doesn't support System V IPC support.
-.if empty(OPSYS:MDarwin)
-PKG_SUPPORTED_OPTIONS+=	squid-backend-diskd
-PKG_SUGGESTED_OPTIONS+=	squid-backend-diskd
-.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 null
-SQUID_BASIC_AUTH_HELPERS?=	getpwnam MSNT NCSA YP
-SQUID_DIGEST_AUTH_HELPERS?=	password
-SQUID_NTLM_AUTH_HELPERS?=	fakeauth SMB
-SQUID_EXTERNAL_ACL_HELPERS?=	ip_user 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)
-CONFIGURE_ARGS+=	--enable-ipf-transparent
-.elif !empty(PKG_OPTIONS:Msquid-ipfw)
-CONFIGURE_ARGS+=	--enable-ipfw-transparent
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-arp-acl)
-CONFIGURE_ARGS+=	--enable-arp-acl
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-carp)
-CONFIGURE_ARGS+=	--enable-carp
-.endif
-
-.if !empty(PKG_SUPPORTED_OPTIONS:Minet6) && \
-    empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-ldap-helper)
-.include "../../databases/openldap-client/buildlink3.mk"
-SQUID_BASIC_AUTH_HELPERS+=	LDAP
-SQUID_DIGEST_AUTH_HELPERS+=	ldap
-SQUID_EXTERNAL_ACL_HELPERS+=	ldap_group
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-pam-helper)
-.  include "../../mk/pam.buildlink3.mk"
-SQUID_BASIC_AUTH_HELPERS+=	PAM
-.endif
-
-.if !empty(PKG_OPTIONS:Msnmp)
-CONFIGURE_ARGS+=	--enable-snmp
-PLIST.snmp=		yes
-.else
-CONFIGURE_ARGS+=	--disable-snmp
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=	--enable-ssl --with-openssl=${SSLBASE:Q}
-.include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-backend-aufs)
-SQUID_BACKENDS+=	aufs
-PTHREAD_AUTO_VARS=	yes
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-backend-coss)
-.if empty(PKG_OPTIONS:Msquid-backend-aufs)
-SQUID_BACKENDS+=	aufs
-PTHREAD_AUTO_VARS=	yes
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-SQUID_BACKENDS+=	coss
-PLIST.coss=		yes
-.endif
-
-.if !empty(PKG_OPTIONS:Msquid-backend-diskd)
-SQUID_BACKENDS+=	diskd
-PLIST.diskd=		yes
-.endif
-
-.if empty(PKG_OPTIONS:Msquid-unlinkd)
-CONFIGURE_ARGS+=	--disable-unlinkd
-.else
-PLIST.unlinkd=		yes
-.endif
-
-.if empty(SQUID_BASIC_AUTH_HELPERS)
-CONFIGURE_ARGS+= --enable-basic-auth-helpers=no
-.else
-CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q}
-.for i in ${SQUID_BASIC_AUTH_HELPERS}
-PLIST.ba_${i}=		yes
-.endfor
-.endif
-
-.if empty(SQUID_DIGEST_AUTH_HELPERS)
-CONFIGURE_ARGS+= --enable-digest-auth-helpers=no
-.else
-CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q}
-.for i in ${SQUID_DIGEST_AUTH_HELPERS}
-PLIST.da_${i}=		yes
-.endfor
-.endif
-
-.if empty(SQUID_NTLM_AUTH_HELPERS)
-CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=no
-.else
-CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q}
-.for i in ${SQUID_NTLM_AUTH_HELPERS}
-PLIST.na_${i}=		yes
-.endfor
-.endif
-
-.if empty(SQUID_EXTERNAL_ACL_HELPERS)
-CONFIGURE_ARGS+= --enable-external-acl-helpers=no
-.else
-CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q}
-.for i in ${SQUID_EXTERNAL_ACL_HELPERS}
-PLIST.eacl_${i}=	yes
-.endfor
-.endif
diff --git a/www/squid27/patches/patch-aa b/www/squid27/patches/patch-aa
deleted file mode 100644
index 25fd07475e0..00000000000
--- a/www/squid27/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/09/18 02:01:35 taca Exp $
-
---- Makefile.in.orig	2009-05-01 10:23:59.000000000 +0900
-+++ Makefile.in
-@@ -697,8 +697,8 @@ dist-hook:
- 	fi
- 
- install-pinger:
--	chown root $(DEFAULT_PINGER) 
--	chmod 4711 $(DEFAULT_PINGER)
-+	chown root $(DESTDIR)$(DEFAULT_PINGER) 
-+	chmod 4511 $(DESTDIR)$(DEFAULT_PINGER)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/www/squid27/patches/patch-ab b/www/squid27/patches/patch-ab
deleted file mode 100644
index 433d3f75efb..00000000000
--- a/www/squid27/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/02/05 13:43:06 taca Exp $
-
---- configure.in.orig	2009-02-04 09:44:06.000000000 +0900
-+++ configure.in
-@@ -1635,11 +1635,13 @@ AC_CHECK_HEADERS(
- 	libc.h \
- 	linux/netfilter_ipv4.h \
- 	linux/netfilter_ipv4/ip_tproxy.h \
-+  	machine/byte_swap.h \
- 	malloc.h \
- 	math.h \
- 	memory.h \
- 	mount.h \
- 	net/if.h \
-+	net/pf/pfvar.h \
- 	net/pfvar.h \
- 	netdb.h \
- 	netinet/if_ether.h \
-@@ -2004,7 +2006,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
- AC_CHECK_SYSTYPE(ssize_t, int)
- AC_CHECK_SYSTYPE(off_t, int)
- AC_CHECK_SYSTYPE(mode_t, unsigned short)
--AC_CHECK_SYSTYPE(fd_mask, int)
-+
-+dnl Check for type fd_mask
-+AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [
-+  AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/unistd.h>],
-+    [fd_mask fds;],
-+    ac_cv_have_fd_mask="yes",
-+    ac_cv_have_fd_mask="no")
-+])
- 
- AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
- AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -2299,8 +2310,8 @@ if test "$GCC" = "yes"; then
- 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
- 	case "$GCCVER" in
- 	[2.95.[123]])
--		echo "Removing -O for gcc on $host with GCC $GCCVER"
--		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
-+		echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER"
-+		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`"
- 		;;
- 	esac
- fi
-@@ -2697,7 +2708,7 @@ dnl PF support requires a header file.
- if test "$PF_TRANSPARENT" ; then
-     AC_MSG_CHECKING(if PF header file is installed)
-     # hold on to your hats...
--    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
-+    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
- 	PF_TRANSPARENT="yes"
- 	AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address
- 	redirection. This provides "masquerading" support for OpenBSD.])
diff --git a/www/squid27/patches/patch-ac b/www/squid27/patches/patch-ac
deleted file mode 100644
index 923bd5dafbf..00000000000
--- a/www/squid27/patches/patch-ac
+++ /dev/null
@@ -1,186 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/09/18 02:01:35 taca Exp $
-
---- configure.orig	2009-09-17 07:46:50.000000000 +0900
-+++ configure
-@@ -8222,11 +8222,13 @@ for ac_header in sys/types.h \
- 	libc.h \
- 	linux/netfilter_ipv4.h \
- 	linux/netfilter_ipv4/ip_tproxy.h \
-+  	machine/byte_swap.h \
- 	malloc.h \
- 	math.h \
- 	memory.h \
- 	mount.h \
- 	net/if.h \
-+	net/pf/pfvar.h \
- 	net/pfvar.h \
- 	netdb.h \
- 	netinet/if_ether.h \
-@@ -22905,98 +22907,25 @@ _ACEOF
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for fd_mask" >&5
--$as_echo_n "checking for fd_mask... " >&6; }
--if test "${ac_cv_type_fd_mask+set}" = set; then
-+{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
-+$as_echo_n "checking for fd_set... " >&6; }
-+if test "${ac_cv_have_fd_mask+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  ac_cv_type_fd_mask=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--/* What a mess.. many systems have added the (now standard) bit types
-- * in their own ways, so we need to scan a wide variety of headers to
-- * find them..
-- */
--#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
--#if HAVE_INTTYPES_H
--#include <inttypes.h>
--#endif
--#if HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--#if HAVE_SYS_BITYPES_H
--#include <sys/bitypes.h>
--#endif
--
--
--int
--main ()
--{
--if (sizeof (fd_mask))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--/* What a mess.. many systems have added the (now standard) bit types
-- * in their own ways, so we need to scan a wide variety of headers to
-- * find them..
-- */
- #include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
--#if HAVE_INTTYPES_H
--#include <inttypes.h>
--#endif
--#if HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--#if HAVE_SYS_BITYPES_H
--#include <sys/bitypes.h>
--#endif
--
--
-+#include <sys/time.h>
-+#include <sys/unistd.h>
- int
- main ()
- {
--if (sizeof ((fd_mask)))
--	  return 0;
-+fd_mask fds;
-   ;
-   return 0;
- }
-@@ -23019,38 +22948,21 @@ $as_echo "$ac_try_echo") >&5
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_fd_mask=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_have_fd_mask="yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--
-+	ac_cv_have_fd_mask="no"
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
--$as_echo "$ac_cv_type_fd_mask" >&6; }
--if test $ac_cv_type_fd_mask = yes; then
--  :
--else
- 
--cat >>confdefs.h <<_ACEOF
--#define fd_mask int
--_ACEOF
- 
- fi
- 
--
--
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
-+$as_echo "$ac_cv_have_fd_mask" >&6; }
- 
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-@@ -26275,8 +26187,8 @@ if test "$GCC" = "yes"; then
- 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
- 	case "$GCCVER" in
- 	2.95.[123])
--		echo "Removing -O for gcc on $host with GCC $GCCVER"
--		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
-+		echo "Making -O\[2-9\] to -O for gcc on $host with GCC $GCCVER"
-+		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*/-O/'`"
- 		;;
- 	esac
- fi
-@@ -27386,7 +27298,7 @@ if test "$PF_TRANSPARENT" ; then
-     { $as_echo "$as_me:$LINENO: checking if PF header file is installed" >&5
- $as_echo_n "checking if PF header file is installed... " >&6; }
-     # hold on to your hats...
--    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
-+    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
- 	PF_TRANSPARENT="yes"
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/www/squid27/patches/patch-ad b/www/squid27/patches/patch-ad
deleted file mode 100644
index 75ac216fa46..00000000000
--- a/www/squid27/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/09/18 02:01:35 taca Exp $
-
---- helpers/basic_auth/MSNT/Makefile.in.orig	2009-05-01 10:24:06.000000000 +0900
-+++ helpers/basic_auth/MSNT/Makefile.in
-@@ -484,11 +484,11 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-dvi: install-dvi-am
- 
--install-exec-am: install-libexecPROGRAMS install-sysconfDATA
-+install-exec-am: install-libexecPROGRAMS
- 
- install-html: install-html-am
- 
diff --git a/www/squid27/patches/patch-ae b/www/squid27/patches/patch-ae
deleted file mode 100644
index 4a74401f807..00000000000
--- a/www/squid27/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-
---- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2005-05-18 01:56:33.000000000 +0900
-+++ helpers/ntlm_auth/SMB/smbval/smblib-util.c
-@@ -60,6 +60,7 @@ static char *SMB_Prots[] =
-     "NT LANMAN 1.0",
-     NULL};
- 
-+#if 0
- /* Print out an SMB pkt in all its gory detail ... */
- 
- void
-@@ -78,6 +79,7 @@ SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, 
-     /* etc                                                 */
- 
- }
-+#endif
- 
- /* Convert a DOS Date_Time to a local host type date time for printing */
- 
diff --git a/www/squid27/patches/patch-af b/www/squid27/patches/patch-af
deleted file mode 100644
index beeec712699..00000000000
--- a/www/squid27/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-
---- include/autoconf.h.in.orig	2008-06-05 09:18:07.000000000 +0900
-+++ include/autoconf.h.in
-@@ -243,6 +243,9 @@
- /* Define to 1 if you have the `lrand48' function. */
- #undef HAVE_LRAND48
- 
-+/* Define if you have the <machine/byte_swap.h> header file.  */
-+#undef HAVE_MACHINE_BYTE_SWAP_H
-+
- /* Define to 1 if you have the `mallinfo' function. */
- #undef HAVE_MALLINFO
- 
-@@ -324,6 +327,9 @@
- /* Define to 1 if you have the <net/pfvar.h> header file. */
- #undef HAVE_NET_PFVAR_H
- 
-+/* Define to 1 if you have the <net/pf/pfvar.h> header file. */
-+#undef HAVE_NET_PF_PFVAR_H
-+
- /* Define to 1 if you have the <nss_common.h> header file. */
- #undef HAVE_NSS_COMMON_H
- 
diff --git a/www/squid27/patches/patch-ag b/www/squid27/patches/patch-ag
deleted file mode 100644
index d5cbded3349..00000000000
--- a/www/squid27/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
-
---- include/ntlmauth.h.orig	2007-03-04 03:25:31.000000000 +0900
-+++ include/ntlmauth.h
-@@ -70,6 +70,9 @@
- #define bswap16(x) bswap_16(x)
- #define bswap32(x) bswap_32(x)
- #else	 /* HAVE_BISTWAP_H */
-+#ifdef HAVE_MACHINE_BYTE_SWAP_H
-+#include <machine/byte_swap.h>
-+#else	/* HAVE_MACHINE_BYTE_SWAP_H */
- #ifndef bswap16
- #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8))
- #endif
-@@ -78,6 +81,7 @@
-     (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >>  8) | \
-      ((((u_int32_t)x) & 0x0000ff00) <<  8) | ((((u_int32_t)x) & 0x000000ff) << 24))
- #endif
-+#endif	/* HAVE_MACHINE_BYTE_SWAP_H */
- #endif /* HAVE_BITSWAP_H */
- 
- /* Used internally. Microsoft seems to think this is right, I believe them.
diff --git a/www/squid27/patches/patch-ah b/www/squid27/patches/patch-ah
deleted file mode 100644
index d276a96f148..00000000000
--- a/www/squid27/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2009/09/18 02:01:35 taca Exp $
-
---- scripts/Makefile.in.orig	2009-05-01 10:24:41.000000000 +0900
-+++ scripts/Makefile.in
-@@ -343,7 +343,7 @@ install-data-am:
- 
- install-dvi: install-dvi-am
- 
--install-exec-am: install-binSCRIPTS
-+install-exec-am:
- 
- install-html: install-html-am
- 
diff --git a/www/squid27/patches/patch-ai b/www/squid27/patches/patch-ai
deleted file mode 100644
index 05e8993a7c8..00000000000
--- a/www/squid27/patches/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2009/09/18 02:01:35 taca Exp $
-
---- src/Makefile.in.orig	2009-05-01 10:24:42.000000000 +0900
-+++ src/Makefile.in
-@@ -617,7 +617,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-+DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid
- DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
- DEFAULT_SWAP_DIR = $(localstatedir)/cache
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -1148,12 +1148,11 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-data-local install-dataDATA
-+install-data-am: install-dataDATA
- 
- install-dvi: install-dvi-recursive
- 
--install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
--	install-sysconfDATA
-+install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
- 
- install-html: install-html-recursive
- 
diff --git a/www/squid27/patches/patch-aj b/www/squid27/patches/patch-aj
deleted file mode 100644
index efd89e2c8d7..00000000000
--- a/www/squid27/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2009/09/18 02:01:35 taca Exp $
-
---- src/cf.data.pre.orig	2009-08-17 06:52:42.000000000 +0900
-+++ src/cf.data.pre
-@@ -3787,12 +3787,12 @@ DOC_END
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: @USER@
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to @USER@.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
diff --git a/www/squid27/patches/patch-ak b/www/squid27/patches/patch-ak
deleted file mode 100644
index c4dc705dcd6..00000000000
--- a/www/squid27/patches/patch-ak
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2012/11/19 03:02:50 joerg Exp $
-
-* Dirty work around for some version of IP filter.
-* Portability with pf(4)'s header.
-
---- src/client_side.c.orig	2010-02-14 00:46:25.000000000 +0000
-+++ src/client_side.c
-@@ -36,6 +36,9 @@
- #include "squid.h"
- 
- #if IPF_TRANSPARENT
-+#ifdef debug
-+#undef debug			/* XXX: IP filter may declar debug(). */
-+#endif
- #if HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
-@@ -79,6 +82,12 @@
- #elif HAVE_NETINET_IP_NAT_H
- #include <netinet/ip_nat.h>
- #endif
-+
-+#undef m_len
-+
-+/* stolen from defines.h */
-+#define debug(SECTION, LEVEL) \
-+        !do_debug(SECTION, LEVEL) ? (void) 0 : _db_print
- #endif
- 
- #if PF_TRANSPARENT
-@@ -88,7 +97,12 @@
- #include <sys/fcntl.h>
- #include <net/if.h>
- #include <netinet/in.h>
-+#ifdef HAVE_NET_PF_PFVAR_H
-+#include <net/pf/pfvar.h>
-+#endif /* HAVE_NET_PF_PFVAR_H */
-+#ifdef HAVE_NET_PFVAR_H
- #include <net/pfvar.h>
-+#endif /* HAVE_NET_PFVAR_H */
- #endif
- 
- #if LINUX_NETFILTER
diff --git a/www/squid27/patches/patch-al b/www/squid27/patches/patch-al
deleted file mode 100644
index 9b0b9043a5b..00000000000
--- a/www/squid27/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/09/18 02:01:35 taca Exp $
-
---- tools/Makefile.in.orig	2009-05-01 10:24:45.000000000 +0900
-+++ tools/Makefile.in
-@@ -698,7 +698,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/www/squid27/patches/patch-am b/www/squid27/patches/patch-am
deleted file mode 100644
index 0d530ca2aed..00000000000
--- a/www/squid27/patches/patch-am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-am,v 1.3 2011/11/28 15:26:26 drochner Exp $
-
-protect against CVE-2011-4122
-
---- helpers/basic_auth/PAM/pam_auth.c.orig	2005-05-17 16:56:25.000000000 +0000
-+++ helpers/basic_auth/PAM/pam_auth.c
-@@ -188,6 +188,11 @@ start:
- 	exit(1);
-     }
- 
-+    if (strchr(service, '/')) {
-+	    fprintf(stderr, "Illegal service '%s'\n", service);
-+	    exit(1);
-+    }
-+
-     while (fgets(buf, BUFSIZE, stdin)) {
- 	user = buf;
- 	password = strchr(buf, '\n');
diff --git a/www/squid27/patches/patch-tools_cachemgr.c b/www/squid27/patches/patch-tools_cachemgr.c
deleted file mode 100644
index 6b7695fe1a7..00000000000
--- a/www/squid27/patches/patch-tools_cachemgr.c
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-tools_cachemgr.c,v 1.1 2012/12/17 13:36:21 taca Exp $
-
-Trying to handle http://www.squid-cache.org/Advisories/SQUID-2012_1.txt.
-
---- tools/cachemgr.c.orig	2008-06-24 22:55:11.000000000 +0000
-+++ tools/cachemgr.c
-@@ -509,12 +509,15 @@ munge_action_line(const char *_buf, cach
-     if ((p = strchr(x, '\n')))
- 	*p = '\0';
-     action = xstrtok(&x, '\t');
-+    if (!action) {
-+	xfree(buf);
-+	return "";
-+    }
-     description = xstrtok(&x, '\t');
-     if (!description)
- 	description = action;
--    if (!action)
--	return "";
-     snprintf(html, sizeof(html), " <a href=\"%s\">%s</a>", menu_url(req, action), description);
-+    xfree(buf);
-     return html;
- }
- 
-@@ -715,6 +718,7 @@ process_request(cachemgr_request * req)
-     if (connect(s, (struct sockaddr *) &S, sizeof(struct sockaddr_in)) < 0) {
- 	snprintf(buf, 1024, "connect: %s\n", xstrerror());
- 	error_html(buf);
-+	close(s);
- 	return 1;
-     }
-     l = snprintf(buf, sizeof(buf),
-@@ -765,18 +769,43 @@ read_post_request(void)
- {
-     char *s;
-     char *buf;
--    int len;
-+    char *endptr;
-+    uint64_t len;
-+    size_t bufLen, readLen;
-+
-     if ((s = getenv("REQUEST_METHOD")) == NULL)
- 	return NULL;
-     if (0 != strcasecmp(s, "POST"))
- 	return NULL;
-     if ((s = getenv("CONTENT_LENGTH")) == NULL)
- 	return NULL;
--    if ((len = atoi(s)) <= 0)
-+    if (*s == '-') // negative length content huh?
-+	return NULL;
-+
-+    endptr = s+ strlen(s);
-+    if ((len = strtoll(s, &endptr, 10)) <= 0)
- 	return NULL;
--    buf = xmalloc(len + 1);
--    fread(buf, len, 1, stdin);
--    buf[len] = '\0';
-+
-+    // limit the input to something reasonable.
-+    // 4KB should be enough for the GET/POST data length, but may be extended.
-+    bufLen = (len >= 4096 ? len : 4095);
-+    buf = (char *)xmalloc(bufLen + 1);
-+
-+    readLen = fread(buf, bufLen, 1, stdin);
-+    if (readLen == 0) {
-+        xfree(buf);
-+        return NULL;
-+    }
-+    buf[readLen] = '\0';
-+    len -= readLen;
-+
-+    // purge the remainder of the request entity
-+    while (len > 0) {
-+        char temp[65535];
-+        readLen = fread(temp, 65535, 1, stdin);
-+        len -= readLen;
-+    }
-+
-     return buf;
- }
- 
-@@ -886,26 +915,38 @@ decode_pub_auth(cachemgr_request * req)
-     buf = xstrdup(base64_decode(req->pub_auth));
-     debug(3) fprintf(stderr, "cmgr: length ok\n");
-     /* parse ( a lot of memory leaks, but that is cachemgr style :) */
--    if ((host_name = strtok(buf, "|")) == NULL)
-+    if ((host_name = strtok(buf, "|")) == NULL) {
-+	xfree(buf);
- 	return;
-+    }
-     debug(3) fprintf(stderr, "cmgr: decoded host: '%s'\n", host_name);
--    if ((time_str = strtok(NULL, "|")) == NULL)
-+    if ((time_str = strtok(NULL, "|")) == NULL) {
-+	xfree(buf);
- 	return;
-+    }
-     debug(3) fprintf(stderr, "cmgr: decoded time: '%s' (now: %d)\n", time_str, (int) now);
--    if ((user_name = strtok(NULL, "|")) == NULL)
-+    if ((user_name = strtok(NULL, "|")) == NULL) {
-+        xfree(buf);
- 	return;
-+    }
-     debug(3) fprintf(stderr, "cmgr: decoded uname: '%s'\n", user_name);
--    if ((passwd = strtok(NULL, "|")) == NULL)
-+    if ((passwd = strtok(NULL, "|")) == NULL) {
-+        xfree(buf);
- 	return;
-+    }
-     debug(2) fprintf(stderr, "cmgr: decoded passwd: '%s'\n", passwd);
-     /* verify freshness and validity */
--    if (atoi(time_str) + passwd_ttl < now)
-+    if (atoi(time_str) + passwd_ttl < now) {
-+        xfree(buf);
- 	return;
--    if (strcasecmp(host_name, req->hostname))
-+    }
-+    if (strcasecmp(host_name, req->hostname)) {
-+        xfree(buf);
- 	return;
-+    }
-     debug(1) fprintf(stderr, "cmgr: verified auth. info.\n");
-     /* ok, accept */
--    xfree(req->user_name);
-+    safe_free(req->user_name);
-     req->user_name = xstrdup(user_name);
-     req->passwd = xstrdup(passwd);
-     xfree(buf);