9 files changed, 640 insertions, 685 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 23ee73eddbe3..b104fbc831a4 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	nip2
-PORTVERSION=	7.12.4
-PORTREVISION=	1
+PORTVERSION=	7.14.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-${PORTVERSION:R}/
+MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Graphical user interface for VIPS
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index ecad7e8f3f4c..738743529c1c 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nip2-7.12.4.tar.gz) = d9d9cf35fe47385e2eb4200cc02a9dd3
-SHA256 (nip2-7.12.4.tar.gz) = 904e010e0025510f0c587cd0a0c44a599134de7402f13ace898e3570763992ea
-SIZE (nip2-7.12.4.tar.gz) = 8311116
+MD5 (nip2-7.14.4.tar.gz) = 453c8f3f1893088fbc10e6ddbdb20245
+SHA256 (nip2-7.14.4.tar.gz) = 9e35bf9232b5cac47eb290db3dfbb1ceeed103718c662db2a1fab00e0d916a54
+SIZE (nip2-7.14.4.tar.gz) = 8385200
diff --git a/graphics/nip2/files/patch-po-Makefile.in.in b/graphics/nip2/files/patch-po-Makefile.in.in
deleted file mode 100644
index 050d50ee11de..000000000000
--- a/graphics/nip2/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- po/Makefile.in.in.orig	Thu Dec 14 17:24:22 2006
-+++ po/Makefile.in.in	Thu Dec 14 17:24:51 2006
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datadir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -44,8 +44,8 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- 
--GMSGFMT = @GMSGFMT@
--MSGFMT = @MSGFMT@
-+GMSGFMT = @INTLTOOL_MSGFMT@
-+MSGFMT = @INTLTOOL_MSGFMT@
- XGETTEXT = @XGETTEXT@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 9f08e1b08448..b7278851a29b 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,18 +1,104 @@
 bin/nip2
 bin/run-nip2.sh
-share/locale/en_GB/LC_MESSAGES/nip2.mo
-share/nip2/compat/7.8/Capture.def
+share/nip2/rc/ipgtkrc
+share/nip2/data/examples/logo/logo2.ws
+share/nip2/data/examples/1_point_mosiac/cd1.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd4.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd2.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd4.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd1.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd3.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd2.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd3.1.jpg
+share/nip2/data/examples/1_point_mosiac/1pt_mosaic.ws
+share/nip2/data/examples/overlays_and_blending/overlay_blend.ws
+share/nip2/data/examples/overlays_and_blending/blend_example_ir.jpg
+share/nip2/data/examples/overlays_and_blending/blend_example_vis.jpg
+share/nip2/data/examples/overlays_and_blending/blend_example_xray.jpg
+share/nip2/data/examples/manual_balance/mask_01.png
+share/nip2/data/examples/manual_balance/mask_02.png
+share/nip2/data/examples/manual_balance/simp_base.png
+share/nip2/data/examples/manual_balance/mask_03.png
+share/nip2/data/examples/manual_balance/mask_control.png
+share/nip2/data/examples/manual_balance/manual_balance.ws
+share/nip2/data/examples/2_point_mosiac/example_im_02.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_04.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_03.jpg
+share/nip2/data/examples/2_point_mosiac/full_image.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_01.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_05.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_06.jpg
+share/nip2/data/examples/2_point_mosiac/2pts_mosaic.ws
+share/nip2/data/examples/registering/example_im_2.jpg
+share/nip2/data/examples/registering/registering.ws
+share/nip2/data/examples/registering/example_im_1.jpg
+share/nip2/data/examples/registering/example_im_4.jpg
+share/nip2/data/examples/registering/example_im_3.jpg
+share/nip2/data/examples/clone/clone.ws
+share/nip2/data/examples/clone/example_im_01.png
+share/nip2/data/examples/clone/example_im_02.png
+share/nip2/data/examples/businesscard/businesscard.ws
+share/nip2/data/examples/businesscard/slanted_oval_vase2.jpg
+share/nip2/data/examples/framing/framing_distorted_frame.png
+share/nip2/data/examples/framing/framing.ws
+share/nip2/data/examples/framing/framing_complex.png
+share/nip2/data/examples/framing/framing_corner.png
+share/nip2/data/examples/framing/framing_picture.jpg
+share/nip2/data/examples/print_test_image.v
+share/nip2/data/rachel.con
+share/nip2/data/AdobeRGB1998.icc
+share/nip2/data/sRGB.icm
+share/nip2/data/macbeth_lab_d65.mat
+share/nip2/data/macbeth_lab_d50.mat
+share/nip2/data/vips-128.png
+share/nip2/data/nip2-icon.ico
+share/nip2/data/HP5000_UVDuraImageGlossMaxQ.icc
+share/nip2/data/stock-tool-ink-22.png
+share/nip2/data/stock-tool-path-22.png
+share/nip2/data/stock-tool-text-22.png
+share/nip2/data/stock-tool-smudge-22.png
+share/nip2/data/stock-tool-bucket-fill-22.png
+share/nip2/data/stock-tool-rect-select-22.png
+share/nip2/data/stock-tool-select-22.png
+share/nip2/data/nip-slider-16.png
+share/nip2/data/stock-tool-move-22.png
+share/nip2/data/stock-led-red-18.png
+share/nip2/data/stock-led-green-18.png
+share/nip2/data/stock-led-blue-18.png
+share/nip2/data/stock-led-cyan-18.png
+share/nip2/data/stock-led-yellow-18.png
+share/nip2/data/stock-led-off-18.png
+share/nip2/start/Math.def
+share/nip2/start/Image.def
+share/nip2/start/Colour.def
+share/nip2/start/Tasks.def
+share/nip2/start/Object.def
+share/nip2/start/Filter.def
+share/nip2/start/Matrix.def
+share/nip2/start/Widgets.def
+share/nip2/start/Histogram.def
+share/nip2/start/Preferences.ws
+share/nip2/start/_joe_extra.def
+share/nip2/start/_joe_utilities.def
+share/nip2/start/_convert.def
+share/nip2/start/_generate.def
+share/nip2/start/_list.def
+share/nip2/start/_predicate.def
+share/nip2/start/_stdenv.def
+share/nip2/start/_Object.def
+share/nip2/start/_types.def
+share/nip2/compat/7.8/Math.def
+share/nip2/compat/7.8/Image.def
+share/nip2/compat/7.8/Mosaic.def
 share/nip2/compat/7.8/Colour.def
-share/nip2/compat/7.8/Filter.def
+share/nip2/compat/7.8/Resize.def
+share/nip2/compat/7.8/Capture.def
 share/nip2/compat/7.8/Format.def
-share/nip2/compat/7.8/Histogram.def
-share/nip2/compat/7.8/Image.def
-share/nip2/compat/7.8/Math.def
+share/nip2/compat/7.8/Filter.def
 share/nip2/compat/7.8/Morphology.def
-share/nip2/compat/7.8/Mosaic.def
 share/nip2/compat/7.8/New.def
+share/nip2/compat/7.8/Histogram.def
 share/nip2/compat/7.8/Print.def
-share/nip2/compat/7.8/Resize.def
 share/nip2/compat/7.8/Rotate.def
 share/nip2/compat/7.8/Statistics.def
 share/nip2/compat/7.8/X_ray.def
@@ -23,18 +109,18 @@ share/nip2/compat/7.8/_list.def
 share/nip2/compat/7.8/_predicate.def
 share/nip2/compat/7.8/_stdenv.def
 share/nip2/compat/7.8/_types.def
-share/nip2/compat/7.9/Capture.def
+share/nip2/compat/7.9/Math.def
+share/nip2/compat/7.9/Image.def
+share/nip2/compat/7.9/Mosaic.def
 share/nip2/compat/7.9/Colour.def
-share/nip2/compat/7.9/Filter.def
+share/nip2/compat/7.9/Resize.def
+share/nip2/compat/7.9/Capture.def
 share/nip2/compat/7.9/Format.def
-share/nip2/compat/7.9/Histogram.def
-share/nip2/compat/7.9/Image.def
-share/nip2/compat/7.9/Math.def
+share/nip2/compat/7.9/Filter.def
 share/nip2/compat/7.9/Morphology.def
-share/nip2/compat/7.9/Mosaic.def
 share/nip2/compat/7.9/New.def
+share/nip2/compat/7.9/Histogram.def
 share/nip2/compat/7.9/Print.def
-share/nip2/compat/7.9/Resize.def
 share/nip2/compat/7.9/Rotate.def
 share/nip2/compat/7.9/Statistics.def
 share/nip2/compat/7.9/X_ray.def
@@ -46,111 +132,44 @@ share/nip2/compat/7.9/_predicate.def
 share/nip2/compat/7.9/_stdenv.def
 share/nip2/compat/7.9/_types.def
 share/nip2/compat/7.10/Colour.def
+share/nip2/compat/7.10/_convert.def
 share/nip2/compat/7.10/Filter.def
 share/nip2/compat/7.10/Format.def
+share/nip2/compat/7.10/_generate.def
 share/nip2/compat/7.10/Histogram.def
 share/nip2/compat/7.10/Image.def
-share/nip2/compat/7.10/Math.def
-share/nip2/compat/7.10/Matrix.def
-share/nip2/compat/7.10/Tasks.def
-share/nip2/compat/7.10/Widgets.def
-share/nip2/compat/7.10/_convert.def
-share/nip2/compat/7.10/_generate.def
 share/nip2/compat/7.10/_joe_extra.def
 share/nip2/compat/7.10/_joe_utilities.def
 share/nip2/compat/7.10/_list.def
+share/nip2/compat/7.10/Math.def
+share/nip2/compat/7.10/Matrix.def
 share/nip2/compat/7.10/_predicate.def
 share/nip2/compat/7.10/_stdenv.def
+share/nip2/compat/7.10/Tasks.def
 share/nip2/compat/7.10/_types.def
