Fri Jun 25 12:21:08 2021 UTC ()
varnish: update to 6.6.0

Based on pkgsrc-wip 5.1.1 package by Filip Hajny.

Changes in Varnish 6.0
  Support for UDS (Unix Domain Sockets)
  Because UNIX Domain Sockets have nothing like IP numbers, we were forced to
  define a new level of the VCL language vcl 4.1 to cope with UDS.
  The HTTP/2 code has received a lot of attention from Dag Haavi Finstad
  (Varnish Software) and it holds up in production on several large sites now.
  There are new and improved VMODs:
    vmod_directors – Much work on the shard director
    vmod_proxy – Proxy protocol information
    vmod_unix – Unix Domain Socket information
    vmod_vtc – Utility functions for writing varnishtest cases.
  The umem stevedore has been brought back on Solaris and it is the default
  storage method there now.
  More error situations now get vcl failure handling, this should make life
  simpler for everybody we hope.
  And it goes without saying that we have fixed a lot of bugs too.

Changes in Varnish 5.0
  Varnish 5.0 changes some (mostly) internal APIs and adds some major new
  features over Varnish 4.1.
  Separate VCL files and VCL labels
  Very Experimental HTTP/2 support
  The Shard Director
  Hit-For-Pass is now actually Hit-For-Miss
  Ban Lurker Improvements
  Request Body sent always / "cacheable POST"
  ESI and Backend Request Coalescing ("waitinglist") Improvement
  Backend PROXY protocol requests
  Default VCL search path
  devicedetect.vcl
  varnishtest
  misc
  News for VMOD authors

Changes in Varnish 4
  Varnish 4 is quite an extensive update to Varnish 3, with some very big
  improvements to central parts of varnish.
  Client/backend split


(tnn)
diff -r1.30 -r1.31 pkgsrc/www/varnish/Makefile
diff -r1.9 -r1.10 pkgsrc/www/varnish/PLIST
diff -r1.1 -r1.2 pkgsrc/www/varnish/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/www/varnish/distinfo
diff -r0 -r1.1 pkgsrc/www/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
diff -r0 -r1.1 pkgsrc/www/varnish/patches/patch-etc_Makefile.in
diff -r0 -r1.1 pkgsrc/www/varnish/patches/patch-include_tbl_params.h
diff -r1.1 -r0 pkgsrc/www/varnish/patches/patch-etc__Makefile.in
cvs diff -r1.30 -r1.31 pkgsrc/www/varnish/Makefile (expand / switch to unified diff)

--- pkgsrc/www/varnish/Makefile 2020/01/26 17:32:25 1.30
+++ pkgsrc/www/varnish/Makefile 2021/06/25 12:21:08 1.31
@@ -1,68 +1,86 @@ @@ -1,68 +1,86 @@
1# $NetBSD: Makefile,v 1.30 2020/01/26 17:32:25 rillig Exp $ 1# $NetBSD: Makefile,v 1.31 2021/06/25 12:21:08 tnn Exp $
2# 
3 2
4DISTNAME= varnish-3.0.6 3DISTNAME= varnish-6.6.0
5PKGREVISION= 3 
6CATEGORIES= www 4CATEGORIES= www
7MASTER_SITES= http://repo.varnish-cache.org/source/ 5MASTER_SITES= https://varnish-cache.org/_downloads/
 6EXTRACT_SUFX= .tgz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://varnish-cache.org/ 9HOMEPAGE= https://varnish-cache.org/
11COMMENT= High-performace HTTP accelerator 10COMMENT= High-performace HTTP accelerator
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
 13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 14PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 15
14GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 17USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config gmake 18USE_TOOLS+= pkg-config gmake
 19
17BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
 21BUILD_DEFS+= PKG_SYSCONFBASE
18 22
 23PKG_SYSCONFSUBDIR= varnish
19EGDIR= ${PREFIX}/share/examples/varnish 24EGDIR= ${PREFIX}/share/examples/varnish
20CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl 25CONF_FILES= ${EGDIR}/builtin.vcl \
 26 ${PKG_SYSCONFDIR}/builtin.vcl
 27
 28.include "../../mk/bsd.prefs.mk"
