Unbreak and update the two ports to the latest version of 7.12.4.

Take over maintainership temporarily upon request from the software's
author(s), who were unable to reach the previous maintainer.

In both:
	- use explict --mandir=${PREFIX}/man to avoid man-pages getting
	  into ${PREFIX}/shared/man incorrectly
	- deal with the NOPORTDOCS situation by simply not-extracting
	  the extra documentation from the distribution tarball
	- parallelize the build to scale with the number of CPUs

In vips:
	- move the (giant) list of man-pages into a separate Makefile.man
	- turn the pages, which contain only `.so other-page', into
	  MANLINKS (specified in Makefile.man)
	- provide a "maintainance target" to regenerate the Makefile.man
	  during the next upgrade
	- do not install the HTML-ized versions of man-pages
	- create OPTIONS for use of devel/liboil and graphics/ImageMagick
	  (OPTION to use PYTHON awaits portmgr's decision/action)

In nip2:
	- do install the HTML pages regardless of NOPORTDOCS -- these
	  are accessible to the user through the application GUI
	- arrange for update-mime-database and update-desktop-database
	  to be run upon install (@exec) and uninstall (@unexec)
	- LIB_DEPEND on math/gsl, which nip2 can use for extra functionality

These ports are in need of a dedicated maintainer.

Approved by:	maintainer timeout

3 files changed, 136 insertions, 167 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 99c45dbdae3a..8f83c67155d7 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	nip2
-PORTVERSION=	7.10.21
-PORTREVISION?=	1
+PORTVERSION=	7.12.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-7.10/
+MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-${PORTVERSION:R}/
 
-MAINTAINER=	lev@FreeBSD.org
+MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Graphical user interface for VIPS
 
-LIB_DEPENDS=	vips.18:${PORTSDIR}/graphics/vips \
-		xml2.5:${PORTSDIR}/textproc/libxml2
-
-BROKEN=		Incomplete pkg-plist
+LIB_DEPENDS=	vips:${PORTSDIR}/graphics/vips	\
+		gsl:${PORTSDIR}/math/gsl	\
+		xml2:${PORTSDIR}/textproc/libxml2
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomemimedata glib20 pkgconfig gtk20
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+# 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 NOPORTDOCS setting.
+# The PDF version of the documentation is another story:
+.if defined(NOPORTDOCS)
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude nipguide --exclude pdf
+.endif
+# Somehow vendor's configure misses these:
+MAKE_ENV+=	UPDATE_MIME_DATABASE=update-mime-database	\
+		UPDATE_DESKTOP_DATABASE=update-desktop-database
 
 MAN1=		nip2.1
 
 post-patch:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} 's/^EXTRA_DIST = scraps bootstrap doc/EXTRA_DIST = scraps bootstrap/' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} '535,538s/^/#/' ${WRKSRC}/Makefile.in
-.endif
+	${REINPLACE_CMD} -e 's, malkovich,,' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index b06c54553339..ecad7e8f3f4c 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nip2-7.10.21.tar.gz) = 25ab1f179c350d43746b66c90156013e
-SHA256 (nip2-7.10.21.tar.gz) = 83745506c88d48c8fc900f29dd8daca9c762059152cbc4c4627a8e712f3e5cb4
-SIZE (nip2-7.10.21.tar.gz) = 12374798
+MD5 (nip2-7.12.4.tar.gz) = d9d9cf35fe47385e2eb4200cc02a9dd3
+SHA256 (nip2-7.12.4.tar.gz) = 904e010e0025510f0c587cd0a0c44a599134de7402f13ace898e3570763992ea
+SIZE (nip2-7.12.4.tar.gz) = 8311116
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 31d6e75c9b1c..4e237422d586 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,7 +1,6 @@
 bin/nip2
 bin/run-nip2.sh
 share/locale/en_GB/LC_MESSAGES/nip2.mo
-share/locale/malkovich/LC_MESSAGES/nip2.mo
 share/nip2/compat/7.8/Capture.def
 share/nip2/compat/7.8/Colour.def
 share/nip2/compat/7.8/Filter.def
@@ -46,8 +45,26 @@ 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/Filter.def
+share/nip2/compat/7.10/Format.def
+share/nip2/compat/7.10/Histogram.def
+share/nip2/compat/7.10/Image.def
+share/nip2/compat/7.10/Math.def
+share/nip2/compat/7.10/Matrix.def
+share/nip2/compat/7.10/Tasks.def
+share/nip2/compat/7.10/Widgets.def
+share/nip2/compat/7.10/_convert.def
+share/nip2/compat/7.10/_generate.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/_predicate.def
+share/nip2/compat/7.10/_stdenv.def
+share/nip2/compat/7.10/_types.def
 share/nip2/data/AdobeRGB1998.icc
 share/nip2/data/HP5000_UVDuraImageGlossMaxQ.icc
+share/nip2/data/nip2-icon.ico
 share/nip2/data/examples/1_point_mosiac/1pt_mosaic.ws
 share/nip2/data/examples/1_point_mosiac/cd1.1.jpg
 share/nip2/data/examples/1_point_mosiac/cd1.2.jpg
@@ -131,156 +148,9 @@ share/nip2/start/_list.def
 share/nip2/start/_predicate.def
 share/nip2/start/_stdenv.def
 share/nip2/start/_types.def
-%%PORTDOCS%%%%DOCSDIR%%/html/WARNINGS
-%%PORTDOCS%%%%DOCSDIR%%/html/images.aux
-%%PORTDOCS%%%%DOCSDIR%%/html/images.log
-%%PORTDOCS%%%%DOCSDIR%%/html/images.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/images.tex
-%%PORTDOCS%%%%DOCSDIR%%/html/img1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img10.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img11.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img12.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img13.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img14.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img15.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img16.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img17.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img18.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img19.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img20.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img21.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img22.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img23.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img24.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img25.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img26.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img27.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img28.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img29.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img3.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img30.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img31.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img32.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img33.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img34.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img35.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img36.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img37.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img38.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img39.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img4.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img40.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img41.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img42.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img5.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img6.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img7.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img8.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img9.png
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/internals.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/labels.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/nipguide.css
-%%PORTDOCS%%%%DOCSDIR%%/html/nipguide.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node13.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node14.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node15.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node16.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node17.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node18.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node19.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node20.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node21.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node22.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node23.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node25.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node26.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node27.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node28.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node29.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node30.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node31.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node32.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node33.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node34.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node35.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node36.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node37.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node38.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node39.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node40.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node41.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node42.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node43.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node44.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node45.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node46.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node47.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node48.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node49.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node50.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node51.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node52.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node53.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node54.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node55.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node56.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node57.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node58.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node59.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node60.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node61.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node63.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node64.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node65.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node68.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node69.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node70.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node71.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node72.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node73.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node74.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node75.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node76.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node77.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node78.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node79.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node80.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node81.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node82.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node83.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node84.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node85.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node86.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node87.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node88.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node89.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node90.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node91.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node92.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node93.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node94.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node95.html
-%%PORTDOCS%%%%DOCSDIR%%/ps/nipguide.ps
 @dirrm share/nip2/compat/7.8
 @dirrm share/nip2/compat/7.9
+@dirrm share/nip2/compat/7.10
 @dirrm share/nip2/compat
 @dirrm share/nip2/data/examples/1_point_mosiac
 @dirrm share/nip2/data/examples/2_point_mosiac
@@ -296,6 +166,98 @@ share/nip2/start/_types.def
 @dirrm share/nip2/rc
 @dirrm share/nip2/start
 @dirrm share/nip2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCSDIR%%/html/figs/ir1.jpg
+%%DOCSDIR%%/html/figs/ir2.jpg
+%%DOCSDIR%%/html/figs/ir3.jpg
+%%DOCSDIR%%/html/figs/ir4.jpg
+%%DOCSDIR%%/html/figs/ir5.jpg
+%%DOCSDIR%%/html/figs/ir6.jpg
+%%DOCSDIR%%/html/figs/ir7.jpg
+%%DOCSDIR%%/html/figs/ir8a.jpg
+%%DOCSDIR%%/html/figs/ir9.jpg
+%%DOCSDIR%%/html/figs/mos2.png
+%%DOCSDIR%%/html/figs/scr21a.png
+%%DOCSDIR%%/html/figs/scr22.png
+%%DOCSDIR%%/html/figs/scr23.jpg
+%%DOCSDIR%%/html/figs/scr24.jpg
+%%DOCSDIR%%/html/figs/scr25.jpg
+%%DOCSDIR%%/html/figs/scr26.png
+%%DOCSDIR%%/html/figs/snap1.jpg
+%%DOCSDIR%%/html/figs/snap10.jpg
+%%DOCSDIR%%/html/figs/snap11.jpg
+%%DOCSDIR%%/html/figs/snap12.jpg
+%%DOCSDIR%%/html/figs/snap13.jpg
+%%DOCSDIR%%/html/figs/snap14.jpg
+%%DOCSDIR%%/html/figs/snap15.jpg
+%%DOCSDIR%%/html/figs/snap16.jpg
+%%DOCSDIR%%/html/figs/snap2.jpg
+%%DOCSDIR%%/html/figs/snap3.jpg
+%%DOCSDIR%%/html/figs/snap4.jpg
+%%DOCSDIR%%/html/figs/snap5.jpg
+%%DOCSDIR%%/html/figs/snap6.jpg
+%%DOCSDIR%%/html/figs/snap7.jpg
+%%DOCSDIR%%/html/figs/snap7a.jpg
+%%DOCSDIR%%/html/figs/snap8.jpg
+%%DOCSDIR%%/html/figs/snap9.jpg
+%%DOCSDIR%%/html/figs/toolkit.jpg
+%%DOCSDIR%%/html/figs/toolkit2.jpg
+%%DOCSDIR%%/html/figs/toolkit3.jpg
+%%DOCSDIR%%/html/nipguide.css
+%%DOCSDIR%%/html/nipguide.html
+%%DOCSDIR%%/html/nipguide37.html
+%%DOCSDIR%%/html/nipguideap1.html
+%%DOCSDIR%%/html/nipguidech1.html
+%%DOCSDIR%%/html/nipguidech2.html
+%%DOCSDIR%%/html/nipguidech3.html
+%%DOCSDIR%%/html/nipguidech4.html
+%%DOCSDIR%%/html/nipguidech5.html
+%%DOCSDIR%%/html/nipguidech6.html
+%%DOCSDIR%%/html/nipguideli1.html
+%%DOCSDIR%%/html/nipguideli2.html
+%%DOCSDIR%%/html/nipguideli3.html
+%%DOCSDIR%%/html/nipguidese1.html
+%%DOCSDIR%%/html/nipguidese10.html
+%%DOCSDIR%%/html/nipguidese11.html
+%%DOCSDIR%%/html/nipguidese12.html
+%%DOCSDIR%%/html/nipguidese13.html
+%%DOCSDIR%%/html/nipguidese14.html
+%%DOCSDIR%%/html/nipguidese15.html
+%%DOCSDIR%%/html/nipguidese16.html
+%%DOCSDIR%%/html/nipguidese17.html
+%%DOCSDIR%%/html/nipguidese18.html
+%%DOCSDIR%%/html/nipguidese19.html
+%%DOCSDIR%%/html/nipguidese2.html
+%%DOCSDIR%%/html/nipguidese20.html
+%%DOCSDIR%%/html/nipguidese21.html
+%%DOCSDIR%%/html/nipguidese22.html
+%%DOCSDIR%%/html/nipguidese23.html
+%%DOCSDIR%%/html/nipguidese24.html
+%%DOCSDIR%%/html/nipguidese25.html
+%%DOCSDIR%%/html/nipguidese26.html
+%%DOCSDIR%%/html/nipguidese27.html
+%%DOCSDIR%%/html/nipguidese28.html
+%%DOCSDIR%%/html/nipguidese29.html
+%%DOCSDIR%%/html/nipguidese3.html
+%%DOCSDIR%%/html/nipguidese30.html
+%%DOCSDIR%%/html/nipguidese31.html
+%%DOCSDIR%%/html/nipguidese32.html
+%%DOCSDIR%%/html/nipguidese33.html
+%%DOCSDIR%%/html/nipguidese34.html
+%%DOCSDIR%%/html/nipguidese35.html
+%%DOCSDIR%%/html/nipguidese4.html
+%%DOCSDIR%%/html/nipguidese5.html
+%%DOCSDIR%%/html/nipguidese6.html
+%%DOCSDIR%%/html/nipguidese7.html
+%%DOCSDIR%%/html/nipguidese8.html
+%%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 || :