[Midnightbsd-cvs] mports [24919] trunk/www/varnish4: update to 4.1.10
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 8 23:47:26 EST 2019
Revision: 24919
http://svnweb.midnightbsd.org/mports/?rev=24919
Author: laffer1
Date: 2019-02-08 23:47:25 -0500 (Fri, 08 Feb 2019)
Log Message:
-----------
update to 4.1.10
Modified Paths:
--------------
trunk/www/varnish4/Makefile
trunk/www/varnish4/distinfo
trunk/www/varnish4/files/varnishd.in
trunk/www/varnish4/pkg-descr
Removed Paths:
-------------
trunk/www/varnish4/files/patch-bin_varnishstat_varnishstat__curses.c
Modified: trunk/www/varnish4/Makefile
===================================================================
--- trunk/www/varnish4/Makefile 2019-02-03 18:44:07 UTC (rev 24918)
+++ trunk/www/varnish4/Makefile 2019-02-09 04:47:25 UTC (rev 24919)
@@ -1,10 +1,10 @@
# $MidnightBSD$
PORTNAME= varnish
-PORTVERSION= 4.1.1
-PORTREVISION= 1
+PORTVERSION= 4.1.10
+DISTVERSIONPREFIX= varnish-
+PORTREVISION= 0
CATEGORIES= www
-MASTER_SITES= http://repo.varnish-cache.org/source/
PKGNAMESUFFIX= 4
MAINTAINER= ports at MidnightBSD.org
@@ -11,13 +11,15 @@
COMMENT= High-performance HTTP accelerator
LICENSE= bsd2
+LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
- libedit.so.0:${PORTSDIR}/devel/libedit
+BUILD_DEPENDS= rst2man:textproc/py-docutils
+LIB_DEPENDS= libpcre.so:devel/pcre
CONFLICTS= varnish-2.* varnish-3.*
-USES= autoreconf cpe gmake libtool pkgconfig python:2,build readline shebangfix
+USES= autoreconf cpe gmake libedit libtool ncurses pathfix \
+ pkgconfig python:2,build readline shebangfix
SHEBANG_FILES= lib/libvcc/vmodtool.py
python_OLD_CMD= /usr/bin/env python
CPE_VENDOR= varnish-cache
@@ -24,10 +26,15 @@
CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX} --enable-tests
-CONFIGURE_ENV= RST2MAN=true
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+TEST_TARGET= check # some tests fail
+TEST_ARGS= TESTS_PARALLELISM=1
+USE_GITHUB= yes
+GH_ACCOUNT= varnishcache
+GH_PROJECT= varnish-cache
+
USERS= varnish varnishlog
GROUPS= varnish
@@ -38,6 +45,8 @@
EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch
.endif
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
${WRKSRC}/Makefile.am
@@ -45,7 +54,4 @@
${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
-
.include <bsd.port.mk>
Modified: trunk/www/varnish4/distinfo
===================================================================
--- trunk/www/varnish4/distinfo 2019-02-03 18:44:07 UTC (rev 24918)
+++ trunk/www/varnish4/distinfo 2019-02-09 04:47:25 UTC (rev 24919)
@@ -1,2 +1,3 @@
-SHA256 (varnish-4.1.1.tar.gz) = 1230ac1b87248b5a3f3fdfddc66cf080c7c4d80a97fcb44efa6286e5ccf8354f
-SIZE (varnish-4.1.1.tar.gz) = 2009042
+TIMESTAMP = 1549687597
+SHA256 (varnish-varnish-4.1.10_GH0.tar.gz) = 44e0fa32112ffc1f8331f66c48b761e75bc1e4b10a9a0d4b58f63c202ce5c3f8
+SIZE (varnish-varnish-4.1.10_GH0.tar.gz) = 953083
Deleted: trunk/www/varnish4/files/patch-bin_varnishstat_varnishstat__curses.c
===================================================================
--- trunk/www/varnish4/files/patch-bin_varnishstat_varnishstat__curses.c 2019-02-03 18:44:07 UTC (rev 24918)
+++ trunk/www/varnish4/files/patch-bin_varnishstat_varnishstat__curses.c 2019-02-09 04:47:25 UTC (rev 24919)
@@ -1,14 +0,0 @@
---- bin/varnishstat/varnishstat_curses.c.orig 2016-01-28 10:30:41 UTC
-+++ bin/varnishstat/varnishstat_curses.c
-@@ -540,8 +540,9 @@ static void
- print_duration(WINDOW *w, time_t t)
- {
-
-- wprintw(w, "%4lu+%02lu:%02lu:%02lu",
-- t / 86400, (t % 86400) / 3600, (t % 3600) / 60, t % 60);
-+ wprintw(w, "%4jd+%02jd:%02jd:%02jd",
-+ (intmax_t)t / 86400, (intmax_t)(t % 86400) / 3600,
-+ (intmax_t)(t % 3600) / 60, (intmax_t)t % 60);
- }
-
- static void
Modified: trunk/www/varnish4/files/varnishd.in
===================================================================
--- trunk/www/varnish4/files/varnishd.in 2019-02-03 18:44:07 UTC (rev 24918)
+++ trunk/www/varnish4/files/varnishd.in 2019-02-09 04:47:25 UTC (rev 24919)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/www/varnish4/files/varnishd.in 400701 2015-11-03 15:08:46Z feld $
+# $FreeBSD: head/www/varnish4/files/varnishd.in 427381 2016-11-29 14:56:48Z feld $
#
# PROVIDE: varnishd
@@ -32,7 +32,7 @@
# default: unset.
#
# varnishd_hash - hash algorithm
-# default: "classic,16383"
+# default: "critbit"
#
# varnishd_storage - storage method and parameters.
# default: "file,/tmp,100M"
@@ -60,7 +60,7 @@
: ${varnishd_admin=localhost:81}
: ${varnishd_backend=localhost:8080}
: ${varnishd_storage=file,/tmp,100M}
-: ${varnishd_hash=classic,16383}
+: ${varnishd_hash=critbit}
: ${varnishd_jailuser=varnish}
command="%%PREFIX%%/sbin/${name}"
Modified: trunk/www/varnish4/pkg-descr
===================================================================
--- trunk/www/varnish4/pkg-descr 2019-02-03 18:44:07 UTC (rev 24918)
+++ trunk/www/varnish4/pkg-descr 2019-02-09 04:47:25 UTC (rev 24919)
@@ -1,12 +1,12 @@
This is the Varnish high-performance HTTP accelerator.
Documentation and additional information about Varnish is available on
-<URL:http://varnish.projects.linpro.no/>.
+http://varnish-cache.org/docs/index.html
Technical questions about Varnish and this release should be addressed
-to <varnish-dev at projects.linpro.no>.
+to <varnish-dev at varnish-cache.org>
Questions about commercial support and services related to Varnish
-should be addressed to <varnish at linpro.no>.
+can be directed here: https://www.varnish-software.com/contact-us
WWW: http://www.varnish-cache.org/
More information about the Midnightbsd-cvs
mailing list