3 files changed, 45 insertions, 43 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 0f4600e95268..6731c92717f7 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index d1dfcb8a254c..8fa00d4099bc 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478323826
-SHA256 (libvirt-2.4.0.tar.xz) = b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224
-SIZE (libvirt-2.4.0.tar.xz) = 13237652
+TIMESTAMP = 1481343631
+SHA256 (libvirt-2.5.0.tar.xz) = 819dffefbfd6ae95dfe1b28cfdee15ebcf9f91bbd732157488a57705bf81cb1e
+SIZE (libvirt-2.5.0.tar.xz) = 13638636
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 62c63e993bd3..14e1d9eb9b33 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -87,25 +87,22 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/api.html
 %%DOCSDIR%%%%PORTVERSION%%/html/api_extension.html
 %%DOCSDIR%%%%PORTVERSION%%/html/apps.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archdomain.html
 %%DOCSDIR%%%%PORTVERSION%%/html/architecture.gif
 %%DOCSDIR%%%%PORTVERSION%%/html/architecture.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archnetwork.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archnode.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archstorage.html
 %%DOCSDIR%%%%PORTVERSION%%/html/auditlog.html
 %%DOCSDIR%%%%PORTVERSION%%/html/auth.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bindings.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bugs.html
+%%DOCSDIR%%%%PORTVERSION%%/html/cgroups.html
 %%DOCSDIR%%%%PORTVERSION%%/html/compiling.html
 %%DOCSDIR%%%%PORTVERSION%%/html/contact.html
-%%DOCSDIR%%%%PORTVERSION%%/html/cgroups.html
+%%DOCSDIR%%%%PORTVERSION%%/html/contribute.html
 %%DOCSDIR%%%%PORTVERSION%%/html/csharp.html
-%%DOCSDIR%%%%PORTVERSION%%/html/deployment.html
 %%DOCSDIR%%%%PORTVERSION%%/html/devguide.html
 %%DOCSDIR%%%%PORTVERSION%%/html/docs.html
 %%DOCSDIR%%%%PORTVERSION%%/html/downloads.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drivers.html
+%%DOCSDIR%%%%PORTVERSION%%/html/drvbhyve.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvesx.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvhyperv.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvlxc.html
@@ -116,63 +113,84 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/drvtest.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvuml.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvvbox.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvvmware.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvvirtuozzo.html
+%%DOCSDIR%%%%PORTVERSION%%/html/drvvmware.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvxen.html
 %%DOCSDIR%%%%PORTVERSION%%/html/errors.html
 %%DOCSDIR%%%%PORTVERSION%%/html/firewall.html
 %%DOCSDIR%%%%PORTVERSION%%/html/format.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatcaps.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatdomain.html
+%%DOCSDIR%%%%PORTVERSION%%/html/formatdomaincaps.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatnetwork.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatnode.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatnwfilter.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatsecret.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatsnapshot.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatstorage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatdomaincaps.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatstorageencryption.html
 %%DOCSDIR%%%%PORTVERSION%%/html/generic.css
 %%DOCSDIR%%%%PORTVERSION%%/html/goals.html
+%%DOCSDIR%%%%PORTVERSION%%/html/governance.html
 %%DOCSDIR%%%%PORTVERSION%%/html/hacking.html
 %%DOCSDIR%%%%PORTVERSION%%/html/hooks.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/home.png
 %%DOCSDIR%%%%PORTVERSION%%/html/html/index.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/left.png
 %%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-common.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain-snapshot.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-event.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-host.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-interface.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-network.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nodedev.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nwfilter.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-secret.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-storage.html
+%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-stream.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-virterror.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/right.png
 %%DOCSDIR%%%%PORTVERSION%%/html/html/up.png
 %%DOCSDIR%%%%PORTVERSION%%/html/hvsupport.html
 %%DOCSDIR%%%%PORTVERSION%%/html/index.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals/eventloop.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
 %%DOCSDIR%%%%PORTVERSION%%/html/internals/command.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals/eventloop.html
 %%DOCSDIR%%%%PORTVERSION%%/html/internals/locking.html