21 29
22VRNUSER?= varnish 30VRNUSER?= varnish
23VRNGROUP?= ${VRNUSER} 31VRNGROUP?= ${VRNUSER}
24STATEDIR= ${VARBASE}/db 32STATEDIR= ${VARBASE}/db
25VRNDIR= ${STATEDIR}/${PKGBASE} 33VRNDIR= ${STATEDIR}/${PKGBASE}
26 34
27CONFIGURE_ARGS+= --localstatedir=${STATEDIR} 
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 
29OWN_DIRS+= ${VRNDIR} 35OWN_DIRS+= ${VRNDIR}
30OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770 36OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
31 37
32PKG_GROUPS+= ${VRNGROUP} 38PKG_GROUPS+= ${VRNGROUP}
33PKG_USERS+= ${VRNUSER}:${VRNGROUP} 39PKG_USERS+= ${VRNUSER}:${VRNGROUP}
34PKG_HOME.${VRNUSER}= ${VRNDIR} 40PKG_HOME.${VRNUSER}= ${VRNDIR}
35PKG_SHELL.${VRNUSER}= ${SH} 41PKG_SHELL.${VRNUSER}= ${SH}
36PKG_GECOS.${VRNUSER}= Varnish daemon user 42PKG_GECOS.${VRNUSER}= Varnish daemon user
37 43
38FILES_SUBST+= VRNUSER=${VRNUSER} 44FILES_SUBST+= VRNUSER=${VRNUSER}
39FILES_SUBST+= VRNGROUP=${VRNGROUP} 45FILES_SUBST+= VRNGROUP=${VRNGROUP}
40 46
41RCD_SCRIPTS= varnishd varnishlog varnishncsa 47REPLACE_PYTHON+= lib/libvcc/vmodtool.py
42PYTHON_FOR_BUILD_ONLY= yes 48REPLACE_PYTHON+= lib/libvcc/vsctool.py
43 49
44REPLACE_PYTHON+= lib/libvcl/generate.py 50CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
45REPLACE_PYTHON+= lib/libvmod_std/vmod.py 51CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
46 
47.include "../../lang/python/pyversion.mk" 
48BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 
49CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX} 
50CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX} 52CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
 53CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
 54CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
51 55
52.include "../../devel/pcre/buildlink3.mk" 
53.include "../../mk/bsd.prefs.mk" 
54 
55.if ${OPSYS} == "SunOS" 
56# Explicitly disable epoll on illumos, provided for Linux compat only. 56# Explicitly disable epoll on illumos, provided for Linux compat only.
57CONFIGURE_ENV+= ac_cv_func_epoll_ctl=no 57CONFIGURE_ARGS.SunOS+= --disable-epoll
58. if ${PKGSRC_COMPILER:Msunpro} 58
59CONFIGURE_ENV+= VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s" 59.include "../../mk/compiler.mk"
60. else 60
61CONFIGURE_ENV+= VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s" 61# Fixes build on at least SunOS/i386
62. endif 62# See https://github.com/varnishcache/varnish-cache/issues/1875
 63.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386"
 64CFLAGS+= -fexcess-precision=standard
63.endif 65.endif
 66LDFLAGS.NetBSD+= -lm # for ldexp
 67
 68INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
 69
 70# not signed/unsigned char safe
 71BUILDLINK_TRANSFORM+= rm:-Werror
64 72
 73PKGCONFIG_OVERRIDE+= varnishapi.pc.in
 74
 75RCD_SCRIPTS= varnishd varnishlog varnishncsa
 76
 77TEST_TARGET= check
 78
 79.include "../../devel/pcre/buildlink3.mk"
 80.include "../../devel/libexecinfo/buildlink3.mk"
 81.include "../../lang/python/application.mk"
 82.include "../../lang/python/versioned_dependencies.mk"
65.include "../../mk/curses.buildlink3.mk" 83.include "../../mk/curses.buildlink3.mk"
66.include "../../mk/pthread.buildlink3.mk" 84.include "../../mk/pthread.buildlink3.mk"
67.include "../../mk/readline.buildlink3.mk" 85.include "../../mk/readline.buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/www/varnish/PLIST (expand / switch to unified diff)

--- pkgsrc/www/varnish/PLIST 2014/03/11 14:05:18 1.9
+++ pkgsrc/www/varnish/PLIST 2021/06/25 12:21:08 1.10
@@ -1,41 +1,132 @@ @@ -1,41 +1,132 @@
1@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:18 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.10 2021/06/25 12:21:08 tnn Exp $
2bin/varnishadm 2bin/varnishadm
3bin/varnishhist 3bin/varnishhist
4bin/varnishlog 4bin/varnishlog
5bin/varnishncsa 5bin/varnishncsa
6bin/varnishreplay 
7bin/varnishsizes 
8bin/varnishstat 6bin/varnishstat
 7bin/varnishstat_help_gen