-share/nip2/data/AdobeRGB1998.icc
-share/nip2/data/HP5000_UVDuraImageGlossMaxQ.icc
-share/nip2/data/nip2-icon.ico
-share/nip2/data/examples/1_point_mosiac/1pt_mosaic.ws
-share/nip2/data/examples/1_point_mosiac/cd1.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd1.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd2.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd2.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd3.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd3.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd4.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd4.2.jpg
-share/nip2/data/examples/2_point_mosiac/2pts_mosaic.ws
-share/nip2/data/examples/2_point_mosiac/example_im_01.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_02.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_03.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_04.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_05.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_06.jpg
-share/nip2/data/examples/2_point_mosiac/full_image.jpg
-share/nip2/data/examples/businesscard/businesscard.ws
-share/nip2/data/examples/businesscard/slanted_oval_vase2.jpg
-share/nip2/data/examples/clone/clone.ws
-share/nip2/data/examples/clone/example_im_01.png
-share/nip2/data/examples/clone/example_im_02.png
-share/nip2/data/examples/framing/framing.ws
-share/nip2/data/examples/framing/framing_complex.png
-share/nip2/data/examples/framing/framing_corner.png
-share/nip2/data/examples/framing/framing_distorted_frame.png
-share/nip2/data/examples/framing/framing_picture.jpg
-share/nip2/data/examples/logo/logo2.ws
-share/nip2/data/examples/manual_balance/manual_balance.ws
-share/nip2/data/examples/manual_balance/mask_01.png
-share/nip2/data/examples/manual_balance/mask_02.png
-share/nip2/data/examples/manual_balance/mask_03.png
-share/nip2/data/examples/manual_balance/mask_control.png
-share/nip2/data/examples/manual_balance/simp_base.png
-share/nip2/data/examples/overlays_and_blending/blend_example_ir.jpg
-share/nip2/data/examples/overlays_and_blending/blend_example_vis.jpg
-share/nip2/data/examples/overlays_and_blending/blend_example_xray.jpg
-share/nip2/data/examples/overlays_and_blending/overlay_blend.ws
-share/nip2/data/examples/print_test_image.v
-share/nip2/data/examples/registering/example_im_1.jpg
-share/nip2/data/examples/registering/example_im_2.jpg
-share/nip2/data/examples/registering/example_im_3.jpg
-share/nip2/data/examples/registering/example_im_4.jpg
-share/nip2/data/examples/registering/registering.ws
-share/nip2/data/macbeth_lab_d50.mat
-share/nip2/data/macbeth_lab_d65.mat
-share/nip2/data/nip-slider-16.png
-share/nip2/data/rachel.con
-share/nip2/data/sRGB.icm
-share/nip2/data/stock-led-blue-18.png
-share/nip2/data/stock-led-cyan-18.png
-share/nip2/data/stock-led-green-18.png
-share/nip2/data/stock-led-off-18.png
-share/nip2/data/stock-led-red-18.png
-share/nip2/data/stock-led-yellow-18.png
-share/nip2/data/stock-tool-bucket-fill-22.png
-share/nip2/data/stock-tool-ink-22.png
-share/nip2/data/stock-tool-move-22.png
-share/nip2/data/stock-tool-path-22.png
-share/nip2/data/stock-tool-rect-select-22.png
-share/nip2/data/stock-tool-select-22.png
-share/nip2/data/stock-tool-smudge-22.png
-share/nip2/data/stock-tool-text-22.png
-share/nip2/data/vips-128.png
-share/nip2/rc/ipgtkrc
-share/nip2/start/Colour.def
-share/nip2/start/Filter.def
-share/nip2/start/Format.def
-share/nip2/start/Histogram.def
-share/nip2/start/Image.def
-share/nip2/start/Math.def
-share/nip2/start/Matrix.def
-share/nip2/start/Preferences.ws
-share/nip2/start/Tasks.def
-share/nip2/start/Widgets.def
-share/nip2/start/_convert.def
-share/nip2/start/_generate.def
-share/nip2/start/_joe_extra.def
-share/nip2/start/_joe_utilities.def
-share/nip2/start/_list.def
-share/nip2/start/_predicate.def
-share/nip2/start/_stdenv.def
-share/nip2/start/_types.def
+share/nip2/compat/7.10/Widgets.def
+share/nip2/compat/7.12/Math.def
+share/nip2/compat/7.12/Image.def
+share/nip2/compat/7.12/Colour.def
+share/nip2/compat/7.12/Tasks.def
+share/nip2/compat/7.12/Format.def
+share/nip2/compat/7.12/Filter.def
+share/nip2/compat/7.12/Matrix.def
+share/nip2/compat/7.12/Widgets.def
+share/nip2/compat/7.12/Histogram.def
+share/nip2/compat/7.12/Preferences.ws
+share/nip2/compat/7.12/_joe_extra.def
+share/nip2/compat/7.12/_joe_utilities.def
+share/nip2/compat/7.12/_convert.def
+share/nip2/compat/7.12/_generate.def
+share/nip2/compat/7.12/_list.def
+share/nip2/compat/7.12/_predicate.def
+share/nip2/compat/7.12/_stdenv.def
+share/nip2/compat/7.12/_types.def
 @dirrm share/nip2/compat/7.8
 @dirrm share/nip2/compat/7.9
 @dirrm share/nip2/compat/7.10
+@dirrm share/nip2/compat/7.12
 @dirrm share/nip2/compat
 @dirrm share/nip2/data/examples/1_point_mosiac
 @dirrm share/nip2/data/examples/2_point_mosiac
@@ -244,6 +263,7 @@ share/nip2/start/_types.def
 %%DOCSDIR%%/html/nipguidese33.html
 %%DOCSDIR%%/html/nipguidese34.html
 %%DOCSDIR%%/html/nipguidese35.html
+%%DOCSDIR%%/html/nipguidese36.html
 %%DOCSDIR%%/html/nipguidese4.html
 %%DOCSDIR%%/html/nipguidese5.html
 %%DOCSDIR%%/html/nipguidese6.html
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index cc4222c9fcb7..604befcf00d3 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -6,37 +6,42 @@
 #
 
 PORTNAME=	vips
-PORTVERSION=	7.12.4
-PORTREVISION=	3
+PORTVERSION=	7.14.4.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-${PORTVERSION:R}/
+MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R:R}/
+DISTVERSION=	7.14.4-1
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Free image processing system
 
-OPTIONS=	MAGICK	"Use ImageMagick for more image-types" ${IMPRESENT}
 OPTIONS+=	LIBOIL	"Use liboil for CPU-optimized primitives" on
 # Making Python a proper option awaits portmgr's resolving the current
 # chicken-and-egg problem of OPTIONS vs. USE_* knobs
 #OPTIONS+=	PYTHON	"Create Python bindings" ${PYPRESENT}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		jpeg:${PORTSDIR}/graphics/jpeg \
+		exif:${PORTSDIR}/graphics/libexif	\
 		tiff:${PORTSDIR}/graphics/tiff \
+		GraphicsMagick:${PORTSDIR}/graphics/GraphicsMagick \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		png:${PORTSDIR}/graphics/png \
 		lcms:${PORTSDIR}/graphics/lcms
 
-IMPRESENT!=	which mogrify > /dev/null && echo on || echo off
 PYPRESENT!=	which python > /dev/null && echo on || echo off
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack glib20 pkgconfig pango libxml2
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+
+post-configure:
+	${REINPLACE_CMD} -Ee 's,^(G?MSGFMT = *)$$,\1${LOCALBASE}/bin/msgfmt,g' \
+		${WRKSRC}/po/Makefile
+
 .if defined(NOPORTDOCS)
 # Don't extract doc/ subdirectory - the simplest way:
 EXTRACT_AFTER_ARGS=	| ${TAR} -xpf - --exclude doc
@@ -46,9 +51,10 @@ post-install:
 # Don't extract html-ized man-pages in either case:
 EXTRACT_AFTER_ARGS=	| ${TAR} -xpf - --exclude doc/html/man
 .endif
-PLIST_SUB+=	VERSION=${PORTVERSION:R}
+PLIST_SUB+=	VERSION=${PORTVERSION:R:R}
 
-CONFIGURE_ARGS=	--without-x --mandir=${PREFIX}/man
+CONFIGURE_ENV+=	MAGICK_CFLAGS="-I${LOCALBASE}/include/GraphicsMagick"
+CONFIGURE_ARGS+=--without-x --mandir=${PREFIX}/man --with-magickpackage=GraphicsMagick
 
 # This is used to generate the list of man-pages and MLINKS. It
 # looks through the available man-pages and filters out those,
@@ -58,7 +64,7 @@ CONFIGURE_ARGS=	--without-x --mandir=${PREFIX}/man
 .PHONY:	Makefile.man
 Makefile.man:
 	@${ECHO_MSG} "# This file is auto-generated" > $@
-	${FIND} ${WRKSRC} -name '*.[13]' | ${XARGS} ${AWK} '	\
+	${FIND} ${WRKSRC}/ -type f -name '*.[13]' | ${XARGS} ${AWK} '	\
 		/\.so/ {	\
 			page=substr($$2, 6, 100);	\
 			sub(".*/", "", FILENAME);	\
@@ -76,12 +82,6 @@ Makefile.man:
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MAGICK)
-LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick
-.else
-CONFIGURE_ARGS+=	--without-magick
-.endif
-
 .if defined(WITH_LIBOIL)
 LIB_DEPENDS+=	oil:${PORTSDIR}/devel/liboil
 .else
diff --git a/graphics/vips/Makefile.man b/graphics/vips/Makefile.man
index 888615ee2a53..e6c918e7e1ac 100644
--- a/graphics/vips/Makefile.man
+++ b/graphics/vips/Makefile.man
@@ -1,549 +1,541 @@
 # This file is auto-generated
+MAN1+=	vdump.1
+MAN1+=	batch_crop.1
 MAN1+=	batch_image_convert.1
-MAN1+=	light_correct.1
 MAN1+=	batch_rubber_sheet.1
-MAN1+=	batch_crop.1
-MLINKS+=	sines.1	squares.1
-MLINKS+=	cooc.1	cooc_features.1
+MAN1+=	binfile.1
 MAN1+=	cooc.1
-MAN1+=	simcontr.1
+MLINKS+=	cooc.1	cooc_features.1
+MAN1+=	debugim.1
+MAN1+=	edvips.1
 MAN1+=	glds.1
-MAN1+=	sines.1
 MLINKS+=	glds.1	glds_features.1
-MAN1+=	edvips.1
+MAN1+=	header.1
+MAN1+=	light_correct.1
 MLINKS+=	debugim.1	printlines.1
+MAN1+=	simcontr.1
+MAN1+=	sines.1
+MLINKS+=	sines.1	squares.1
 MAN1+=	vips.1
