 @@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2009/09/13 01:00:16 taca Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/18 02:01:35 taca Exp $
-DISTNAME=	squid-2.7.STABLE6
+DISTNAME=	squid-2.7.STABLE7
 PKGNAME=	${DISTNAME:S/STABLE//}
 PKGREVISION=	2
 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
 PKG_DESTDIR_SUPPORT=	destdir
 .include "../../www/squid/Makefile.squid"
 .include "../../www/squid/options.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.5 2009/09/13 01:00:16 taca Exp $
+$NetBSD: distinfo,v 1.6 2009/09/18 02:01:35 taca Exp $
-SHA1 (squid-2.7.STABLE6.tar.bz2) = b4b323be1ff3617a22070c243b2504f30d6b302d
+SHA1 (squid-2.7.STABLE7.tar.bz2) = 0729116f309093e4f141e000136cdec39290628a
-RMD160 (squid-2.7.STABLE6.tar.bz2) = d804175b95c6b026abed505b086eeaa2c479d2e2
+RMD160 (squid-2.7.STABLE7.tar.bz2) = a13df321fb0831de963c77f6e33e3f374634d353
-Size (squid-2.7.STABLE6.tar.bz2) = 1345472 bytes
+Size (squid-2.7.STABLE7.tar.bz2) = 1341869 bytes
-SHA1 (patch-aa) = 7db6c34be31ecee1dd08486de14c3fbc3b21c5aa
+SHA1 (patch-aa) = e6b112b463b1bc996490c99b91945361f0c2506a
 SHA1 (patch-ab) = 0d8e73eab50a54bd9c8662ee418c0640f30fdeea
-SHA1 (patch-ac) = 2218ce7f6abdc0a33bb6ac5f6116bb00d44bf53e
+SHA1 (patch-ac) = 175bc741bb2adc6b5f3452c6a8d25e594e7c3acd
-SHA1 (patch-ad) = 3b0a8cf357d97053c52cd7429db621ea61932ba2
+SHA1 (patch-ad) = 24e7303aa3160a3e675da333737eade458c5c197
 SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
 SHA1 (patch-af) = d8bfc5e92988ffa37d39c799e62176974fb9c27a
 SHA1 (patch-ag) = b375ecb8eefb4059642450fd25a0ec8e0d74efd7
-SHA1 (patch-ah) = 6732a21860216e58322ab084e3d525237811cc89
+SHA1 (patch-ah) = c1c22c57e5e63d0d0756202224d156e47413a4d8
-SHA1 (patch-ai) = bf6438e8fb577342c782d2b729add0698bf99e9c
+SHA1 (patch-ai) = a227e6fc622f1bda3fa49406b4d588c1f1f78430
-SHA1 (patch-aj) = f1d18a900d7ada0985499979398bb12dace3ee40
+SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e
 SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c
-SHA1 (patch-al) = 43ff4508d964d273227263b7a623d67725e8b7bd
+SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff
 SHA1 (patch-am) = 2d098a9da3ba83a340cd9552950cc02e3de47cf9

 @@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2008/09/25 03:24:45 taca Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/18 02:01:35 taca Exp $
---- Makefile.in.orig	2008-01-26 08:24:17.000000000 +0900
+--- Makefile.in.orig	2009-05-01 10:23:59.000000000 +0900
 +++ Makefile.in
-@@ -725,8 +725,8 @@ dist-hook:
+@@ -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:

 @@ -1,32 +1,32 @@
-$NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
+$NetBSD: patch-ac,v 1.3 2009/09/18 02:01:35 taca Exp $
---- configure.orig	2009-02-04 09:44:06.000000000 +0900
+--- configure.orig	2009-09-17 07:46:50.000000000 +0900
 +++ configure
-@@ -8251,11 +8251,13 @@ for ac_header in sys/types.h \
+@@ -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 \
-@@ -22934,98 +22936,25 @@ _ACEOF
+@@ -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
 @@ -111,27 +111,27 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43
+-
+-
 +#include <sys/time.h>
 +#include <sys/unistd.h>
  int
  main ()
+ {
 -if (sizeof ((fd_mask)))
 -	  return 0;
 +fd_mask fds;
+   ;
    return 0;
+ }
-@@ -23048,38 +22977,21 @@ $as_echo "$ac_try_echo") >&5
+@@ -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"
 @@ -154,33 +154,33 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43
 -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
-@@ -26304,8 +26216,8 @@ if test "$GCC" = "yes"; then
+@@ -26275,8 +26187,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
 .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
-@@ -27437,7 +27349,7 @@ if test "$PF_TRANSPARENT" ; then
+@@ -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

 @@ -1,16 +1,18 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ad,v 1.2 2009/09/18 02:01:35 taca Exp $
---- helpers/basic_auth/MSNT/Makefile.in.orig	2007-11-12 10:13:58.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2009-05-01 10:24:06.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -530,9 +530,9 @@ info: info-am
+@@ -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-info: install-info-am
+ install-html: install-html-am

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ah,v 1.2 2009/09/18 02:01:35 taca Exp $
---- scripts/Makefile.in.orig	2007-11-12 10:14:20.000000000 +0900
+--- scripts/Makefile.in.orig	2009-05-01 10:24:41.000000000 +0900
 +++ scripts/Makefile.in
-@@ -386,7 +386,7 @@ info-am:
+@@ -343,7 +343,7 @@ install-data-am:
- install-data-am:
+ install-dvi: install-dvi-am
 -install-exec-am: install-binSCRIPTS
 +install-exec-am:
- install-info: install-info-am
+ install-html: install-html-am

 @@ -1,26 +1,28 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ai,v 1.2 2009/09/18 02:01:35 taca Exp $
---- src/Makefile.in.orig	2008-01-03 10:16:40.000000000 +0900
+--- src/Makefile.in.orig	2009-05-01 10:24:42.000000000 +0900
 +++ src/Makefile.in
-@@ -657,7 +657,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -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)/'`
-@@ -1190,10 +1190,9 @@ info: info-recursive
+@@ -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-info: install-info-recursive
+ install-html: install-html-recursive

 @@ -1,18 +1,18 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-aj,v 1.2 2009/09/18 02:01:35 taca Exp $
---- src/cf.data.pre.orig	2008-06-25 07:54:18.000000000 +0900
+--- src/cf.data.pre.orig	2009-08-17 06:52:42.000000000 +0900
 +++ src/cf.data.pre
-@@ -3753,12 +3753,12 @@ DOC_END
+@@ -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

 @@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-al,v 1.2 2009/09/18 02:01:35 taca Exp $
---- tools/Makefile.in.orig	2007-11-12 10:14:28.000000000 +0900
+--- tools/Makefile.in.orig	2009-05-01 10:24:45.000000000 +0900
 +++ tools/Makefile.in
-@@ -737,7 +737,7 @@ info: info-recursive
+@@ -698,7 +698,7 @@ info: info-recursive
  info-am:
 -install-data-am: install-data-local
 +install-data-am:
- install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+ install-dvi: install-dvi-recursive