9bin/varnishtest 8bin/varnishtest
10bin/varnishtop 9bin/varnishtop
11include/varnish/varnishapi.h 10include/varnish/cache/cache.h
 11include/varnish/cache/cache_backend.h
 12include/varnish/cache/cache_director.h
 13include/varnish/cache/cache_filter.h
 14include/varnish/cache/cache_varnishd.h
 15include/varnish/common/common_param.h
 16include/varnish/miniobj.h
 17include/varnish/tbl/acct_fields_bereq.h
 18include/varnish/tbl/acct_fields_req.h
 19include/varnish/tbl/backend_poll.h
 20include/varnish/tbl/ban_arg_oper.h
 21include/varnish/tbl/ban_oper.h
 22include/varnish/tbl/ban_vars.h
 23include/varnish/tbl/bo_flags.h
 24include/varnish/tbl/boc_state.h
 25include/varnish/tbl/body_status.h
 26include/varnish/tbl/cli_cmds.h
 27include/varnish/tbl/debug_bits.h
 28include/varnish/tbl/feature_bits.h
 29include/varnish/tbl/h2_error.h
 30include/varnish/tbl/h2_frames.h
 31include/varnish/tbl/h2_settings.h
 32include/varnish/tbl/h2_stream.h
 33include/varnish/tbl/htc.h
 34include/varnish/tbl/http_headers.h
 35include/varnish/tbl/http_response.h
 36include/varnish/tbl/locks.h
 37include/varnish/tbl/mgt_vcc.h
 38include/varnish/tbl/obj_attr.h
 39include/varnish/tbl/oc_exp_flags.h
 40include/varnish/tbl/oc_flags.h
 41include/varnish/tbl/params.h
 42include/varnish/tbl/req_flags.h
 43include/varnish/tbl/sess_attr.h
 44include/varnish/tbl/sess_close.h
 45include/varnish/tbl/symbol_kind.h
 46include/varnish/tbl/vcl_returns.h
 47include/varnish/tbl/vcl_states.h
 48include/varnish/tbl/vhd_fsm.h
 49include/varnish/tbl/vhd_fsm_funcs.h
 50include/varnish/tbl/vhd_return.h
 51include/varnish/tbl/vhp_huffman.h
 52include/varnish/tbl/vhp_static.h
 53include/varnish/tbl/vrt_stv_var.h
 54include/varnish/tbl/vsc_levels.h
 55include/varnish/tbl/vsig_list.h
 56include/varnish/tbl/vsl_tags.h
 57include/varnish/tbl/vsl_tags_http.h
 58include/varnish/tbl/waiters.h
 59include/varnish/vapi/vapi_options.h
 60include/varnish/vapi/voptget.h
 61include/varnish/vapi/vsc.h
 62include/varnish/vapi/vsig.h
 63include/varnish/vapi/vsl.h
 64include/varnish/vapi/vsl_int.h
 65include/varnish/vapi/vsm.h
 66include/varnish/vas.h
 67include/varnish/vav.h
 68include/varnish/vbh.h
 69include/varnish/vbm.h
 70include/varnish/vcl.h
12include/varnish/vcli.h 71include/varnish/vcli.h
13include/varnish/vsc.h 72include/varnish/vcs.h
14include/varnish/vsc_all.h 73include/varnish/vdef.h
15include/varnish/vsc_fields.h 74include/varnish/vmod_abi.h
16include/varnish/vsl.h 75include/varnish/vqueue.h
17include/varnish/vsl_tags.h 76include/varnish/vre.h
18include/varnish/vsm.h 77include/varnish/vrnd.h
 78include/varnish/vrt.h
 79include/varnish/vrt_obj.h
 80include/varnish/vsa.h
 81include/varnish/vsb.h
 82include/varnish/vsha256.h
 83include/varnish/vtcp.h
 84include/varnish/vtim.h
 85include/varnish/vtree.h
 86include/varnish/vut.h
 87include/varnish/vut_options.h
 88include/varnish/waiter/waiter.h