-MAN1+=	debugim.1
-MAN1+=	header.1
-MAN1+=	binfile.1
-MAN1+=	vdump.1
-MAN3+=	im_maplut.3
-MLINKS+=	im_histgr.3	im_identity.3
-MAN3+=	im_histplot.3
-MLINKS+=	im_tone_build.3	im_tone_map.3
-MAN3+=	im_stdif.3
-MLINKS+=	im_heq.3	im_hsp.3
-MAN3+=	im_project.3
-MAN3+=	im_tone_build.3
-MAN3+=	im_invertlut.3
-MAN3+=	im_histgr.3
-MAN3+=	im_gammacorrect.3
-MAN3+=	im_heq.3
-MLINKS+=	im_tone_build.3	im_tone_analyse.3
-MLINKS+=	im_histgr.3	im_histcum.3
-MLINKS+=	im_histgr.3	im_histeq.3
-MAN3+=	im_buildlut.3
-MLINKS+=	im_histgr.3	im_histnD.3
-MLINKS+=	im_histgr.3	im_identity_ushort.3
-MAN3+=	im_hist.3
-MLINKS+=	im_heq.3	im_lhisteq.3
-MLINKS+=	im_histgr.3	im_histnorm.3
-MLINKS+=	im_heq.3	im_lhisteq_raw.3
-MLINKS+=	im_histgr.3	im_histspec.3
-MAN3+=	im_lrmosaic.3
-MAN3+=	im_match_linear_search.3
-MLINKS+=	im_match_linear_search.3	im_match_linear.3
-MAN3+=	im_similarity_area.3
-MLINKS+=	im_similarity_area.3	im_similarity.3
-MLINKS+=	im_global_balance.3	im_global_balance_float.3
-MAN3+=	im_remosaic.3
-MLINKS+=	im_lrmosaic.3	im_tbmosaic.3
-MAN3+=	im_correl.3
+MLINKS+=	im_error.3	error_exit.3
+MAN3+=	im_abs.3
+MLINKS+=	im_costra.3	im_acostra.3
+MAN3+=	im_add.3
+MLINKS+=	im_malloc.3	im_add_preclose_callback.3
+MLINKS+=	im_malloc.3	im_add_close_callback.3
+MLINKS+=	im_malloc.3	im_add_evalstart_callback.3
+MLINKS+=	im_malloc.3	im_add_eval_callback.3
+MLINKS+=	im_malloc.3	im_add_evalend_callback.3
+MAN3+=	im_addgnoise.3
 MAN3+=	im_affine.3
-MLINKS+=	im_lrmerge.3	im_tbmerge.3
-MAN3+=	im_global_balance.3
-MAN3+=	im_lrmerge.3
-MLINKS+=	im_matinv.3	im_matmul.3
-MAN3+=	im_matinv.3
-MAN3+=	im_lu_decomp.3
-MLINKS+=	im_matinv.3	im_mattrn.3
-MLINKS+=	im_matinv.3	im_matcat.3
-MLINKS+=	im_matinv.3	im_matinv_inplace.3
-MLINKS+=	im_lu_decomp.3	im_lu_solve.3
-MLINKS+=	im_offsets45.3	im_rotate_imask45.3
-MAN3+=	im_lowpass.3
-MLINKS+=	im_conv.3	im_shrink.3
-MAN3+=	im_rank.3
+MLINKS+=	im_generate.3	im_allocate_input_array.3
+MLINKS+=	im_iscomplex.3	im_amiMSBfirst.3
+MAN3+=	im_analyze2vips.3
+MLINKS+=	im_andimage.3	im_andconst.3
+MAN3+=	im_andimage.3
+MLINKS+=	im_andimage.3	im_and_vec.3
+MAN3+=	IM_ARRAY.3
+MLINKS+=	im_costra.3	im_asintra.3
+MLINKS+=	im_costra.3	im_atantra.3
+MAN3+=	im_avg.3
+MAN3+=	im_bandjoin.3
+MLINKS+=	im_printdesc.3	im_BandFmt2char.3
+MAN3+=	im_bandmean.3
+MAN3+=	im_benchmark.3
+MAN3+=	im_binfile.3
+MAN3+=	im_bits_of_fmt.3
+MAN3+=	im_black.3
+MLINKS+=	im_ifthenelse.3	im_blend.3
+MAN3+=	im_buildlut.3
+MLINKS+=	im_clip.3	im_c2amph.3
+MLINKS+=	im_clip.3	im_c2imag.3
+MLINKS+=	im_clip.3	im_c2ps.3
+MLINKS+=	im_clip.3	im_c2real.3
+MLINKS+=	im_clip.3	im_c2rect.3
+MLINKS+=	im_render.3	im_cache.3
+MAN3+=	im_ceil.3
+MLINKS+=	im_printdesc.3	im_char2BandFmt.3
+MLINKS+=	im_printdesc.3	im_char2Coding.3
+MLINKS+=	im_printdesc.3	im_char2Compression.3
+MLINKS+=	im_printdesc.3	im_char2Type.3
+MAN3+=	im_circle.3
+MLINKS+=	im_clip.3	im_clip2c.3
+MLINKS+=	im_clip.3	im_clip2cm.3
+MLINKS+=	im_clip.3	im_clip2d.3
+MLINKS+=	im_clip.3	im_clip2dcm.3
+MLINKS+=	im_clip.3	im_clip2f.3
+MLINKS+=	im_clip.3	im_clip2fmt.3
+MLINKS+=	im_clip.3	im_clip2i.3
+MLINKS+=	im_clip.3	im_clip2s.3
+MLINKS+=	im_clip.3	im_clip2ui.3
+MLINKS+=	im_clip.3	im_clip2us.3
+MAN3+=	im_clip.3
+MAN3+=	im_close.3
+MAN3+=	im_cmulnorm.3
+MAN3+=	im_cntlines.3
+MLINKS+=	im_printdesc.3	im_Coding2char.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_ab2Ch.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_C2Cucs.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Ch2ab.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Ch2hucs.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Chucs2h.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Cucs2C.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_dECMC.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_display.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_L2Lucs.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Lab2XYZ.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_Lucs2L.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_make_tables_RGB.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_make_tables_UCS.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_pythagoras.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_rgb2XYZ.3
+MLINKS+=	im_col_XYZ2rgb.3	im_col_XYZ2Lab.3
+MAN3+=	im_col_XYZ2rgb.3
+MAN3+=	im_compass.3
+MLINKS+=	im_printdesc.3	im_Compression2char.3
+MLINKS+=	im_concurrency_set.3	im_concurrency_get.3
+MAN3+=	im_concurrency_set.3
+MAN3+=	im_contrast_surface.3
+MLINKS+=	im_contrast_surface.3	im_contrast_surface_raw.3
+MAN3+=	im_conv.3
+MLINKS+=	im_conv.3	im_convf.3
+MLINKS+=	im_conv.3	im_convf_raw.3
+MAN3+=	im_conv_raw.3
 MLINKS+=	im_conv.3	im_convsep.3
-MLINKS+=	im_create_dmask.3	im_print_dmask.3
-MLINKS+=	im_offsets45.3	im_rotate_dmask90.3
-MLINKS+=	im_create_dmask.3	im_write_dmask.3
-MLINKS+=	im_conv.3	im_convsepf_raw.3
-MAN3+=	im_mpercent.3
-MLINKS+=	im_offsets45.3	im_offsets90.3
-MLINKS+=	im_create_dmask.3	im_free_dmask.3
-MAN3+=	im_addgnoise.3
-MAN3+=	im_gaussnoise.3
-MLINKS+=	im_create_dmask.3	im_read_imask.3
 MLINKS+=	im_conv.3	im_convsepf.3
-MLINKS+=	im_create_dmask.3	im_dup_dmask.3
-MAN3+=	im_conv.3
-MAN3+=	im_sharpen.3
-MLINKS+=	im_log_imask.3	im_log_dmask.3
+MLINKS+=	im_conv.3	im_convsepf_raw.3
+MLINKS+=	im_conv.3	im_convsep_raw.3
+MLINKS+=	im_conv.3	im_convsub.3
+MLINKS+=	im_cooc_matrix.3	im_cooc_asm.3
+MLINKS+=	im_cooc_matrix.3	im_cooc_contrast.3
+MLINKS+=	im_cooc_matrix.3	im_cooc_correlation.3
+MLINKS+=	im_cooc_matrix.3	im_cooc_entropy.3
+MAN3+=	im_cooc_matrix.3
+MAN3+=	im_copy.3
+MLINKS+=	im_copy.3	im_copy_from.3
+MLINKS+=	im_copy.3	im_copy_morph.3
+MLINKS+=	im_copy.3	im_copy_set.3
+MLINKS+=	im_copy.3	im_copy_set_meta.3
+MLINKS+=	im_copy.3	im_copy_swap.3
+MAN3+=	im_correl.3
+MAN3+=	im_costra.3
+MAN3+=	im_cp_desc.3
+MLINKS+=	im_cp_desc.3	im_cp_desc_array.3
+MLINKS+=	im_cp_desc.3	im_cp_descv.3
 MAN3+=	im_create_dmask.3
-MLINKS+=	im_compass.3	im_maxvalue.3
-MLINKS+=	im_conv.3	im_convf_raw.3
-MLINKS+=	im_compass.3	im_gradient.3
-MLINKS+=	im_create_dmask.3	im_write_dmask_name.3
-MLINKS+=	im_create_dmask.3	im_write_imask.3
-MLINKS+=	im_create_dmask.3	im_print_imask.3
+MAN3+=	im_create_fmask.3
+MLINKS+=	im_create_dmask.3	im_create_imask.3
+MAN3+=	im_csv2vips.3
+MLINKS+=	im_csv2vips.3	im_csv2vips_header.3
+MLINKS+=	im_dE_fromLab.3	im_dE00_fromLab.3
+MAN3+=	im_debugim.3
+MLINKS+=	im_dE_fromdisp.3	im_dECMC_fromdisp.3
+MLINKS+=	im_dE_fromLab.3	im_dECMC_fromLab.3
+MAN3+=	im_dE_fromdisp.3
+MAN3+=	im_dE_fromLab.3
+MLINKS+=	im_dE_fromdisp.3	im_dE_fromXYZ.3
+MAN3+=	im_demand_hint.3
+MLINKS+=	im_demand_hint.3	im_demand_hint_array.3
+MLINKS+=	im_avg.3	im_deviate.3
+MLINKS+=	im_error.3	im_diag.3
+MAN3+=	im_dif_std.3
+MAN3+=	im_dilate.3
+MLINKS+=	im_dilate.3	im_dilate_raw.3
+MLINKS+=	im_Lab2UCS.3	im_disp2Lab.3
+MLINKS+=	im_XYZ2disp.3	im_disp2XYZ.3
+MAN3+=	im_disp_ps.3
+MAN3+=	im_divide.3
+MLINKS+=	im_create_dmask.3	im_dup_dmask.3
 MLINKS+=	im_create_dmask.3	im_dup_imask.3
