Upgrade from 7.26.3 to 7.40.1 (nip2) and .2 (vips) -- the current

latest. Support staging in nip2. Add self-test target to nip2.

Although the software is built against GraphicsMagick, some of the
tests require ImageMagick's convert and therefor the tests are not
(yet) labeled "regression-test".  The author is working on the fix.

1 files changed, 23 insertions, 26 deletions

diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 23cba497a349..499c4e105403 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -1,44 +1,44 @@
-bin/mergeup
-bin/find_mosaic
 bin/vips
-bin/edvips
+bin/vipsedit
 bin/vipsthumbnail
-bin/header
+bin/vipsheader
 bin/light_correct
 bin/shrink_width
 bin/batch_image_convert
 bin/batch_rubber_sheet
 bin/batch_crop
+bin/vipsprofile
 bin/vips-%%VERSION%%
+include/vips/basic.h
+include/vips/type.h
+include/vips/gate.h
 include/vips/almostdeprecated.h
 include/vips/deprecated.h
 include/vips/arithmetic.h
-include/vips/boolean.h
 include/vips/buf.h
 include/vips/colour.h
 include/vips/conversion.h
 include/vips/convolution.h
 include/vips/debug.h
 include/vips/dispatch.h
-include/vips/disp.h
 include/vips/enumtypes.h
 include/vips/error.h
 include/vips/operation.h
 include/vips/format.h
-include/vips/inplace.h
+include/vips/foreign.h
+include/vips/draw.h
 include/vips/generate.h
 include/vips/header.h
-include/vips/histograms_lut.h
-include/vips/freq_filt.h
+include/vips/histogram.h
+include/vips/freqfilt.h
 include/vips/image.h
 include/vips/interpolate.h
 include/vips/intl.h
 include/vips/mask.h
-include/vips/pool.h
 include/vips/memory.h
 include/vips/morphology.h
 include/vips/mosaicing.h
-include/vips/other.h
+include/vips/create.h
 include/vips/video.h
 include/vips/cimg_funcs.h
 include/vips/object.h
@@ -58,32 +58,33 @@ include/vips/vips7compat.h
 include/vips/vips.h
 include/vips/VDisplay.h
 include/vips/VError.h
-include/vips/VImage.h
 include/vips/VMask.h
+include/vips/VImage.h
 include/vips/vipscpp.h
 include/vips/vips
 include/vips/vipsc++.h
 @dirrm include/vips
 lib/libvips.a
-lib/libvips.so.15
-lib/libvips.so.15.15.2
+lib/libvips.so.38
+lib/libvips.so.38.0.0
 lib/libvips.so
 lib/libvipsCC.a
 lib/libvipsCC.so
-lib/libvipsCC.so.15
-lib/libvipsCC.so.15.15.2
-libdata/pkgconfig/vips-%%VERSION%%.pc
-libdata/pkgconfig/vipsCC-%%VERSION%%.pc
+lib/libvipsCC.so.38
+lib/libvipsCC.so.38.0.0
+libdata/pkgconfig/vips.pc
+libdata/pkgconfig/vipsCC.pc
 man/man1/batch_crop.1.gz
 man/man1/batch_image_convert.1.gz
 man/man1/batch_rubber_sheet.1.gz
-man/man1/edvips.1.gz
-man/man1/header.1.gz
 man/man1/light_correct.1.gz
 man/man1/vips.1.gz
+man/man1/vipsedit.1.gz
+man/man1/vipsheader.1.gz
+man/man1/vipsprofile.1.gz
 man/man1/vipsthumbnail.1.gz
-share/locale/de/LC_MESSAGES/vips7.mo
-share/locale/en_GB/LC_MESSAGES/vips7.mo
+share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
 %%PORTDOCS%%share/doc/vips/pdf/vipsmanual.pdf
 %%PORTDOCS%%@dirrm share/doc/vips/pdf
 %%PORTDOCS%%share/doc/vips/html/figs/arch.png
@@ -170,13 +171,9 @@ share/locale/en_GB/LC_MESSAGES/vips7.mo
 %%PORTDOCS%%@dirrmtry share/gtk-doc/html
 %%PORTDOCS%%@dirrmtry share/gtk-doc
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.la
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.la
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.la
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.la
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.a
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.a
 %%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.a