19lib/libvarnishapi.la 89lib/libvarnishapi.la
20lib/pkgconfig/varnishapi.pc 90lib/pkgconfig/varnishapi.pc
21lib/varnish/libvarnish.la 91lib/varnish/vmods/libvmod_blob.la
22lib/varnish/libvarnishcompat.la 92lib/varnish/vmods/libvmod_cookie.la
23lib/varnish/libvcl.la 93lib/varnish/vmods/libvmod_debug.la
24lib/varnish/libvgz.la 94lib/varnish/vmods/libvmod_directors.la
 95lib/varnish/vmods/libvmod_proxy.la
 96lib/varnish/vmods/libvmod_purge.la
25lib/varnish/vmods/libvmod_std.la 97lib/varnish/vmods/libvmod_std.la
 98lib/varnish/vmods/libvmod_unix.la
 99lib/varnish/vmods/libvmod_vtc.la
26man/man1/varnishadm.1 100man/man1/varnishadm.1
27man/man1/varnishd.1 101man/man1/varnishd.1
28man/man1/varnishhist.1 102man/man1/varnishhist.1
29man/man1/varnishlog.1 103man/man1/varnishlog.1
30man/man1/varnishncsa.1 104man/man1/varnishncsa.1
31man/man1/varnishreplay.1 
32man/man1/varnishsizes.1 
33man/man1/varnishstat.1 105man/man1/varnishstat.1
34man/man1/varnishtest.1 106man/man1/varnishtest.1
35man/man1/varnishtop.1 107man/man1/varnishtop.1
 108man/man3/vmod_blob.3
 109man/man3/vmod_cookie.3
 110man/man3/vmod_directors.3
 111man/man3/vmod_proxy.3
 112man/man3/vmod_purge.3
36man/man3/vmod_std.3 113man/man3/vmod_std.3
 114man/man3/vmod_unix.3
 115man/man3/vmod_vtc.3
37man/man7/varnish-cli.7 116man/man7/varnish-cli.7
38man/man7/varnish-counters.7 117man/man7/varnish-counters.7
 118man/man7/vcl-backend.7
 119man/man7/vcl-probe.7
 120man/man7/vcl-var.7
39man/man7/vcl.7 121man/man7/vcl.7
 122man/man7/vsl-query.7
 123man/man7/vsl.7
 124man/man7/vtc.7
40sbin/varnishd 125sbin/varnishd
41share/examples/varnish/default.vcl 126share/aclocal/varnish-legacy.m4
 127share/aclocal/varnish.m4
 128share/examples/varnish/builtin.vcl
 129share/examples/varnish/example.vcl
 130share/varnish/vcl/devicedetect.vcl
 131share/varnish/vmodtool.py
 132share/varnish/vsctool.py
cvs diff -r1.1 -r1.2 pkgsrc/www/varnish/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/varnish/buildlink3.mk 2020/07/13 18:43:22 1.1
+++ pkgsrc/www/varnish/buildlink3.mk 2021/06/25 12:21:08 1.2
@@ -1,20 +1,16 @@ @@ -1,20 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.1 2020/07/13 18:43:22 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2021/06/25 12:21:08 tnn Exp $
2 2
3BUILDLINK_TREE+= varnish 3BUILDLINK_TREE+= varnish
4 4
5.if !defined(VARNISH_BUILDLINK3_MK) 5.if !defined(VARNISH_BUILDLINK3_MK)
6VARNISH_BUILDLINK3_MK:= 6VARNISH_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.varnish+= varnish>=3.0.6nb3 8BUILDLINK_API_DEPENDS.varnish+= varnish>=6.6.0
9BUILDLINK_PKGSRCDIR.varnish?= ../../www/varnish 9BUILDLINK_PKGSRCDIR.varnish?= ../../www/varnish
10BUILDLINK_INCDIRS.varnish= include/varnish 
11BUILDLINK_LIBDIRS.varnish= lib/varnish 
12 10
 11.include "../../devel/libexecinfo/buildlink3.mk"
13.include "../../devel/pcre/buildlink3.mk" 12.include "../../devel/pcre/buildlink3.mk"
14.include "../../mk/curses.buildlink3.mk" 
15.include "../../mk/pthread.buildlink3.mk" 
16.include "../../mk/readline.buildlink3.mk" 
17 13
18.endif # VARNISH_BUILDLINK3_MK 14.endif # VARNISH_BUILDLINK3_MK
19 15
20BUILDLINK_TREE+= -varnish 16BUILDLINK_TREE+= -varnish
cvs diff -r1.14 -r1.15 pkgsrc/www/varnish/distinfo (expand / switch to unified diff)