-MLINKS+=	im_create_dmask.3	im_scale_dmask.3
-MLINKS+=	im_compass.3	im_lindetect.3
-MAN3+=	im_stretch3.3
-MLINKS+=	im_conv.3	im_convsub.3
-MLINKS+=	im_create_dmask.3	im_free_imask.3
 MAN3+=	im_embed.3
-MLINKS+=	im_conv.3	im_convsep_raw.3
-MLINKS+=	im_conv.3	im_convf.3
-MLINKS+=	im_create_dmask.3	im_read_dmask.3
-MAN3+=	im_log_imask.3
-MLINKS+=	im_fastcor.3	im_spcor.3
+MLINKS+=	im_andimage.3	im_eorconst.3
+MLINKS+=	im_andimage.3	im_eorimage.3
+MLINKS+=	im_andimage.3	im_eor_vec.3
+MAN3+=	im_equal.3
+MLINKS+=	im_equal.3	im_equalconst.3
+MLINKS+=	im_equal.3	im_equal_vec.3
+MLINKS+=	im_dilate.3	im_erode.3
+MLINKS+=	im_dilate.3	im_erode_raw.3
+MAN3+=	im_error.3
+MLINKS+=	im_error.3	im_error_buffer.3
+MLINKS+=	im_error.3	im_error_clear.3
+MAN3+=	im_exp10tra.3
+MLINKS+=	im_exp10tra.3	im_expntra.3
+MLINKS+=	im_exp10tra.3	im_expntra_vec.3
+MLINKS+=	im_exp10tra.3	im_exptra.3
+MAN3+=	im_exr2vips.3
+MLINKS+=	im_exr2vips.3	im_exr2vips_header.3
+MAN3+=	im_extract.3
+MLINKS+=	im_extract.3	im_extract_area.3
+MLINKS+=	im_extract.3	im_extract_areabands.3
+MLINKS+=	im_extract.3	im_extract_bands.3
+MAN3+=	im_eye.3
+MAN3+=	im_falsecolour.3
 MAN3+=	im_fastcor.3
-MLINKS+=	im_create_dmask.3	im_write_imask_name.3
-MAN3+=	im_compass.3
-MLINKS+=	im_offsets45.3	im_rotate_dmask45.3
+MLINKS+=	im_paintrect.3	im_fastline.3
+MLINKS+=	im_paintrect.3	im_fastlineuser.3
+MAN3+=	im_fav4.3
+MLINKS+=	im_eye.3	im_feye.3
+MLINKS+=	im_grey.3	im_fgrey.3
+MLINKS+=	im_rot180.3	im_fliphor.3
+MLINKS+=	im_rot180.3	im_flipver.3
+MAN3+=	im_flood.3
+MLINKS+=	im_flood.3	im_flood_blob.3
+MAN3+=	im_floor.3
+MAN3+=	im_flt_imag_freq.3
+MAN3+=	im_fractsurf.3
+MLINKS+=	im_malloc.3	im_free.3
+MLINKS+=	im_create_dmask.3	im_free_dmask.3
+MLINKS+=	im_create_dmask.3	im_free_imask.3
+MAN3+=	im_freqflt.3
+MAN3+=	im_fwfft.3
+MLINKS+=	im_zone.3	im_fzone.3
+MLINKS+=	im_add.3	im_gadd.3
+MLINKS+=	im_add.3	im_gaddim.3
+MAN3+=	im_gammacorrect.3
 MAN3+=	im_gauss_dmask.3
-MAN3+=	im_contrast_surface.3
-MLINKS+=	im_offsets45.3	im_rotate_imask90.3
-MAN3+=	im_zerox.3
-MAN3+=	im_offsets45.3
-MLINKS+=	im_compass.3	im_rank_image.3
 MLINKS+=	im_gauss_dmask.3	im_gauss_imask.3
-MLINKS+=	im_create_dmask.3	im_create_imask.3
-MLINKS+=	im_create_dmask.3	im_norm_dmask.3
-MAN3+=	im_conv_raw.3
-MLINKS+=	im_contrast_surface.3	im_contrast_surface_raw.3
-MAN3+=	im_zone.3
-MLINKS+=	im_eye.3	im_feye.3
+MAN3+=	im_gaussnoise.3
+MLINKS+=	im_bandjoin.3	im_gbandjoin.3
+MAN3+=	im_generate.3
+MLINKS+=	im_init_world.3	im_get_option_group.3
+MLINKS+=	im_add.3	im_gfadd.3
 MLINKS+=	im_equal.3	im_glds_asm.3
-MLINKS+=	im_quantim.3	im_spatres.3
-MAN3+=	im_sines.3
-MLINKS+=	im_cooc_matrix.3	im_cooc_correlation.3
-MAN3+=	im_grey.3
-MAN3+=	im_simcontr.3
-MLINKS+=	im_zone.3	im_fzone.3
 MLINKS+=	im_equal.3	im_glds_contrast.3
-MLINKS+=	im_cooc_matrix.3	im_cooc_entropy.3
-MLINKS+=	im_mean_std_int_buffer.3	im_mean_std_double_buffer.3
-MLINKS+=	im_cooc_matrix.3	im_cooc_contrast.3
-MAN3+=	im_benchmark.3
-MAN3+=	im_mean_std_int_buffer.3
-MAN3+=	im_cooc_matrix.3
-MAN3+=	im_quantim.3
-MAN3+=	im_eye.3
-MAN3+=	im_glds_matrix.3
-MLINKS+=	im_quantim.3	im_quantlut.3
-MLINKS+=	im_grey.3	im_fgrey.3
-MLINKS+=	im_grey.3	im_make_xy.3
 MLINKS+=	im_equal.3	im_glds_entropy.3
-MLINKS+=	im_cooc_matrix.3	im_cooc_asm.3
-MAN3+=	im_dif_std.3
+MAN3+=	im_glds_matrix.3
 MLINKS+=	im_equal.3	im_glds_mean.3
-MLINKS+=	im_region_buffer.3	im_region_position.3
-MLINKS+=	im_meta.3	im_meta_get_int.3
-MAN3+=	im_demand_hint.3
-MAN3+=	im_setupout.3
-MLINKS+=	im_iscomplex.3	im_istifftiled.3
-MLINKS+=	im_meta.3	im_meta_set_int.3
-MLINKS+=	im_list_add.3	im_list_map.3
-MLINKS+=	im_render.3	im_cache.3
-MLINKS+=	im_iocheck.3	im_incheck.3
-MLINKS+=	im_list_add.3	im_list_remove.3
-MLINKS+=	IM_REGION_ADDR.3	IM_REGION_N_ELEMENTS.3
-MLINKS+=	im_malloc.3	im_add_evalend_callback.3
-MLINKS+=	im_iscomplex.3	im_isMSBfirst.3
-MLINKS+=	im_list_add.3	im_list_eq.3
-MAN3+=	im_prepare.3
-MLINKS+=	im_printdesc.3	im_Compression2char.3
-MLINKS+=	im_init_world.3	im_get_option_group.3
-MAN3+=	im_render.3
-MAN3+=	im_printdesc.3
-MAN3+=	im_image_sanity.3
-MLINKS+=	im_list_add.3	im_list_append.3
-MAN3+=	im_init_world.3
-MLINKS+=	im_cp_desc.3	im_cp_descv.3
-MLINKS+=	im_error.3	im_error_buffer.3
-MAN3+=	im_iterate.3
-MLINKS+=	im_error.3	im_error_clear.3
-MLINKS+=	im_list_add.3	im_list_member.3
-MLINKS+=	im_debugim.3	im_printlines.3
-MLINKS+=	im_header.3	im_header_string.3
-MAN3+=	im_mmapinrw.3
-MLINKS+=	IM_REGION_ADDR.3	IM_REGION_LSKIP.3
+MAN3+=	im_global_balance.3
+MLINKS+=	im_global_balance.3	im_global_balance_float.3
+MLINKS+=	im_fastcor.3	im_gradcor.3
+MLINKS+=	im_compass.3	im_gradient.3
+MAN3+=	im_grad_x.3
+MLINKS+=	im_grad_x.3	im_grad_y.3
+MAN3+=	im_grey.3
+MAN3+=	im_grid.3
+MAN3+=	im_guess_prefix.3
+MAN3+=	im_header.3
+MLINKS+=	im_header.3	im_header_double.3
 MLINKS+=	im_header.3	im_header_get.3
-MLINKS+=	im_iscomplex.3	im_isint.3
-MLINKS+=	im_iscomplex.3	im_isfloat.3
-MLINKS+=	im_wrapone.3	im_wrapmany.3
-MLINKS+=	im_list_add.3	im_list_pos.3
-MAN3+=	im_piocheck.3
+MLINKS+=	im_header.3	im_header_get_type.3
 MLINKS+=	im_header.3	im_header_int.3
-MAN3+=	im_region_buffer.3
-MAN3+=	im_iscomplex.3
-MLINKS+=	im_printdesc.3	im_char2Compression.3
-MAN3+=	IM_ARRAY.3
-MAN3+=	im_cp_desc.3
-MAN3+=	im_bits_of_fmt.3
 MLINKS+=	im_header.3	im_header_map.3
