graphics/vips & nip2: Upgrade version

Upgrade vips version 7.40.3 => 7.40.4
Upgrade nip2 version 7.40.2 => 7.40.3

PR:		192206
Submitted by:	Ports Fury

4 files changed, 120 insertions, 138 deletions

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