--- pkgsrc/www/varnish/distinfo 2015/11/04 02:47:41 1.14
+++ pkgsrc/www/varnish/distinfo 2021/06/25 12:21:08 1.15
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.14 2015/11/04 02:47:41 agc Exp $ 1$NetBSD: distinfo,v 1.15 2021/06/25 12:21:08 tnn Exp $
2 2
3SHA1 (varnish-3.0.6.tar.gz) = c58590f87f0981c3c10c4066d739e93352678824 3SHA1 (varnish-6.6.0.tgz) = c330a3cbdbb13586338d1419ef8913efbd3816ae
4RMD160 (varnish-3.0.6.tar.gz) = 29b298800bff08ff471e081fa64e49e34d484bcd 4RMD160 (varnish-6.6.0.tgz) = 550dfcf68597dc2937c7eafa7dd03ff805c3cdfa
5SHA512 (varnish-3.0.6.tar.gz) = 6dcbbf1407e72f9fe6c156a4074d9d42ce147d225cd3001b3240a22ed02e7adf2e900671f9f7e81cbd6b565b29ac65e0436c08c295763b5f7d48b6ab76a1c6b3 5SHA512 (varnish-6.6.0.tgz) = 0f52e94dd866a7cf141f9333a9169b396627f169907acb2d64f18dcac3188f9d9f1e72ea9eb9f2c0c19a5f53df0c90446041eb2b1e52f4756ea257efb329d0d1
6Size (varnish-3.0.6.tar.gz) = 2049810 bytes 6Size (varnish-6.6.0.tgz) = 3519048 bytes
7SHA1 (patch-etc__Makefile.in) = 86424950049721ef224facdfbe4cb630a2c46532 7SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82
 8SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be
 9SHA1 (patch-include_tbl_params.h) = 7a52ef6a98ec29409c7284876adffdb5c53facff
File Added: pkgsrc/www/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
$NetBSD: patch-bin_varnishd_cache_cache__panic.c,v 1.1 2021/06/25 12:21:08 tnn Exp $

Need sys/cdefs.h for __BEGIN_DECLS/__END_DECLS.

--- bin/varnishd/cache/cache_panic.c.orig	2021-03-12 15:02:41.000000000 +0000
+++ bin/varnishd/cache/cache_panic.c
@@ -31,6 +31,10 @@
 
 #include "config.h"
 
+#ifdef __NetBSD__
+#include <sys/cdefs.h>
+#endif
+
 #ifdef WITH_UNWIND
 #  include <libunwind.h>
 #else
File Added: pkgsrc/www/varnish/patches/patch-etc_Makefile.in
$NetBSD: patch-etc_Makefile.in,v 1.1 2021/06/25 12:21:08 tnn Exp $

Use standard sysconfdir for vcl files.

--- etc/Makefile.in.orig	2021-03-15 11:36:30.000000000 +0000
+++ etc/Makefile.in
@@ -157,7 +157,7 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(vcldir)"
+am__installdirs = "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(vcldir)"
 DATA = $(dist_doc_DATA) $(dist_vcl_DATA)
 am__extra_recursive_targets = recheck-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -380,18 +380,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_docDATA: $(dist_doc_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	@list='$(dist_doc_DATA)'; test -n "$(sysconfdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
 	done
 
 uninstall-dist_docDATA:
@@ -465,7 +465,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(vcldir)"; do \
+	for dir in "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(vcldir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
File Added: pkgsrc/www/varnish/patches/patch-include_tbl_params.h
$NetBSD: patch-include_tbl_params.h,v 1.1 2021/06/25 12:21:08 tnn Exp $

Change some default limits to cover NetBSD defaults.

--- include/tbl/params.h.orig	2021-03-12 15:02:41.000000000 +0000
+++ include/tbl/params.h
@@ -856,7 +856,7 @@ PARAM_SIMPLE(
 	/* name */	tcp_keepalive_intvl,
 	/* type */	timeout,
 	/* min */	"1",
-	/* max */	"100",
+	/* max */	"150",
 	/* def */	NULL,
 	/* units */	"seconds",
 	/* descr */
@@ -889,7 +889,7 @@ PARAM_SIMPLE(
 	/* name */	tcp_keepalive_time,
 	/* type */	timeout,
 	/* min */	"1",
-	/* max */	"7200",
+	/* max */	"14400",
 	/* def */	NULL,
 	/* units */	"seconds",
 	/* descr */
File Deleted: pkgsrc/www/varnish/patches/Attic/patch-etc__Makefile.in