-%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/locking-lockd.html
-%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/locking-sanlock.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals/oomtesting.html
 %%DOCSDIR%%%%PORTVERSION%%/html/internals/rpc.html
-%%DOCSDIR%%%%PORTVERSION%%/html/intro.html
 %%DOCSDIR%%%%PORTVERSION%%/html/java.html
 %%DOCSDIR%%%%PORTVERSION%%/html/libvirt-daemon-arch.png
 %%DOCSDIR%%%%PORTVERSION%%/html/libvirt-driver-arch.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-bg.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-logo.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-logical.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-physical.png
 %%DOCSDIR%%%%PORTVERSION%%/html/libvirt-object-model.png
 %%DOCSDIR%%%%PORTVERSION%%/html/libvirt.css
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirtLogo.png
 %%DOCSDIR%%%%PORTVERSION%%/html/locking.html
 %%DOCSDIR%%%%PORTVERSION%%/html/logging.html
-%%DOCSDIR%%%%PORTVERSION%%/html/madeWith.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-dark-256.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-dark-800.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-dark.svg
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-light-256.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-light-800.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-banner-light.svg
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-base.svg
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-128.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-192.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-256.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-96.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-powered-128.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-powered-192.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-powered-256.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-powered-96.png
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square-powered.svg
+%%DOCSDIR%%%%PORTVERSION%%/html/logos/logo-square.svg
 %%DOCSDIR%%%%PORTVERSION%%/html/main.css
-%%DOCSDIR%%%%PORTVERSION%%/html/migration.html
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-direct.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-p2p.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-native.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-tunnel.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
+%%DOCSDIR%%%%PORTVERSION%%/html/migration.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2005.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2006.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2007.html
@@ -184,17 +202,15 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2013.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2014.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2015.html
+%%DOCSDIR%%%%PORTVERSION%%/html/news-2016.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news.html
 %%DOCSDIR%%%%PORTVERSION%%/html/node.gif
 %%DOCSDIR%%%%PORTVERSION%%/html/nss.html
-%%DOCSDIR%%%%PORTVERSION%%/html/pending.html
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html
-%%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html
 %%DOCSDIR%%%%PORTVERSION%%/html/remote.html
 %%DOCSDIR%%%%PORTVERSION%%/html/secureusage.html
 %%DOCSDIR%%%%PORTVERSION%%/html/securityprocess.html
-%%DOCSDIR%%%%PORTVERSION%%/html/sitemap.html
 %%DOCSDIR%%%%PORTVERSION%%/html/storage.html
 %%DOCSDIR%%%%PORTVERSION%%/html/testapi.html
 %%DOCSDIR%%%%PORTVERSION%%/html/testsuites.html
@@ -203,20 +219,8 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/uri.html
 %%DOCSDIR%%%%PORTVERSION%%/html/virshcmdref.html
 %%DOCSDIR%%%%PORTVERSION%%/html/windows.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvbhyve.html
-%%DOCSDIR%%%%PORTVERSION%%/html/governance.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals/oomtesting.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain-snapshot.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-event.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-host.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-interface.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-network.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nodedev.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nwfilter.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-secret.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-storage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-stream.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/locking-lockd.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/locking-sanlock.html
 share/gtk-doc/html/libvirt/general.html
 share/gtk-doc/html/libvirt/home.png
 share/gtk-doc/html/libvirt/index.html
@@ -227,7 +231,6 @@ share/gtk-doc/html/libvirt/right.png
 share/gtk-doc/html/libvirt/style.css
 share/gtk-doc/html/libvirt/up.png
 %%DATADIR%%/cpu_map.xml
-%%DATADIR%%/libvirtLogo.png
 %%DATADIR%%/api/libvirt-admin-api.xml
 %%DATADIR%%/api/libvirt-api.xml
 %%DATADIR%%/api/libvirt-lxc-api.xml