+MLINKS+=	im_header.3	im_header_string.3
+MAN3+=	im_heq.3
+MAN3+=	im_hist.3
+MLINKS+=	im_histgr.3	im_histeq.3
+MLINKS+=	im_histgr.3	im_histcum.3
+MAN3+=	im_histgr.3
+MAN3+=	im_histlin.3
+MLINKS+=	im_histgr.3	im_histnD.3
+MLINKS+=	im_histgr.3	im_histnorm.3
+MLINKS+=	im_histlin.3	im_history_get.3
+MAN3+=	im_histplot.3
+MLINKS+=	im_histgr.3	im_histspec.3
+MLINKS+=	im_heq.3	im_hsp.3
+MLINKS+=	im_icc_transform.3	im_icc_ac2rc.3
+MLINKS+=	im_icc_transform.3	im_icc_export.3
+MLINKS+=	im_icc_transform.3	im_icc_export_depth.3
+MLINKS+=	im_icc_transform.3	im_icc_import.3
+MLINKS+=	im_icc_transform.3	im_icc_import_embedded.3
+MLINKS+=	im_icc_transform.3	im_icc_present.3
+MAN3+=	im_icc_transform.3
+MLINKS+=	im_histgr.3	im_identity.3
+MLINKS+=	im_histgr.3	im_identity_ushort.3
+MAN3+=	im_ifthenelse.3
+MLINKS+=	im_binfile.3	im_image.3
+MAN3+=	IM_IMAGE_ADDR.3
 MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_N_ELEMENTS.3
-MAN3+=	im_error.3
-MLINKS+=	im_iscomplex.3	im_ispartial.3
-MLINKS+=	im_meta.3	im_meta_set_area.3
-MAN3+=	im_makerw.3
-MAN3+=	im_invalidate.3
-MLINKS+=	im_open.3	im_open_local_array.3
-MLINKS+=	im_list_add.3	im_list_fix.3
-MLINKS+=	im_cp_desc.3	im_cp_desc_array.3
-MLINKS+=	im_list_add.3	im_list_fold.3
-MAN3+=	im_generate.3
-MLINKS+=	im_region_buffer.3	im_region_region.3
-MLINKS+=	im_header.3	im_header_double.3
-MLINKS+=	im_list_add.3	im_list_free.3
-MLINKS+=	im_meta.3	im_meta_get_double.3
+MAN3+=	im_image_sanity.3
+MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_SIZEOF_ELEMENT.3
 MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_SIZEOF_LINE.3
+MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_SIZEOF_PEL.3
+MLINKS+=	im_iocheck.3	im_incheck.3
+MAN3+=	im_init.3
+MAN3+=	im_initdesc.3
+MAN3+=	im_init_world.3
+MAN3+=	im_insert.3
+MAN3+=	im_insertplace.3
+MAN3+=	im_invalidate.3
+MAN3+=	im_invert.3
+MAN3+=	im_invertlut.3
+MLINKS+=	im_fwfft.3	im_invfft.3
+MLINKS+=	im_fwfft.3	im_invfftr.3
+MAN3+=	im_iocheck.3
+MAN3+=	im_iscomplex.3
+MLINKS+=	im_iscomplex.3	im_isfile.3
+MLINKS+=	im_iscomplex.3	im_isfloat.3
+MLINKS+=	im_iscomplex.3	im_isint.3
+MLINKS+=	im_iscomplex.3	im_isjpeg.3
+MLINKS+=	im_iscomplex.3	im_isMSBfirst.3
+MLINKS+=	im_iscomplex.3	im_ispartial.3
 MLINKS+=	im_iscomplex.3	im_ispng.3
-MAN3+=	im_header.3
-MLINKS+=	im_piocheck.3	im_poutcheck.3
-MAN3+=	im_binfile.3
-MLINKS+=	im_list_add.3	im_list_len.3
-MAN3+=	im_open.3
-MLINKS+=	im_rect_marginadjust.3	IM_RECT_HCENTRE.3
+MLINKS+=	im_iscomplex.3	im_isppm.3
+MLINKS+=	im_iscomplex.3	im_isscalar.3
+MLINKS+=	im_iscomplex.3	im_istiff.3
+MLINKS+=	im_iscomplex.3	im_istifftiled.3
+MLINKS+=	im_iscomplex.3	im_isuint.3
+MLINKS+=	im_iscomplex.3	im_isvips.3
+MAN3+=	im_iterate.3
+MAN3+=	im_jpeg2vips.3
+MLINKS+=	im_jpeg2vips.3	im_jpeg2vips_header.3
+MLINKS+=	im_Lab2UCS.3	im_Lab2disp.3
+MAN3+=	im_Lab2LabQ.3
+MLINKS+=	im_Lab2LabQ.3	im_Lab2LabS.3
+MLINKS+=	im_XYZ2disp.3	im_Lab2LCh.3
+MAN3+=	im_Lab2UCS.3
+MLINKS+=	im_XYZ2disp.3	im_Lab2XYZ.3
+MAN3+=	im_lab_morph.3
+MAN3+=	im_LabQ2disp.3
+MLINKS+=	im_LabQ2disp.3	im_LabQ2disp_build_table.3
+MLINKS+=	im_LabQ2disp.3	im_LabQ2disp_table.3
+MLINKS+=	im_Lab2LabQ.3	im_LabQ2Lab.3
+MLINKS+=	im_Lab2LabQ.3	im_LabQ2LabS.3
+MLINKS+=	im_Lab2UCS.3	im_LabQ2XYZ.3
+MLINKS+=	im_Lab2LabQ.3	im_LabS2Lab.3
+MLINKS+=	im_Lab2LabQ.3	im_LabS2LabQ.3
+MLINKS+=	im_XYZ2disp.3	im_LCh2Lab.3
+MLINKS+=	im_XYZ2disp.3	im_LCh2UCS.3
+MLINKS+=	im_equal.3	im_less.3
+MLINKS+=	im_equal.3	im_lessconst.3
+MLINKS+=	im_equal.3	im_lesseq.3
+MLINKS+=	im_equal.3	im_lesseqconst.3
+MLINKS+=	im_equal.3	im_lesseq_vec.3
+MLINKS+=	im_equal.3	im_less_vec.3
+MLINKS+=	im_heq.3	im_lhisteq.3
+MLINKS+=	im_heq.3	im_lhisteq_raw.3
+MLINKS+=	im_compass.3	im_lindetect.3
+MAN3+=	im_line.3
+MLINKS+=	im_paintrect.3	im_lineset.3
+MAN3+=	im_lintra.3
+MLINKS+=	im_lintra.3	im_lintra_vec.3
+MAN3+=	im_litecor.3
+MLINKS+=	im_exp10tra.3	im_log10tra.3
+MLINKS+=	im_log_imask.3	im_log_dmask.3
+MAN3+=	im_log_imask.3
+MLINKS+=	im_exp10tra.3	im_logtra.3
+MAN3+=	im_lowpass.3
+MAN3+=	im_lrjoin.3
+MAN3+=	im_lrmerge.3
+MAN3+=	im_lrmosaic.3
+MAN3+=	im_lu_decomp.3
+MLINKS+=	im_lu_decomp.3	im_lu_solve.3
+MAN3+=	im_magick2vips.3
+MLINKS+=	im_magick2vips.3	im_magick2vips_header.3
+MAN3+=	im_makerw.3
+MLINKS+=	im_grey.3	im_make_xy.3
 MAN3+=	im_malloc.3
-MLINKS+=	im_error.3	error_exit.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_includesrect.3
-MLINKS+=	im_rect_marginadjust.3	IM_RECT_BOTTOM.3
-MLINKS+=	im_printdesc.3	im_BandFmt2char.3
-MLINKS+=	im_render.3	im_render_fade.3
-MLINKS+=	im_header.3	im_header_get_type.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_unionrect.3
-MLINKS+=	im_iscomplex.3	im_amiMSBfirst.3
+MAN3+=	im_maplut.3
+MLINKS+=	im_vips2mask.3	im_mask2vips.3
+MLINKS+=	im_matinv.3	im_matcat.3
+MLINKS+=	im_match_linear_search.3	im_match_linear.3
+MAN3+=	im_match_linear_search.3
+MAN3+=	im_matinv.3
+MLINKS+=	im_matinv.3	im_matinv_inplace.3
+MLINKS+=	im_matinv.3	im_matmul.3
+MLINKS+=	im_matinv.3	im_mattrn.3
+MLINKS+=	im_avg.3	im_max.3
+MLINKS+=	IM_RINT.3	IM_MAX.3
+MLINKS+=	im_avg.3	im_maxpos.3
+MAN3+=	im_maxpos_vec.3
+MLINKS+=	im_compass.3	im_maxvalue.3
+MLINKS+=	im_mean_std_int_buffer.3	im_mean_std_double_buffer.3
+MAN3+=	im_mean_std_int_buffer.3
+MAN3+=	im_measure.3
 MAN3+=	im_meta.3
-MLINKS+=	im_generate.3	im_stop_one.3
-MLINKS+=	im_piocheck.3	im_pincheck.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_isempty.3
-MAN3+=	im_setbuf.3
-MLINKS+=	im_malloc.3	im_free.3
+MLINKS+=	im_meta.3	im_meta_get.3
 MLINKS+=	im_meta.3	im_meta_get_area.3
-MLINKS+=	im_generate.3	im_start_one.3
-MLINKS+=	im_malloc.3	im_add_close_callback.3
-MLINKS+=	im_error.3	im_diag.3
-MLINKS+=	im_meta.3	im_meta_get_type.3
 MLINKS+=	im_meta.3	im_meta_get_blob.3
+MLINKS+=	im_avg.3	im_min.3
+MLINKS+=	im_meta.3	im_meta_get_double.3
+MLINKS+=	im_meta.3	im_meta_get_int.3
+MLINKS+=	im_meta.3	im_meta_get_string.3
+MLINKS+=	im_meta.3	im_meta_get_type.3
+MLINKS+=	im_meta.3	im_meta_set.3
+MLINKS+=	im_meta.3	im_meta_set_area.3
 MLINKS+=	im_meta.3	im_meta_set_blob.3
-MLINKS+=	im_rect_marginadjust.3	IM_RECT_VCENTRE.3
-MAN3+=	im_iocheck.3
-MAN3+=	im_openout.3
-MAN3+=	im_debugim.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_includespoint.3
-MLINKS+=	im_generate.3	im_stop_many.3
-MLINKS+=	im_list_add.3	im_list_insert.3
-MLINKS+=	im_iocheck.3	im_outcheck.3
-MLINKS+=	im_meta.3	im_meta_get.3
-MLINKS+=	im_prepare.3	im_prepare_many.3
-MAN3+=	im_wrapone.3
+MLINKS+=	im_meta.3	im_meta_set_double.3
+MLINKS+=	im_meta.3	im_meta_set_int.3
 MLINKS+=	im_meta.3	im_meta_set_string.3
