- Update graphics/vips and graphics/nip2 to 8.7.0

- Use GITHUB instead of MASTER_SITES

6 files changed, 58 insertions, 120 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 03381483b59e..3a9d0dc20faa 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	nip2
-PORTVERSION=	8.6.0
-PORTREVISION=	2
+PORTVERSION=	8.7.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Graphical user interface for VIPS
@@ -18,19 +17,22 @@ LIB_DEPENDS=	libvips.so:graphics/vips \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		bison desktop-file-utils dos2unix gettext gmake pkgconfig \
+USES=		autoreconf:build bison desktop-file-utils dos2unix gettext gmake gnome pkgconfig \
 		shared-mime-info
+
 DOS2UNIX_GLOB=	*.def
 USE_GNOME=	cairo gdkpixbuf2 gnomemimedata gtk20 libxml2
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--disable-update-desktop
 LDFLAGS+=	-lm
 
-GH_ACCOUNT=	jcupitt
+USE_GITHUB=	yes
+GH_ACCOUNT=	libvips
 
 SUB_FILES=	run-nip2.sh
 
-OPTIONS_DEFINE=		DOCS FFTW GOFFICE GRAPHVIZ GSF GSL
+OPTIONS_DEFINE=		FFTW GOFFICE GRAPHVIZ GSF GSL
 OPTIONS_DEFAULT=	FFTW GOFFICE GRAPHVIZ GSF GSL
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index 4e2d5cbf1783..691e18e06c9a 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515158898
-SHA256 (nip2-8.6.0.tar.gz) = 1ed55f0890a626d7a45c513e4788058d99b45008b793072c3f7e80231a7c7186
-SIZE (nip2-8.6.0.tar.gz) = 8245610
+TIMESTAMP = 1538421349
+SHA256 (libvips-nip2-v8.7.0_GH0.tar.gz) = af6a9437885da6a450571b566e309f5e022b30fa153a44d252d77c0502d88982
+SIZE (libvips-nip2-v8.7.0_GH0.tar.gz) = 5754241
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 5fc52b381c69..8c0f5ec8789d 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,85 +1,8 @@
 bin/nip2
 bin/run-nip2.sh
-man/man1/nip2.1.gz
 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
+share/man/man1/nip2.1
 share/mime/packages/nip2.xml
 %%DATADIR%%/compat/7.10/Colour.def
 %%DATADIR%%/compat/7.10/Filter.def
@@ -375,6 +298,26 @@ share/mime/packages/nip2.xml
 %%DATADIR%%/compat/8.5/_predicate.def
 %%DATADIR%%/compat/8.5/_stdenv.def
 %%DATADIR%%/compat/8.5/_types.def
+%%DATADIR%%/compat/8.6/Colour.def
+%%DATADIR%%/compat/8.6/Filter.def
+%%DATADIR%%/compat/8.6/Histogram.def
+%%DATADIR%%/compat/8.6/Image.def
+%%DATADIR%%/compat/8.6/Magick.def
+%%DATADIR%%/compat/8.6/Math.def
+%%DATADIR%%/compat/8.6/Matrix.def
+%%DATADIR%%/compat/8.6/Object.def
+%%DATADIR%%/compat/8.6/Tasks.def
+%%DATADIR%%/compat/8.6/Widgets.def
+%%DATADIR%%/compat/8.6/_Object.def
+%%DATADIR%%/compat/8.6/_convert.def
+%%DATADIR%%/compat/8.6/_generate.def
+%%DATADIR%%/compat/8.6/_joe_extra.def
+%%DATADIR%%/compat/8.6/_joe_utilities.def
+%%DATADIR%%/compat/8.6/_list.def
+%%DATADIR%%/compat/8.6/_magick.def
+%%DATADIR%%/compat/8.6/_predicate.def
+%%DATADIR%%/compat/8.6/_stdenv.def
+%%DATADIR%%/compat/8.6/_types.def
 %%DATADIR%%/data/AdobeRGB1998.icc
 %%DATADIR%%/data/cmyk.icm
 %%DATADIR%%/data/examples/1_point_mosaic/1pt_mosaic.ws
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 076d6d3a8a64..d1be53950f4e 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	vips
-PORTVERSION=	8.6.5
-PORTREVISION=	3
+PORTVERSION=	8.7.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Free image processing system
@@ -13,6 +12,7 @@ COMMENT=	Free image processing system
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 RUN_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		liborc-0.4.so:devel/orc \
@@ -32,20 +32,26 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libImath.so:graphics/ilmbase \
 		libhdf5.so:science/hdf5 \
-		libexpat.so:textproc/expat2
+		libexpat.so:textproc/expat2 \
+		libcurl.so:ftp/curl
+
+USES=		autoreconf:build compiler:c++11-lang cpe gettext gmake gnome jpeg libtool \
+		pathfix pkgconfig python:2.7 shebangfix
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jcupitt
+GH_PROJECT=	libvips
 
-USES=		compiler:c++11-lang cpe gettext gmake jpeg libtool pathfix pkgconfig python:2.7 shebangfix
 SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
 USE_GNOME=	cairo gdkpixbuf2 glib20 libgsf librsvg2 libxml2 pango
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-x \
-		--without-openslide \
-		--with-magickpackage=GraphicsMagick
+CONFIGURE_SCRIPT=	./autogen.sh
+CONFIGURE_ARGS+=	--without-x \
+			--without-openslide \
+			--with-magickpackage=GraphicsMagick
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-GH_ACCOUNT=	jcupitt
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -55,9 +61,8 @@ OPTIONS_DEFINE=		DOCS PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
-DOCS_CONFIGURE_ENABLE=	docs
+DOCS_CONFIGURE_ENABLE=	gtk-doc gtk-doc-html
 
-PYTHON_CONFIGURE_WITH=	python
 PYTHON_CONFIGURE_ENABLE=	pyvips8
 PYTHON_USE=			GNOME=pygobject3
 
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index bf1643cf26f7..18eeb4927a34 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532549699
-SHA256 (vips-8.6.5.tar.gz) = 8702af0e340e220e0c08f8ded6c8248b18e7043938d9e8a2426631fd37a9d5db
-SIZE (vips-8.6.5.tar.gz) = 12151424
+TIMESTAMP = 1538420393
+SHA256 (jcupitt-libvips-v8.7.0_GH0.tar.gz) = 79be1d48be6d7426ca41724f920ab6754721449b6bd4ec963ebc3fb4312216b4
+SIZE (jcupitt-libvips-v8.7.0_GH0.tar.gz) = 13607364
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index b5864d3f84ba..43488ed318fd 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -9,13 +9,9 @@ bin/vipsedit
 bin/vipsheader
 bin/vipsprofile
 bin/vipsthumbnail
-include/vips/VDisplay.h
-include/vips/VError.h
 include/vips/VError8.h
-include/vips/VImage.h
 include/vips/VImage8.h
 include/vips/VInterpolate8.h
-include/vips/VMask.h
 include/vips/almostdeprecated.h
 include/vips/arithmetic.h
 include/vips/basic.h
@@ -62,32 +58,24 @@ include/vips/util.h
 include/vips/vector.h
 include/vips/version.h
 include/vips/video.h
-include/vips/vips
 include/vips/vips-operators.h
 include/vips/vips.h
 include/vips/vips7compat.h
 include/vips/vips8
-include/vips/vipsc++.h
-include/vips/vipscpp.h
 lib/girepository-1.0/Vips-8.0.typelib
 lib/libvips-cpp.a
 lib/libvips-cpp.so
 lib/libvips-cpp.so.42
-lib/libvips-cpp.so.42.8.4
+lib/libvips-cpp.so.42.9.0
 lib/libvips.a
 lib/libvips.so
 lib/libvips.so.42
-lib/libvips.so.42.8.4
-lib/libvipsCC.a
-lib/libvipsCC.so
-lib/libvipsCC.so.42
-lib/libvipsCC.so.42.8.4
+lib/libvips.so.42.9.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Vips.pyo
 libdata/pkgconfig/vips-cpp.pc
 libdata/pkgconfig/vips.pc
-libdata/pkgconfig/vipsCC.pc
 man/man1/batch_crop.1.gz
 man/man1/batch_image_convert.1.gz
 man/man1/batch_rubber_sheet.1.gz
@@ -97,7 +85,7 @@ man/man1/vipsedit.1.gz
 man/man1/vipsheader.1.gz
 man/man1/vipsprofile.1.gz
 man/man1/vipsthumbnail.1.gz
-%%PORTDOCS%%share/gir-1.0/Vips-8.0.gir
+share/gir-1.0/Vips-8.0.gir
 %%PORTDOCS%%share/gtk-doc/html/libvips/Cite.md.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/Combine.png
 %%PORTDOCS%%share/gtk-doc/html/libvips/Examples.md.html
@@ -168,5 +156,5 @@ man/man1/vipsthumbnail.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-from-c.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-from-cpp.html
 %%PORTDOCS%%share/gtk-doc/html/libvips/using-threads.html
-%%PORTDOCS%%share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
-%%PORTDOCS%%share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/vips%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/vips%%VERSION%%.mo