Upgrade vips and nip2 to 7.40.3 and 7.40.2 respectively. Unbreak

packaging for the case, when the install of documentation is enabled.

Transfer maintainership to antoine@, so he can continue to do as he
pleases with both, but without the guilt of changing other people's
ports.

6 files changed, 21 insertions, 86 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index c38ea43c44f8..03d1b881497a 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	nip2
-PORTVERSION=	7.40.1
+PORTVERSION=	7.40.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Graphical user interface for VIPS
 
 OPTIONS_DEFINE=	DOCS
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libvips.so.38:${PORTSDIR}/graphics/vips \
 		libgoffice-*.so:${PORTSDIR}/devel/goffice \
 		libgsl.so:${PORTSDIR}/math/gsl \
 		libgvc.so:${PORTSDIR}/graphics/graphviz \
-		xml2:${PORTSDIR}/textproc/libxml2
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
 
 USES=		bison dos2unix gettext gmake pkgconfig
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index 94343f98fdef..e455bbb1c48f 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nip2-7.40.1.tar.gz) = 67b46e6e6b488c6ed4e9212100d59ddeee34fac0977cc0c32aa0a21f29653a4d
-SIZE (nip2-7.40.1.tar.gz) = 9628285
+SHA256 (nip2-7.40.2.tar.gz) = da4db3b21f4db5a5965e9cefb656cc208a5c845a084bda04cbb1e2833310b24a
+SIZE (nip2-7.40.2.tar.gz) = 9639389
diff --git a/graphics/nip2/files/patch-tests b/graphics/nip2/files/patch-tests
index 3b5160656ef9..cc760ba560c1 100644
--- a/graphics/nip2/files/patch-tests
+++ b/graphics/nip2/files/patch-tests
@@ -1,32 +1,3 @@
---- test/scripts/test_threading.sh	2013-08-19 16:56:45.000000000 -0400
-+++ test/scripts/test_threading.sh	2014-07-01 11:54:10.000000000 -0400
-@@ -1,3 +1,3 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # set -x
-@@ -28,14 +28,14 @@
- 		vips im_abs $tmp/t8.v $tmp/t9.v
- 		max=`vips im_max $tmp/t9.v`
--		if [[ $max > 0 ]]; then
-+		if [ $max -gt 0 ]; then
- 			break
- 		fi
- 	done
--	if [[ $max > 0 ]]; then
-+	if [ $max -gt 0 ]; then
- 		break
- 	fi
- done
- 
--if [[ $max > 0 ]]; then
-+if [ $max -gt 0 ]; then
- 	echo error, max == $max
- 	exit 1
-@@ -43,3 +43,2 @@
- 	echo all threading tests passed
- fi
--
 --- 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 @@
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 506585252329..1afe85a03153 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	vips
-PORTVERSION=	7.40.2
+PORTVERSION=	7.40.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Free image processing system
 
 BROKEN=		Fails to package
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index c6b76821afc3..2b7904cba9d6 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vips-7.40.2.tar.gz) = fd90faa0ccdf5397ca9c2c4944fcfefdfab23b292a74d23443a25d7752d30604
-SIZE (vips-7.40.2.tar.gz) = 3484259
+SHA256 (vips-7.40.3.tar.gz) = e78b717fba83fd40715db7fca835698fd1f2bad4f9e31df788727660562617ca
+SIZE (vips-7.40.3.tar.gz) = 3479017
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 499c4e105403..4efcf1649035 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -66,12 +66,12 @@ include/vips/vipsc++.h
 @dirrm include/vips
 lib/libvips.a
 lib/libvips.so.38
-lib/libvips.so.38.0.0
+lib/libvips.so.38.0.1
 lib/libvips.so
 lib/libvipsCC.a
 lib/libvipsCC.so
 lib/libvipsCC.so.38
-lib/libvipsCC.so.38.0.0
+lib/libvipsCC.so.38.0.1
 libdata/pkgconfig/vips.pc
 libdata/pkgconfig/vipsCC.pc
 man/man1/batch_crop.1.gz
@@ -85,47 +85,14 @@ 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%%share/doc/vips/pdf/vipsmanual.pdf
-%%PORTDOCS%%@dirrm share/doc/vips/pdf
-%%PORTDOCS%%share/doc/vips/html/figs/arch.png
-%%PORTDOCS%%share/doc/vips/html/figs/interconvert.png
-%%PORTDOCS%%@dirrm share/doc/vips/html/figs
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse16.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualch4.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualli2.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualli3.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualli1.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse13.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanual.css
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse1.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse7.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse6.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse10.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse15.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse9.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse3.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualch3.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualch1.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse18.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse4.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse12.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse17.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse8.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse5.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualch2.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse2.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse14.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanualse11.html
-%%PORTDOCS%%share/doc/vips/html/vipsmanual.html
-%%PORTDOCS%%@dirrm share/doc/vips/html
-%%PORTDOCS%%@dirrm share/doc/vips
-%%PORTDOCS%%share/gtk-doc/html/libvips/VipsFormat.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/VipsForeignSave.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsImage.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsInterpolate.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/VipsObject.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsOperation.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/VipsPool.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsRegion.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/VipsThreadState.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/annotation-glossary.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/api-index-full.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch01.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/ch02.html
@@ -134,38 +101,35 @@ share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
 %%PORTDOCS%%share/gtk-doc/html/libvips/index.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/index.sgml
 %%PORTDOCS%%share/gtk-doc/html/libvips/interconvert.png
+%%PORTDOCS%%share/gtk-doc/html/libvips/left-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/left.png
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-VipsArgument.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-arithmetic.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-boolean.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-buf.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-colour.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-conversion.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-convolution.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-create.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-draw.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-error.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-freq-filt.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-freqfilt.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-generate.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-header.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-histograms-lut.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-inplace.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-mask.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-histogram.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-memory.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-morphology.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-mosaicing.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-other.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-rect.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips.devhelp
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-relational.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-resample.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-semaphore.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-transform.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-util.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips-version.html
-%%PORTDOCS%%share/gtk-doc/html/libvips/libvips-video.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/libvips.devhelp2
 %%PORTDOCS%%share/gtk-doc/html/libvips/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libvips/right-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/right.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/style.css
+%%PORTDOCS%%share/gtk-doc/html/libvips/up-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/up.png
 %%PORTDOCS%%@dirrm share/gtk-doc/html/libvips
 %%PORTDOCS%%@dirrmtry share/gtk-doc/html