-MAN3+=	im_initdesc.3
 MLINKS+=	IM_RINT.3	IM_MIN.3
-MLINKS+=	im_concurrency_set.3	im_concurrency_get.3
-MLINKS+=	im_open.3	im_open_local.3
-MLINKS+=	im_list_add.3	im_list_index.3
-MLINKS+=	IM_ARRAY.3	IM_NEW.3
-MAN3+=	IM_REGION_ADDR.3
-MLINKS+=	im_version.3	im_version_string.3
-MAN3+=	im_init.3
-MLINKS+=	im_list_add.3	im_list_map_rev.3
-MLINKS+=	im_histlin.3	im_history_get.3
-MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_SIZEOF_PEL.3
-MLINKS+=	IM_IMAGE_ADDR.3	IM_IMAGE_SIZEOF_ELEMENT.3
-MLINKS+=	im_iscomplex.3	im_isvips.3
-MLINKS+=	im_iscomplex.3	im_isuint.3
-MLINKS+=	im_demand_hint.3	im_demand_hint_array.3
-MLINKS+=	im_printdesc.3	im_char2Coding.3
-MLINKS+=	im_prepare.3	im_prepare_to.3
-MLINKS+=	im_meta.3	im_meta_set_double.3
-MAN3+=	im_histlin.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_equalsrect.3
-MAN3+=	im_region_create.3
-MLINKS+=	im_printdesc.3	im_Type2char.3
-MLINKS+=	im_histlin.3	im_updatehist.3
-MLINKS+=	im_generate.3	im_start_many.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_normalise.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_dup.3
-MLINKS+=	im_rect_marginadjust.3	im_rect_intersectrect.3
-MLINKS+=	im_error.3	im_warn.3
-MLINKS+=	im_iscomplex.3	im_isjpeg.3
-MAN3+=	im_partial.3
-MLINKS+=	im_rect_marginadjust.3	IM_RECT_RIGHT.3
-MLINKS+=	IM_RINT.3	IM_MAX.3
-MLINKS+=	im_printdesc.3	im_char2BandFmt.3
-MAN3+=	IM_RINT.3
-MAN3+=	im_concurrency_set.3
-MAN3+=	im_writeline.3
-MLINKS+=	IM_ARRAY.3	IM_NUMBER.3
-MLINKS+=	IM_REGION_ADDR.3	IM_REGION_SIZEOF_LINE.3
-MAN3+=	im_close.3
-MAN3+=	im_list_add.3
-MLINKS+=	im_iscomplex.3	im_isppm.3
-MLINKS+=	im_binfile.3	im_image.3
-MLINKS+=	im_printdesc.3	im_char2Type.3
-MLINKS+=	im_meta.3	im_meta_get_string.3
-MLINKS+=	im_iscomplex.3	im_isscalar.3
-MLINKS+=	im_iscomplex.3	im_isfile.3
-MLINKS+=	im_generate.3	im_allocate_input_array.3
-MLINKS+=	im_error.3	im_verror.3
+MLINKS+=	im_avg.3	im_minpos.3
+MLINKS+=	im_maxpos_vec.3	im_minpos_vec.3
 MAN3+=	im_mmapin.3
-MAN3+=	IM_IMAGE_ADDR.3
-MAN3+=	im_rect_marginadjust.3
-MLINKS+=	im_printdesc.3	im_Coding2char.3
-MLINKS+=	im_malloc.3	im_add_eval_callback.3
-MAN3+=	im_version.3
-MLINKS+=	im_meta.3	im_meta_set.3
-MLINKS+=	im_region_buffer.3	im_region_image.3
-MAN3+=	im_guess_prefix.3
-MLINKS+=	im_region_create.3	im_region_free.3
-MAN3+=	im_dilate.3
-MLINKS+=	im_dilate.3	im_dilate_raw.3
-MAN3+=	im_cntlines.3
-MLINKS+=	im_cntlines.3	im_profile.3
-MLINKS+=	im_dilate.3	im_erode.3
-MLINKS+=	im_dilate.3	im_erode_raw.3
-MAN3+=	im_video_v4l1.3
+MAN3+=	im_mmapinrw.3
+MLINKS+=	im_equal.3	im_more.3
+MLINKS+=	im_equal.3	im_moreconst.3
+MLINKS+=	im_equal.3	im_moreeq.3
 MLINKS+=	im_equal.3	im_moreeqconst.3
-MLINKS+=	im_equal.3	im_less.3
-MLINKS+=	im_equal.3	im_equalconst.3
 MLINKS+=	im_equal.3	im_moreeq_vec.3
-MLINKS+=	im_equal.3	im_moreeq.3
-MLINKS+=	im_equal.3	im_less_vec.3
-MLINKS+=	im_equal.3	im_notequal.3
-MLINKS+=	im_equal.3	im_lesseqconst.3
 MLINKS+=	im_equal.3	im_more_vec.3
-MLINKS+=	im_equal.3	im_notequal_vec.3
-MLINKS+=	im_equal.3	im_notequalconst.3
-MLINKS+=	im_equal.3	im_lesseq.3
-MAN3+=	im_equal.3
-MLINKS+=	im_equal.3	im_lesseq_vec.3
-MLINKS+=	im_equal.3	im_lessconst.3
-MLINKS+=	im_equal.3	im_more.3
-MLINKS+=	im_equal.3	im_moreconst.3
-MLINKS+=	im_equal.3	im_equal_vec.3
-MLINKS+=	im_ifthenelse.3	im_blend.3
-MAN3+=	im_ifthenelse.3
-MLINKS+=	im_add.3	im_gaddim.3
-MLINKS+=	im_exp10tra.3	im_exptra.3
-MLINKS+=	im_remainder.3	im_remainderconst.3
-MLINKS+=	im_exp10tra.3	im_logtra.3
-MLINKS+=	im_costra.3	im_atantra.3
-MAN3+=	im_bandmean.3
-MAN3+=	im_floor.3
-MAN3+=	im_costra.3
-MAN3+=	im_avg.3
-MLINKS+=	im_avg.3	im_maxpos.3
-MLINKS+=	im_avg.3	im_deviate.3
-MLINKS+=	im_exp10tra.3	im_expntra_vec.3
-MLINKS+=	im_maxpos_vec.3	im_minpos_vec.3
-MLINKS+=	im_avg.3	im_min.3
-MLINKS+=	im_exp10tra.3	im_expntra.3
-MLINKS+=	im_avg.3	im_max.3
-MAN3+=	im_stats.3
-MAN3+=	im_invert.3
-MAN3+=	im_measure.3
-MAN3+=	im_maxpos_vec.3
-MAN3+=	im_lintra.3
-MAN3+=	im_rint.3
-MLINKS+=	im_add.3	im_gadd.3
-MLINKS+=	im_exp10tra.3	im_log10tra.3
-MAN3+=	im_exp10tra.3
-MLINKS+=	im_lintra.3	im_lintra_vec.3
-MAN3+=	im_ceil.3
+MAN3+=	im_mpercent.3
+MAN3+=	im_msb.3
+MLINKS+=	im_msb.3	im_msb_band.3
 MLINKS+=	im_cmulnorm.3	im_multiply.3
-MLINKS+=	im_exp10tra.3	im_powtra_vec.3
-MAN3+=	im_litecor.3
-MLINKS+=	im_avg.3	im_minpos.3
-MLINKS+=	im_costra.3	im_sintra.3
-MAN3+=	im_add.3
-MAN3+=	im_remainder.3
-MAN3+=	im_abs.3
-MLINKS+=	im_costra.3	im_asintra.3
-MAN3+=	im_sign.3
-MLINKS+=	im_costra.3	im_tantra.3
-MAN3+=	im_subtract.3
-MLINKS+=	im_costra.3	im_acostra.3
-MLINKS+=	im_add.3	im_gfadd.3
-MAN3+=	im_fav4.3
-MAN3+=	im_cmulnorm.3
-MAN3+=	im_divide.3
-MLINKS+=	im_exp10tra.3	im_powtra.3
-MAN3+=	im_andimage.3
-MLINKS+=	im_andimage.3	im_eorimage.3
-MLINKS+=	im_andimage.3	im_orimage.3
-MLINKS+=	im_shiftleft.3	im_shiftright.3
-MLINKS+=	im_andimage.3	im_andconst.3
+MLINKS+=	IM_ARRAY.3	IM_NEW.3
+MLINKS+=	im_create_dmask.3	im_norm_dmask.3
+MLINKS+=	im_equal.3	im_notequal.3
+MLINKS+=	im_equal.3	im_notequalconst.3
+MLINKS+=	im_equal.3	im_notequal_vec.3
+MLINKS+=	IM_ARRAY.3	IM_NUMBER.3
+MAN3+=	im_offsets45.3
+MLINKS+=	im_offsets45.3	im_offsets90.3
+MAN3+=	im_open.3
+MLINKS+=	im_open.3	im_open_local.3
+MLINKS+=	im_open.3	im_open_local_array.3
+MAN3+=	im_openout.3
 MLINKS+=	im_andimage.3	im_orconst.3
-MLINKS+=	im_andimage.3	im_eorconst.3
-MLINKS+=	im_andimage.3	im_eor_vec.3
+MLINKS+=	im_andimage.3	im_orimage.3
 MLINKS+=	im_andimage.3	im_or_vec.3
-MAN3+=	im_shiftleft.3
-MLINKS+=	im_andimage.3	im_and_vec.3
-MLINKS+=	im_paintrect.3	im_readpoint.3
-MLINKS+=	im_flood.3	im_flood_blob.3
-MLINKS+=	im_paintrect.3	im_lineset.3
-MLINKS+=	im_paintrect.3	im_fastlineuser.3
-MAN3+=	im_line.3
-MAN3+=	im_insertplace.3
-MLINKS+=	im_smudge.3	im_smear.3
-MLINKS+=	im_paintrect.3	im_fastline.3
-MLINKS+=	im_paintrect.3	im_plotmask.3
-MAN3+=	im_smudge.3
-MAN3+=	im_flood.3
+MLINKS+=	im_iocheck.3	im_outcheck.3
 MAN3+=	im_paintrect.3
