Index: www/varnish/Makefile =================================================================== --- /dev/null +++ www/varnish/Makefile @@ -1,76 +1,43 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 3.0.5 -PORTREVISION= 3 +PORTVERSION= 4.0.2 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ -MAINTAINER= anders@FreeBSD.org +MAINTAINER= allanjude@FreeBSD.org COMMENT= The Varnish high-performance HTTP accelerator LICENSE= BSD2CLAUSE LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -CONFLICTS= varnish-2.* +CONFLICTS= varnish-3.* GNU_CONFIGURE= yes -USES= gmake libtool readline pkgconfig +USES= gmake libtool readline pkgconfig autoreconf USE_PYTHON_BUILD= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX} --enable-tests +CONFIGURE_ARGS= --localstatedir=${PREFIX} CONFIGURE_ENV= RST2MAN=true USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal libtoolize automake autoconf -ACLOCAL_ARGS= -I m4 -LIBTOOLFLAGS= --copy --force --disable-static -AUTOMAKE_ARGS= --add-missing --copy --foreign INSTALL_TARGET= install-strip USE_RC_SUBR= varnishd varnishlog varnishncsa SUB_FILES= pkg-message -.if defined(NO_INET6) || defined(WITHOUT_INET6) -BAD_TESTS+= r00832 -EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch -.endif post-patch: @${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.am -.if defined(BAD_TESTS) - ${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|} -.endif - -regression-test check test: build - ${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check - -post-build: - # - # It is highly recommended, that you verify the build's - # correctness by performing: - # - # make check - # - # now... - # post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/varnish - ${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${STAGEDIR}${PREFIX}/share/varnish -.for f in cache.h heritage.h steps.h common.h acct_fields.h locks.h body_status.h - ${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${STAGEDIR}${PREFIX}/include/varnish -.endfor -.for f in vct.h vmod_abi.h vre.h vrt.h vqueue.h vsb.h libvarnish.h miniobj.h vas.h vav.h http_headers.h vcl_returns.h - ${INSTALL_DATA} ${WRKSRC}/include/${f} ${STAGEDIR}${PREFIX}/include/varnish -.endfor @${RM} -f ${STAGEDIR}${PREFIX}/lib/libvarnishapi.*a ${STAGEDIR}${PREFIX}/lib/varnish/lib*a ${STAGEDIR}${PREFIX}/lib/varnish/vmods/lib*a - @${MV} ${STAGEDIR}${ETCDIR}/default.vcl ${STAGEDIR}${ETCDIR}/default.vcl.sample + ${MKDIR} ${STAGEDIR}${ETCDIR} + @${CP} ${WRKSRC}/etc/builtin.vcl ${STAGEDIR}${ETCDIR}/builtin.vcl.sample + @${CP} ${WRKSRC}/etc/example.vcl ${STAGEDIR}${ETCDIR}/example.vcl.sample .include -.if ${ARCH} == "i386" -EXTRA_PATCHES+= ${FILESDIR}/bug-1201.patch -.endif .if ${ARCH} == "arm" BROKEN= Does not configure on arm .endif Index: www/varnish/distinfo =================================================================== --- /dev/null +++ www/varnish/distinfo @@ -1,2 +1,2 @@ -SHA256 (varnish-3.0.5.tar.gz) = 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 -SIZE (varnish-3.0.5.tar.gz) = 2116664 +SHA256 (varnish-4.0.2.tar.gz) = d9fb6a6eaf05bbb0c8eb5855556a4b092183b2c1a61281bfd73adf83a304555b +SIZE (varnish-4.0.2.tar.gz) = 1853668 Index: www/varnish/files/bug-1201.patch =================================================================== --- www/varnish/files/bug-1201.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use larger stack-size for the r01109 test. See: - - https://www.varnish-cache.org/trac/ticket/1201 - -for details. - ---- bin/varnishtest/tests/r01109.vtc 2012-08-20 05:20:39.000000000 -0400 -+++ bin/varnishtest/tests/r01109.vtc 2012-10-10 09:06:29.000000000 -0400 -@@ -22,5 +22,5 @@ - } -start - --varnish v1 -arg "-pfetch_chunksize=4k" -arg "-pgzip_level=0" -vcl+backend { -+varnish v1 -arg "-pfetch_chunksize=4k" -arg "-pgzip_level=0" -arg "-pthread_pool_stack=131072" -vcl+backend { - sub vcl_fetch { - if (req.url ~ "/test") { Index: www/varnish/files/no-inet6.patch =================================================================== --- www/varnish/files/no-inet6.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- bin/varnishtest/tests/c00005.vtc 2012-08-20 05:20:39.000000000 -0400 -+++ bin/varnishtest/tests/c00005.vtc 2012-09-26 12:09:59.000000000 -0400 -@@ -32,5 +32,4 @@ - ! "localhost"; - "0.0.0.0" / 0; -- "::" / 0; - } - Index: www/varnish/files/patch-bug-1202 =================================================================== --- www/varnish/files/patch-bug-1202 +++ /dev/null @@ -1,12 +0,0 @@ -See: - https://www.varnish-cache.org/trac/ticket/1202 - ---- bin/varnishtest/vtc_log.c 2012-08-20 05:20:40.000000000 -0400 -+++ bin/varnishtest/vtc_log.c 2012-10-01 12:35:45.000000000 -0400 -@@ -138,5 +138,5 @@ - AZ(pthread_mutex_lock(&vl->mtx)); - vl->act = 1; -- assert(lvl < NLEAD); -+ assert(lvl < (int)NLEAD); - VSB_clear(vl->vsb); - VSB_printf(vl->vsb, "%s %-4s %4.1f ", Index: www/varnish/files/patch-configure.ac =================================================================== --- www/varnish/files/patch-configure.ac +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.ac.orig 2013-06-14 10:39:32.000000000 +0200 -+++ configure.ac 2013-09-04 22:58:56.000000000 +0200 -@@ -147,9 +147,22 @@ - AC_SUBST(PCRE_CFLAGS) - AC_SUBST(PCRE_LIBS) - --PKG_CHECK_MODULES([LIBEDIT], [libedit], -- [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], -- [AX_LIB_READLINE]) -+case $target in -+*-*-freebsd*) -+ AC_CHECK_LIB(edit, el_init, -+ [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) -+ AC_DEFINE([HAVE_READLINE_READLINE_H], [1], [Define if we have readline.h]) -+ LIBEDIT_CFLAGS="" -+ LIBEDIT_LIBS="-lreadline ${CURSES_LIBS}" -+ ], -+ [AC_MSG_WARN([libedit not found, disabling libedit support])]) -+ ;; -+*) -+ PKG_CHECK_MODULES([LIBEDIT], [libedit], -+ [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], -+ [AX_LIB_READLINE]) -+ ;; -+esac - if test "$ac_cv_have_readline" = no; then - AC_MSG_ERROR([libedit or readline not found]) - fi Index: www/varnish/files/varnishd.in =================================================================== --- /dev/null +++ www/varnish/files/varnishd.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: head/www/varnish/files/varnishd.in 340872 2014-01-24 00:14:07Z mat $ # # PROVIDE: varnishd Index: www/varnish/files/varnishlog.in =================================================================== --- /dev/null +++ www/varnish/files/varnishlog.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: head/www/varnish/files/varnishlog.in 340872 2014-01-24 00:14:07Z mat $ # # PROVIDE: varnishlog Index: www/varnish/files/varnishncsa.in =================================================================== --- /dev/null +++ www/varnish/files/varnishncsa.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: head/www/varnish/files/varnishncsa.in 340872 2014-01-24 00:14:07Z mat $ # # PROVIDE: varnishncsa Index: www/varnish/pkg-plist =================================================================== --- /dev/null +++ www/varnish/pkg-plist @@ -2,70 +2,103 @@ bin/varnishhist bin/varnishlog bin/varnishncsa -bin/varnishreplay -bin/varnishsizes bin/varnishstat bin/varnishtest bin/varnishtop -@unexec if cmp -s %D/etc/varnish/default.vcl.sample %D/etc/varnish/default.vcl; then rm -f %D/etc/varnish/default.vcl; fi -etc/varnish/default.vcl.sample -@exec if [ ! -f %D/etc/varnish/default.vcl ] ; then cp -p %D/%F %B/default.vcl; fi -include/varnish/acct_fields.h -include/varnish/body_status.h -include/varnish/cache.h -include/varnish/common.h -include/varnish/heritage.h -include/varnish/http_headers.h -include/varnish/libvarnish.h -include/varnish/locks.h -include/varnish/miniobj.h -include/varnish/steps.h -include/varnish/varnishapi.h -include/varnish/vas.h -include/varnish/vav.h -include/varnish/vcl_returns.h +@sample %%ETCDIR%%/builtin.vcl.sample +@sample %%ETCDIR%%/example.vcl.sample +include/varnish/tbl/acct_fields_bereq.h +include/varnish/tbl/acct_fields_req.h +include/varnish/tbl/backend_poll.h +include/varnish/tbl/ban_vars.h +include/varnish/tbl/bo_flags.h +include/varnish/tbl/body_status.h +include/varnish/tbl/debug_bits.h +include/varnish/tbl/feature_bits.h +include/varnish/tbl/http_headers.h +include/varnish/tbl/http_response.h +include/varnish/tbl/locks.h +include/varnish/tbl/req_body.h +include/varnish/tbl/sess_close.h +include/varnish/tbl/steps.h +include/varnish/tbl/symbol_kind.h +include/varnish/tbl/vcc_types.h +include/varnish/tbl/vcl_returns.h +include/varnish/tbl/vrt_stv_var.h +include/varnish/tbl/vsc_all.h +include/varnish/tbl/vsc_f_main.h +include/varnish/tbl/vsc_fields.h +include/varnish/tbl/vsc_levels.h +include/varnish/tbl/vsc_types.h +include/varnish/tbl/vsl_tags.h +include/varnish/tbl/vsl_tags_http.h +include/varnish/vapi/vapi_options.h +include/varnish/vapi/voptget.h +include/varnish/vapi/vsc.h +include/varnish/vapi/vsc_int.h +include/varnish/vapi/vsl.h +include/varnish/vapi/vsl_int.h +include/varnish/vapi/vsm.h +include/varnish/vapi/vsm_int.h include/varnish/vcli.h -include/varnish/vct.h -include/varnish/vmod_abi.h -include/varnish/vqueue.h -include/varnish/vre.h -include/varnish/vrt.h -include/varnish/vsb.h -include/varnish/vsc.h -include/varnish/vsc_all.h -include/varnish/vsc_fields.h -include/varnish/vsl.h -include/varnish/vsl_tags.h -include/varnish/vsm.h +lib/libvarnishapi.so +lib/libvarnishapi.so.1 +lib/libvarnishapi.so.1.0.0 lib/varnish/libvarnish.so lib/varnish/libvarnishcompat.so -lib/varnish/libvcl.so +lib/varnish/libvcc.so lib/varnish/libvgz.so +lib/varnish/vmods/libvmod_directors.so lib/varnish/vmods/libvmod_std.so -lib/libvarnishapi.so.1.0.0 -lib/libvarnishapi.so.1 -lib/libvarnishapi.so libdata/pkgconfig/varnishapi.pc man/man1/varnishadm.1.gz man/man1/varnishd.1.gz man/man1/varnishhist.1.gz man/man1/varnishlog.1.gz man/man1/varnishncsa.1.gz -man/man1/varnishreplay.1.gz -man/man1/varnishsizes.1.gz man/man1/varnishstat.1.gz man/man1/varnishtest.1.gz man/man1/varnishtop.1.gz +man/man3/vmod_directors.3.gz man/man3/vmod_std.3.gz man/man7/varnish-cli.7.gz man/man7/varnish-counters.7.gz man/man7/vcl.7.gz +man/man7/vsl-query.7.gz +man/man7/vsl.7.gz sbin/varnishd -share/varnish/vmod.py -@exec [ -d %D/varnish ] || mkdir %D/varnish +share/aclocal/varnish.m4 +%%PORTDOCS%%%%DOCSDIR%%/builtin.vcl +%%PORTDOCS%%%%DOCSDIR%%/example.vcl +%%DATADIR%%/include/cache/cache.h +%%DATADIR%%/include/cache/cache_backend.h +%%DATADIR%%/include/common/common.h +%%DATADIR%%/include/common/params.h +%%DATADIR%%/include/miniobj.h +%%DATADIR%%/include/vas.h +%%DATADIR%%/include/vav.h +%%DATADIR%%/include/vbm.h +%%DATADIR%%/include/vcl.h +%%DATADIR%%/include/vcs.h +%%DATADIR%%/include/vdef.h +%%DATADIR%%/include/vmod_abi.h +%%DATADIR%%/include/vqueue.h +%%DATADIR%%/include/vre.h +%%DATADIR%%/include/vrt.h +%%DATADIR%%/include/vrt_obj.h +%%DATADIR%%/include/vsa.h +%%DATADIR%%/include/vsb.h +%%DATADIR%%/include/vsha256.h +%%DATADIR%%/vmodtool.py +@dirrmtry %%ETCDIR%% +@dirrmtry include/varnish/tbl +@dirrmtry include/varnish/vapi +@dirrmtry include/varnish @dirrmtry lib/varnish/vmods @dirrmtry lib/varnish +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrmtry %%DATADIR%%/include/cache +@dirrmtry %%DATADIR%%/include/common +@dirrmtry %%DATADIR%%/include +@dirrmtry %%DATADIR%% @dirrmtry varnish -@dirrm include/varnish -@dirrm share/varnish -@dirrmtry etc/varnish