9 files changed, 533 insertions, 602 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 8f63577f5e88..b79a04ea9d2c 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -2,45 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	nip2
-PORTVERSION=	7.40.2
+PORTVERSION=	7.40.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical user interface for VIPS
 
-OPTIONS_DEFINE=	DOCS
-LIB_DEPENDS=	libvips.so.38:${PORTSDIR}/graphics/vips \
-		libgoffice-*.so:${PORTSDIR}/devel/goffice \
-		libgsl.so:${PORTSDIR}/math/gsl \
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libgoffice-*.so:${PORTSDIR}/devel/goffice \
 		libgvc.so:${PORTSDIR}/graphics/graphviz \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
+		libvips.so:${PORTSDIR}/graphics/vips \
+		libgsl.so:${PORTSDIR}/math/gsl
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USES=		bison dos2unix gettext gmake pkgconfig
-USE_GNOME=	gnomemimedata glib20 gtk20
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-CONFIGURE_ENV+=	XGETTEXT=${LOCALBASE}/bin/xgettext	\
-		LIBGVC_LIBS="-L${LOCALBASE}/lib/graphviz -lgvc"	\
-		LIBGVC_CFLAGS="-I${LOCALBASE}/include/graphviz"
+USES=		bison desktop-file-utils dos2unix gettext gmake pkgconfig \
+		shared-mime-info
 DOS2UNIX_GLOB=	*.def
+USE_GNOME=	gnomemimedata gtk20 libxml2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-update-desktop \
+		--without-goffice
+
 SUB_FILES=	run-nip2.sh
