Update to 3.0.0. Use ports/www/varnish2 for Varnish 2.

More info: https://www.varnish-cache.org/releases/varnish-cache-3.0.0

3 files changed, 32 insertions, 20 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index eb04dcd8f412..861d0dda9bea 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	varnish
-PORTVERSION=	2.1.5
+PORTVERSION=	3.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
@@ -17,8 +17,11 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
+CONFLICTS=	varnish-2.*
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_PYTHON_BUILD=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}
 CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
@@ -27,7 +30,8 @@ USE_GNOME=	pkgconfig
 MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
 		varnishstat.1 varnishtest.1 varnishtop.1
-MAN7=		vcl.7
+MAN3=		vmod_std.3
+MAN7=		vcl.7 varnish-cli.7
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index 859881f0c6c2..3dd1af4700e9 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varnish-2.1.5.tar.gz) = 2d8049be14ada035d0e3a54c2b519143af40d03d917763cf72d53d8188e5ef83
-SIZE (varnish-2.1.5.tar.gz) = 1530856
+SHA256 (varnish-3.0.0.tar.gz) = 30c4c931a50eab8e78a39a776b85cbb4d242f9ddb707e04e7876fb29f3a8a5eb
+SIZE (varnish-3.0.0.tar.gz) = 2013974
diff --git a/www/varnish/pkg-plist b/www/varnish/pkg-plist
index 0874bd911cf7..e021cc3b0cea 100644
--- a/www/varnish/pkg-plist
+++ b/www/varnish/pkg-plist
@@ -8,30 +8,38 @@ bin/varnishstat
 bin/varnishtest
 bin/varnishtop
 etc/varnish/default.vcl
-include/varnish/shmlog.h
-include/varnish/shmlog_tags.h
-include/varnish/stat_field.h
-include/varnish/stats.h
 include/varnish/varnishapi.h
-lib/libvarnish.so.1
-lib/libvarnish.so
-lib/libvarnish.la
-lib/libvarnish.a
+include/varnish/vcli.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/varnish/libvarnish.so
+lib/varnish/libvarnish.la
+lib/varnish/libvarnish.a
+lib/varnish/libvarnishcompat.so
+lib/varnish/libvarnishcompat.la
+lib/varnish/libvarnishcompat.a
+lib/varnish/libvcl.so
+lib/varnish/libvcl.la
+lib/varnish/libvcl.a
+lib/varnish/libvgz.so
+lib/varnish/libvgz.la
+lib/varnish/libvgz.a
+lib/varnish/vmods/libvmod_std.so
+lib/varnish/vmods/libvmod_std.la
+lib/varnish/vmods/libvmod_std.a
 lib/libvarnishapi.so.1
 lib/libvarnishapi.so
 lib/libvarnishapi.la
 lib/libvarnishapi.a
-lib/libvarnishcompat.so.1
-lib/libvarnishcompat.so
-lib/libvarnishcompat.la
-lib/libvarnishcompat.a
-lib/libvcl.so.1
-lib/libvcl.so
-lib/libvcl.la
-lib/libvcl.a
 libdata/pkgconfig/varnishapi.pc
 sbin/varnishd
 @exec [ -d %D/varnish ] || mkdir %D/varnish
+@dirrmtry lib/varnish/vmods
+@dirrmtry lib/varnish
 @dirrmtry varnish
 @dirrm include/varnish
 @dirrmtry etc/varnish