-MAN3+=	im_circle.3
+MAN3+=	im_partial.3
+MLINKS+=	im_piocheck.3	im_pincheck.3
+MAN3+=	im_piocheck.3
+MLINKS+=	im_paintrect.3	im_plotmask.3
 MLINKS+=	im_paintrect.3	im_plotpoint.3
-MLINKS+=	im_Lab2UCS.3	im_UCS2XYZ.3
-MAN3+=	im_dE_fromdisp.3
-MLINKS+=	im_Lab2UCS.3	im_XYZ2UCS.3
-MLINKS+=	im_Lab2LabQ.3	im_LabS2Lab.3
-MAN3+=	im_LabQ2disp.3
-MLINKS+=	im_XYZ2disp.3	im_Yxy2XYZ.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_display.3
-MLINKS+=	im_dE_fromdisp.3	im_dE_fromXYZ.3
-MLINKS+=	im_icc_transform.3	im_icc_ac2rc.3
-MLINKS+=	im_Lab2LabQ.3	im_Lab2LabS.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Ch2ab.3
-MLINKS+=	im_dE_fromLab.3	im_dE00_fromLab.3
-MLINKS+=	im_LabQ2disp.3	im_LabQ2disp_table.3
-MAN3+=	im_col_XYZ2rgb.3
-MLINKS+=	im_XYZ2disp.3	im_LCh2UCS.3
-MLINKS+=	im_XYZ2disp.3	im_Lab2LCh.3
-MLINKS+=	im_Lab2UCS.3	im_LabQ2XYZ.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Cucs2C.3
-MLINKS+=	im_Lab2UCS.3	im_UCS2Lab.3
-MLINKS+=	im_dE_fromdisp.3	im_dECMC_fromdisp.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_dECMC.3
-MAN3+=	im_Lab2UCS.3
-MLINKS+=	im_icc_transform.3	im_icc_present.3
-MLINKS+=	im_icc_transform.3	im_icc_export.3
-MLINKS+=	im_Lab2LabQ.3	im_LabQ2Lab.3
-MAN3+=	im_dE_fromLab.3
-MAN3+=	im_icc_transform.3
-MLINKS+=	im_Lab2LabQ.3	im_LabQ2LabS.3
-MLINKS+=	im_XYZ2disp.3	im_disp2XYZ.3
-MLINKS+=	im_Lab2UCS.3	im_Lab2disp.3
-MLINKS+=	im_LabQ2disp.3	im_LabQ2disp_build_table.3
-MAN3+=	im_Lab2LabQ.3
-MLINKS+=	im_Lab2LabQ.3	im_LabS2LabQ.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_XYZ2Lab.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Ch2hucs.3
-MLINKS+=	im_XYZ2disp.3	im_Lab2XYZ.3
-MLINKS+=	im_XYZ2disp.3	im_LCh2Lab.3
-MLINKS+=	im_icc_transform.3	im_icc_import.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Lab2XYZ.3
-MLINKS+=	im_XYZ2disp.3	im_UCS2LCh.3
-MLINKS+=	im_XYZ2disp.3	im_XYZ2Yxy.3
-MAN3+=	im_lab_morph.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_rgb2XYZ.3
-MLINKS+=	im_icc_transform.3	im_icc_import_embedded.3
-MLINKS+=	im_XYZ2disp.3	im_XYZ2sRGB.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_pythagoras.3
-MLINKS+=	im_icc_transform.3	im_icc_export_depth.3
-MLINKS+=	im_XYZ2disp.3	im_sRGB2XYZ.3
-MLINKS+=	im_XYZ2disp.3	im_XYZ2Lab.3
-MAN3+=	im_XYZ2disp.3
-MLINKS+=	im_Lab2UCS.3	im_disp2Lab.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_ab2Ch.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_L2Lucs.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_C2Cucs.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Chucs2h.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_Lucs2L.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_make_tables_UCS.3
-MLINKS+=	im_col_XYZ2rgb.3	im_col_make_tables_RGB.3
-MLINKS+=	im_dE_fromLab.3	im_dECMC_fromLab.3
-MAN3+=	im_raw2vips.3
-MLINKS+=	im_msb.3	im_msb_band.3
-MLINKS+=	im_rot180.3	im_flipver.3
-MLINKS+=	im_tiff2vips.3	im_tiff2vips_header.3
-MLINKS+=	im_vips2mask.3	im_mask2vips.3
-MLINKS+=	im_clip.3	im_clip2s.3
+MAN3+=	im_png2vips.3
+MLINKS+=	im_png2vips.3	im_png2vips_header.3
+MLINKS+=	im_piocheck.3	im_poutcheck.3
+MLINKS+=	im_exp10tra.3	im_powtra.3
+MLINKS+=	im_exp10tra.3	im_powtra_vec.3
+MAN3+=	im_ppm2vips.3
+MLINKS+=	im_ppm2vips.3	im_ppm2vips_header.3
+MAN3+=	im_prepare.3
+MLINKS+=	im_prepare.3	im_prepare_many.3
+MLINKS+=	im_prepare.3	im_prepare_to.3
 MAN3+=	im_print.3
-MLINKS+=	im_jpeg2vips.3	im_vips2jpeg.3
-MLINKS+=	im_jpeg2vips.3	im_vips2bufjpeg.3
-MAN3+=	im_msb.3
-MAN3+=	im_copy.3
+MAN3+=	im_printdesc.3
+MLINKS+=	im_create_dmask.3	im_print_dmask.3
+MLINKS+=	im_create_dmask.3	im_print_imask.3
+MLINKS+=	im_debugim.3	im_printlines.3
+MLINKS+=	im_cntlines.3	im_profile.3
+MAN3+=	im_project.3
+MAN3+=	im_quantim.3
+MLINKS+=	im_quantim.3	im_quantlut.3
+MAN3+=	im_rank.3
+MLINKS+=	im_compass.3	im_rank_image.3
+MAN3+=	im_raw2vips.3
+MLINKS+=	im_create_dmask.3	im_read_dmask.3
+MLINKS+=	im_create_dmask.3	im_read_imask.3
+MLINKS+=	im_paintrect.3	im_readpoint.3
 MAN3+=	im_recomb.3
+MLINKS+=	im_rect_marginadjust.3	IM_RECT_BOTTOM.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_dup.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_equalsrect.3
+MLINKS+=	im_rect_marginadjust.3	IM_RECT_HCENTRE.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_includespoint.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_includesrect.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_intersectrect.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_isempty.3
+MAN3+=	im_render.3
+MAN3+=	im_rect_marginadjust.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_normalise.3
+MLINKS+=	im_rect_marginadjust.3	IM_RECT_RIGHT.3
+MLINKS+=	im_rect_marginadjust.3	im_rect_unionrect.3
+MLINKS+=	im_rect_marginadjust.3	IM_RECT_VCENTRE.3
+MAN3+=	IM_REGION_ADDR.3
+MAN3+=	im_region_buffer.3
+MAN3+=	im_region_create.3
+MLINKS+=	im_region_create.3	im_region_free.3
+MLINKS+=	im_region_buffer.3	im_region_image.3
+MLINKS+=	IM_REGION_ADDR.3	IM_REGION_LSKIP.3
+MLINKS+=	IM_REGION_ADDR.3	IM_REGION_N_ELEMENTS.3
+MLINKS+=	im_region_buffer.3	im_region_position.3
+MLINKS+=	im_region_buffer.3	im_region_region.3
+MLINKS+=	IM_REGION_ADDR.3	IM_REGION_SIZEOF_LINE.3
+MAN3+=	im_remainder.3
+MLINKS+=	im_remainder.3	im_remainderconst.3
+MAN3+=	im_remosaic.3
+MLINKS+=	im_remainder.3	im_remainderconst_vec.3
+MLINKS+=	im_render.3	im_render_fade.3
+MAN3+=	im_replicate.3
 MLINKS+=	im_clip.3	im_ri2c.3
-MLINKS+=	im_clip.3	im_clip2us.3
-MLINKS+=	im_png2vips.3	im_png2vips_header.3
-MAN3+=	im_system.3
-MAN3+=	im_lrjoin.3
-MAN3+=	im_zoom.3
+MAN3+=	im_rightshift_size.3
+MAN3+=	im_rint.3
+MAN3+=	IM_RINT.3
 MAN3+=	im_rot180.3
-MLINKS+=	im_clip.3	im_clip2d.3
+MLINKS+=	im_rot180.3	im_rot270.3
+MLINKS+=	im_rot180.3	im_rot90.3
+MLINKS+=	im_offsets45.3	im_rotate_dmask45.3
+MLINKS+=	im_offsets45.3	im_rotate_dmask90.3
+MLINKS+=	im_offsets45.3	im_rotate_imask45.3
+MLINKS+=	im_offsets45.3	im_rotate_imask90.3
+MAN3+=	im_rotquad.3
+MAN3+=	im_scale.3
+MLINKS+=	im_create_dmask.3	im_scale_dmask.3
+MLINKS+=	im_scale.3	im_scaleps.3
+MAN3+=	im_setbuf.3
+MAN3+=	im_setupout.3
+MAN3+=	im_sharpen.3
+MAN3+=	im_shiftleft.3
+MLINKS+=	im_shiftleft.3	im_shiftright.3
+MLINKS+=	im_conv.3	im_shrink.3
+MAN3+=	im_sign.3
+MAN3+=	im_simcontr.3
+MLINKS+=	im_similarity_area.3	im_similarity.3
+MAN3+=	im_similarity_area.3
+MAN3+=	im_sines.3
+MLINKS+=	im_costra.3	im_sintra.3
 MLINKS+=	im_thresh.3	im_slice.3
+MLINKS+=	im_smudge.3	im_smear.3
+MAN3+=	im_smudge.3
+MLINKS+=	im_quantim.3	im_spatres.3
+MLINKS+=	im_fastcor.3	im_spcor.3
+MLINKS+=	im_XYZ2disp.3	im_sRGB2XYZ.3
+MLINKS+=	im_generate.3	im_start_many.3
+MLINKS+=	im_generate.3	im_start_one.3
+MAN3+=	im_stats.3
+MAN3+=	im_stdif.3
+MLINKS+=	im_generate.3	im_stop_many.3
+MLINKS+=	im_generate.3	im_stop_one.3
+MAN3+=	im_stretch3.3
+MAN3+=	im_subsample.3
+MAN3+=	im_subtract.3
+MAN3+=	im_system.3
+MLINKS+=	im_costra.3	im_tantra.3
+MLINKS+=	im_lrjoin.3	im_tbjoin.3
+MLINKS+=	im_lrmerge.3	im_tbmerge.3
+MLINKS+=	im_lrmosaic.3	im_tbmosaic.3
 MAN3+=	im_text.3