-# This port has no man-pages. It installs a number of HTML files,
-# which are available through the GUI's Help. For this reason, they
-# are always installed, regardless of the DOCS setting.
-# Somehow vendor's configure misses these:
-MAKE_ENV+=	UPDATE_MIME_DATABASE=update-mime-database	\
-		UPDATE_DESKTOP_DATABASE=update-desktop-database
-MANCOMPRESSED=	no
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/run-nip2.sh \
-	    ${STAGEDIR}/${PREFIX}/bin/
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
-	    ${WRKSRC}/test/scripts/*
+	@${REINPLACE_CMD} -e \
+		's|/bin/bash|/bin/sh|' ${WRKSRC}/test/scripts/*
+
+post-install:
+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} run-nip2.sh \
+		${STAGEDIR}/${PREFIX}/bin)
 
 test check: build
 	#
@@ -49,12 +45,6 @@ test check: build
 	# the log-file:
 	#	${WRKSRC}/test/test_all.sh.log
 	#
-	${GMAKE} -C ${WRKSRC} check
-
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MDOCS)
-EXTRACT_AFTER_ARGS+=	--exclude nipguide.pdf --exclude pdf
-.endif
+	(cd %{WRKSRC} && ${SETENV} {MAKE_ENV} ${MAKE_CMD} check)
 
 .include <bsd.port.mk>
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index e455bbb1c48f..2fa6d824cb5f 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nip2-7.40.2.tar.gz) = da4db3b21f4db5a5965e9cefb656cc208a5c845a084bda04cbb1e2833310b24a
-SIZE (nip2-7.40.2.tar.gz) = 9639389
+SHA256 (nip2-7.40.3.tar.gz) = 75dd68b7e316d1da9275a97a53456345641111e9fd1deeee29c5c7be5bd85fce
+SIZE (nip2-7.40.3.tar.gz) = 9639656
diff --git a/graphics/nip2/files/patch-src-graphwindow.c b/graphics/nip2/files/patch-src-graphwindow.c
deleted file mode 100644
index e20fa3a7f689..000000000000
--- a/graphics/nip2/files/patch-src-graphwindow.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/graphwindow.c	2011-01-25 19:44:07.000000000 +0300
-+++ src/graphwindow.c	2013-11-28 03:48:15.996694984 +0400
-@@ -260,7 +260,7 @@
- 
- 	IM_FREEF( agclose, graphwindow->graph );
- 
--	graphwindow->graph = agread( of->fp );
-+	graphwindow->graph = agread( of->fp, NULL );
- 
- 	ifile_close( of );
- 	unlinkf( "%s", tname );
diff --git a/graphics/nip2/files/patch-tests b/graphics/nip2/files/patch-tests
deleted file mode 100644
index cc760ba560c1..000000000000
--- a/graphics/nip2/files/patch-tests
+++ /dev/null
@@ -1,28 +0,0 @@
---- test/scripts/test_seq.sh	2014-06-23 15:17:21.000000000 -0400
-+++ test/scripts/test_seq.sh	2014-07-01 12:38:53.000000000 -0400
-@@ -1,3 +1,3 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # set -x
-@@ -18,5 +18,5 @@
- rm -f $tmp/x.png
- vipsthumbnail $huge -o $tmp/x.png
--if ! vipsheader $tmp/x.png &> /dev/null ; then
-+if ! vipsheader $tmp/x.png ; then
- 	echo "vipsthumbnail failed in basic mode"
- 	exit 1
-@@ -33,5 +33,5 @@
- rm -f $tmp/x.png
- vipsthumbnail $huge -o $tmp/x.png
--if ! vipsheader $tmp/x.png &> /dev/null ; then
-+if ! vipsheader $tmp/x.png ; then
- 	echo "vipsthumbnail made a temp"
- 	exit 1
-@@ -42,5 +42,5 @@
- rm -f $tmp/x.png
- vips shrink $huge $tmp/x.png 230 230 
--if ! vipsheader $tmp/x.png &> /dev/null; then
-+if ! vipsheader $tmp/x.png ; then
- 	echo "shrink made a temp"
- 	exit 1
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 500d905a3e6d..77ef0cb22752 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,395 +1,393 @@
 bin/nip2
 bin/run-nip2.sh
 man/man1/nip2.1.gz
-share/nip2/rc/ipgtkrc
-share/nip2/data/examples/logo/logo2.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/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/_magick.def
-share/nip2/start/Magick.def
-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/Resize.def
-share/nip2/compat/7.8/Capture.def
-share/nip2/compat/7.8/Format.def
-share/nip2/compat/7.8/Filter.def
-share/nip2/compat/7.8/Morphology.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/Rotate.def
-share/nip2/compat/7.8/Statistics.def
-share/nip2/compat/7.8/X_ray.def
-share/nip2/compat/7.8/_convert.def
-share/nip2/compat/7.8/_errors.def
-share/nip2/compat/7.8/_generate.def
-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/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/Resize.def
-share/nip2/compat/7.9/Capture.def
-share/nip2/compat/7.9/Format.def
-share/nip2/compat/7.9/Filter.def
-share/nip2/compat/7.9/Morphology.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/Rotate.def
-share/nip2/compat/7.9/Statistics.def
-share/nip2/compat/7.9/X_ray.def
-share/nip2/compat/7.9/_convert.def
-share/nip2/compat/7.9/_errors.def
-share/nip2/compat/7.9/_generate.def
-share/nip2/compat/7.9/_list.def
-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/_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/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
-share/nip2/compat/7.14/Colour.def
-share/nip2/compat/7.14/Filter.def
-share/nip2/compat/7.14/Histogram.def
-share/nip2/compat/7.14/Image.def
-share/nip2/compat/7.14/Math.def
-share/nip2/compat/7.14/Matrix.def
-share/nip2/compat/7.14/Object.def
-share/nip2/compat/7.14/Preferences.ws
-share/nip2/compat/7.14/Tasks.def
-share/nip2/compat/7.14/Widgets.def
-share/nip2/compat/7.14/_Object.def
-share/nip2/compat/7.14/_convert.def
-share/nip2/compat/7.14/_generate.def
-share/nip2/compat/7.14/_joe_extra.def
-share/nip2/compat/7.14/_joe_utilities.def
-share/nip2/compat/7.14/_list.def
-share/nip2/compat/7.14/_predicate.def
-share/nip2/compat/7.14/_stdenv.def
-share/nip2/compat/7.14/_types.def
-share/nip2/compat/7.16/Colour.def
-share/nip2/compat/7.16/Filter.def
-share/nip2/compat/7.16/Histogram.def
-share/nip2/compat/7.16/Image.def
-share/nip2/compat/7.16/Math.def
-share/nip2/compat/7.16/Matrix.def
-share/nip2/compat/7.16/Object.def
-share/nip2/compat/7.16/Preferences.ws
-share/nip2/compat/7.16/Tasks.def
-share/nip2/compat/7.16/Widgets.def
-share/nip2/compat/7.16/_Object.def
-share/nip2/compat/7.16/_convert.def
-share/nip2/compat/7.16/_generate.def
-share/nip2/compat/7.16/_joe_extra.def
-share/nip2/compat/7.16/_joe_utilities.def
-share/nip2/compat/7.16/_list.def
-share/nip2/compat/7.16/_predicate.def
-share/nip2/compat/7.16/_stdenv.def
-share/nip2/compat/7.16/_types.def
-share/nip2/compat/7.24/Colour.def
-share/nip2/compat/7.24/Filter.def
-share/nip2/compat/7.24/Histogram.def
-share/nip2/compat/7.24/Image.def
-share/nip2/compat/7.24/Math.def
-share/nip2/compat/7.24/Matrix.def
-share/nip2/compat/7.24/Object.def
-share/nip2/compat/7.24/Tasks.def
-share/nip2/compat/7.24/Widgets.def
-share/nip2/compat/7.24/_Object.def
-share/nip2/compat/7.24/_convert.def
-share/nip2/compat/7.24/_generate.def
-share/nip2/compat/7.24/_joe_extra.def
-share/nip2/compat/7.24/_joe_utilities.def
-share/nip2/compat/7.24/_list.def
-share/nip2/compat/7.24/_predicate.def
-share/nip2/compat/7.24/_stdenv.def
-share/nip2/compat/7.24/_types.def
-share/nip2/compat/7.26/Math.def
-share/nip2/compat/7.26/Image.def
-share/nip2/compat/7.26/Colour.def
-share/nip2/compat/7.26/Tasks.def
-share/nip2/compat/7.26/Object.def
-share/nip2/compat/7.26/Filter.def
-share/nip2/compat/7.26/Matrix.def
-share/nip2/compat/7.26/Widgets.def
-share/nip2/compat/7.26/Histogram.def
-share/nip2/compat/7.26/_joe_extra.def
-share/nip2/compat/7.26/_joe_utilities.def
-share/nip2/compat/7.26/_convert.def
-share/nip2/compat/7.26/_generate.def
-share/nip2/compat/7.26/_list.def
-share/nip2/compat/7.26/_predicate.def
-share/nip2/compat/7.26/_stdenv.def
-share/nip2/compat/7.26/_Object.def
-share/nip2/compat/7.26/_types.def
-share/nip2/compat/7.28/Math.def
-share/nip2/compat/7.28/Image.def
-share/nip2/compat/7.28/Colour.def
-share/nip2/compat/7.28/Tasks.def
-share/nip2/compat/7.28/Object.def
-share/nip2/compat/7.28/Filter.def
-share/nip2/compat/7.28/Matrix.def
-share/nip2/compat/7.28/Widgets.def
-share/nip2/compat/7.28/Histogram.def
-share/nip2/compat/7.28/_joe_extra.def
-share/nip2/compat/7.28/_joe_utilities.def
-share/nip2/compat/7.28/_convert.def
-share/nip2/compat/7.28/_generate.def
-share/nip2/compat/7.28/_list.def
-share/nip2/compat/7.28/_predicate.def
-share/nip2/compat/7.28/_stdenv.def
-share/nip2/compat/7.28/_Object.def
-share/nip2/compat/7.28/_types.def
-share/nip2/compat/7.38/Math.def
-share/nip2/compat/7.38/Image.def
-share/nip2/compat/7.38/Colour.def
-share/nip2/compat/7.38/Tasks.def
-share/nip2/compat/7.38/Object.def
-share/nip2/compat/7.38/Filter.def
-share/nip2/compat/7.38/Matrix.def
-share/nip2/compat/7.38/Widgets.def
-share/nip2/compat/7.38/Histogram.def
-share/nip2/compat/7.38/_joe_extra.def
-share/nip2/compat/7.38/_joe_utilities.def
-share/nip2/compat/7.38/_convert.def
-share/nip2/compat/7.38/_generate.def
-share/nip2/compat/7.38/_list.def
-share/nip2/compat/7.38/_predicate.def
-share/nip2/compat/7.38/_stdenv.def
-share/nip2/compat/7.38/_Object.def
-share/nip2/compat/7.38/_types.def
-share/nip2/data/examples/1_point_mosaic/1pt_mosaic.ws
-share/nip2/data/examples/1_point_mosaic/cd1.1.jpg
-share/nip2/data/examples/1_point_mosaic/cd1.2.jpg
-share/nip2/data/examples/1_point_mosaic/cd2.1.jpg
-share/nip2/data/examples/1_point_mosaic/cd2.2.jpg
-share/nip2/data/examples/1_point_mosaic/cd3.1.jpg
-share/nip2/data/examples/1_point_mosaic/cd3.2.jpg
-share/nip2/data/examples/1_point_mosaic/cd4.1.jpg
-share/nip2/data/examples/1_point_mosaic/cd4.2.jpg
-@dirrm share/nip2/data/examples/1_point_mosaic
-share/nip2/data/examples/2_point_mosaic/2pts_mosaic.ws
-share/nip2/data/examples/2_point_mosaic/example_im_01.jpg
-share/nip2/data/examples/2_point_mosaic/example_im_02.jpg
-share/nip2/data/examples/2_point_mosaic/example_im_03.jpg
-share/nip2/data/examples/2_point_mosaic/example_im_04.jpg
-share/nip2/data/examples/2_point_mosaic/example_im_05.jpg
-share/nip2/data/examples/2_point_mosaic/example_im_06.jpg
-share/nip2/data/examples/2_point_mosaic/full_image.jpg
-share/nip2/data/stock-padlock-closed-22.png
-share/nip2/data/stock-alert-22.png
-@dirrm share/nip2/data/examples/2_point_mosaic
-@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/7.14
-@dirrm share/nip2/compat/7.16
-@dirrm share/nip2/compat/7.24
-@dirrm share/nip2/compat/7.26
-@dirrm share/nip2/compat/7.28
-@dirrm share/nip2/compat/7.38
-@dirrm share/nip2/compat
-@dirrm share/nip2/data/examples/businesscard
-@dirrm share/nip2/data/examples/clone
-@dirrm share/nip2/data/examples/framing
-@dirrm share/nip2/data/examples/logo
-@dirrm share/nip2/data/examples/manual_balance
-@dirrm share/nip2/data/examples/overlays_and_blending
-@dirrm share/nip2/data/examples/registering
-@dirrm share/nip2/data/examples
-@dirrm share/nip2/data
-@dirrm share/nip2/rc
-@dirrm share/nip2/start
-@dirrm share/nip2
-%%DOCSDIR%%/html/figs/ir7.jpg
-%%DOCSDIR%%/html/figs/ir5.jpg
-%%DOCSDIR%%/html/figs/ir8a.jpg
-%%DOCSDIR%%/html/figs/toolkit2.jpg
-%%DOCSDIR%%/html/figs/snap9.jpg
-%%DOCSDIR%%/html/figs/snap7a.jpg
-%%DOCSDIR%%/html/figs/snap12.jpg
-%%DOCSDIR%%/html/figs/scr21a.png
-%%DOCSDIR%%/html/figs/ir3.jpg
-%%DOCSDIR%%/html/figs/snap16.jpg
-%%DOCSDIR%%/html/figs/snap2.jpg
-%%DOCSDIR%%/html/figs/snap13.jpg
-%%DOCSDIR%%/html/figs/snap14.jpg
-%%DOCSDIR%%/html/figs/snap4.jpg
-%%DOCSDIR%%/html/figs/snap6.jpg
-%%DOCSDIR%%/html/figs/toolkit.jpg
-%%DOCSDIR%%/html/figs/snap15.jpg
-%%DOCSDIR%%/html/figs/ir2.jpg
-%%DOCSDIR%%/html/figs/snap7.jpg
-%%DOCSDIR%%/html/figs/snap10.jpg
-%%DOCSDIR%%/html/figs/snap11.jpg
-%%DOCSDIR%%/html/figs/ir4.jpg
-%%DOCSDIR%%/html/figs/snap1.jpg
-%%DOCSDIR%%/html/figs/snap5.jpg
-%%DOCSDIR%%/html/figs/snap3.jpg
-%%DOCSDIR%%/html/figs/toolkit3.jpg
-%%DOCSDIR%%/html/figs/snap8.jpg
-%%DOCSDIR%%/html/nipguidese33.html
-%%DOCSDIR%%/html/nipguidese24.html
-%%DOCSDIR%%/html/nipguidese21.html
-%%DOCSDIR%%/html/nipguidech5.html
-%%DOCSDIR%%/html/nipguidese31.html
-%%DOCSDIR%%/html/nipguidech6.html
-%%DOCSDIR%%/html/nipguidese4.html
-%%DOCSDIR%%/html/nipguideli2.html
-%%DOCSDIR%%/html/nipguidese8.html
-%%DOCSDIR%%/html/nipguidese2.html
-%%DOCSDIR%%/html/nipguidese20.html
-%%DOCSDIR%%/html/nipguidese6.html
-%%DOCSDIR%%/html/nipguidese16.html
-%%DOCSDIR%%/html/nipguide37.html
-%%DOCSDIR%%/html/nipguidese18.html
-%%DOCSDIR%%/html/nipguidese30.html
-%%DOCSDIR%%/html/nipguidese34.html
-%%DOCSDIR%%/html/nipguidese29.html
-%%DOCSDIR%%/html/nipguide.html
-%%DOCSDIR%%/html/nipguidech1.html
-%%DOCSDIR%%/html/nipguideli1.html
-%%DOCSDIR%%/html/nipguidese11.html
-%%DOCSDIR%%/html/nipguidese25.html
-%%DOCSDIR%%/html/nipguide.css
-%%DOCSDIR%%/html/nipguidese9.html
-%%DOCSDIR%%/html/nipguidese3.html
-%%DOCSDIR%%/html/nipguidese22.html
-%%DOCSDIR%%/html/nipguidese15.html
-%%DOCSDIR%%/html/nipguidese26.html
-%%DOCSDIR%%/html/nipguidese23.html
-%%DOCSDIR%%/html/nipguidese27.html
-%%DOCSDIR%%/html/nipguideap1.html
-%%DOCSDIR%%/html/nipguidese1.html
-%%DOCSDIR%%/html/nipguidese5.html
-%%DOCSDIR%%/html/nipguidese12.html
-%%DOCSDIR%%/html/nipguidese28.html
-%%DOCSDIR%%/html/nipguidese17.html
-%%DOCSDIR%%/html/nipguidech3.html
-%%DOCSDIR%%/html/nipguidese36.html
-%%DOCSDIR%%/html/nipguideli3.html
-%%DOCSDIR%%/html/nipguidese7.html
-%%DOCSDIR%%/html/nipguidese19.html
-%%DOCSDIR%%/html/nipguidech4.html
-%%DOCSDIR%%/html/nipguidese32.html
-%%DOCSDIR%%/html/nipguidese13.html
-%%DOCSDIR%%/html/nipguidech2.html
-%%DOCSDIR%%/html/nipguidese10.html
-%%DOCSDIR%%/html/nipguidese14.html
-%%DOCSDIR%%/html/nipguidese35.html
+share/appdata/nip2.appdata.xml
+share/applications/nip2.desktop
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir7.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/ir8a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/scr21a.png
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap10.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap11.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap12.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap13.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap14.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap15.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap7.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap7a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap8.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/snap9.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/toolkit.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/toolkit2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/toolkit3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguide.css
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguide37.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguideap1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidech6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguideli1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguideli2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguideli3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese17.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese19.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese20.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese21.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese22.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese23.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese24.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese25.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese26.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese27.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese28.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese29.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese30.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese31.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese33.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese34.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese36.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nipguidese9.html
 %%PORTDOCS%%%%DOCSDIR%%/pdf/nipguide.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-@dirrm %%DOCSDIR%%/html/figs
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 share/mime/packages/nip2.xml
-share/applications/nip2.desktop
-@exec update-mime-database %D/share/mime || :
-@exec update-desktop-database %D/share/applications || :
-@unexec update-mime-database %D/share/mime || :
-@unexec update-desktop-database %D/share/applications || :
+%%DATADIR%%/compat/7.10/Colour.def
+%%DATADIR%%/compat/7.10/Filter.def
+%%DATADIR%%/compat/7.10/Format.def
+%%DATADIR%%/compat/7.10/Histogram.def
+%%DATADIR%%/compat/7.10/Image.def
+%%DATADIR%%/compat/7.10/Math.def
+%%DATADIR%%/compat/7.10/Matrix.def
+%%DATADIR%%/compat/7.10/Tasks.def
+%%DATADIR%%/compat/7.10/Widgets.def
+%%DATADIR%%/compat/7.10/_convert.def
+%%DATADIR%%/compat/7.10/_generate.def
+%%DATADIR%%/compat/7.10/_joe_extra.def
+%%DATADIR%%/compat/7.10/_joe_utilities.def
+%%DATADIR%%/compat/7.10/_list.def
+%%DATADIR%%/compat/7.10/_predicate.def
+%%DATADIR%%/compat/7.10/_stdenv.def
+%%DATADIR%%/compat/7.10/_types.def
+%%DATADIR%%/compat/7.12/Colour.def
+%%DATADIR%%/compat/7.12/Filter.def
+%%DATADIR%%/compat/7.12/Format.def
+%%DATADIR%%/compat/7.12/Histogram.def
+%%DATADIR%%/compat/7.12/Image.def
+%%DATADIR%%/compat/7.12/Math.def
+%%DATADIR%%/compat/7.12/Matrix.def
+%%DATADIR%%/compat/7.12/Preferences.ws
+%%DATADIR%%/compat/7.12/Tasks.def
+%%DATADIR%%/compat/7.12/Widgets.def
+%%DATADIR%%/compat/7.12/_convert.def
+%%DATADIR%%/compat/7.12/_generate.def
+%%DATADIR%%/compat/7.12/_joe_extra.def
+%%DATADIR%%/compat/7.12/_joe_utilities.def
+%%DATADIR%%/compat/7.12/_list.def
+%%DATADIR%%/compat/7.12/_predicate.def
+%%DATADIR%%/compat/7.12/_stdenv.def
+%%DATADIR%%/compat/7.12/_types.def
+%%DATADIR%%/compat/7.14/Colour.def
+%%DATADIR%%/compat/7.14/Filter.def
+%%DATADIR%%/compat/7.14/Histogram.def
+%%DATADIR%%/compat/7.14/Image.def
+%%DATADIR%%/compat/7.14/Math.def
+%%DATADIR%%/compat/7.14/Matrix.def
+%%DATADIR%%/compat/7.14/Object.def
+%%DATADIR%%/compat/7.14/Preferences.ws
+%%DATADIR%%/compat/7.14/Tasks.def
+%%DATADIR%%/compat/7.14/Widgets.def
+%%DATADIR%%/compat/7.14/_Object.def
+%%DATADIR%%/compat/7.14/_convert.def
+%%DATADIR%%/compat/7.14/_generate.def
+%%DATADIR%%/compat/7.14/_joe_extra.def
+%%DATADIR%%/compat/7.14/_joe_utilities.def
+%%DATADIR%%/compat/7.14/_list.def
+%%DATADIR%%/compat/7.14/_predicate.def
+%%DATADIR%%/compat/7.14/_stdenv.def
+%%DATADIR%%/compat/7.14/_types.def
+%%DATADIR%%/compat/7.16/Colour.def
+%%DATADIR%%/compat/7.16/Filter.def
+%%DATADIR%%/compat/7.16/Histogram.def
+%%DATADIR%%/compat/7.16/Image.def
+%%DATADIR%%/compat/7.16/Math.def
+%%DATADIR%%/compat/7.16/Matrix.def
+%%DATADIR%%/compat/7.16/Object.def
+%%DATADIR%%/compat/7.16/Preferences.ws
+%%DATADIR%%/compat/7.16/Tasks.def
+%%DATADIR%%/compat/7.16/Widgets.def
+%%DATADIR%%/compat/7.16/_Object.def
+%%DATADIR%%/compat/7.16/_convert.def
+%%DATADIR%%/compat/7.16/_generate.def
+%%DATADIR%%/compat/7.16/_joe_extra.def
+%%DATADIR%%/compat/7.16/_joe_utilities.def
+%%DATADIR%%/compat/7.16/_list.def
+%%DATADIR%%/compat/7.16/_predicate.def
+%%DATADIR%%/compat/7.16/_stdenv.def
+%%DATADIR%%/compat/7.16/_types.def
+%%DATADIR%%/compat/7.24/Colour.def
+%%DATADIR%%/compat/7.24/Filter.def
+%%DATADIR%%/compat/7.24/Histogram.def
+%%DATADIR%%/compat/7.24/Image.def
+%%DATADIR%%/compat/7.24/Math.def
+%%DATADIR%%/compat/7.24/Matrix.def
+%%DATADIR%%/compat/7.24/Object.def
+%%DATADIR%%/compat/7.24/Tasks.def
+%%DATADIR%%/compat/7.24/Widgets.def
+%%DATADIR%%/compat/7.24/_Object.def
+%%DATADIR%%/compat/7.24/_convert.def
+%%DATADIR%%/compat/7.24/_generate.def
+%%DATADIR%%/compat/7.24/_joe_extra.def
+%%DATADIR%%/compat/7.24/_joe_utilities.def
+%%DATADIR%%/compat/7.24/_list.def
+%%DATADIR%%/compat/7.24/_predicate.def
+%%DATADIR%%/compat/7.24/_stdenv.def
+%%DATADIR%%/compat/7.24/_types.def
+%%DATADIR%%/compat/7.26/Colour.def
+%%DATADIR%%/compat/7.26/Filter.def
+%%DATADIR%%/compat/7.26/Histogram.def
+%%DATADIR%%/compat/7.26/Image.def
+%%DATADIR%%/compat/7.26/Math.def
+%%DATADIR%%/compat/7.26/Matrix.def
+%%DATADIR%%/compat/7.26/Object.def
+%%DATADIR%%/compat/7.26/Tasks.def
+%%DATADIR%%/compat/7.26/Widgets.def
+%%DATADIR%%/compat/7.26/_Object.def
+%%DATADIR%%/compat/7.26/_convert.def
+%%DATADIR%%/compat/7.26/_generate.def
+%%DATADIR%%/compat/7.26/_joe_extra.def
+%%DATADIR%%/compat/7.26/_joe_utilities.def
+%%DATADIR%%/compat/7.26/_list.def
+%%DATADIR%%/compat/7.26/_predicate.def
+%%DATADIR%%/compat/7.26/_stdenv.def
+%%DATADIR%%/compat/7.26/_types.def
+%%DATADIR%%/compat/7.28/Colour.def
+%%DATADIR%%/compat/7.28/Filter.def
+%%DATADIR%%/compat/7.28/Histogram.def
+%%DATADIR%%/compat/7.28/Image.def
+%%DATADIR%%/compat/7.28/Math.def
+%%DATADIR%%/compat/7.28/Matrix.def
+%%DATADIR%%/compat/7.28/Object.def
+%%DATADIR%%/compat/7.28/Tasks.def
+%%DATADIR%%/compat/7.28/Widgets.def
+%%DATADIR%%/compat/7.28/_Object.def
+%%DATADIR%%/compat/7.28/_convert.def
+%%DATADIR%%/compat/7.28/_generate.def
+%%DATADIR%%/compat/7.28/_joe_extra.def
+%%DATADIR%%/compat/7.28/_joe_utilities.def
+%%DATADIR%%/compat/7.28/_list.def
+%%DATADIR%%/compat/7.28/_predicate.def
+%%DATADIR%%/compat/7.28/_stdenv.def
+%%DATADIR%%/compat/7.28/_types.def
+%%DATADIR%%/compat/7.38/Colour.def
+%%DATADIR%%/compat/7.38/Filter.def
+%%DATADIR%%/compat/7.38/Histogram.def
+%%DATADIR%%/compat/7.38/Image.def
+%%DATADIR%%/compat/7.38/Math.def
+%%DATADIR%%/compat/7.38/Matrix.def
+%%DATADIR%%/compat/7.38/Object.def
+%%DATADIR%%/compat/7.38/Tasks.def
+%%DATADIR%%/compat/7.38/Widgets.def
+%%DATADIR%%/compat/7.38/_Object.def
+%%DATADIR%%/compat/7.38/_convert.def
+%%DATADIR%%/compat/7.38/_generate.def
+%%DATADIR%%/compat/7.38/_joe_extra.def
+%%DATADIR%%/compat/7.38/_joe_utilities.def
+%%DATADIR%%/compat/7.38/_list.def
+%%DATADIR%%/compat/7.38/_predicate.def
+%%DATADIR%%/compat/7.38/_stdenv.def
+%%DATADIR%%/compat/7.38/_types.def
+%%DATADIR%%/compat/7.8/Capture.def
+%%DATADIR%%/compat/7.8/Colour.def
+%%DATADIR%%/compat/7.8/Filter.def
+%%DATADIR%%/compat/7.8/Format.def
+%%DATADIR%%/compat/7.8/Histogram.def
+%%DATADIR%%/compat/7.8/Image.def
+%%DATADIR%%/compat/7.8/Math.def
+%%DATADIR%%/compat/7.8/Morphology.def
+%%DATADIR%%/compat/7.8/Mosaic.def
+%%DATADIR%%/compat/7.8/New.def
+%%DATADIR%%/compat/7.8/Print.def
+%%DATADIR%%/compat/7.8/Resize.def
+%%DATADIR%%/compat/7.8/Rotate.def
+%%DATADIR%%/compat/7.8/Statistics.def
+%%DATADIR%%/compat/7.8/X_ray.def
+%%DATADIR%%/compat/7.8/_convert.def
+%%DATADIR%%/compat/7.8/_errors.def
+%%DATADIR%%/compat/7.8/_generate.def
+%%DATADIR%%/compat/7.8/_list.def
+%%DATADIR%%/compat/7.8/_predicate.def
+%%DATADIR%%/compat/7.8/_stdenv.def
+%%DATADIR%%/compat/7.8/_types.def
+%%DATADIR%%/compat/7.9/Capture.def
+%%DATADIR%%/compat/7.9/Colour.def
+%%DATADIR%%/compat/7.9/Filter.def
+%%DATADIR%%/compat/7.9/Format.def
+%%DATADIR%%/compat/7.9/Histogram.def
+%%DATADIR%%/compat/7.9/Image.def
+%%DATADIR%%/compat/7.9/Math.def
+%%DATADIR%%/compat/7.9/Morphology.def
+%%DATADIR%%/compat/7.9/Mosaic.def
+%%DATADIR%%/compat/7.9/New.def
+%%DATADIR%%/compat/7.9/Print.def
+%%DATADIR%%/compat/7.9/Resize.def
+%%DATADIR%%/compat/7.9/Rotate.def
+%%DATADIR%%/compat/7.9/Statistics.def
+%%DATADIR%%/compat/7.9/X_ray.def
+%%DATADIR%%/compat/7.9/_convert.def
+%%DATADIR%%/compat/7.9/_errors.def
+%%DATADIR%%/compat/7.9/_generate.def
+%%DATADIR%%/compat/7.9/_list.def
+%%DATADIR%%/compat/7.9/_predicate.def
+%%DATADIR%%/compat/7.9/_stdenv.def
+%%DATADIR%%/compat/7.9/_types.def
+%%DATADIR%%/data/AdobeRGB1998.icc
+%%DATADIR%%/data/HP5000_UVDuraImageGlossMaxQ.icc
+%%DATADIR%%/data/examples/1_point_mosaic/1pt_mosaic.ws
+%%DATADIR%%/data/examples/1_point_mosaic/cd1.1.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd1.2.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd2.1.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd2.2.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd3.1.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd3.2.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd4.1.jpg
+%%DATADIR%%/data/examples/1_point_mosaic/cd4.2.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/2pts_mosaic.ws
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_01.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_02.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_03.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_04.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_05.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/example_im_06.jpg
+%%DATADIR%%/data/examples/2_point_mosaic/full_image.jpg
+%%DATADIR%%/data/examples/businesscard/businesscard.ws
+%%DATADIR%%/data/examples/businesscard/slanted_oval_vase2.jpg
+%%DATADIR%%/data/examples/clone/clone.ws
+%%DATADIR%%/data/examples/clone/example_im_01.png
+%%DATADIR%%/data/examples/clone/example_im_02.png
+%%DATADIR%%/data/examples/framing/framing.ws
+%%DATADIR%%/data/examples/framing/framing_complex.png
+%%DATADIR%%/data/examples/framing/framing_corner.png
+%%DATADIR%%/data/examples/framing/framing_distorted_frame.png
+%%DATADIR%%/data/examples/framing/framing_picture.jpg
+%%DATADIR%%/data/examples/logo/logo2.ws
+%%DATADIR%%/data/examples/manual_balance/manual_balance.ws
+%%DATADIR%%/data/examples/manual_balance/mask_01.png
+%%DATADIR%%/data/examples/manual_balance/mask_02.png
+%%DATADIR%%/data/examples/manual_balance/mask_03.png
+%%DATADIR%%/data/examples/manual_balance/mask_control.png
+%%DATADIR%%/data/examples/manual_balance/simp_base.png
+%%DATADIR%%/data/examples/overlays_and_blending/blend_example_ir.jpg
+%%DATADIR%%/data/examples/overlays_and_blending/blend_example_vis.jpg
+%%DATADIR%%/data/examples/overlays_and_blending/blend_example_xray.jpg
+%%DATADIR%%/data/examples/overlays_and_blending/overlay_blend.ws
+%%DATADIR%%/data/examples/print_test_image.v
+%%DATADIR%%/data/examples/registering/example_im_1.jpg
+%%DATADIR%%/data/examples/registering/example_im_2.jpg
+%%DATADIR%%/data/examples/registering/example_im_3.jpg
+%%DATADIR%%/data/examples/registering/example_im_4.jpg
+%%DATADIR%%/data/examples/registering/registering.ws
+%%DATADIR%%/data/macbeth_lab_d50.mat
+%%DATADIR%%/data/macbeth_lab_d65.mat
+%%DATADIR%%/data/nip-slider-16.png
+%%DATADIR%%/data/nip2-icon.ico
+%%DATADIR%%/data/rachel.con
+%%DATADIR%%/data/sRGB.icm
+%%DATADIR%%/data/stock-alert-22.png
+%%DATADIR%%/data/stock-led-blue-18.png
+%%DATADIR%%/data/stock-led-cyan-18.png
+%%DATADIR%%/data/stock-led-green-18.png
+%%DATADIR%%/data/stock-led-off-18.png
+%%DATADIR%%/data/stock-led-red-18.png
+%%DATADIR%%/data/stock-led-yellow-18.png
+%%DATADIR%%/data/stock-padlock-closed-22.png
+%%DATADIR%%/data/stock-tool-bucket-fill-22.png
+%%DATADIR%%/data/stock-tool-ink-22.png
+%%DATADIR%%/data/stock-tool-move-22.png
+%%DATADIR%%/data/stock-tool-path-22.png
+%%DATADIR%%/data/stock-tool-rect-select-22.png
+%%DATADIR%%/data/stock-tool-select-22.png
+%%DATADIR%%/data/stock-tool-smudge-22.png
+%%DATADIR%%/data/stock-tool-text-22.png
+%%DATADIR%%/data/vips-128.png
+%%DATADIR%%/rc/ipgtkrc
+%%DATADIR%%/start/Colour.def
+%%DATADIR%%/start/Filter.def
+%%DATADIR%%/start/Histogram.def
+%%DATADIR%%/start/Image.def
+%%DATADIR%%/start/Magick.def
+%%DATADIR%%/start/Math.def
+%%DATADIR%%/start/Matrix.def
+%%DATADIR%%/start/Object.def
+%%DATADIR%%/start/Preferences.ws
+%%DATADIR%%/start/Tasks.def
+%%DATADIR%%/start/Widgets.def
+%%DATADIR%%/start/_Object.def
+%%DATADIR%%/start/_convert.def
+%%DATADIR%%/start/_generate.def
+%%DATADIR%%/start/_joe_extra.def
+%%DATADIR%%/start/_joe_utilities.def
+%%DATADIR%%/start/_list.def
+%%DATADIR%%/start/_magick.def
+%%DATADIR%%/start/_predicate.def
+%%DATADIR%%/start/_stdenv.def
+%%DATADIR%%/start/_types.def
+@dirrm %%DATADIR%%/start
+@dirrm %%DATADIR%%/rc
+@dirrm %%DATADIR%%/data/examples/registering
+@dirrm %%DATADIR%%/data/examples/overlays_and_blending
+@dirrm %%DATADIR%%/data/examples/manual_balance
+@dirrm %%DATADIR%%/data/examples/logo
+@dirrm %%DATADIR%%/data/examples/framing
+@dirrm %%DATADIR%%/data/examples/clone
+@dirrm %%DATADIR%%/data/examples/businesscard
+@dirrm %%DATADIR%%/data/examples/2_point_mosaic
+@dirrm %%DATADIR%%/data/examples/1_point_mosaic
+@dirrm %%DATADIR%%/data/examples
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/compat/7.9
+@dirrm %%DATADIR%%/compat/7.8
+@dirrm %%DATADIR%%/compat/7.38
+@dirrm %%DATADIR%%/compat/7.28
+@dirrm %%DATADIR%%/compat/7.26
+@dirrm %%DATADIR%%/compat/7.24
+@dirrm %%DATADIR%%/compat/7.16
+@dirrm %%DATADIR%%/compat/7.14
+@dirrm %%DATADIR%%/compat/7.12
+@dirrm %%DATADIR%%/compat/7.10
+@dirrm %%DATADIR%%/compat
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/appdata
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 20516f70bb2e..e2688a169555 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,75 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	vips
-PORTVERSION=	7.40.3
-PORTREVISION=	1
+PORTVERSION=	7.40.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free image processing system
 
-OPTIONS_DEFINE=	PYTHON DOCS
-OPTIONS_DEFAULT=
-PYTHON_DESC=	Create Python bindings
+LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libexif.so:${PORTSDIR}/graphics/libexif	\
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio \
+		liborc-0.4.so:${PORTSDIR}/devel/orc \
 		libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		liborc-0.4.so:${PORTSDIR}/devel/orc \
-		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+		libexif.so:${PORTSDIR}/graphics/libexif	\
 		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libwebp.so:${PORTSDIR}/graphics/webp \
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libmatio.so:${PORTSDIR}/math/matio
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-PYPRESENT!=	which python > /dev/null && echo on || echo off
-.if ${PYPRESENT} == on
-OPTIONS_DEFAULT+=	PYTHON
-.endif
-USES=		gettext gmake libtool pathfix perl5 pkgconfig shebangfix
-USE_PERL5=	build
+USES=		gettext gmake libtool pathfix pkgconfig shebangfix
 SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
-USE_GNOME=	glib20 pango libxml2 libgsf
-USE_LDCONFIG=	yes
+USE_GNOME=	glib20 libgsf libxml2 pango
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-
-post-configure:
-	${REINPLACE_CMD} -Ee 's,^(G?MSGFMT = *)$$,\1${LOCALBASE}/bin/msgfmt,g' \
-		${WRKSRC}/po/Makefile
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--disable-docs
-EXTRACT_AFTER_ARGS+=	--exclude doc
-EXTRA_PATCHES+=	${FILESDIR}/nodoc-patch
-.endif
-
-PLIST_SUB+=	VERSION=${PORTVERSION:R}
+CONFIGURE_ARGS=	--without-x \
+		--without-openslide \
+		--with-magickpackage=GraphicsMagick
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 
-CONFIGURE_ENV+=	MAGICK_CFLAGS="-I${LOCALBASE}/include/GraphicsMagick"
-CONFIGURE_ARGS+=--without-x --mandir=${STAGEDIR}${PREFIX}/man --with-magickpackage=GraphicsMagick
-.for p in tiff jpeg zip png
-CONFIGURE_ARGS+=--with-$p-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-$p-libraries=${LOCALBASE}/lib
-.endfor
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-PLIST_SUB+=	PY=""
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
-post-patch::
-	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
-	    ${WRKSRC}/tools/vipsprofile
+OPTIONS_DEFINE=		DOCS PYTHON
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
 
-.else
-CONFIGURE_ARGS=	--without-python
-PLIST_SUB+=	PY="@comment "
-.endif
+DOCS_CONFIGURE_ENABLE=	docs
+PYTHON_USE=		python=yes
+PYTHON_CONFIGURE_WITH=	python
 
 .include <bsd.port.mk>
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index 2b7904cba9d6..1387459d721c 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vips-7.40.3.tar.gz) = e78b717fba83fd40715db7fca835698fd1f2bad4f9e31df788727660562617ca
-SIZE (vips-7.40.3.tar.gz) = 3479017
+SHA256 (vips-7.40.4.tar.gz) = 19b7dca6ba37e52b33405a4627009eff0688facda12c252ed58c4e288acda41c
+SIZE (vips-7.40.4.tar.gz) = 3478814
diff --git a/graphics/vips/files/nodoc-patch b/graphics/vips/files/nodoc-patch
deleted file mode 100644
index 26c33afd44f9..000000000000
--- a/graphics/vips/files/nodoc-patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Remove Makefiles under the doc/ subdirectory, which we choose to
-not even extract, much less install, from the list...
-
---- configure	2014-06-23 16:48:44.000000000 -0400
-+++ configure	2014-06-24 11:02:30.000000000 -0400
-@@ -25207,5 +25207,5 @@
- 
- 
--ac_config_files="$ac_config_files vips.pc vipsCC.pc Makefile libvips/include/vips/version.h libvips/include/Makefile libvips/include/vips/Makefile libvips/Makefile libvips/arithmetic/Makefile libvips/cimg/Makefile libvips/colour/Makefile libvips/conversion/Makefile libvips/convolution/Makefile libvips/deprecated/Makefile libvips/foreign/Makefile libvips/freqfilt/Makefile libvips/histogram/Makefile libvips/draw/Makefile libvips/iofuncs/Makefile libvips/morphology/Makefile libvips/mosaicing/Makefile libvips/create/Makefile libvips/resample/Makefile libvips/video/Makefile libvipsCC/include/Makefile libvipsCC/include/vips/Makefile libvipsCC/Makefile tools/Makefile tools/batch_crop tools/batch_image_convert tools/batch_rubber_sheet tools/light_correct tools/shrink_width swig/Makefile swig/vipsCC/Makefile swig/python/setup.py man/Makefile doc/Makefile doc/reference/Makefile doc/reference/libvips-docs.sgml po/Makefile.in"
-+ac_config_files="$ac_config_files vips.pc vipsCC.pc Makefile libvips/include/vips/version.h libvips/include/Makefile libvips/include/vips/Makefile libvips/Makefile libvips/arithmetic/Makefile libvips/cimg/Makefile libvips/colour/Makefile libvips/conversion/Makefile libvips/convolution/Makefile libvips/deprecated/Makefile libvips/foreign/Makefile libvips/freqfilt/Makefile libvips/histogram/Makefile libvips/draw/Makefile libvips/iofuncs/Makefile libvips/morphology/Makefile libvips/mosaicing/Makefile libvips/create/Makefile libvips/resample/Makefile libvips/video/Makefile libvipsCC/include/Makefile libvipsCC/include/vips/Makefile libvipsCC/Makefile tools/Makefile tools/batch_crop tools/batch_image_convert tools/batch_rubber_sheet tools/light_correct tools/shrink_width swig/Makefile swig/vipsCC/Makefile swig/python/setup.py man/Makefile po/Makefile.in"
- 
- cat >confcache <<\_ACEOF
---- Makefile.in	2011-08-19 11:59:16.000000000 -0400
-+++ Makefile.in	2011-09-23 17:41:49.000000000 -0400
-@@ -93,5 +93,5 @@
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = libvips tools po man doc libvipsCC swig
-+DIST_SUBDIRS = libvips tools po man libvipsCC swig
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
-@@ -357,5 +357,4 @@
- 	po \
- 	man \
--	doc \
- 	$(C_COMPILE_DIR) \
- 	$(P_COMPILE_DIR) 
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 4efcf1649035..52e888275686 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -1,36 +1,40 @@
+bin/batch_crop
+bin/batch_image_convert
+bin/batch_rubber_sheet
+bin/light_correct
+bin/shrink_width
 bin/vips
+bin/vips-%%VERSION%%
 bin/vipsedit
-bin/vipsthumbnail
 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
+bin/vipsthumbnail
+include/vips/VDisplay.h
+include/vips/VError.h
+include/vips/VImage.h
+include/vips/VMask.h
 include/vips/almostdeprecated.h
-include/vips/deprecated.h
 include/vips/arithmetic.h
+include/vips/basic.h
 include/vips/buf.h
+include/vips/cimg_funcs.h
 include/vips/colour.h
 include/vips/conversion.h
 include/vips/convolution.h
+include/vips/create.h
 include/vips/debug.h
+include/vips/deprecated.h
 include/vips/dispatch.h
+include/vips/draw.h
 include/vips/enumtypes.h
 include/vips/error.h
-include/vips/operation.h
-include/vips/format.h
 include/vips/foreign.h
-include/vips/draw.h
+include/vips/format.h
+include/vips/freqfilt.h
+include/vips/gate.h
 include/vips/generate.h
 include/vips/header.h
 include/vips/histogram.h
-include/vips/freqfilt.h
 include/vips/image.h
 include/vips/interpolate.h
 include/vips/intl.h
@@ -38,40 +42,58 @@ include/vips/mask.h
 include/vips/memory.h
 include/vips/morphology.h
 include/vips/mosaicing.h
-include/vips/create.h
-include/vips/video.h
-include/vips/cimg_funcs.h
 include/vips/object.h
+include/vips/operation.h
 include/vips/private.h
 include/vips/rect.h
 include/vips/region.h
 include/vips/relational.h
 include/vips/resample.h
 include/vips/semaphore.h
-include/vips/threadpool.h
 include/vips/thread.h
+include/vips/threadpool.h
 include/vips/transform.h
+include/vips/type.h
 include/vips/util.h
-include/vips/version.h
 include/vips/vector.h
-include/vips/vips7compat.h
-include/vips/vips.h
-include/vips/VDisplay.h
-include/vips/VError.h
-include/vips/VMask.h
-include/vips/VImage.h
-include/vips/vipscpp.h
+include/vips/version.h
+include/vips/video.h
 include/vips/vips
+include/vips/vips.h
+include/vips/vips7compat.h
 include/vips/vipsc++.h
-@dirrm include/vips
+include/vips/vipscpp.h
 lib/libvips.a
-lib/libvips.so.38
-lib/libvips.so.38.0.1
 lib/libvips.so
+lib/libvips.so.38
+lib/libvips.so.38.0.2
 lib/libvipsCC.a
 lib/libvipsCC.so
 lib/libvipsCC.so.38
-lib/libvipsCC.so.38.0.1
+lib/libvipsCC.so.38.0.2
+%%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
 libdata/pkgconfig/vips.pc
 libdata/pkgconfig/vipsCC.pc
 man/man1/batch_crop.1.gz
@@ -83,8 +105,36 @@ 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/vips%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/arch.png
+%%PORTDOCS%%%%DOCSDIR%%/html/figs/interconvert.png
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanual.css
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualch1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualch2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualch3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualch4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualli1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualli2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualli3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse17.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vipsmanualse9.html
+%%PORTDOCS%%%%DOCSDIR%%/pdf/vipsmanual.pdf
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsForeignSave.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsImage.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsInterpolate.html
@@ -131,30 +181,14 @@ share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
 %%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
+share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
 %%PORTDOCS%%@dirrm share/gtk-doc/html/libvips
 %%PORTDOCS%%@dirrmtry share/gtk-doc/html
 %%PORTDOCS%%@dirrmtry share/gtk-doc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.so
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vimagemodule.a
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vdisplaymodule.a
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/verrormodule.a
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/vmaskmodule.a
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.py
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.py
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.py
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.py
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.py
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.pyc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.pyc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.pyc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.pyc
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VImage.pyo
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyo
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VError.pyo
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/VMask.pyo
-%%PY%%%%PYTHON_SITELIBDIR%%/vipsCC/__init__.pyo
-%%PY%%@dirrm %%PYTHON_SITELIBDIR%%/vipsCC
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vipsCC
+@dirrm include/vips