- Update from 7.40.11 to 7.42.0

4 files changed, 30 insertions, 15 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 6608a5e3fd0a..5fc17f237ed9 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nip2
 PORTVERSION=	7.40.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index d3f41f67c278..a387415797f2 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vips
-PORTVERSION=	7.40.11
+PORTVERSION=	7.42.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index 2f1a33b12a27..8e489778a974 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vips-7.40.11.tar.gz) = 26207184227301ad47c1c8fd5f7f98556087b6add63fa776b54abefed4ae062d
-SIZE (vips-7.40.11.tar.gz) = 3523206
+SHA256 (vips-7.42.0.tar.gz) = bd6816e36086eed40aa8ad7c9c5e0916b1840cbbe1e45e16eccf1399aca67348
+SIZE (vips-7.42.0.tar.gz) = 6904903
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index c63379e91b6b..64e0346fc53c 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -11,7 +11,9 @@ bin/vipsprofile
 bin/vipsthumbnail
 include/vips/VDisplay.h
 include/vips/VError.h
+include/vips/VError8.h
 include/vips/VImage.h
+include/vips/VImage8.h
 include/vips/VMask.h
 include/vips/almostdeprecated.h
 include/vips/arithmetic.h
@@ -59,18 +61,28 @@ include/vips/vector.h
 include/vips/version.h
 include/vips/video.h
 include/vips/vips
+include/vips/vips-operators.h
 include/vips/vips.h
 include/vips/vips7compat.h
+include/vips/vips8
 include/vips/vipsc++.h
 include/vips/vipscpp.h
+lib/girepository-1.0/Vips-8.0.typelib
+lib/libvips-cpp.a
+lib/libvips-cpp.so
+lib/libvips-cpp.so.38
+lib/libvips-cpp.so.38.1.0
 lib/libvips.a
 lib/libvips.so
 lib/libvips.so.38
-lib/libvips.so.38.0.7
+lib/libvips.so.38.1.0
 lib/libvipsCC.a
 lib/libvipsCC.so
 lib/libvipsCC.so.38
-lib/libvipsCC.so.38.0.7
+lib/libvipsCC.so.38.1.0
+%%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
@@ -94,6 +106,7 @@ lib/libvipsCC.so.38.0.7
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.so
+libdata/pkgconfig/vips-cpp.pc
 libdata/pkgconfig/vips.pc
 libdata/pkgconfig/vipsCC.pc
 man/man1/batch_crop.1.gz
@@ -105,13 +118,6 @@ man/man1/vipsedit.1.gz
 man/man1/vipsheader.1.gz
 man/man1/vipsprofile.1.gz
 man/man1/vipsthumbnail.1.gz
-%%PORTDOCS%%share/gtk-doc/html/libvips/binding.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/ch04.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/extending.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-type.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-vips.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/using-cli.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/using-from-c.html
 %%PORTDOCS%%%%DOCSDIR%%/html/figs/arch.png
 %%PORTDOCS%%%%DOCSDIR%%/html/figs/interconvert.png
 %%PORTDOCS%%%%DOCSDIR%%/html/vipsmanual.css
@@ -142,6 +148,7 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse9.html
 %%PORTDOCS%%%%DOCSDIR%%/pdf/vipsmanual.pdf
+share/gir-1.0/Vips-8.0.gir
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsForeignSave.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsImage.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsInterpolate.html
@@ -151,9 +158,12 @@ 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/ch01.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch02.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch03.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/ch04.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/extending.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
@@ -161,6 +171,7 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/left-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/left.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-arithmetic.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-basic.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-buf.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-colour.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-conversion.html
@@ -179,8 +190,10 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-resample.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-semaphore.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-transform.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-type.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-util.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-version.html
+%%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/right-insensitive.png
@@ -188,7 +201,9 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/style.css
 %%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
 share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
-lib/girepository-1.0/Vips-8.0.typelib
-share/gir-1.0/Vips-8.0.gir