-MLINKS+=	im_ppm2vips.3	im_ppm2vips_header.3
-MAN3+=	im_csv2vips.3
-MLINKS+=	im_csv2vips.3	im_vips2csv.3
-MLINKS+=	im_magick2vips.3	im_magick2vips_header.3
-MAN3+=	im_extract.3
-MAN3+=	im_png2vips.3
-MLINKS+=	im_copy.3	im_copy_from.3
 MAN3+=	im_thresh.3
-MLINKS+=	im_exr2vips.3	im_exr2vips_header.3
-MLINKS+=	im_jpeg2vips.3	im_vips2mimejpeg.3
-MAN3+=	im_tile_cache.3
-MLINKS+=	im_rot180.3	im_rot90.3
-MAN3+=	im_clip.3
-MLINKS+=	im_clip.3	im_clip2ui.3
-MAN3+=	im_bandjoin.3
-MAN3+=	im_subsample.3
-MLINKS+=	im_clip.3	im_clip2fmt.3
 MAN3+=	im_tiff2vips.3
-MLINKS+=	im_bandjoin.3	im_gbandjoin.3
-MAN3+=	im_ppm2vips.3
-MAN3+=	im_black.3
-MLINKS+=	im_rot180.3	im_rot270.3
-MLINKS+=	im_clip.3	im_c2ps.3
-MAN3+=	im_insert.3
-MLINKS+=	im_copy.3	im_copy_swap.3
-MAN3+=	im_exr2vips.3
-MAN3+=	im_magick2vips.3
-MLINKS+=	im_copy.3	im_copy_set_meta.3
-MLINKS+=	im_iscomplex.3	im_istiff.3
-MLINKS+=	im_copy.3	im_copy_morph.3
-MLINKS+=	im_clip.3	im_clip2cm.3
-MLINKS+=	im_copy.3	im_copy_set.3
-MLINKS+=	im_rot180.3	im_fliphor.3
-MLINKS+=	im_clip.3	im_c2rect.3
-MAN3+=	im_rightshift_size.3
-MLINKS+=	im_clip.3	im_c2imag.3
-MLINKS+=	im_clip.3	im_c2real.3
-MLINKS+=	im_extract.3	im_extract_bands.3
-MAN3+=	im_analyze2vips.3
-MLINKS+=	im_clip.3	im_clip2c.3
-MLINKS+=	im_clip.3	im_clip2i.3
-MLINKS+=	im_csv2vips.3	im_csv2vips_header.3
-MLINKS+=	im_scale.3	im_scaleps.3
-MLINKS+=	im_lrjoin.3	im_tbjoin.3
-MAN3+=	im_falsecolour.3
-MAN3+=	im_scale.3
-MLINKS+=	im_ppm2vips.3	im_vips2ppm.3
-MLINKS+=	im_clip.3	im_clip2f.3
-MLINKS+=	im_tiff2vips.3	im_vips2tiff.3
-MAN3+=	im_grid.3
-MLINKS+=	im_jpeg2vips.3	im_jpeg2vips_header.3
-MLINKS+=	im_extract.3	im_extract_areabands.3
+MLINKS+=	im_tiff2vips.3	im_tiff2vips_header.3
+MAN3+=	im_tile_cache.3
+MLINKS+=	im_tone_build.3	im_tone_analyse.3
+MAN3+=	im_tone_build.3
+MLINKS+=	im_tone_build.3	im_tone_map.3
+MLINKS+=	im_printdesc.3	im_Type2char.3
+MLINKS+=	im_Lab2UCS.3	im_UCS2Lab.3
+MLINKS+=	im_XYZ2disp.3	im_UCS2LCh.3
+MLINKS+=	im_Lab2UCS.3	im_UCS2XYZ.3
+MLINKS+=	im_histlin.3	im_updatehist.3
+MLINKS+=	im_error.3	im_verror.3
+MLINKS+=	im_error.3	im_warn.3
+MAN3+=	im_version.3
+MLINKS+=	im_version.3	im_version_string.3
+MAN3+=	im_video_v4l1.3
+MLINKS+=	im_jpeg2vips.3	im_vips2bufjpeg.3
+MLINKS+=	im_csv2vips.3	im_vips2csv.3
+MLINKS+=	im_jpeg2vips.3	im_vips2jpeg.3
 MAN3+=	im_vips2mask.3
-MAN3+=	im_jpeg2vips.3
-MLINKS+=	im_clip.3	im_c2amph.3
-MAN3+=	im_replicate.3
-MLINKS+=	im_clip.3	im_clip2dcm.3
-MLINKS+=	im_extract.3	im_extract_area.3
+MLINKS+=	im_jpeg2vips.3	im_vips2mimejpeg.3
 MLINKS+=	im_png2vips.3	im_vips2png.3
-MLINKS+=	im_fwfft.3	im_invfft.3
-MLINKS+=	im_fwfft.3	im_invfftr.3
-MAN3+=	im_fwfft.3
-MAN3+=	im_fractsurf.3
-MAN3+=	im_flt_imag_freq.3
-MAN3+=	im_disp_ps.3
-MAN3+=	im_freqflt.3
-MAN3+=	im_rotquad.3
-MAN3+=	im_create_fmask.3
+MLINKS+=	im_ppm2vips.3	im_vips2ppm.3
+MLINKS+=	im_tiff2vips.3	im_vips2tiff.3
+MLINKS+=	im_wrapone.3	im_wrapmany.3
+MAN3+=	im_wrapone.3
+MLINKS+=	im_create_dmask.3	im_write_dmask.3
+MLINKS+=	im_create_dmask.3	im_write_dmask_name.3
+MLINKS+=	im_create_dmask.3	im_write_imask.3
+MLINKS+=	im_create_dmask.3	im_write_imask_name.3
+MAN3+=	im_writeline.3
+MAN3+=	im_XYZ2disp.3
+MAN3+=	im_zerox.3
+MLINKS+=	im_XYZ2disp.3	im_XYZ2Lab.3
+MLINKS+=	im_XYZ2disp.3	im_XYZ2sRGB.3
+MLINKS+=	im_Lab2UCS.3	im_XYZ2UCS.3
+MLINKS+=	im_XYZ2disp.3	im_XYZ2Yxy.3
+MLINKS+=	im_XYZ2disp.3	im_Yxy2XYZ.3
+MAN3+=	im_zone.3
+MAN3+=	im_zoom.3
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index b1d4a7d73b50..b0cc8c6f37ec 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,3 +1,3 @@
-MD5 (vips-7.12.4.tar.gz) = 5399e1355172964f503ce1422e648ffd
-SHA256 (vips-7.12.4.tar.gz) = 82c4b1ae2299e1c63c50f549a2964d5cc5d4e9fdff8e95107bad3ff73a102e1e
-SIZE (vips-7.12.4.tar.gz) = 3469526
+MD5 (vips-7.14.4-1.tar.gz) = 9d2cc20e752faf9db16a58bb6d82bdca
+SHA256 (vips-7.14.4-1.tar.gz) = b179f5e970fd4bcbb095bcb2724b7e0e3932aad101a4d9b03344f5f665e566be
+SIZE (vips-7.14.4-1.tar.gz) = 2760371
diff --git a/graphics/vips/files/patch-po-Makefile.in.in b/graphics/vips/files/patch-po-Makefile.in.in
deleted file mode 100644
index dd02c40e802d..000000000000
--- a/graphics/vips/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/Makefile.in.in.orig	Thu Dec 14 16:41:02 2006
-+++ po/Makefile.in.in	Thu Dec 14 16:56:02 2006
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = ${datadir}/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -44,15 +44,15 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- 
--GMSGFMT = @GMSGFMT@
--MSGFMT = @MSGFMT@
-+GMSGFMT = @INTLTOOL_MSGFMT@
-+MSGFMT = @INTLTOOL_MSGFMT@
- XGETTEXT = @XGETTEXT@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
- GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
- 
- ALL_LINGUAS = @ALL_LINGUAS@
- 
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
- 
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 6e08afd69f99..227c2884a49d 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -303,8 +303,6 @@ bin/im_similarity_area
 bin/im_sintra
 bin/im_slice
 bin/im_spcor
-bin/im_spcor2
-bin/im_spcor2_raw
 bin/im_spcor_raw
 bin/im_stats
 bin/im_stdif
@@ -361,7 +359,6 @@ include/vips/colour.h
 include/vips/debug.h
 include/vips/dispatch.h
 include/vips/fmask.h
-include/vips/history.h
 include/vips/intl.h
 include/vips/meta.h
 include/vips/mosaic.h
@@ -373,7 +370,6 @@ include/vips/semaphore.h
 include/vips/struct.h
 include/vips/thread.h
 include/vips/threadgroup.h
-include/vips/time.h
 include/vips/util.h
 include/vips/vbuf.h
 include/vips/version.h
@@ -384,11 +380,11 @@ include/vips/vipscpp.h
 lib/libvips.a
 lib/libvips.la
 lib/libvips.so
-lib/libvips.so.14
+lib/libvips.so.20
 lib/libvipsCC.a
 lib/libvipsCC.la
 lib/libvipsCC.so
-lib/libvipsCC.so.14
+lib/libvipsCC.so.20
 libdata/pkgconfig/vips-%%VERSION%%.pc
 libdata/pkgconfig/vipsCC-%%VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/figs/arch.png
@@ -420,7 +416,6 @@ libdata/pkgconfig/vipsCC-%%VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse9.html
 %%PORTDOCS%%%%DOCSDIR%%/pdf/vipsmanual.pdf
-share/locale/en_GB/LC_MESSAGES/vips7.mo
 %%DATADIR%%/vdump.pro
 %%DATADIR%%/vips2dj/cmyk/head1
 %%DATADIR%%/vips2dj/cmyk/head2