- Update to 8.6.1

- Change MASTER_SITES to github
- Move python to USES due bin/vipsprofile
- Update WWW

4 files changed, 32 insertions, 40 deletions

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index df157f4817b..c70a5b34f1c 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	vips
-PORTVERSION=	8.4.5
-PORTREVISION=	5
+PORTVERSION=	8.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Free image processing system
@@ -31,9 +30,10 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libgif.so:graphics/giflib \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libImath-2_2.so:graphics/ilmbase \
-		libhdf5.so:science/hdf5
+		libhdf5.so:science/hdf5 \
+		libexpat.so:textproc/expat2
 
-USES=		cpe gettext gmake jpeg libtool pathfix pkgconfig shebangfix
+USES=		cpe gettext gmake jpeg libtool pathfix pkgconfig python:2.7 shebangfix
 SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
 USE_GNOME=	cairo gdkpixbuf2 glib20 libgsf librsvg2 libxml2 pango
 GNU_CONFIGURE=	yes
@@ -43,6 +43,8 @@ CONFIGURE_ARGS=	--without-x \
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
+GH_ACCOUNT=	jcupitt
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -53,7 +55,7 @@ OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
-PYTHON_USES=		python:2.7
+
 PYTHON_CONFIGURE_WITH=	python
 PYTHON_CONFIGURE_ENABLE=	pyvips8
 PYTHON_USE=			GNOME=pygobject3
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index 8877fd2c0b5..60bacd977f3 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481279555
-SHA256 (vips-8.4.5.tar.gz) = 0af73a51f53250ca240a683ba0d652003744382b78d8a10152c8f1bd019897fd
-SIZE (vips-8.4.5.tar.gz) = 11527549
+TIMESTAMP = 1515158464
+SHA256 (vips-8.6.1.tar.gz) = f9ba6235ebc3e4d20af5f1604436bcd9686a3fecbe40838325d542f0c21a9270
+SIZE (vips-8.6.1.tar.gz) = 12184735
diff --git a/graphics/vips/pkg-descr b/graphics/vips/pkg-descr
index 61e202676c7..f3f48bb7e9b 100644
--- a/graphics/vips/pkg-descr
+++ b/graphics/vips/pkg-descr
@@ -6,4 +6,4 @@ think) at all the other things you use photoshop for. It's particularly
 good with large images (ie. images larger than the amount of RAM in your
 machine), and for working with colour.
 
-WWW: http://www.vips.ecs.soton.ac.uk/
+WWW: http://jcupitt.github.io/libvips/
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 15111bc6362..6729cbff35f 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -25,6 +25,7 @@ include/vips/colour.h
 include/vips/conversion.h
 include/vips/convolution.h
 include/vips/create.h
+include/vips/dbuf.h
 include/vips/debug.h
 include/vips/deprecated.h
 include/vips/dispatch.h
@@ -52,6 +53,7 @@ include/vips/rect.h
 include/vips/region.h
 include/vips/resample.h
 include/vips/semaphore.h
+include/vips/soname.h
 include/vips/thread.h
 include/vips/threadpool.h
 include/vips/transform.h
@@ -71,41 +73,18 @@ lib/girepository-1.0/Vips-8.0.typelib
 lib/libvips-cpp.a
 lib/libvips-cpp.so
 lib/libvips-cpp.so.42
-lib/libvips-cpp.so.42.6.5
+lib/libvips-cpp.so.42.8.1
 lib/libvips.a
 lib/libvips.so
 lib/libvips.so.42
-lib/libvips.so.42.6.5
+lib/libvips.so.42.8.1
 lib/libvipsCC.a
 lib/libvipsCC.so
 lib/libvipsCC.so.42
-lib/libvipsCC.so.42.6.5
+lib/libvipsCC.so.42.8.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.%%PYTHON_PYOEXTENSION%%
 libdata/pkgconfig/vips-cpp.pc
 libdata/pkgconfig/vips.pc
 libdata/pkgconfig/vipsCC.pc
@@ -119,6 +98,17 @@ man/man1/vipsheader.1.gz
 man/man1/vipsprofile.1.gz
 man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gir-1.0/Vips-8.0.gir
+%%PORTDOCS%%share/gtk-doc/html/libvips/Cite.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/Combine.png
+%%PORTDOCS%%share/gtk-doc/html/libvips/Examples.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/How-it-opens-files.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/How-it-works.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/Making-image-pyramids.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/Memtrace.png
+%%PORTDOCS%%share/gtk-doc/html/libvips/Sequence.png
+%%PORTDOCS%%share/gtk-doc/html/libvips/Sink.png
+%%PORTDOCS%%share/gtk-doc/html/libvips/Using-vipsthumbnail.md.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/Vips-smp.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsForeignSave.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsImage.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsInterpolate.html
@@ -128,7 +118,7 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsThreadState.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/annotation-glossary.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/api-index-full.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/binding.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/binding.md.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch01.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch02.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch03.html
@@ -138,7 +128,6 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/func-list.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/home.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/index.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/index.sgml
 %%PORTDOCS%%share/gtk-doc/html/libvips/interconvert.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/left-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/left.png
@@ -168,15 +157,16 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-vips.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips.devhelp2
 %%PORTDOCS%%share/gtk-doc/html/libvips/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/owl.jpg
 %%PORTDOCS%%share/gtk-doc/html/libvips/right-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/right.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/style.css
+%%PORTDOCS%%share/gtk-doc/html/libvips/tn_owl.jpg
 %%PORTDOCS%%share/gtk-doc/html/libvips/up-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/up.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-cli.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-from-c.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-from-cpp.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/using-from-python.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-threads.html
 %%PORTDOCS%%share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
 %%PORTDOCS%%share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo