- Use MASTER_SITES to download the tarball release by the project [1]

- Reintroduce DOCS options

Reported by:	mat [1]

3 files changed, 87 insertions, 13 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 3a9d0dc20faa..d7bb7a8c303c 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,8 +3,9 @@
 
 PORTNAME=	nip2
 PORTVERSION=	8.7.0
-DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	graphics
+MASTER_SITES=	https://github.com/libvips/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Graphical user interface for VIPS
@@ -17,22 +18,18 @@ LIB_DEPENDS=	libvips.so:graphics/vips \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		autoreconf:build bison desktop-file-utils dos2unix gettext gmake gnome pkgconfig \
+USES=		bison desktop-file-utils dos2unix gettext gmake gnome pkgconfig \
 		shared-mime-info
 
 DOS2UNIX_GLOB=	*.def
 USE_GNOME=	cairo gdkpixbuf2 gnomemimedata gtk20 libxml2
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	./autogen.sh
-CONFIGURE_ARGS=	--disable-update-desktop
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-update-desktop
 LDFLAGS+=	-lm
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	libvips
-
 SUB_FILES=	run-nip2.sh
 
-OPTIONS_DEFINE=		FFTW GOFFICE GRAPHVIZ GSF GSL
+OPTIONS_DEFINE=		DOCS 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 691e18e06c9a..4bf287de5787 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538421349
-SHA256 (libvips-nip2-v8.7.0_GH0.tar.gz) = af6a9437885da6a450571b566e309f5e022b30fa153a44d252d77c0502d88982
-SIZE (libvips-nip2-v8.7.0_GH0.tar.gz) = 5754241
+TIMESTAMP = 1541843938
+SHA256 (nip2-8.7.0.tar.gz) = 6ce935adfdc643e0ce32c544aea0efce64a102390170d6696c7d074b7473bd21
+SIZE (nip2-8.7.0.tar.gz) = 8491333
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 8c0f5ec8789d..45134abb3efa 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,8 +1,85 @@
 bin/nip2
 bin/run-nip2.sh
+man/man1/nip2.1.gz
 share/appdata/nip2.appdata.xml
 share/applications/nip2.desktop
-share/man/man1/nip2.1
+%%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/mime/packages/nip2.xml
 %%DATADIR%%/compat/7.10/Colour.def
 %%DATADIR%%/compat/7.10/Filter.def